summaryrefslogtreecommitdiff
path: root/src/haikuterm.h
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2022-04-17 07:15:17 +0000
committerPo Lu <luangruo@yahoo.com>2022-04-17 08:14:05 +0000
commite8b0808e20797f84fb2a720e38f315bfab39bde4 (patch)
treec0ecf223452c66c107d500b08b27a42841ee5ddf /src/haikuterm.h
parent3dc73569b405d80e89c2965daba31ea4ee6664f0 (diff)
downloademacs-e8b0808e20797f84fb2a720e38f315bfab39bde4.tar.gz
emacs-e8b0808e20797f84fb2a720e38f315bfab39bde4.tar.bz2
emacs-e8b0808e20797f84fb2a720e38f315bfab39bde4.zip
Fix hangs when clicking on Haiku menu bar to activate frame
* src/haiku_io.c (haiku_len): Handle new event `MENU_BAR_CLICK'. * src/haiku_support.cc (class EmacsWindow): Remove most of the menu bar cv stuff. (MessageReceived): Handle REPLAY_MENU_BAR message. (EmacsWindow_signal_menu_update_complete): Delete function. (be_replay_menu_bar_event): New function. * src/haiku_support.h (enum haiku_event_type): New event type `MENU_BAR_CLICK'. (struct haiku_menu_bar_click_event): New struct. * src/haikumenu.c (haiku_activate_menubar): New function. * src/haikuterm.c (haiku_read_socket): Save a MENU_BAR_ACTIVATE_EVENT and the menu bar click event instead of handling the menu bar update synchronously. (haiku_create_terminal): Set `activate_menubar_hook'. (syms_of_haikuterm): Remove extraneous newline. * src/haikuterm.h (struct haiku_output): New field `saved_menu_event'.
Diffstat (limited to 'src/haikuterm.h')
-rw-r--r--src/haikuterm.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/haikuterm.h b/src/haikuterm.h
index 7022ea77dec..e922743b18c 100644
--- a/src/haikuterm.h
+++ b/src/haikuterm.h
@@ -176,6 +176,9 @@ struct haiku_output
/* The default cursor foreground color. */
uint32_t cursor_fg;
+
+ /* If non-NULL, the last menu bar click event received. */
+ struct haiku_menu_bar_click_event *saved_menu_event;
};
struct x_output
@@ -291,6 +294,7 @@ extern void haiku_put_pixel (haiku, int, int, unsigned long);
extern Lisp_Object haiku_menu_show (struct frame *, int, int, int,
Lisp_Object, const char **);
extern Lisp_Object haiku_popup_dialog (struct frame *, Lisp_Object, Lisp_Object);
+extern void haiku_activate_menubar (struct frame *);
extern void haiku_note_drag_motion (void);
extern void initialize_frame_menubar (struct frame *);