===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.273
retrieving revision 1.274
diff -c -r1.273 -r1.274
*** src/usr.bin/tmux/server-client.c	2019/03/25 09:22:09	1.273
--- src/usr.bin/tmux/server-client.c	2019/03/25 18:59:55	1.274
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.273 2019/03/25 09:22:09 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.274 2019/03/25 18:59:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 419,425 ****
  	struct timeval		 tv;
  	struct style_range	*sr;
  	enum { NOTYPE, MOVE, DOWN, UP, DRAG, WHEEL, DOUBLE, TRIPLE } type;
! 	enum { NOWHERE, PANE, STATUS, STATUS_LEFT, STATUS_RIGHT, BORDER } where;
  
  	type = NOTYPE;
  	where = NOWHERE;
--- 419,425 ----
  	struct timeval		 tv;
  	struct style_range	*sr;
  	enum { NOTYPE, MOVE, DOWN, UP, DRAG, WHEEL, DOUBLE, TRIPLE } type;
! 	enum { NOWHERE, PANE, STATUS, STATUS_LEFT, STATUS_RIGHT, STATUS_DEFAULT, BORDER } where;
  
  	type = NOTYPE;
  	where = NOWHERE;
***************
*** 508,532 ****
  	    y >= (u_int)m->statusat &&
  	    y < m->statusat + status_line_size(c)) {
  		sr = status_get_range(c, x, y - m->statusat);
! 		if (sr == NULL)
! 			return (KEYC_UNKNOWN);
! 		switch (sr->type) {
! 		case STYLE_RANGE_NONE:
! 			return (KEYC_UNKNOWN);
! 		case STYLE_RANGE_LEFT:
! 			where = STATUS_LEFT;
! 			break;
! 		case STYLE_RANGE_RIGHT:
! 			where = STATUS_RIGHT;
! 			break;
! 		case STYLE_RANGE_WINDOW:
! 			wl = winlink_find_by_index(&s->windows, sr->argument);
! 			if (wl == NULL)
  				return (KEYC_UNKNOWN);
! 			m->w = wl->window->id;
  
! 			where = STATUS;
! 			break;
  		}
  	}
  
--- 508,534 ----
  	    y >= (u_int)m->statusat &&
  	    y < m->statusat + status_line_size(c)) {
  		sr = status_get_range(c, x, y - m->statusat);
! 		if (sr == NULL) {
! 			where = STATUS_DEFAULT;
! 		} else {
! 			switch (sr->type) {
! 			case STYLE_RANGE_NONE:
  				return (KEYC_UNKNOWN);
! 			case STYLE_RANGE_LEFT:
! 				where = STATUS_LEFT;
! 				break;
! 			case STYLE_RANGE_RIGHT:
! 				where = STATUS_RIGHT;
! 				break;
! 			case STYLE_RANGE_WINDOW:
! 				wl = winlink_find_by_index(&s->windows, sr->argument);
! 				if (wl == NULL)
! 					return (KEYC_UNKNOWN);
! 				m->w = wl->window->id;
  
! 				where = STATUS;
! 				break;
! 			}
  		}
  	}
  
***************
*** 605,610 ****
--- 607,614 ----
  				key = KEYC_MOUSEDRAGEND1_STATUS_LEFT;
  			if (where == STATUS_RIGHT)
  				key = KEYC_MOUSEDRAGEND1_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDRAGEND1_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_MOUSEDRAGEND1_BORDER;
  			break;
***************
*** 617,622 ****
--- 621,628 ----
  				key = KEYC_MOUSEDRAGEND2_STATUS_LEFT;
  			if (where == STATUS_RIGHT)
  				key = KEYC_MOUSEDRAGEND2_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDRAGEND2_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_MOUSEDRAGEND2_BORDER;
  			break;
***************
*** 629,634 ****
--- 635,642 ----
  				key = KEYC_MOUSEDRAGEND3_STATUS_LEFT;
  			if (where == STATUS_RIGHT)
  				key = KEYC_MOUSEDRAGEND3_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDRAGEND3_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_MOUSEDRAGEND3_BORDER;
  			break;
***************
*** 651,656 ****
--- 659,670 ----
  			key = KEYC_MOUSEMOVE_PANE;
  		if (where == STATUS)
  			key = KEYC_MOUSEMOVE_STATUS;
+ 		if (where == STATUS_LEFT)
+ 			key = KEYC_MOUSEMOVE_STATUS_LEFT;
+ 		if (where == STATUS_RIGHT)
+ 			key = KEYC_MOUSEMOVE_STATUS_RIGHT;
+ 		if (where == STATUS_DEFAULT)
+ 			key = KEYC_MOUSEMOVE_STATUS_DEFAULT;
  		if (where == BORDER)
  			key = KEYC_MOUSEMOVE_BORDER;
  		break;
***************
*** 668,673 ****
--- 682,689 ----
  					key = KEYC_MOUSEDRAG1_STATUS_LEFT;
  				if (where == STATUS_RIGHT)
  					key = KEYC_MOUSEDRAG1_STATUS_RIGHT;
+ 				if (where == STATUS_DEFAULT)
+ 					key = KEYC_MOUSEDRAG1_STATUS_DEFAULT;
  				if (where == BORDER)
  					key = KEYC_MOUSEDRAG1_BORDER;
  				break;
