Author: rmottola
Date: Wed Nov 25 00:47:25 2015
New Revision: 39198
URL: http://svn.gna.org/viewcvs/gnustep?rev=39198&view=rev
Log:
Enable Sync only on explicit presence of sync.h, not just Xext.
Modified:
libs/back/trunk/ChangeLog
libs/back/trunk/Headers/x11/XGServer.h
libs/back/trunk/Headers/x11/XGServerWindow.h
libs/back/trunk/Source/x11/XGServer.m
libs/back/trunk/Source/x11/XGServerEvent.m
libs/back/trunk/Source/x11/XGServerWindow.m
Modified: libs/back/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/ChangeLog?rev=39198&r1=39197&r2=39198&view=diff
==============================================================================
--- libs/back/trunk/ChangeLog (original)
+++ libs/back/trunk/ChangeLog Wed Nov 25 00:47:25 2015
@@ -1,3 +1,18 @@
+2015-11-25 Riccardo Mottola <[email protected]>
+
+ * configure
+ * configure.ac
+ * config.h.in
+ Specifically check for X11/extensions/sync.
+
+ * Headers/x11/XGServer.h
+ * Headers/x11/XGServerWindow.h
+ * Source/x11/XGServer.m
+ * Source/x11/XGServerEvent.m
+ * Source/x11/XGServerWindow.m
+ Enable Sync only on explicit presence of sync.h, not just Xext.
+
+
2015-11-13 Wolfgang Lux <[email protected]>
* Source/x11/XGServerWindow.m (_setupRootWindow, window::::):
Modified: libs/back/trunk/Headers/x11/XGServer.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/Headers/x11/XGServer.h?rev=39198&r1=39197&r2=39198&view=diff
==============================================================================
--- libs/back/trunk/Headers/x11/XGServer.h (original)
+++ libs/back/trunk/Headers/x11/XGServer.h Wed Nov 25 00:47:25 2015
@@ -2,7 +2,7 @@
<abstract>Backend server using the X11.</abstract>
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002-2015 Free Software Foundation, Inc.
Author: Adam Fedor <[email protected]>
Date: Mar 2002
@@ -36,7 +36,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "x11/XGGeneric.h"
-#ifdef HAVE_LIBXEXT
+#ifdef HAVE_X11_EXTENSIONS_SYNC_H
#include <X11/extensions/sync.h>
#endif
/*
Modified: libs/back/trunk/Headers/x11/XGServerWindow.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/Headers/x11/XGServerWindow.h?rev=39198&r1=39197&r2=39198&view=diff
==============================================================================
--- libs/back/trunk/Headers/x11/XGServerWindow.h (original)
+++ libs/back/trunk/Headers/x11/XGServerWindow.h Wed Nov 25 00:47:25 2015
@@ -1,6 +1,6 @@
/* Window ops for X11 server
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999-2015 Free Software Foundation, Inc.
Written by: Adam Fedor <[email protected]>
Date: Nov 1999
@@ -117,7 +117,7 @@
void *gdriver; /* gdriver ident. Managed by gdriver */
int gdriverProtocol; /* Managed by gdriver */
BOOL ignore_take_focus;
-#ifdef HAVE_LIBXEXT
+#ifdef HAVE_X11_EXTENSIONS_SYNC_H
uint32_t net_wm_sync_request_counter_value_low;
uint32_t net_wm_sync_request_counter_value_high;
XSyncCounter net_wm_sync_request_counter;
Modified: libs/back/trunk/Source/x11/XGServer.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/Source/x11/XGServer.m?rev=39198&r1=39197&r2=39198&view=diff
==============================================================================
--- libs/back/trunk/Source/x11/XGServer.m (original)
+++ libs/back/trunk/Source/x11/XGServer.m Wed Nov 25 00:47:25 2015
@@ -1,7 +1,7 @@
/* -*- mode:ObjC -*-
XGServer - X11 Server Class
- Copyright (C) 1998,2002 Free Software Foundation, Inc.
+ Copyright (C) 1998-2015 Free Software Foundation, Inc.
Written by: Adam Fedor <[email protected]>
Date: Mar 2002
@@ -447,7 +447,7 @@
XSetErrorHandler(XGErrorHandler);
-#ifdef HAVE_LIBXEXT
+#ifdef HAVE_X11_EXTENSIONS_SYNC_H
{
int xsync_evbase, xsync_errbase;
int major, minor;
Modified: libs/back/trunk/Source/x11/XGServerEvent.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/Source/x11/XGServerEvent.m?rev=39198&r1=39197&r2=39198&view=diff
==============================================================================
--- libs/back/trunk/Source/x11/XGServerEvent.m (original)
+++ libs/back/trunk/Source/x11/XGServerEvent.m Wed Nov 25 00:47:25 2015
@@ -1,7 +1,7 @@
/*
XGServerEvent - Window/Event code for X11 backends.
- Copyright (C) 1998,1999 Free Software Foundation, Inc.
+ Copyright (C) 1998-2015 Free Software Foundation, Inc.
Written by: Adam Fedor <[email protected]>
Date: Nov 1998
@@ -634,7 +634,7 @@
(SubstructureRedirectMask | SubstructureNotifyMask),
&xEvent);
}
-#ifdef HAVE_LIBXEXT
+#ifdef HAVE_X11_EXTENSIONS_SYNC_H
else if ((Atom)xEvent.xclient.data.l[0]
== generic.net_wm_sync_request_atom)
{
Modified: libs/back/trunk/Source/x11/XGServerWindow.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/Source/x11/XGServerWindow.m?rev=39198&r1=39197&r2=39198&view=diff
==============================================================================
--- libs/back/trunk/Source/x11/XGServerWindow.m (original)
+++ libs/back/trunk/Source/x11/XGServerWindow.m Wed Nov 25 00:47:25 2015
@@ -1,6 +1,6 @@
/* XGServerWindows - methods for window/screen handling
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999-2015 Free Software Foundation, Inc.
Written by: Adam Fedor <[email protected]>
Date: Nov 1999
@@ -1507,7 +1507,7 @@
if ((generic.wm & XGWM_EWMH) != 0)
{
window->protocols[window->numProtocols++] = generic.net_wm_ping_atom;
-#ifdef HAVE_LIBXEXT
+#ifdef HAVE_X11_EXTENSIONS_SYNC_H
window->protocols[window->numProtocols++] =
generic.net_wm_sync_request_atom;
#endif
}
@@ -2155,7 +2155,7 @@
window->gen_hints.flags |= WindowGroupHint;
window->gen_hints.window_group = ROOT;
-#ifdef HAVE_LIBXEXT
+#ifdef HAVE_X11_EXTENSIONS_SYNC_H
/**
* Setup net_wm_sync_request_counter
*/
@@ -3774,7 +3774,7 @@
}
}
-#ifdef HAVE_LIBXEXT
+#ifdef HAVE_X11_EXTENSIONS_SYNC_H
if (window->net_wm_sync_request_counter_value_low != 0
|| window->net_wm_sync_request_counter_value_high != 0)
{
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
