diff options
| author | Jan Djärv | 2007-08-17 07:52:08 +0000 |
|---|---|---|
| committer | Jan Djärv | 2007-08-17 07:52:08 +0000 |
| commit | a33f5759a6c9f28882db8495ccff32748795dfd0 (patch) | |
| tree | 921d9b91198fafa7d53c16ea8fe23f1bcc47a0b3 /src/xterm.c | |
| parent | 912651fc0caeb9b205042b627626f97bb8d8caa6 (diff) | |
| download | emacs-a33f5759a6c9f28882db8495ccff32748795dfd0.tar.gz emacs-a33f5759a6c9f28882db8495ccff32748795dfd0.zip | |
(handle_one_xevent): Remove check that mouse click is in
active frame.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/xterm.c b/src/xterm.c index 512fff35f50..6c58cc39fd2 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -6751,7 +6751,11 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) | |||
| 6751 | f = last_mouse_frame; | 6751 | f = last_mouse_frame; |
| 6752 | else | 6752 | else |
| 6753 | f = x_window_to_frame (dpyinfo, event.xbutton.window); | 6753 | f = x_window_to_frame (dpyinfo, event.xbutton.window); |
| 6754 | 6754 | if (event.type == ButtonPress) | |
| 6755 | { | ||
| 6756 | static int xxx = 0; | ||
| 6757 | fprintf (stderr, "%d, F: %p\n", xxx++, f); | ||
| 6758 | } | ||
| 6755 | if (f) | 6759 | if (f) |
| 6756 | { | 6760 | { |
| 6757 | /* Is this in the tool-bar? */ | 6761 | /* Is this in the tool-bar? */ |
| @@ -6777,27 +6781,23 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) | |||
| 6777 | } | 6781 | } |
| 6778 | 6782 | ||
| 6779 | if (!tool_bar_p) | 6783 | if (!tool_bar_p) |
| 6780 | if (!dpyinfo->x_focus_frame | ||
| 6781 | || f == dpyinfo->x_focus_frame) | ||
| 6782 | { | ||
| 6783 | #if defined (USE_X_TOOLKIT) || defined (USE_GTK) | 6784 | #if defined (USE_X_TOOLKIT) || defined (USE_GTK) |
| 6784 | if (! popup_activated ()) | 6785 | if (! popup_activated ()) |
| 6785 | #endif | 6786 | #endif |
| 6786 | { | 6787 | { |
| 6787 | if (ignore_next_mouse_click_timeout) | 6788 | if (ignore_next_mouse_click_timeout) |
| 6788 | { | 6789 | { |
| 6789 | if (event.type == ButtonPress | 6790 | if (event.type == ButtonPress |
| 6790 | && (int)(event.xbutton.time - ignore_next_mouse_click_timeout) > 0) | 6791 | && (int)(event.xbutton.time - ignore_next_mouse_click_timeout) > 0) |
| 6791 | { | 6792 | { |
| 6792 | ignore_next_mouse_click_timeout = 0; | 6793 | ignore_next_mouse_click_timeout = 0; |
| 6793 | construct_mouse_click (&inev.ie, &event.xbutton, f); | 6794 | construct_mouse_click (&inev.ie, &event.xbutton, f); |
| 6794 | } | 6795 | } |
| 6795 | if (event.type == ButtonRelease) | 6796 | if (event.type == ButtonRelease) |
| 6796 | ignore_next_mouse_click_timeout = 0; | 6797 | ignore_next_mouse_click_timeout = 0; |
| 6797 | } | 6798 | } |
| 6798 | else | 6799 | else |
| 6799 | construct_mouse_click (&inev.ie, &event.xbutton, f); | 6800 | construct_mouse_click (&inev.ie, &event.xbutton, f); |
| 6800 | } | ||
| 6801 | } | 6801 | } |
| 6802 | } | 6802 | } |
| 6803 | else | 6803 | else |