diff options
| author | Pip Cet <pipcet@gmail.com> | 2015-08-24 09:41:35 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2015-08-24 09:41:35 +0200 |
| commit | 93da8ac5d79e742e1b1391f449c0456b9eb1f534 (patch) | |
| tree | 98df56649a77c1e3824d10d53ebb7b0b69d96190 /src/gtkutil.c | |
| parent | d56d62b13b608cd2d13dd2098f73d2fc7e494819 (diff) | |
| download | emacs-93da8ac5d79e742e1b1391f449c0456b9eb1f534.tar.gz | |
Fix full-screen code when there is no window manager (Bug#21317)
* src/xterm.h (x_wm_supports): Declare external.
* src/xterm.c (wm_suppports): Rename to `x_wm_supports', export.
(do_ewmh_fullscreen, x_ewmh_activate_frame): Adjust for rename.
(x_check_fullscreen): Call `x_wm_set_size_hint', restore
`fullscreen' frame parameter.
* gtkutil.c (x_wm_set_size_hint): Set size hints when running
without a window manager.
Copyright-paperwork-exempt: yes
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index d684cd90888..5fc2bebdc6d 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1375,7 +1375,9 @@ x_wm_set_size_hint (struct frame *f, long int flags, bool user_position) XSETFRAME (frame, f); fs_state = Fframe_parameter (frame, Qfullscreen); - if (EQ (fs_state, Qmaximized) || EQ (fs_state, Qfullboth)) + if ((EQ (fs_state, Qmaximized) || EQ (fs_state, Qfullboth)) && + (x_wm_supports (f, FRAME_DISPLAY_INFO (f)->Xatom_net_wm_state) || + x_wm_supports (f, FRAME_DISPLAY_INFO (f)->Xatom_net_wm_state_fullscreen))) { /* Don't set hints when maximized or fullscreen. Apparently KWin and Gtk3 don't get along and the frame shrinks (!). |