diff options
| author | Jeff Walsh | 2020-01-09 16:36:11 +1100 |
|---|---|---|
| committer | Jeff Walsh | 2020-11-24 12:24:39 +1100 |
| commit | c9e6b4486b6aee1e1011c81fdf0ef8270e237a15 (patch) | |
| tree | cbe5a6dc5428d60dd2a736a17cfd0f46a2c73272 /src/pgtkmenu.c | |
| parent | e021e233b4e96740dbc78bbc2717de6ee6e68291 (diff) | |
| download | emacs-c9e6b4486b6aee1e1011c81fdf0ef8270e237a15.tar.gz emacs-c9e6b4486b6aee1e1011c81fdf0ef8270e237a15.zip | |
Some work toward posframe on wayland
* src/pgtkterm.c (flip_cr_context, x_set_offset): update for new functionality
(pgtk_set_window_size): remove dead code
(x_set_parent_frame): cleanup trace code
(pgtk_cr_update_surface_desired_size): add comment
* src/pgtkmenu.c (Fmenu_or_popup_active_p):
* src/pgtkfns.c (pgtk_frame_parm_handlers, Fx_create_frame):
* src/gtkutil.c (xg_create_frame_widgets, x_wm_set_size_hint):
* src/gtkutil.c (xg_create_frame_widgets):
hacky GTK offsets taht will need better calculations
Get parent frame's editor widget allocation for the offset
Fix child-frame offsets for negative values
Add some function comments around the new double context handling
Diffstat (limited to 'src/pgtkmenu.c')
| -rw-r--r-- | src/pgtkmenu.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/pgtkmenu.c b/src/pgtkmenu.c index bbe47ddad6b..9148504f8ee 100644 --- a/src/pgtkmenu.c +++ b/src/pgtkmenu.c | |||
| @@ -457,9 +457,8 @@ DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_ | |||
| 457 | doc: /* SKIP: real doc in xmenu.c. */) | 457 | doc: /* SKIP: real doc in xmenu.c. */) |
| 458 | (void) | 458 | (void) |
| 459 | { | 459 | { |
| 460 | struct frame *f; | 460 | /* struct frame *f = SELECTED_FRAME (); */ |
| 461 | f = SELECTED_FRAME (); | 461 | /* return (f->output_data.pgtk->menubar_active > 0) ? Qt : Qnil; */ |
| 462 | // return (f->output_data.pgtk->menubar_active > 0) ? Qt : Qnil; | ||
| 463 | return Qnil; | 462 | return Qnil; |
| 464 | } | 463 | } |
| 465 | 464 | ||