***************
*** 680,685 ****
--- 696,703 ----
  					key = KEYC_MOUSEDRAG2_STATUS_LEFT;
  				if (where == STATUS_RIGHT)
  					key = KEYC_MOUSEDRAG2_STATUS_RIGHT;
+ 				if (where == STATUS_DEFAULT)
+ 					key = KEYC_MOUSEDRAG2_STATUS_DEFAULT;
  				if (where == BORDER)
  					key = KEYC_MOUSEDRAG2_BORDER;
  				break;
***************
*** 692,697 ****
--- 710,717 ----
  					key = KEYC_MOUSEDRAG3_STATUS_LEFT;
  				if (where == STATUS_RIGHT)
  					key = KEYC_MOUSEDRAG3_STATUS_RIGHT;
+ 				if (where == STATUS_DEFAULT)
+ 					key = KEYC_MOUSEDRAG3_STATUS_DEFAULT;
  				if (where == BORDER)
  					key = KEYC_MOUSEDRAG3_BORDER;
  				break;
***************
*** 714,719 ****
--- 734,741 ----
  				key = KEYC_WHEELUP_STATUS_LEFT;
  			if (where == STATUS_RIGHT)
  				key = KEYC_WHEELUP_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_WHEELUP_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_WHEELUP_BORDER;
  		} else {
***************
*** 721,726 ****
--- 743,754 ----
  				key = KEYC_WHEELDOWN_PANE;
  			if (where == STATUS)
  				key = KEYC_WHEELDOWN_STATUS;
+ 			if (where == STATUS_LEFT)
+ 				key = KEYC_WHEELDOWN_STATUS_LEFT;
+ 			if (where == STATUS_RIGHT)
+ 				key = KEYC_WHEELDOWN_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_WHEELDOWN_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_WHEELDOWN_BORDER;
  		}
***************
*** 736,741 ****
--- 764,771 ----
  				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;
***************
*** 748,753 ****
--- 778,785 ----
  				key = KEYC_MOUSEUP2_STATUS_LEFT;
  			if (where == STATUS_RIGHT)
  				key = KEYC_MOUSEUP2_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEUP2_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_MOUSEUP2_BORDER;
  			break;
***************
*** 760,765 ****
--- 792,799 ----
  				key = KEYC_MOUSEUP3_STATUS_LEFT;
  			if (where == STATUS_RIGHT)
  				key = KEYC_MOUSEUP3_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEUP3_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_MOUSEUP3_BORDER;
  			break;
***************
*** 776,781 ****
--- 810,817 ----
  				key = KEYC_MOUSEDOWN1_STATUS_LEFT;
  			if (where == STATUS_RIGHT)
  				key = KEYC_MOUSEDOWN1_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDOWN1_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_MOUSEDOWN1_BORDER;
  			break;
***************
*** 788,793 ****
--- 824,831 ----
  				key = KEYC_MOUSEDOWN2_STATUS_LEFT;
  			if (where == STATUS_RIGHT)
  				key = KEYC_MOUSEDOWN2_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDOWN2_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_MOUSEDOWN2_BORDER;
  			break;
***************
*** 800,805 ****
--- 838,845 ----
  				key = KEYC_MOUSEDOWN3_STATUS_LEFT;
  			if (where == STATUS_RIGHT)
  				key = KEYC_MOUSEDOWN3_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_MOUSEDOWN3_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_MOUSEDOWN3_BORDER;
  			break;
***************
*** 816,821 ****
--- 856,863 ----
  				key = KEYC_DOUBLECLICK1_STATUS_LEFT;
  			if (where == STATUS_RIGHT)
  				key = KEYC_DOUBLECLICK1_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_DOUBLECLICK1_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_DOUBLECLICK1_BORDER;
  			break;
***************
*** 828,833 ****
--- 870,877 ----
  				key = KEYC_DOUBLECLICK2_STATUS_LEFT;
  			if (where == STATUS_RIGHT)
  				key = KEYC_DOUBLECLICK2_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_DOUBLECLICK2_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_DOUBLECLICK2_BORDER;
  			break;
***************
*** 840,845 ****
--- 884,891 ----
  				key = KEYC_DOUBLECLICK3_STATUS_LEFT;
  			if (where == STATUS_RIGHT)
  				key = KEYC_DOUBLECLICK3_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_DOUBLECLICK3_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_DOUBLECLICK3_BORDER;
  			break;
***************
*** 856,861 ****
--- 902,909 ----
  				key = KEYC_TRIPLECLICK1_STATUS_LEFT;
  			if (where == STATUS_RIGHT)
  				key = KEYC_TRIPLECLICK1_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_TRIPLECLICK1_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_TRIPLECLICK1_BORDER;
  			break;
***************
*** 868,873 ****
--- 916,923 ----
  				key = KEYC_TRIPLECLICK2_STATUS_LEFT;
  			if (where == STATUS_RIGHT)
  				key = KEYC_TRIPLECLICK2_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_TRIPLECLICK2_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_TRIPLECLICK2_BORDER;
  			break;
***************
*** 880,885 ****
--- 930,937 ----
  				key = KEYC_TRIPLECLICK3_STATUS_LEFT;
  			if (where == STATUS_RIGHT)
  				key = KEYC_TRIPLECLICK3_STATUS_RIGHT;
+ 			if (where == STATUS_DEFAULT)
+ 				key = KEYC_TRIPLECLICK3_STATUS_DEFAULT;
  			if (where == BORDER)
  				key = KEYC_TRIPLECLICK3_BORDER;
  			break;