mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-26 07:11:34 -08:00
Code Issues Projects Releases Wiki Activity

Minor changes to xsync support

Browse source 
* src/xfns.c (append_wm_protocols): Don't append
_NET_WM_SYNC_REQUEST unless the display supports our version of
XSync.

* src/xterm.c (handle_one_xevent): Don't handle
_NET_WM_SYNC_REQUEST unless the display supports that.
(x_free_frame_resources): Test basic counter against None.
This commit is contained in:
Po Lu 2022-02-06 08:39:02 +08:00
parent ab0554a197
commit eb351e3795
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/xfns.c
View file

@ -2402,7 +2402,7 @@ append_wm_protocols (struct x_display_info *dpyinfo,
if (!found_wm_ping)
protos[num_protos++] = dpyinfo->Xatom_net_wm_ping;
#if !defined HAVE_GTK3 && defined HAVE_XSYNC
if (!found_wm_sync_request)
if (!found_wm_sync_request && dpyinfo->xsync_supported_p)
protos[num_protos++] = dpyinfo->Xatom_net_wm_sync_request;
#endif

5
src/xterm.c
View file

@ -9103,7 +9103,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
#if defined HAVE_XSYNC && !defined HAVE_GTK3
if (event->xclient.data.l[0] == dpyinfo->Xatom_net_wm_sync_request
&& event->xclient.format == 32)
&& event->xclient.format == 32
&& dpyinfo->xsync_supported_p)
{
struct frame *f
= x_top_window_to_frame (dpyinfo,
@ -14784,7 +14785,7 @@ x_free_frame_resources (struct frame *f)
#endif /* !USE_X_TOOLKIT */
#ifdef HAVE_XSYNC
if (FRAME_X_BASIC_COUNTER (f))
if (FRAME_X_BASIC_COUNTER (f) != None)
XSyncDestroyCounter (FRAME_X_DISPLAY (f),
FRAME_X_BASIC_COUNTER (f));
#endif