Mercurial > emacs
comparison src/xterm.c @ 83653:2a69b973fae2
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 852-856)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 93-96)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 245)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-32
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 21 Aug 2007 04:55:30 +0000 |
| parents | 5b644ae74c91 15f0ab37e515 |
| children | 04182505543b |
comparison
equal
deleted
inserted
replaced
| 83652:5b644ae74c91 | 83653:2a69b973fae2 |
|---|---|
| 6864 event.xbutton.state)); | 6864 event.xbutton.state)); |
| 6865 } | 6865 } |
| 6866 } | 6866 } |
| 6867 | 6867 |
| 6868 if (!tool_bar_p) | 6868 if (!tool_bar_p) |
| 6869 if (!dpyinfo->x_focus_frame | 6869 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) |
| 6870 || f == dpyinfo->x_focus_frame) | 6870 if (! popup_activated ()) |
| 6871 #endif | |
| 6871 { | 6872 { |
| 6872 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) | 6873 if (ignore_next_mouse_click_timeout) |
| 6873 if (! popup_activated ()) | 6874 { |
| 6874 #endif | 6875 if (event.type == ButtonPress |
| 6875 { | 6876 && (int)(event.xbutton.time - ignore_next_mouse_click_timeout) > 0) |
| 6876 if (ignore_next_mouse_click_timeout) | 6877 { |
| 6877 { | 6878 ignore_next_mouse_click_timeout = 0; |
| 6878 if (event.type == ButtonPress | 6879 construct_mouse_click (&inev.ie, &event.xbutton, f); |
| 6879 && (int)(event.xbutton.time - ignore_next_mouse_click_timeout) > 0) | 6880 } |
| 6880 { | 6881 if (event.type == ButtonRelease) |
| 6881 ignore_next_mouse_click_timeout = 0; | 6882 ignore_next_mouse_click_timeout = 0; |
| 6882 construct_mouse_click (&inev.ie, &event.xbutton, f); | 6883 } |
| 6883 } | 6884 else |
| 6884 if (event.type == ButtonRelease) | 6885 construct_mouse_click (&inev.ie, &event.xbutton, f); |
| 6885 ignore_next_mouse_click_timeout = 0; | |
| 6886 } | |
| 6887 else | |
| 6888 construct_mouse_click (&inev.ie, &event.xbutton, f); | |
| 6889 } | |
| 6890 } | 6886 } |
| 6891 } | 6887 } |
| 6892 else | 6888 else |
| 6893 { | 6889 { |
| 6894 struct scroll_bar *bar | 6890 struct scroll_bar *bar |