mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Merge branch 'obsd-master'
This commit is contained in:
		@@ -144,7 +144,8 @@ input_key(struct window_pane *wp, int key, struct mouse_event *m)
 | 
				
			|||||||
	char			       *out;
 | 
						char			       *out;
 | 
				
			||||||
	u_char				ch;
 | 
						u_char				ch;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	log_debug("writing key 0x%x (%s)", key, key_string_lookup_key(key));
 | 
						log_debug("writing key 0x%x (%s) to %%%u", key,
 | 
				
			||||||
 | 
						    key_string_lookup_key(key), wp->id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* If this is a mouse key, pass off to mouse function. */
 | 
						/* If this is a mouse key, pass off to mouse function. */
 | 
				
			||||||
	if (KEYC_IS_MOUSE(key)) {
 | 
						if (KEYC_IS_MOUSE(key)) {
 | 
				
			||||||
@@ -250,6 +251,6 @@ input_key_mouse(struct window_pane *wp, struct mouse_event *m)
 | 
				
			|||||||
		buf[len++] = x + 33;
 | 
							buf[len++] = x + 33;
 | 
				
			||||||
		buf[len++] = y + 33;
 | 
							buf[len++] = y + 33;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	log_debug("writing mouse %.*s", (int)len, buf);
 | 
						log_debug("writing mouse %.*s to %%%u", (int)len, buf, wp->id);
 | 
				
			||||||
	bufferevent_write(wp->event, buf, len);
 | 
						bufferevent_write(wp->event, buf, len);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -368,6 +368,8 @@ server_client_check_mouse(struct client *c)
 | 
				
			|||||||
			wp = window_get_active_at(s->curw->window, x, y);
 | 
								wp = window_get_active_at(s->curw->window, x, y);
 | 
				
			||||||
			if (wp != NULL)
 | 
								if (wp != NULL)
 | 
				
			||||||
				where = PANE;
 | 
									where = PANE;
 | 
				
			||||||
 | 
								log_debug("mouse at %u,%u is on pane %%%u", x, y,
 | 
				
			||||||
 | 
								    wp->id);
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		if (where == NOWHERE)
 | 
							if (where == NOWHERE)
 | 
				
			||||||
			return (KEYC_NONE);
 | 
								return (KEYC_NONE);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user