===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.390
retrieving revision 1.391
diff -c -r1.390 -r1.391
*** src/usr.bin/tmux/server-client.c	2021/11/15 10:58:13	1.390
--- src/usr.bin/tmux/server-client.c	2022/02/16 18:55:05	1.391
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.390 2021/11/15 10:58:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.391 2022/02/16 18:55:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 596,606 ****
  		log_debug("double-click at %u,%u", x, y);
  	} else if ((m->sgr_type != ' ' &&
  	    MOUSE_DRAG(m->sgr_b) &&
! 	    MOUSE_BUTTONS(m->sgr_b) == 3) ||
  	    (m->sgr_type == ' ' &&
  	    MOUSE_DRAG(m->b) &&
! 	    MOUSE_BUTTONS(m->b) == 3 &&
! 	    MOUSE_BUTTONS(m->lb) == 3)) {
  		type = MOVE;
  		x = m->x, y = m->y, b = 0;
  		log_debug("move at %u,%u", x, y);
--- 596,606 ----
  		log_debug("double-click at %u,%u", x, y);
  	} else if ((m->sgr_type != ' ' &&
  	    MOUSE_DRAG(m->sgr_b) &&
! 	    MOUSE_RELEASE(m->sgr_b)) ||
  	    (m->sgr_type == ' ' &&
  	    MOUSE_DRAG(m->b) &&
! 	    MOUSE_RELEASE(m->b) &&
! 	    MOUSE_RELEASE(m->lb))) {
  		type = MOVE;
  		x = m->x, y = m->y, b = 0;
  		log_debug("move at %u,%u", x, y);
***************
*** 753,759 ****
  		m->wp = -1;
  
  	/* Stop dragging if needed. */
! 	if (type != DRAG && type != WHEEL && c->tty.mouse_drag_flag) {
  		if (c->tty.mouse_drag_release != NULL)
  			c->tty.mouse_drag_release(c, m);
  
--- 753,759 ----
  		m->wp = -1;
  
  	/* Stop dragging if needed. */
! 	if (type != DRAG && type != WHEEL && c->tty.mouse_drag_flag != 0) {
  		if (c->tty.mouse_drag_release != NULL)
  			c->tty.mouse_drag_release(c, m);
  
***************
*** 764,771 ****
  		 * End a mouse drag by passing a MouseDragEnd key corresponding
  		 * to the button that started the drag.
  		 */
! 		switch (c->tty.mouse_drag_flag) {
! 		case 1:
  			if (where == PANE)
  				key = KEYC_MOUSEDRAGEND1_PANE;
  			if (where == STATUS)
--- 764,771 ----
  		 * End a mouse drag by passing a MouseDragEnd key corresponding
  		 * to the button that started the drag.
  		 */
! 		switch (c->tty.mouse_drag_flag - 1) {
! 		case MOUSE_BUTTON_1:
  			if (where == PANE)
  				key = KEYC_MOUSEDRAGEND1_PANE;
  			if (where == STATUS)
***************
*** 779,785 ****
  			if (where == BORDER)
  				key = KEYC_MOUSEDRAGEND1_BORDER;
  			break;
! 		case 2:
  			if (where == PANE)
  				key = KEYC_MOUSEDRAGEND2_PANE;
  			if (where == STATUS)
--- 779,785 ----
  			if (where == BORDER)
  				key = KEYC_MOUSEDRAGEND1_BORDER;
  			break;
! 		case MOUSE_BUTTON_2:
  			if (where == PANE)
  				key = KEYC_MOUSEDRAGEND2_PANE;
  			if (where == STATUS)
***************
*** 793,799 ****
  			if (where == BORDER)
  				key = KEYC_MOUSEDRAGEND2_BORDER;
  			break;
! 		case 3:
  			if (where == PANE)
  				key = KEYC_MOUSEDRAGEND3_PANE;
  			if (where == STATUS)
--- 793,799 ----
  			if (where == BORDER)
  				key = KEYC_MOUSEDRAGEND2_BORDER;
  			break;
! 		case MOUSE_BUTTON_3:
  			if (where == PANE)
  				key = KEYC_MOUSEDRAGEND3_PANE;
  			if (where == STATUS)
***************
*** 807,812 ****
--- 807,896 ----
  			if (where == BORDER)
  				key = KEYC_MOUSEDRAGEND3_BORDER;
  			break;
+ 		case MOUSE_BUTTON_6:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEDRAGEND6_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEDRAGEND6_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEDRAGEND6_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEDRAGEND6_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDRAGEND6_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEDRAGEND6_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_7:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEDRAGEND7_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEDRAGEND7_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEDRAGEND7_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEDRAGEND7_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDRAGEND7_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEDRAGEND7_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_8:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEDRAGEND8_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEDRAGEND8_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEDRAGEND8_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEDRAGEND8_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDRAGEND8_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEDRAGEND8_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_9:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEDRAGEND9_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEDRAGEND9_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEDRAGEND9_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEDRAGEND9_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDRAGEND9_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEDRAGEND9_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_10:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEDRAGEND10_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEDRAGEND10_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEDRAGEND10_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEDRAGEND10_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDRAGEND10_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEDRAGEND10_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_11:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEDRAGEND11_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEDRAGEND11_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEDRAGEND11_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEDRAGEND11_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDRAGEND11_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEDRAGEND11_BORDER;
+ 			break;
  		default:
  			key = KEYC_MOUSE;
  			break;
***************
*** 839,845 ****
  			key = KEYC_DRAGGING;
  		else {
  			switch (MOUSE_BUTTONS(b)) {
! 			case 0:
  				if (where == PANE)
  					key = KEYC_MOUSEDRAG1_PANE;
  				if (where == STATUS)
--- 923,929 ----
  			key = KEYC_DRAGGING;
  		else {
  			switch (MOUSE_BUTTONS(b)) {
! 			case MOUSE_BUTTON_1:
  				if (where == PANE)
  					key = KEYC_MOUSEDRAG1_PANE;
  				if (where == STATUS)
***************
*** 853,859 ****
  				if (where == BORDER)
  					key = KEYC_MOUSEDRAG1_BORDER;
  				break;
! 			case 1:
  				if (where == PANE)
  					key = KEYC_MOUSEDRAG2_PANE;
  				if (where == STATUS)
--- 937,943 ----
  				if (where == BORDER)
  					key = KEYC_MOUSEDRAG1_BORDER;
  				break;
! 			case MOUSE_BUTTON_2:
  				if (where == PANE)
  					key = KEYC_MOUSEDRAG2_PANE;
  				if (where == STATUS)
***************
*** 867,873 ****
  				if (where == BORDER)
  					key = KEYC_MOUSEDRAG2_BORDER;
  				break;
! 			case 2:
  				if (where == PANE)
  					key = KEYC_MOUSEDRAG3_PANE;
  				if (where == STATUS)
--- 951,957 ----
  				if (where == BORDER)
  					key = KEYC_MOUSEDRAG2_BORDER;
  				break;
! 			case MOUSE_BUTTON_3:
  				if (where == PANE)
  					key = KEYC_MOUSEDRAG3_PANE;
  				if (where == STATUS)
***************
*** 881,886 ****
--- 965,1054 ----
  				if (where == BORDER)
  					key = KEYC_MOUSEDRAG3_BORDER;
  				break;
+ 			case MOUSE_BUTTON_6:
+ 				if (where == PANE)
+ 					key = KEYC_MOUSEDRAG6_PANE;
+ 				if (where == STATUS)
+ 					key = KEYC_MOUSEDRAG6_STATUS;
+ 				if (where == STATUS_LEFT)
+ 					key = KEYC_MOUSEDRAG6_STATUS_LEFT;
+ 				if (where == STATUS_RIGHT)
+ 					key = KEYC_MOUSEDRAG6_STATUS_RIGHT;
+ 				if (where == STATUS_DEFAULT)
+ 					key = KEYC_MOUSEDRAG6_STATUS_DEFAULT;
+ 				if (where == BORDER)
+ 					key = KEYC_MOUSEDRAG6_BORDER;
+ 				break;
+ 			case MOUSE_BUTTON_7:
+ 				if (where == PANE)
+ 					key = KEYC_MOUSEDRAG7_PANE;
+ 				if (where == STATUS)
+ 					key = KEYC_MOUSEDRAG7_STATUS;
+ 				if (where == STATUS_LEFT)
+ 					key = KEYC_MOUSEDRAG7_STATUS_LEFT;
+ 				if (where == STATUS_RIGHT)
+ 					key = KEYC_MOUSEDRAG7_STATUS_RIGHT;
+ 				if (where == STATUS_DEFAULT)
+ 					key = KEYC_MOUSEDRAG7_STATUS_DEFAULT;
+ 				if (where == BORDER)
+ 					key = KEYC_MOUSEDRAG7_BORDER;
+ 				break;
+ 			case MOUSE_BUTTON_8:
+ 				if (where == PANE)
+ 					key = KEYC_MOUSEDRAG8_PANE;
+ 				if (where == STATUS)
+ 					key = KEYC_MOUSEDRAG8_STATUS;
+ 				if (where == STATUS_LEFT)
+ 					key = KEYC_MOUSEDRAG8_STATUS_LEFT;
+ 				if (where == STATUS_RIGHT)
+ 					key = KEYC_MOUSEDRAG8_STATUS_RIGHT;
+ 				if (where == STATUS_DEFAULT)
+ 					key = KEYC_MOUSEDRAG8_STATUS_DEFAULT;
+ 				if (where == BORDER)
+ 					key = KEYC_MOUSEDRAG8_BORDER;
+ 				break;
+ 			case MOUSE_BUTTON_9:
+ 				if (where == PANE)
+ 					key = KEYC_MOUSEDRAG9_PANE;
+ 				if (where == STATUS)
+ 					key = KEYC_MOUSEDRAG9_STATUS;
+ 				if (where == STATUS_LEFT)
+ 					key = KEYC_MOUSEDRAG9_STATUS_LEFT;
+ 				if (where == STATUS_RIGHT)
+ 					key = KEYC_MOUSEDRAG9_STATUS_RIGHT;
+ 				if (where == STATUS_DEFAULT)
+ 					key = KEYC_MOUSEDRAG9_STATUS_DEFAULT;
+ 				if (where == BORDER)
+ 					key = KEYC_MOUSEDRAG9_BORDER;
+ 				break;
+ 			case MOUSE_BUTTON_10:
+ 				if (where == PANE)
+ 					key = KEYC_MOUSEDRAG10_PANE;
+ 				if (where == STATUS)
+ 					key = KEYC_MOUSEDRAG10_STATUS;
+ 				if (where == STATUS_LEFT)
+ 					key = KEYC_MOUSEDRAG10_STATUS_LEFT;
+ 				if (where == STATUS_RIGHT)
+ 					key = KEYC_MOUSEDRAG10_STATUS_RIGHT;
+ 				if (where == STATUS_DEFAULT)
+ 					key = KEYC_MOUSEDRAG10_STATUS_DEFAULT;
+ 				if (where == BORDER)
+ 					key = KEYC_MOUSEDRAG10_BORDER;
+ 				break;
+ 			case MOUSE_BUTTON_11:
+ 				if (where == PANE)
+ 					key = KEYC_MOUSEDRAG11_PANE;
+ 				if (where == STATUS)
+ 					key = KEYC_MOUSEDRAG11_STATUS;
+ 				if (where == STATUS_LEFT)
+ 					key = KEYC_MOUSEDRAG11_STATUS_LEFT;
+ 				if (where == STATUS_RIGHT)
+ 					key = KEYC_MOUSEDRAG11_STATUS_RIGHT;
+ 				if (where == STATUS_DEFAULT)
+ 					key = KEYC_MOUSEDRAG11_STATUS_DEFAULT;
+ 				if (where == BORDER)
+ 					key = KEYC_MOUSEDRAG11_BORDER;
+ 				break;
  			}
  		}
  
***************
*** 921,927 ****
  		break;
  	case UP:
  		switch (MOUSE_BUTTONS(b)) {
! 		case 0:
  			if (where == PANE)
  				key = KEYC_MOUSEUP1_PANE;
  			if (where == STATUS)
--- 1089,1095 ----
  		break;
  	case UP:
  		switch (MOUSE_BUTTONS(b)) {
! 		case MOUSE_BUTTON_1:
  			if (where == PANE)
  				key = KEYC_MOUSEUP1_PANE;
  			if (where == STATUS)
***************
*** 935,941 ****
  			if (where == BORDER)
  				key = KEYC_MOUSEUP1_BORDER;
  			break;
! 		case 1:
  			if (where == PANE)
  				key = KEYC_MOUSEUP2_PANE;
  			if (where == STATUS)
--- 1103,1109 ----
  			if (where == BORDER)
  				key = KEYC_MOUSEUP1_BORDER;
  			break;
! 		case MOUSE_BUTTON_2:
  			if (where == PANE)
  				key = KEYC_MOUSEUP2_PANE;
  			if (where == STATUS)
***************
*** 949,955 ****
  			if (where == BORDER)
  				key = KEYC_MOUSEUP2_BORDER;
  			break;
! 		case 2:
  			if (where == PANE)
  				key = KEYC_MOUSEUP3_PANE;
  			if (where == STATUS)
--- 1117,1123 ----
  			if (where == BORDER)
  				key = KEYC_MOUSEUP2_BORDER;
  			break;
! 		case MOUSE_BUTTON_3:
  			if (where == PANE)
  				key = KEYC_MOUSEUP3_PANE;
  			if (where == STATUS)
***************
*** 963,973 ****
  			if (where == BORDER)
  				key = KEYC_MOUSEUP3_BORDER;
  			break;
  		}
  		break;
  	case DOWN:
  		switch (MOUSE_BUTTONS(b)) {
! 		case 0:
  			if (where == PANE)
  				key = KEYC_MOUSEDOWN1_PANE;
  			if (where == STATUS)
--- 1131,1225 ----
  			if (where == BORDER)
  				key = KEYC_MOUSEUP3_BORDER;
  			break;
+ 		case MOUSE_BUTTON_6:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEUP6_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEUP6_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEUP6_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEUP6_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEUP6_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEUP6_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_7:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEUP7_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEUP7_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEUP7_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEUP7_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEUP7_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEUP7_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_8:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEUP8_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEUP8_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEUP8_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEUP8_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEUP8_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEUP8_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_9:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEUP9_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEUP9_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEUP9_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEUP9_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEUP9_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEUP9_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_10:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEUP1_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEUP1_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEUP1_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEUP1_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEUP1_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEUP1_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_11:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEUP11_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEUP11_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEUP11_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEUP11_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEUP11_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEUP11_BORDER;
+ 			break;
  		}
  		break;
  	case DOWN:
  		switch (MOUSE_BUTTONS(b)) {
! 		case MOUSE_BUTTON_1:
  			if (where == PANE)
  				key = KEYC_MOUSEDOWN1_PANE;
  			if (where == STATUS)
***************
*** 981,987 ****
  			if (where == BORDER)
  				key = KEYC_MOUSEDOWN1_BORDER;
  			break;
! 		case 1:
  			if (where == PANE)
  				key = KEYC_MOUSEDOWN2_PANE;
  			if (where == STATUS)
--- 1233,1239 ----
  			if (where == BORDER)
  				key = KEYC_MOUSEDOWN1_BORDER;
  			break;
! 		case MOUSE_BUTTON_2:
  			if (where == PANE)
  				key = KEYC_MOUSEDOWN2_PANE;
  			if (where == STATUS)
***************
*** 995,1001 ****
  			if (where == BORDER)
  				key = KEYC_MOUSEDOWN2_BORDER;
  			break;
! 		case 2:
  			if (where == PANE)
  				key = KEYC_MOUSEDOWN3_PANE;
  			if (where == STATUS)
--- 1247,1253 ----
  			if (where == BORDER)
  				key = KEYC_MOUSEDOWN2_BORDER;
  			break;
! 		case MOUSE_BUTTON_3:
  			if (where == PANE)
  				key = KEYC_MOUSEDOWN3_PANE;
  			if (where == STATUS)
***************
*** 1009,1019 ****
  			if (where == BORDER)
  				key = KEYC_MOUSEDOWN3_BORDER;
  			break;
  		}
  		break;
  	case SECOND:
  		switch (MOUSE_BUTTONS(b)) {
! 		case 0:
  			if (where == PANE)
  				key = KEYC_SECONDCLICK1_PANE;
  			if (where == STATUS)
--- 1261,1355 ----
  			if (where == BORDER)
  				key = KEYC_MOUSEDOWN3_BORDER;
  			break;
+ 		case MOUSE_BUTTON_6:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEDOWN6_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEDOWN6_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEDOWN6_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEDOWN6_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDOWN6_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEDOWN6_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_7:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEDOWN7_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEDOWN7_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEDOWN7_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEDOWN7_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDOWN7_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEDOWN7_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_8:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEDOWN8_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEDOWN8_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEDOWN8_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEDOWN8_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDOWN8_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEDOWN8_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_9:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEDOWN9_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEDOWN9_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEDOWN9_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEDOWN9_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDOWN9_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEDOWN9_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_10:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEDOWN10_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEDOWN10_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEDOWN10_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEDOWN10_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDOWN10_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEDOWN10_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_11:
+ 			if (where == PANE)
+ 				key = KEYC_MOUSEDOWN11_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_MOUSEDOWN11_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_MOUSEDOWN11_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_MOUSEDOWN11_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDOWN11_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_MOUSEDOWN11_BORDER;
+ 			break;
  		}
  		break;
  	case SECOND:
  		switch (MOUSE_BUTTONS(b)) {
! 		case MOUSE_BUTTON_1:
  			if (where == PANE)
  				key = KEYC_SECONDCLICK1_PANE;
  			if (where == STATUS)
***************
*** 1027,1033 ****
  			if (where == BORDER)
  				key = KEYC_SECONDCLICK1_BORDER;
  			break;
! 		case 1:
  			if (where == PANE)
  				key = KEYC_SECONDCLICK2_PANE;
  			if (where == STATUS)
--- 1363,1369 ----
  			if (where == BORDER)
  				key = KEYC_SECONDCLICK1_BORDER;
  			break;
! 		case MOUSE_BUTTON_2:
  			if (where == PANE)
  				key = KEYC_SECONDCLICK2_PANE;
  			if (where == STATUS)
***************
*** 1041,1047 ****
  			if (where == BORDER)
  				key = KEYC_SECONDCLICK2_BORDER;
  			break;
! 		case 2:
  			if (where == PANE)
  				key = KEYC_SECONDCLICK3_PANE;
  			if (where == STATUS)
--- 1377,1383 ----
  			if (where == BORDER)
  				key = KEYC_SECONDCLICK2_BORDER;
  			break;
! 		case MOUSE_BUTTON_3:
  			if (where == PANE)
  				key = KEYC_SECONDCLICK3_PANE;
  			if (where == STATUS)
***************
*** 1055,1065 ****
  			if (where == BORDER)
  				key = KEYC_SECONDCLICK3_BORDER;
  			break;
  		}
  		break;
  	case DOUBLE:
  		switch (MOUSE_BUTTONS(b)) {
! 		case 0:
  			if (where == PANE)
  				key = KEYC_DOUBLECLICK1_PANE;
  			if (where == STATUS)
--- 1391,1485 ----
  			if (where == BORDER)
  				key = KEYC_SECONDCLICK3_BORDER;
  			break;
+ 		case MOUSE_BUTTON_6:
+ 			if (where == PANE)
+ 				key = KEYC_SECONDCLICK6_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_SECONDCLICK6_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_SECONDCLICK6_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_SECONDCLICK6_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_SECONDCLICK6_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_SECONDCLICK6_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_7:
+ 			if (where == PANE)
+ 				key = KEYC_SECONDCLICK7_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_SECONDCLICK7_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_SECONDCLICK7_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_SECONDCLICK7_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_SECONDCLICK7_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_SECONDCLICK7_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_8:
+ 			if (where == PANE)
+ 				key = KEYC_SECONDCLICK8_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_SECONDCLICK8_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_SECONDCLICK8_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_SECONDCLICK8_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_SECONDCLICK8_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_SECONDCLICK8_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_9:
+ 			if (where == PANE)
+ 				key = KEYC_SECONDCLICK9_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_SECONDCLICK9_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_SECONDCLICK9_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_SECONDCLICK9_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_SECONDCLICK9_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_SECONDCLICK9_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_10:
+ 			if (where == PANE)
+ 				key = KEYC_SECONDCLICK10_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_SECONDCLICK10_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_SECONDCLICK10_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_SECONDCLICK10_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_SECONDCLICK10_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_SECONDCLICK10_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_11:
+ 			if (where == PANE)
+ 				key = KEYC_SECONDCLICK11_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_SECONDCLICK11_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_SECONDCLICK11_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_SECONDCLICK11_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_SECONDCLICK11_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_SECONDCLICK11_BORDER;
+ 			break;
  		}
  		break;
  	case DOUBLE:
  		switch (MOUSE_BUTTONS(b)) {
! 		case MOUSE_BUTTON_1:
  			if (where == PANE)
  				key = KEYC_DOUBLECLICK1_PANE;
  			if (where == STATUS)
***************
*** 1073,1079 ****
  			if (where == BORDER)
  				key = KEYC_DOUBLECLICK1_BORDER;
  			break;
! 		case 1:
  			if (where == PANE)
  				key = KEYC_DOUBLECLICK2_PANE;
  			if (where == STATUS)
--- 1493,1499 ----
  			if (where == BORDER)
  				key = KEYC_DOUBLECLICK1_BORDER;
  			break;
! 		case MOUSE_BUTTON_2:
  			if (where == PANE)
  				key = KEYC_DOUBLECLICK2_PANE;
  			if (where == STATUS)
***************
*** 1087,1093 ****
  			if (where == BORDER)
  				key = KEYC_DOUBLECLICK2_BORDER;
  			break;
! 		case 2:
  			if (where == PANE)
  				key = KEYC_DOUBLECLICK3_PANE;
  			if (where == STATUS)
--- 1507,1513 ----
  			if (where == BORDER)
  				key = KEYC_DOUBLECLICK2_BORDER;
  			break;
! 		case MOUSE_BUTTON_3:
  			if (where == PANE)
  				key = KEYC_DOUBLECLICK3_PANE;
  			if (where == STATUS)
***************
*** 1101,1111 ****
  			if (where == BORDER)
  				key = KEYC_DOUBLECLICK3_BORDER;
  			break;
  		}
  		break;
  	case TRIPLE:
  		switch (MOUSE_BUTTONS(b)) {
! 		case 0:
  			if (where == PANE)
  				key = KEYC_TRIPLECLICK1_PANE;
  			if (where == STATUS)
--- 1521,1615 ----
  			if (where == BORDER)
  				key = KEYC_DOUBLECLICK3_BORDER;
  			break;
+ 		case MOUSE_BUTTON_6:
+ 			if (where == PANE)
+ 				key = KEYC_DOUBLECLICK6_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_DOUBLECLICK6_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_DOUBLECLICK6_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_DOUBLECLICK6_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_DOUBLECLICK6_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_DOUBLECLICK6_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_7:
+ 			if (where == PANE)
+ 				key = KEYC_DOUBLECLICK7_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_DOUBLECLICK7_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_DOUBLECLICK7_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_DOUBLECLICK7_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_DOUBLECLICK7_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_DOUBLECLICK7_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_8:
+ 			if (where == PANE)
+ 				key = KEYC_DOUBLECLICK8_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_DOUBLECLICK8_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_DOUBLECLICK8_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_DOUBLECLICK8_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_DOUBLECLICK8_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_DOUBLECLICK8_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_9:
+ 			if (where == PANE)
+ 				key = KEYC_DOUBLECLICK9_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_DOUBLECLICK9_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_DOUBLECLICK9_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_DOUBLECLICK9_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_DOUBLECLICK9_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_DOUBLECLICK9_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_10:
+ 			if (where == PANE)
+ 				key = KEYC_DOUBLECLICK10_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_DOUBLECLICK10_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_DOUBLECLICK10_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_DOUBLECLICK10_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_DOUBLECLICK10_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_DOUBLECLICK10_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_11:
+ 			if (where == PANE)
+ 				key = KEYC_DOUBLECLICK11_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_DOUBLECLICK11_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_DOUBLECLICK11_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_DOUBLECLICK11_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_DOUBLECLICK11_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_DOUBLECLICK11_BORDER;
+ 			break;
  		}
  		break;
  	case TRIPLE:
  		switch (MOUSE_BUTTONS(b)) {
! 		case MOUSE_BUTTON_1:
  			if (where == PANE)
  				key = KEYC_TRIPLECLICK1_PANE;
  			if (where == STATUS)
***************
*** 1119,1125 ****
  			if (where == BORDER)
  				key = KEYC_TRIPLECLICK1_BORDER;
  			break;
! 		case 1:
  			if (where == PANE)
  				key = KEYC_TRIPLECLICK2_PANE;
  			if (where == STATUS)
--- 1623,1629 ----
  			if (where == BORDER)
  				key = KEYC_TRIPLECLICK1_BORDER;
  			break;
! 		case MOUSE_BUTTON_2:
  			if (where == PANE)
  				key = KEYC_TRIPLECLICK2_PANE;
  			if (where == STATUS)
***************
*** 1133,1139 ****
  			if (where == BORDER)
  				key = KEYC_TRIPLECLICK2_BORDER;
  			break;
! 		case 2:
  			if (where == PANE)
  				key = KEYC_TRIPLECLICK3_PANE;
  			if (where == STATUS)
--- 1637,1643 ----
  			if (where == BORDER)
  				key = KEYC_TRIPLECLICK2_BORDER;
  			break;
! 		case MOUSE_BUTTON_3:
  			if (where == PANE)
  				key = KEYC_TRIPLECLICK3_PANE;
  			if (where == STATUS)
***************
*** 1146,1151 ****
--- 1650,1739 ----
  				key = KEYC_TRIPLECLICK3_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_TRIPLECLICK3_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_6:
+ 			if (where == PANE)
+ 				key = KEYC_TRIPLECLICK6_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_TRIPLECLICK6_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_TRIPLECLICK6_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_TRIPLECLICK6_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_TRIPLECLICK6_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_TRIPLECLICK6_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_7:
+ 			if (where == PANE)
+ 				key = KEYC_TRIPLECLICK7_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_TRIPLECLICK7_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_TRIPLECLICK7_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_TRIPLECLICK7_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_TRIPLECLICK7_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_TRIPLECLICK7_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_8:
+ 			if (where == PANE)
+ 				key = KEYC_TRIPLECLICK8_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_TRIPLECLICK8_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_TRIPLECLICK8_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_TRIPLECLICK8_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_TRIPLECLICK8_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_TRIPLECLICK8_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_9:
+ 			if (where == PANE)
+ 				key = KEYC_TRIPLECLICK9_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_TRIPLECLICK9_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_TRIPLECLICK9_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_TRIPLECLICK9_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_TRIPLECLICK9_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_TRIPLECLICK9_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_10:
+ 			if (where == PANE)
+ 				key = KEYC_TRIPLECLICK10_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_TRIPLECLICK10_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_TRIPLECLICK10_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_TRIPLECLICK10_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_TRIPLECLICK10_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_TRIPLECLICK10_BORDER;
+ 			break;
+ 		case MOUSE_BUTTON_11:
+ 			if (where == PANE)
+ 				key = KEYC_TRIPLECLICK11_PANE;
+ 			if (where == STATUS)
+ 				key = KEYC_TRIPLECLICK11_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_TRIPLECLICK11_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_TRIPLECLICK11_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_TRIPLECLICK11_STATUS_DEFAULT;
+ 			if (where == BORDER)
+ 				key = KEYC_TRIPLECLICK11_BORDER;
  			break;
  		}
  		break;