diff options
| author | Po Lu <luangruo@yahoo.com> | 2022-02-08 08:46:31 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2022-02-08 08:48:55 +0800 |
| commit | 1f45d273884a648f47abea919a5246452f542aa9 (patch) | |
| tree | 6b63158f9fcdca3e89ef872b3d0542fb77f47f7c /src/widget.c | |
| parent | 77cbde6d09bbca0070bfc7765fb07b8a69f7c6f2 (diff) | |
| download | emacs-1f45d273884a648f47abea919a5246452f542aa9.tar.gz emacs-1f45d273884a648f47abea919a5246452f542aa9.tar.bz2 emacs-1f45d273884a648f47abea919a5246452f542aa9.zip | |
Make sure `update_wm_hints' finds the WMShell
* 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)
Diffstat (limited to 'src/widget.c')
| -rw-r--r-- | src/widget.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/widget.c b/src/widget.c index c13ec504981..4231aa71b53 100644 --- a/src/widget.c +++ b/src/widget.c @@ -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); |