Remove the --sync commandline option
Remove the --sync option and remove the possibility of backend-specific commandline options altogether. --sync is being replaced by a GDK_SYNCHRONIZE environment variable.
This commit is contained in:
Matthias Clasen
@ -16,42 +16,41 @@ LDADDS = $(GDK_DEP_LIBS)
|
||||
|
||||
noinst_LTLIBRARIES = libgdk-x11.la
|
||||
|
||||
libgdk_x11_la_SOURCES = \
|
||||
MwmUtil.h \
|
||||
libgdk_x11_la_SOURCES = \
|
||||
MwmUtil.h \
|
||||
gdkapplaunchcontext-x11.c \
|
||||
gdkasync.c \
|
||||
gdkasync.h \
|
||||
gdkcursor-x11.c \
|
||||
gdkcursor-x11.c \
|
||||
gdkdevice-core.h \
|
||||
gdkdevice-core.c \
|
||||
gdkdevicemanager-core.h \
|
||||
gdkdevicemanager-core.c \
|
||||
gdkdevicemanager-core.h \
|
||||
gdkdevicemanager-core.c \
|
||||
gdkdevicemanager-x11.c \
|
||||
gdkdisplaymanager-x11.c \
|
||||
gdkdisplay-x11.c \
|
||||
gdkdisplay-x11.h \
|
||||
gdkdnd-x11.c \
|
||||
gdkdnd-x11.c \
|
||||
gdkeventsource.c \
|
||||
gdkeventsource.h \
|
||||
gdkeventtranslator.c \
|
||||
gdkeventtranslator.h \
|
||||
gdkgeometry-x11.c \
|
||||
gdkglobals-x11.c \
|
||||
gdkim-x11.c \
|
||||
gdkkeys-x11.c \
|
||||
gdkmain-x11.c \
|
||||
gdkproperty-x11.c \
|
||||
gdkmain-x11.c \
|
||||
gdkproperty-x11.c \
|
||||
gdkscreen-x11.c \
|
||||
gdkscreen-x11.h \
|
||||
gdkselection-x11.c \
|
||||
gdkselection-x11.c \
|
||||
gdktestutils-x11.c \
|
||||
gdkvisual-x11.c \
|
||||
gdkwindow-x11.c \
|
||||
gdkvisual-x11.c \
|
||||
gdkwindow-x11.c \
|
||||
gdkwindow-x11.h \
|
||||
gdkxftdefaults.c \
|
||||
gdkxid.c \
|
||||
gdkx.h \
|
||||
gdkprivate-x11.h \
|
||||
gdkxid.c \
|
||||
gdkx.h \
|
||||
gdkprivate-x11.h \
|
||||
xsettings-client.h \
|
||||
xsettings-client.c \
|
||||
xsettings-common.h \
|
||||
@ -59,14 +58,14 @@ libgdk_x11_la_SOURCES = \
|
||||
|
||||
if XINPUT_XFREE
|
||||
libgdk_x11_la_SOURCES += \
|
||||
gdkdevicemanager-xi.c \
|
||||
gdkdevicemanager-xi.h \
|
||||
gdkdevicemanager-xi.c \
|
||||
gdkdevicemanager-xi.h \
|
||||
gdkdevice-xi.c \
|
||||
gdkdevice-xi.h
|
||||
if XINPUT_2
|
||||
libgdk_x11_la_SOURCES += \
|
||||
gdkdevicemanager-xi2.c \
|
||||
gdkdevicemanager-xi2.h \
|
||||
gdkdevicemanager-xi2.c \
|
||||
gdkdevicemanager-xi2.h \
|
||||
gdkdevice-xi2.c \
|
||||
gdkdevice-xi2.h
|
||||
endif
|
||||
|
||||
@ -1357,12 +1357,12 @@ _gdk_x11_display_open (const gchar *display_name)
|
||||
}
|
||||
}
|
||||
|
||||
if (_gdk_synchronize)
|
||||
if (g_getenv ("GDK_SYNCHRONIZE"))
|
||||
XSynchronize (display_x11->xdisplay, True);
|
||||
|
||||
|
||||
class_hint = XAllocClassHint();
|
||||
class_hint->res_name = g_get_prgname ();
|
||||
|
||||
|
||||
class_hint->res_class = (char *)gdk_get_program_class ();
|
||||
|
||||
/* XmbSetWMProperties sets the RESOURCE_NAME environment variable
|
||||
@ -1370,7 +1370,7 @@ _gdk_x11_display_open (const gchar *display_name)
|
||||
*/
|
||||
argc = 1;
|
||||
argv[0] = g_get_prgname ();
|
||||
|
||||
|
||||
XmbSetWMProperties (display_x11->xdisplay,
|
||||
display_x11->leader_window,
|
||||
NULL, NULL, argv, argc, NULL, NULL,
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
/* GDK - The GIMP Drawing Kit
|
||||
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
||||
* file for a list of people on the GTK+ Team. See the ChangeLog
|
||||
* files for a list of changes. These files are distributed with
|
||||
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "gdktypes.h"
|
||||
#include "gdkprivate-x11.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
gboolean _gdk_synchronize = FALSE;
|
||||
@ -87,12 +87,6 @@ static int gdk_x_io_error (Display *display);
|
||||
*/
|
||||
static GQueue gdk_error_traps;
|
||||
|
||||
const GOptionEntry _gdk_windowing_args[] = {
|
||||
{ "sync", 0, 0, G_OPTION_ARG_NONE, &_gdk_synchronize,
|
||||
/* Description of --sync in --help output */ N_("Make X calls synchronous"), NULL },
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
void
|
||||
_gdk_x11_windowing_init (void)
|
||||
{
|
||||
|
||||
@ -219,8 +219,6 @@ cairo_surface_t * _gdk_x11_window_create_bitmap_surface (GdkWindow *window,
|
||||
|
||||
extern const gint _gdk_x11_event_mask_table[];
|
||||
extern const gint _gdk_x11_event_mask_table_size;
|
||||
extern GdkAtom _gdk_selection_property;
|
||||
extern gboolean _gdk_synchronize;
|
||||
|
||||
#define GDK_SCREEN_DISPLAY(screen) (GDK_SCREEN_X11 (screen)->display)
|
||||
#define GDK_SCREEN_XROOTWIN(screen) (GDK_SCREEN_X11 (screen)->xroot_window)
|
||||
|
||||
Reference in New Issue
Block a user