mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-01 11:14:55 +00:00
Code Issues Releases Activity

Make sure `update_wm_hints' finds the WMShell

Browse Source 
* src/widget.c (update_wm_hints): Accept frame separately from
the shell widget.
(widget_update_wm_size_hints): Require WM shell to be explictly
specified.
(EmacsFrameRealize):
(EmacsFrameResize): Update callers to `update_wm_hints'.
* src/widget.h: Update prototypes.
* src/xterm.c (x_wm_set_size_hint): Pass frame widget
(ApplicationShell) and the edit widget (EmacsFrame) to
`widget_update_wm_size_hints'.  (bug#53839)
This commit is contained in:
Po Lu 2022-02-08 08:46:31 +08:00
parent 77cbde6d09
commit 1f45d27388
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/widget.c
View File

@ -260,9 +260,8 @@ set_frame_size (EmacsFrame ew)
}
static void
update_wm_hints (EmacsFrame ew)
update_wm_hints (Widget wmshell, EmacsFrame ew)
{
Widget wmshell = get_wm_shell ((Widget) ew);
int cw;
int ch;
Dimension rounded_width;
@ -272,9 +271,6 @@ update_wm_hints (EmacsFrame ew)
int base_width;
int base_height;
/* This happens when the frame is just created. */
if (! wmshell) return;
pixel_to_char_size (ew, ew->core.width, ew->core.height,
&char_width, &char_height);
char_to_pixel_size (ew, char_width, char_height,
@ -302,10 +298,9 @@ update_wm_hints (EmacsFrame ew)
}
void
widget_update_wm_size_hints (Widget widget)
widget_update_wm_size_hints (Widget widget, Widget frame)
{
EmacsFrame ew = (EmacsFrame) widget;
update_wm_hints (ew);
update_wm_hints (widget, (EmacsFrame) frame);
}
static void
@ -386,7 +381,8 @@ EmacsFrameRealize (Widget widget, XtValueMask *mask, XSetWindowAttributes *attrs
frame_size_history_plain
(f, build_string ("EmacsFrameRealize"));
update_wm_hints (ew);
if (get_wm_shell (widget))
update_wm_hints (get_wm_shell (widget), ew);
}
static void
@ -410,7 +406,8 @@ EmacsFrameResize (Widget widget)
change_frame_size (f, ew->core.width, ew->core.height, false, true, false);
update_wm_hints (ew);
if (get_wm_shell (widget))
update_wm_hints (get_wm_shell (widget), ew);
update_various_frame_slots (ew);
cancel_mouse_face (f);

2
src/widget.h
View File

@ -97,6 +97,6 @@ extern struct _DisplayContext *display_context;
/* Special entry points */
void EmacsFrameSetCharSize (Widget, int, int);
void widget_store_internal_border (Widget widget);
void widget_update_wm_size_hints (Widget widget);
void widget_update_wm_size_hints (Widget widget, Widget frame);
#endif /* _EmacsFrame_h */

3
src/xterm.c
View File

@ -14959,7 +14959,8 @@ x_wm_set_size_hint (struct frame *f, long flags, bool user_position)
#ifdef USE_X_TOOLKIT
if (f->output_data.x->widget)
{
widget_update_wm_size_hints (f->output_data.x->widget);
widget_update_wm_size_hints (f->output_data.x->widget,
f->output_data.x->edit_widget);
return;
}
#endif