gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 07:21:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enable Sync only on explicit presence of sync.h, not just Xext.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@39198 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rmottola 2015-11-24 23:47:25 +00:00
parent 65edc2e961
commit 43b08cb4f1
6 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2015-11-25 Riccardo Mottola <rm@gnu.org>
* 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 <wolfgang.lux@gmail.com>
* Source/x11/XGServerWindow.m (_setupRootWindow, window::::):

4
Headers/x11/XGServer.h
View file

@ -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 <fedor@gnu.org>
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
/*

4
Headers/x11/XGServerWindow.h
View file

@ -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 <fedor@gnu.org>
Date: Nov 1999
@ -117,7 +117,7 @@ typedef struct _gswindow_device_t {
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;

4
Source/x11/XGServer.m
View file

@ -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 <fedor@gnu.org>
Date: Mar 2002
@ -447,7 +447,7 @@ _parse_display_name(NSString *name, int *dn, int *sn)
XSetErrorHandler(XGErrorHandler);
#ifdef HAVE_LIBXEXT
#ifdef HAVE_X11_EXTENSIONS_SYNC_H
{
int xsync_evbase, xsync_errbase;
int major, minor;

4
Source/x11/XGServerEvent.m
View file

@ -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 <fedor@boulder.colorado.edu>
Date: Nov 1998
@ -634,7 +634,7 @@ posixFileDescriptor: (NSPosixFileDescriptor*)fileDescriptor
(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)
{

8
Source/x11/XGServerWindow.m
View file

@ -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 <fedor@gnu.org>
Date: Nov 1999
@ -1507,7 +1507,7 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
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 @@ _get_next_prop_new_event(Display *display, XEvent *event, char *arg)
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 @@ static BOOL didCreatePixmaps;
}
}
#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)
{