diff options
| author | Po Lu <luangruo@yahoo.com> | 2022-04-14 16:02:12 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2022-04-14 16:04:59 +0800 |
| commit | 203c503ff22e6c3c7b75d0e30d1974bb0ca9e60a (patch) | |
| tree | ea558353a347de0844bcecfcc6e3a6bcb7a30712 /src/xterm.h | |
| parent | c10024911d6c225645c22e87a7326c13c0116ac6 (diff) | |
| download | emacs-203c503ff22e6c3c7b75d0e30d1974bb0ca9e60a.tar.gz | |
Minor fixes to menus on XI2
* src/xfns.c (Fx_create_frame): Populate `xi_masks'.
* src/xmenu.c (x_activate_menubar)
(create_and_show_popup_menu, x_menu_show): Only clear input
extension grabs if we (or the toolkit) actually selected for
XI_ButtonPress events.
* src/xterm.c (xi_frame_selected_for): New function.
(xi_populate_device_from_info, handle_one_xevent): Store device
use instead of just whether or not it's a master device.
(x_dnd_begin_drag_and_drop): Clean up block_input stuff.
* src/xterm.h: Update prototypes.
(struct xi_device_t): Rename `master_p' to `use'.
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/xterm.h b/src/xterm.h index 75094082683..defeaacc0d7 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -232,8 +232,7 @@ struct xi_device_t #ifdef HAVE_XINPUT2_1 int scroll_valuator_count; #endif - int grab; - bool master_p; + int grab, use; #ifdef HAVE_XINPUT2_2 bool direct_p; #endif @@ -977,6 +976,11 @@ struct x_output bool preedit_active; int preedit_caret; #endif + +#ifdef HAVE_XINPUT2 + XIEventMask *xi_masks; + int num_xi_masks; +#endif }; enum @@ -1571,6 +1575,7 @@ extern struct frame *x_dnd_frame; #ifdef HAVE_XINPUT2 struct xi_device_t *xi_device_from_id (struct x_display_info *, int); +bool xi_frame_selected_for (struct frame *, unsigned long); #endif extern void mark_xterm (void); |