Mercurial > emacs
changeset 78579:bd4ae2a657e3
(handle_one_xevent): Remove check that mouse click is in
active frame.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Fri, 17 Aug 2007 07:51:55 +0000 |
| parents | be466566559a |
| children | 33b50daa55e3 |
| files | src/xterm.c |
| diffstat | 1 files changed, 21 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Fri Aug 17 07:16:17 2007 +0000 +++ b/src/xterm.c Fri Aug 17 07:51:55 2007 +0000 @@ -6751,7 +6751,11 @@ f = last_mouse_frame; else f = x_window_to_frame (dpyinfo, event.xbutton.window); - + if (event.type == ButtonPress) + { + static int xxx = 0; + fprintf (stderr, "%d, F: %p\n", xxx++, f); + } if (f) { /* Is this in the tool-bar? */ @@ -6777,27 +6781,23 @@ } if (!tool_bar_p) - if (!dpyinfo->x_focus_frame - || f == dpyinfo->x_focus_frame) +#if defined (USE_X_TOOLKIT) || defined (USE_GTK) + if (! popup_activated ()) +#endif { -#if defined (USE_X_TOOLKIT) || defined (USE_GTK) - if (! popup_activated ()) -#endif - { - if (ignore_next_mouse_click_timeout) - { - if (event.type == ButtonPress - && (int)(event.xbutton.time - ignore_next_mouse_click_timeout) > 0) - { - ignore_next_mouse_click_timeout = 0; - construct_mouse_click (&inev.ie, &event.xbutton, f); - } - if (event.type == ButtonRelease) - ignore_next_mouse_click_timeout = 0; - } - else - construct_mouse_click (&inev.ie, &event.xbutton, f); - } + if (ignore_next_mouse_click_timeout) + { + if (event.type == ButtonPress + && (int)(event.xbutton.time - ignore_next_mouse_click_timeout) > 0) + { + ignore_next_mouse_click_timeout = 0; + construct_mouse_click (&inev.ie, &event.xbutton, f); + } + if (event.type == ButtonRelease) + ignore_next_mouse_click_timeout = 0; + } + else + construct_mouse_click (&inev.ie, &event.xbutton, f); } } else