andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make `x-no-window-manager' cover user time as well

Browse source 
* src/xterm.c (x_update_frame_user_time_window):
(x_wm_supports_1): Respect `x-no-window-manager'.  This makes
testing some features easier.
This commit is contained in:
Po Lu 2022-07-10 10:49:46 +08:00
parent 588feeecfd
commit 932cf200bb
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/xterm.c
View file

@ -7113,6 +7113,23 @@ x_update_frame_user_time_window (struct frame *f)
output = FRAME_X_OUTPUT (f);
dpyinfo = FRAME_DISPLAY_INFO (f);
if (!NILP (Vx_no_window_manager))
{
if (output->user_time_window != None
&& output->user_time_window != FRAME_OUTER_WINDOW (f))
{
XDestroyWindow (dpyinfo->display, output->user_time_window);
XDeleteProperty (dpyinfo->display, FRAME_OUTER_WINDOW (f),
dpyinfo->Xatom_net_wm_user_time_window);
}
else
XDeleteProperty (dpyinfo->display, FRAME_OUTER_WINDOW (f),
dpyinfo->Xatom_net_wm_user_time);
output->user_time_window = None;
return;
}
if (!x_wm_supports (f, dpyinfo->Xatom_net_wm_user_time_window))
{
if (output->user_time_window == None)
@ -24115,6 +24132,11 @@ x_wm_supports_1 (struct x_display_info *dpyinfo, Atom want_atom)
unsigned char *tmp_data = NULL;
Atom target_type = XA_WINDOW;
/* The user says there's no window manager, so take him up on
it. */
if (!NILP (Vx_no_window_manager))
return false;
block_input ();
x_catch_errors (dpy);