From f2d438a1fd395fff0304594c35d46a3891d0ad65 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 27 Oct 2013 23:22:46 +0100 Subject: x11: fix border toggling Trying to toggle the border during fullscreen (with "cycle border") would leave the window stuck without border, and it couldn't be restored. This was because vo_x11_decoration() always excepted to be called when toggling the state, and thus confusing the contents of the olddecor variable. Add got_motif_hints to hopefully prevent this. Also, when changing the border, don't take fs in account. May break on older/broken WMs, but all in all is in fact more robust and simpler, because you do not need to update the border state manually when returning from fullscreen. --- video/out/x11_common.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'video/out/x11_common.h') diff --git a/video/out/x11_common.h b/video/out/x11_common.h index 7cd848245d..0b22681731 100644 --- a/video/out/x11_common.h +++ b/video/out/x11_common.h @@ -90,8 +90,10 @@ struct vo_x11_state { bool size_changed_during_fs; bool pos_changed_during_fs; + bool got_motif_hints; unsigned int olddecor; unsigned int oldfuncs; + XComposeStatus compose_status; /* XShm stuff */ -- cgit v1.2.3