diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml index 4abbd9d1d9..8119f236a2 100644 --- a/docs/reference/gtk/running.sgml +++ b/docs/reference/gtk/running.sgml @@ -368,6 +368,15 @@ nevertheless. + + <envar>GDK_SYNCHRONIZE</envar> + + + If set, GDK makes all X requests synchronously. This is a useful + option for debugging, but it will slow down the performance considerably. + + + <envar>XDG_DATA_HOME</envar>, <envar>XDG_DATA_DIRS</envar> diff --git a/docs/reference/gtk/x11.sgml b/docs/reference/gtk/x11.sgml index 30600da04e..e75bd2774b 100644 --- a/docs/reference/gtk/x11.sgml +++ b/docs/reference/gtk/x11.sgml @@ -20,13 +20,13 @@ X11 aspects of using GTK+ GTK+ for the X Window System -On UNIX, the X backend is the default build for GTK+. So -you don't need to do anything special when compiling it, +On UNIX, the X backend is the default build for GTK+. +So you don't need to do anything special when compiling it, and everything should "just work." -To mix low-level Xlib routines into a GTK program, +To mix low-level Xlib routines into a GTK program, see GDK X Window System interaction in the GDK manual. @@ -35,8 +35,7 @@ System interaction in the GDK manual. X11-specific commandline options -The X backend understands some additional command line -arguments. +The X backend understands some additional command line arguments. @@ -48,15 +47,6 @@ in the DISPLAY environment variable. - -<systemitem>--sync</systemitem> - - -Makes all X requests synchronously. This is a useful option for -debugging, but it will slow down the performance considerably. - - - diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 0e980493fe..12b6fd6340 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -13,13 +13,13 @@ DIST_SUBDIRS = win32 x11 quartz tests CLEANFILES = -EXTRA_DIST += \ +EXTRA_DIST += \ keynames.txt \ keyname-table.h \ gen-keyname-table.pl \ - gdkconfig.h.win32 \ + gdkconfig.h.win32 \ gdkkeysyms-update.pl \ - gdk.def \ + gdk.def \ gdkmarshalers.list \ gdkwindowimpl.h \ makeenums.pl \ @@ -29,12 +29,12 @@ EXTRA_DIST += \ gdkenumtypes.h.template \ abicheck.sh -INCLUDES = \ +INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DGDK_COMPILATION \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ - $(GTK_DEBUG_FLAGS) \ + $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) gtarget=$(gdktarget) @@ -46,12 +46,12 @@ endif # libtool stuff: set version and export symbols for resolving # since automake doesn't support conditionalized libsomething_la_LDFLAGS # we use the general approach here -LDADD = \ - $(GTK_LINK_FLAGS) \ - -version-info $(LT_VERSION_INFO) \ - -export-dynamic \ - -rpath $(libdir) \ - $(no_undefined) \ +LDADD = \ + $(GTK_LINK_FLAGS) \ + -version-info $(LT_VERSION_INFO) \ + -export-dynamic \ + -rpath $(libdir) \ + $(no_undefined) \ $(LIBTOOL_EXPORT_OPTIONS) # @@ -60,7 +60,7 @@ LDADD = \ # # GDK header files for public installation (non-generated) # -gdk_public_h_sources = \ +gdk_public_h_sources = \ gdk.h \ gdkapplaunchcontext.h \ gdkcairo.h \ @@ -90,11 +90,11 @@ gdk_public_h_sources = \ gdkvisual.h \ gdkwindow.h -gdk_built_public_sources = \ +gdk_built_public_sources = \ gdkconfig.h \ gdkenumtypes.h -gdk_private_headers = \ +gdk_private_headers = \ gdkapplaunchcontextprivate.h \ gdkdevicemanagerprivate.h \ gdkdeviceprivate.h \ @@ -108,33 +108,33 @@ gdk_private_headers = \ gdkvisualprivate.h \ gdkpoly-generic.h -gdk_c_sources = \ - gdk.c \ - gdkapplaunchcontext.c \ - gdkcairo.c \ - gdkcolor.c \ - gdkcursor.c \ - gdkdevice.c \ - gdkdevicemanager.c \ - gdkdisplay.c \ - gdkdisplaymanager.c \ - gdkdnd.c \ - gdkevents.c \ - gdkglobals.c \ - gdkkeys.c \ - gdkkeyuni.c \ - gdkoffscreenwindow.c \ - gdkpango.c \ - gdkpixbuf-drawable.c \ - gdkrectangle.c \ - gdkrgba.c \ - gdkscreen.c \ - gdkselection.c \ - gdkvisual.c \ - gdkwindow.c \ +gdk_c_sources = \ + gdk.c \ + gdkapplaunchcontext.c \ + gdkcairo.c \ + gdkcolor.c \ + gdkcursor.c \ + gdkdevice.c \ + gdkdevicemanager.c \ + gdkdisplay.c \ + gdkdisplaymanager.c \ + gdkdnd.c \ + gdkevents.c \ + gdkglobals.c \ + gdkkeys.c \ + gdkkeyuni.c \ + gdkoffscreenwindow.c \ + gdkpango.c \ + gdkpixbuf-drawable.c \ + gdkrectangle.c \ + gdkrgba.c \ + gdkscreen.c \ + gdkselection.c \ + gdkvisual.c \ + gdkwindow.c \ gdkwindowimpl.c -gdk_built_sources = \ +gdk_built_sources = \ gdkenumtypes.c \ gdkmarshalers.h \ gdkmarshalers.c \ @@ -201,7 +201,6 @@ x11_introspection_files = \ x11/gdkeventsource.c \ x11/gdkeventtranslator.c \ x11/gdkgeometry-x11.c \ - x11/gdkglobals-x11.c \ x11/gdkim-x11.c \ x11/gdkkeys-x11.c \ x11/gdkmain-x11.c \ diff --git a/gdk/gdk.c b/gdk/gdk.c index c0b5d0ad2f..6ab3caf151 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -177,15 +177,14 @@ static const GOptionEntry gdk_args[] = { /** * gdk_add_option_entries_libgtk_only: * @group: An option group. - * + * * Appends gdk option entries to the passed in option group. This is * not public API and must not be used by applications. - **/ + */ void gdk_add_option_entries_libgtk_only (GOptionGroup *group) { g_option_group_add_entries (group, gdk_args); - g_option_group_add_entries (group, _gdk_windowing_args); } void @@ -260,7 +259,6 @@ gdk_parse_args (int *argc, g_option_context_set_main_group (option_context, option_group); g_option_group_add_entries (option_group, gdk_args); - g_option_group_add_entries (option_group, _gdk_windowing_args); if (!g_option_context_parse (option_context, argc, argv, &error)) { diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index d05a03355c..72487ae518 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -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 diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 88f8c98adc..6f755dc67a 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -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, diff --git a/gdk/x11/gdkglobals-x11.c b/gdk/x11/gdkglobals-x11.c deleted file mode 100644 index 15144e744f..0000000000 --- a/gdk/x11/gdkglobals-x11.c +++ /dev/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 - -gboolean _gdk_synchronize = FALSE; diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index a09d589fc6..b3de1684ab 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -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) { diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h index 5fb3b8a424..1a2db5ff15 100644 --- a/gdk/x11/gdkprivate-x11.h +++ b/gdk/x11/gdkprivate-x11.h @@ -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)