]> Pileus Git - ~andy/gtk/blobdiff - gdk/x11/gdkmain-x11.c
Updated Azeri and Walloon files
[~andy/gtk] / gdk / x11 / gdkmain-x11.c
index afcc3dd257b9797477017803dc9f1425c1f8d236..607483402466bcc2f1158e4477484739cebad626 100644 (file)
@@ -2,23 +2,23 @@
  * 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 Library General Public
+ * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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-1999.  See the AUTHORS
+ * 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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <limits.h>
+#include <errno.h>
 
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif /* HAVE_SYS_SELECT_H_ */
-
-#define XLIB_ILLEGAL_ACCESS
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
-#include <X11/Xos.h>
 #include <X11/Xutil.h>
-#include <X11/Xmu/WinUtil.h>
-#include <X11/cursorfont.h>
+
+#ifdef HAVE_XKB
+#include <X11/XKBlib.h>
+#endif
+
 #include "gdk.h"
-#include "gdkprivate.h"
-#include "gdkinput.h"
-#include "gdkx.h"
-#include "gdki18n.h"
 
-#ifndef X_GETTIMEOFDAY
-#define X_GETTIMEOFDAY(tv)  gettimeofday (tv, NULL)
-#endif /* X_GETTIMEOFDAY */
+#include "gdkprivate-x11.h"
+#include "gdkinternals.h"
+#include "gdkregion-generic.h"
+#include "gdkinputprivate.h"
 
+#include <pango/pangox.h>
 
 typedef struct _GdkPredicate  GdkPredicate;
 typedef struct _GdkErrorTrap  GdkErrorTrap;
@@ -80,42 +77,18 @@ static void  gdkx_XConvertCase      (KeySym        symbol,
 #define XConvertCase gdkx_XConvertCase
 #endif
 
-static void        gdk_exit_func                (void);
 static int         gdk_x_error                  (Display     *display, 
                                                  XErrorEvent *error);
 static int         gdk_x_io_error               (Display     *display);
 
-GdkFilterReturn gdk_wm_protocols_filter (GdkXEvent *xev,
-                                        GdkEvent  *event,
-                                        gpointer   data);
-
 /* Private variable declarations
  */
 static int gdk_initialized = 0;                            /* 1 if the library is initialized,
                                                     * 0 otherwise.
                                                     */
 
-static struct timeval start;                       /* The time at which the library was
-                                                    *  last initialized.
-                                                    */
-static struct timeval timer;                       /* Timeout interval to use in the call
-                                                    *  to "select". This is used in
-                                                    *  conjunction with "timerp" to create
-                                                    *  a maximum time to wait for an event
-                                                    *  to arrive.
-                                                    */
-static struct timeval *timerp;                     /* The actual timer passed to "select"
-                                                    *  This may be NULL, in which case
-                                                    *  "select" will block until an event
-                                                    *  arrives.
-                                                    */
-static guint32 timer_val;                          /* The timeout length as specified by
-                                                    *  the user in milliseconds.
-                                                    */
 static gint autorepeat;
-
-static GSList *gdk_error_traps = NULL;               /* List of error traps */
-static GSList *gdk_error_trap_free_list = NULL;      /* Free list */
+static gboolean gdk_synchronize = FALSE;
 
 #ifdef G_ENABLE_DEBUG
 static const GDebugKey gdk_debug_keys[] = {
@@ -130,258 +103,31 @@ static const int gdk_ndebug_keys = sizeof(gdk_debug_keys)/sizeof(GDebugKey);
 
 #endif /* G_ENABLE_DEBUG */
 
-/*
- *--------------------------------------------------------------
- * gdk_init_heck
- *
- *   Initialize the library for use.
- *
- * Arguments:
- *   "argc" is the number of arguments.
- *   "argv" is an array of strings.
- *
- * Results:
- *   "argc" and "argv" are modified to reflect any arguments
- *   which were not handled. (Such arguments should either
- *   be handled by the application or dismissed). If initialization
- *   fails, returns FALSE, otherwise TRUE.
- *
- * Side effects:
- *   The library is initialized.
- *
- *--------------------------------------------------------------
- */
+GdkArgDesc _gdk_windowing_args[] = {
+  { "display",     GDK_ARG_STRING,   &gdk_display_name,    (GdkArgFunc)NULL   },
+  { "sync",        GDK_ARG_BOOL,     &gdk_synchronize,     (GdkArgFunc)NULL   },
+  { "no-xshm",     GDK_ARG_NOBOOL,   &gdk_use_xshm,        (GdkArgFunc)NULL   },
+  { "class",       GDK_ARG_STRING,   &gdk_progclass,       (GdkArgFunc)NULL   },
+  { "gxid-host",   GDK_ARG_STRING,   &gdk_input_gxid_host, (GdkArgFunc)NULL   },
+  { "gxid-port",   GDK_ARG_INT,      &gdk_input_gxid_port, (GdkArgFunc)NULL   },
+  { NULL }
+};
 
 gboolean
-gdk_init_check (int     *argc,
-               char ***argv)
+_gdk_windowing_init_check (int argc, char **argv)
 {
   XKeyboardState keyboard_state;
-  gint synchronize;
-  gint i, j, k;
   XClassHint *class_hint;
-  gchar **argv_orig = NULL;
-  gint argc_orig = 0;
-  
-  if (gdk_initialized)
-    return TRUE;
-  
-  if (g_thread_supported ())
-    gdk_threads_mutex = g_mutex_new ();
-  
-  if (argc && argv)
-    {
-      argc_orig = *argc;
-      
-      argv_orig = g_malloc ((argc_orig + 1) * sizeof (char*));
-      for (i = 0; i < argc_orig; i++)
-       argv_orig[i] = g_strdup ((*argv)[i]);
-      argv_orig[argc_orig] = NULL;
-    }
-  
-  X_GETTIMEOFDAY (&start);
-  
-  gdk_display_name = NULL;
+  guint pid;
   
   XSetErrorHandler (gdk_x_error);
   XSetIOErrorHandler (gdk_x_io_error);
   
-  synchronize = FALSE;
-  
-#ifdef G_ENABLE_DEBUG
-  {
-    gchar *debug_string = getenv("GDK_DEBUG");
-    if (debug_string != NULL)
-      gdk_debug_flags = g_parse_debug_string (debug_string,
-                                             (GDebugKey *) gdk_debug_keys,
-                                             gdk_ndebug_keys);
-  }
-#endif /* G_ENABLE_DEBUG */
-  
-  if (argc && argv)
-    {
-      if (*argc > 0)
-       {
-         gchar *d;
-         
-         d = strrchr((*argv)[0],'/');
-         if (d != NULL)
-           g_set_prgname (d + 1);
-         else
-           g_set_prgname ((*argv)[0]);
-       }
-      
-      for (i = 1; i < *argc;)
-       {
-#ifdef G_ENABLE_DEBUG    
-         if ((strcmp ("--gdk-debug", (*argv)[i]) == 0) ||
-             (strncmp ("--gdk-debug=", (*argv)[i], 12) == 0))
-           {
-             gchar *equal_pos = strchr ((*argv)[i], '=');
-             
-             if (equal_pos != NULL)
-               {
-                 gdk_debug_flags |= g_parse_debug_string (equal_pos+1,
-                                                          (GDebugKey *) gdk_debug_keys,
-                                                          gdk_ndebug_keys);
-               }
-             else if ((i + 1) < *argc && (*argv)[i + 1])
-               {
-                 gdk_debug_flags |= g_parse_debug_string ((*argv)[i+1],
-                                                          (GDebugKey *) gdk_debug_keys,
-                                                          gdk_ndebug_keys);
-                 (*argv)[i] = NULL;
-                 i += 1;
-               }
-             (*argv)[i] = NULL;
-           }
-         else if ((strcmp ("--gdk-no-debug", (*argv)[i]) == 0) ||
-                  (strncmp ("--gdk-no-debug=", (*argv)[i], 15) == 0))
-           {
-             gchar *equal_pos = strchr ((*argv)[i], '=');
-             
-             if (equal_pos != NULL)
-               {
-                 gdk_debug_flags &= ~g_parse_debug_string (equal_pos+1,
-                                                           (GDebugKey *) gdk_debug_keys,
-                                                           gdk_ndebug_keys);
-               }
-             else if ((i + 1) < *argc && (*argv)[i + 1])
-               {
-                 gdk_debug_flags &= ~g_parse_debug_string ((*argv)[i+1],
-                                                           (GDebugKey *) gdk_debug_keys,
-                                                           gdk_ndebug_keys);
-                 (*argv)[i] = NULL;
-                 i += 1;
-               }
-             (*argv)[i] = NULL;
-           }
-         else 
-#endif /* G_ENABLE_DEBUG */
-           if (strcmp ("--display", (*argv)[i]) == 0)
-             {
-               (*argv)[i] = NULL;
-               
-               if ((i + 1) < *argc && (*argv)[i + 1])
-                 {
-                   gdk_display_name = g_strdup ((*argv)[i + 1]);
-                   (*argv)[i + 1] = NULL;
-                   i += 1;
-                 }
-             }
-           else if (strcmp ("--sync", (*argv)[i]) == 0)
-             {
-               (*argv)[i] = NULL;
-               synchronize = TRUE;
-             }
-           else if (strcmp ("--no-xshm", (*argv)[i]) == 0)
-             {
-               (*argv)[i] = NULL;
-               gdk_use_xshm = FALSE;
-             }
-           else if (strcmp ("--name", (*argv)[i]) == 0)
-             {
-               if ((i + 1) < *argc && (*argv)[i + 1])
-                 {
-                   (*argv)[i++] = NULL;
-                   g_set_prgname ((*argv)[i]);
-                   (*argv)[i] = NULL;
-                 }
-             }
-           else if (strcmp ("--class", (*argv)[i]) == 0)
-             {
-               if ((i + 1) < *argc && (*argv)[i + 1])
-                 {
-                   (*argv)[i++] = NULL;
-                   gdk_progclass = (*argv)[i];
-                   (*argv)[i] = NULL;
-                 }
-             }
-#ifdef XINPUT_GXI
-           else if (strcmp ("--gxid_host", (*argv)[i]) == 0)
-             {
-               if ((i + 1) < *argc && (*argv)[i + 1])
-                 {
-                   (*argv)[i++] = NULL;
-                   gdk_input_gxid_host = ((*argv)[i]);
-                   (*argv)[i] = NULL;
-                 }
-             }
-           else if (strcmp ("--gxid_port", (*argv)[i]) == 0)
-             {
-               if ((i + 1) < *argc && (*argv)[i + 1])
-                 {
-                   (*argv)[i++] = NULL;
-                   gdk_input_gxid_port = atoi ((*argv)[i]);
-                   (*argv)[i] = NULL;
-                 }
-             }
-#endif
-#ifdef USE_XIM
-           else if (strcmp ("--xim-preedit", (*argv)[i]) == 0)
-             {
-               if ((i + 1) < *argc && (*argv)[i + 1])
-                 {
-                   (*argv)[i++] = NULL;
-                   if (strcmp ("none", (*argv)[i]) == 0)
-                     gdk_im_set_best_style (GDK_IM_PREEDIT_NONE);
-                   else if (strcmp ("nothing", (*argv)[i]) == 0)
-                     gdk_im_set_best_style (GDK_IM_PREEDIT_NOTHING);
-                   else if (strcmp ("area", (*argv)[i]) == 0)
-                     gdk_im_set_best_style (GDK_IM_PREEDIT_AREA);
-                   else if (strcmp ("position", (*argv)[i]) == 0)
-                     gdk_im_set_best_style (GDK_IM_PREEDIT_POSITION);
-                   else if (strcmp ("callbacks", (*argv)[i]) == 0)
-                     gdk_im_set_best_style (GDK_IM_PREEDIT_CALLBACKS);
-                 }
-             }
-           else if (strcmp ("--xim-status", (*argv)[i]) == 0)
-             {
-               if ((i + 1) < *argc && (*argv)[i + 1])
-                 {
-                   (*argv)[i++] = NULL;
-                   if (strcmp ("none", (*argv)[i]) == 0)
-                     gdk_im_set_best_style (GDK_IM_STATUS_NONE);
-                   else if (strcmp ("nothing", (*argv)[i]) == 0)
-                     gdk_im_set_best_style (GDK_IM_STATUS_NOTHING);
-                   else if (strcmp ("area", (*argv)[i]) == 0)
-                     gdk_im_set_best_style (GDK_IM_STATUS_AREA);
-                   else if (strcmp ("callbacks", (*argv)[i]) == 0)
-                     gdk_im_set_best_style (GDK_IM_STATUS_CALLBACKS);
-                 }
-             }
-#endif
-         
-         i += 1;
-       }
-      
-      for (i = 1; i < *argc; i++)
-       {
-         for (k = i; k < *argc; k++)
-           if ((*argv)[k] != NULL)
-             break;
-         
-         if (k > i)
-           {
-             k -= i;
-             for (j = i + k; j < *argc; j++)
-               (*argv)[j-k] = (*argv)[j];
-             *argc -= k;
-           }
-       }
-    }
-  else
-    {
-      g_set_prgname ("<unknown>");
-    }
-  
-  GDK_NOTE (MISC, g_message ("progname: \"%s\"", g_get_prgname ()));
-  
   gdk_display = XOpenDisplay (gdk_display_name);
   if (!gdk_display)
     return FALSE;
   
-  if (synchronize)
+  if (gdk_synchronize)
     XSynchronize (gdk_display, True);
   
   gdk_screen = DefaultScreen (gdk_display);
@@ -398,199 +144,96 @@ gdk_init_check (int       *argc,
     }
   class_hint->res_class = gdk_progclass;
   XmbSetWMProperties (gdk_display, gdk_leader_window,
-                      NULL, NULL, argv_orig, argc_orig
+                      NULL, NULL, argv, argc
                       NULL, NULL, class_hint);
   XFree (class_hint);
+
+  pid = getpid();
+  XChangeProperty (gdk_display, gdk_leader_window,
+                  gdk_atom_intern ("_NET_WM_PID", FALSE),
+                  XA_CARDINAL, 32,
+                  PropModeReplace,
+                  (guchar *)&pid, 1);
   
-  for (i = 0; i < argc_orig; i++)
-    g_free(argv_orig[i]);
-  g_free(argv_orig);
-  
-  gdk_wm_delete_window = XInternAtom (gdk_display, "WM_DELETE_WINDOW", True);
-  gdk_wm_take_focus = XInternAtom (gdk_display, "WM_TAKE_FOCUS", True);
-  gdk_wm_protocols = XInternAtom (gdk_display, "WM_PROTOCOLS", True);
+  gdk_wm_delete_window = gdk_atom_intern ("WM_DELETE_WINDOW", FALSE);
+  gdk_wm_take_focus = gdk_atom_intern ("WM_TAKE_FOCUS", FALSE);
+  gdk_wm_protocols = gdk_atom_intern ("WM_PROTOCOLS", FALSE);
   gdk_wm_window_protocols[0] = gdk_wm_delete_window;
   gdk_wm_window_protocols[1] = gdk_wm_take_focus;
-  gdk_selection_property = XInternAtom (gdk_display, "GDK_SELECTION", False);
+  gdk_wm_window_protocols[2] = gdk_atom_intern ("_NET_WM_PING", FALSE);
+  gdk_selection_property = gdk_atom_intern ("GDK_SELECTION", FALSE);
   
   XGetKeyboardControl (gdk_display, &keyboard_state);
   autorepeat = keyboard_state.global_auto_repeat;
-  
-  timer.tv_sec = 0;
-  timer.tv_usec = 0;
-  timerp = NULL;
-  
-  g_atexit (gdk_exit_func);
-  
-  gdk_events_init ();
-  gdk_visual_init ();
-  gdk_window_init ();
-  gdk_image_init ();
-  gdk_input_init ();
-  gdk_dnd_init ();
-
-#ifdef USE_XIM
-  gdk_im_open ();
+
+#ifdef HAVE_XKB
+  {
+    gint xkb_major = XkbMajorVersion;
+    gint xkb_minor = XkbMinorVersion;
+    if (XkbLibraryVersion (&xkb_major, &xkb_minor))
+      {
+        xkb_major = XkbMajorVersion;
+        xkb_minor = XkbMinorVersion;
+        if (XkbQueryExtension (gdk_display, NULL, NULL, NULL,
+                               &xkb_major, &xkb_minor))
+          {
+           Bool detectable_autorepeat_supported;
+           
+            _gdk_use_xkb = TRUE;
+
+            XkbSelectEvents (gdk_display,
+                             XkbUseCoreKbd,
+                             XkbMapNotifyMask,
+                             XkbMapNotifyMask);
+
+           XkbSetDetectableAutoRepeat (gdk_display,
+                                       True,
+                                       &detectable_autorepeat_supported);
+
+           GDK_NOTE (MISC, g_message ("Detectable autorepeat %s.",
+                                      detectable_autorepeat_supported ? "supported" : "not supported"));
+           
+           _gdk_have_xkb_autorepeat = detectable_autorepeat_supported;
+          }
+      }
+  }
 #endif
   
-  gdk_initialized = 1;
-
   return TRUE;
 }
 
 void
-gdk_init (int *argc, char ***argv)
-{
-  if (!gdk_init_check (argc, argv))
-    {
-      g_warning ("cannot open display: %s", gdk_get_display ());
-      exit(1);
-    }
-}
-
-/*
- *--------------------------------------------------------------
- * gdk_exit
- *
- *   Restores the library to an un-itialized state and exits
- *   the program using the "exit" system call.
- *
- * Arguments:
- *   "errorcode" is the error value to pass to "exit".
- *
- * Results:
- *   Allocated structures are freed and the program exits
- *   cleanly.
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
-
-void
-gdk_exit (int errorcode)
-{
-  /* de-initialisation is done by the gdk_exit_funct(),
-     no need to do this here (Alex J.) */
-  exit (errorcode);
-}
-
-void
-gdk_set_use_xshm (gint use_xshm)
+gdk_set_use_xshm (gboolean use_xshm)
 {
   gdk_use_xshm = use_xshm;
 }
 
-gint
+gboolean
 gdk_get_use_xshm (void)
 {
   return gdk_use_xshm;
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_time_get
- *
- *   Get the number of milliseconds since the library was
- *   initialized.
- *
- * Arguments:
- *
- * Results:
- *   The time since the library was initialized is returned.
- *   This time value is accurate to milliseconds even though
- *   a more accurate time down to the microsecond could be
- *   returned.
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
-
-guint32
-gdk_time_get (void)
+static GdkGrabStatus
+gdk_x11_convert_grab_status (gint status)
 {
-  struct timeval end;
-  struct timeval elapsed;
-  guint32 milliseconds;
-  
-  X_GETTIMEOFDAY (&end);
-  
-  if (start.tv_usec > end.tv_usec)
+  switch (status)
     {
-      end.tv_usec += 1000000;
-      end.tv_sec--;
+    case GrabSuccess:
+      return GDK_GRAB_SUCCESS;
+    case AlreadyGrabbed:
+      return GDK_GRAB_ALREADY_GRABBED;
+    case GrabInvalidTime:
+      return GDK_GRAB_INVALID_TIME;
+    case GrabNotViewable:
+      return GDK_GRAB_NOT_VIEWABLE;
+    case GrabFrozen:
+      return GDK_GRAB_FROZEN;
     }
-  elapsed.tv_sec = end.tv_sec - start.tv_sec;
-  elapsed.tv_usec = end.tv_usec - start.tv_usec;
-  
-  milliseconds = (elapsed.tv_sec * 1000) + (elapsed.tv_usec / 1000);
-  
-  return milliseconds;
-}
-
-/*
- *--------------------------------------------------------------
- * gdk_timer_get
- *
- *   Returns the current timer.
- *
- * Arguments:
- *
- * Results:
- *   Returns the current timer interval. This interval is
- *   in units of milliseconds.
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
-
-guint32
-gdk_timer_get (void)
-{
-  return timer_val;
-}
-
-/*
- *--------------------------------------------------------------
- * gdk_timer_set
- *
- *   Sets the timer interval.
- *
- * Arguments:
- *   "milliseconds" is the new value for the timer.
- *
- * Results:
- *
- * Side effects:
- *   Calls to "gdk_event_get" will last for a maximum
- *   of time of "milliseconds". However, a value of 0
- *   milliseconds will cause "gdk_event_get" to block
- *   indefinately until an event is received.
- *
- *--------------------------------------------------------------
- */
-
-void
-gdk_timer_set (guint32 milliseconds)
-{
-  timer_val = milliseconds;
-  timer.tv_sec = milliseconds / 1000;
-  timer.tv_usec = (milliseconds % 1000) * 1000;
-  
-}
 
-void
-gdk_timer_enable (void)
-{
-  timerp = &timer;
-}
+  g_assert_not_reached();
 
-void
-gdk_timer_disable (void)
-{
-  timerp = NULL;
+  return 0;
 }
 
 /*
@@ -616,18 +259,15 @@ gdk_timer_disable (void)
  *--------------------------------------------------------------
  */
 
-gint
+GdkGrabStatus
 gdk_pointer_grab (GdkWindow *    window,
-                 gint            owner_events,
+                 gboolean        owner_events,
                  GdkEventMask    event_mask,
                  GdkWindow *     confine_to,
                  GdkCursor *     cursor,
                  guint32         time)
 {
-  /*  From gdkwindow.c */
   gint return_val;
-  GdkWindowPrivate *window_private;
-  GdkWindowPrivate *confine_to_private;
   GdkCursorPrivate *cursor_private;
   guint xevent_mask;
   Window xwindow;
@@ -636,17 +276,17 @@ gdk_pointer_grab (GdkWindow *       window,
   int i;
   
   g_return_val_if_fail (window != NULL, 0);
+  g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
+  g_return_val_if_fail (confine_to == NULL || GDK_IS_WINDOW (confine_to), 0);
   
-  window_private = (GdkWindowPrivate*) window;
-  confine_to_private = (GdkWindowPrivate*) confine_to;
   cursor_private = (GdkCursorPrivate*) cursor;
   
-  xwindow = window_private->xwindow;
+  xwindow = GDK_WINDOW_XID (window);
   
-  if (!confine_to || confine_to_private->destroyed)
+  if (!confine_to || GDK_WINDOW_DESTROYED (confine_to))
     xconfine_to = None;
   else
-    xconfine_to = confine_to_private->xwindow;
+    xconfine_to = GDK_WINDOW_XID (confine_to);
   
   if (!cursor)
     xcursor = None;
@@ -661,19 +301,16 @@ gdk_pointer_grab (GdkWindow *       window,
        xevent_mask |= gdk_event_mask_table[i];
     }
   
-  if (gdk_input_vtable.grab_pointer)
-    return_val = gdk_input_vtable.grab_pointer (window,
-                                               owner_events,
-                                               event_mask,
-                                               confine_to,
-                                               time);
-  else
-    return_val = Success;
-  
-  if (return_val == Success)
+  return_val = _gdk_input_grab_pointer (window,
+                                       owner_events,
+                                       event_mask,
+                                       confine_to,
+                                       time);
+
+  if (return_val == GrabSuccess)
     {
-      if (!window_private->destroyed)
-       return_val = XGrabPointer (window_private->xdisplay,
+      if (!GDK_WINDOW_DESTROYED (window))
+       return_val = XGrabPointer (GDK_WINDOW_XDISPLAY (window),
                                   xwindow,
                                   owner_events,
                                   xevent_mask,
@@ -686,9 +323,9 @@ gdk_pointer_grab (GdkWindow *         window,
     }
   
   if (return_val == GrabSuccess)
-    gdk_xgrab_window = window_private;
-  
-  return return_val;
+    gdk_xgrab_window = (GdkWindowObject *)window;
+
+  return gdk_x11_convert_grab_status (return_val);
 }
 
 /*
@@ -709,8 +346,7 @@ gdk_pointer_grab (GdkWindow *         window,
 void
 gdk_pointer_ungrab (guint32 time)
 {
-  if (gdk_input_vtable.ungrab_pointer)
-    gdk_input_vtable.ungrab_pointer (time);
+  _gdk_input_ungrab_pointer (time);
   
   XUngrabPointer (gdk_display, time);
   gdk_xgrab_window = NULL;
@@ -731,7 +367,7 @@ gdk_pointer_ungrab (guint32 time)
  *--------------------------------------------------------------
  */
 
-gint
+gboolean
 gdk_pointer_is_grabbed (void)
 {
   return gdk_xgrab_window != NULL;
@@ -757,27 +393,26 @@ gdk_pointer_is_grabbed (void)
  *--------------------------------------------------------------
  */
 
-gint
+GdkGrabStatus
 gdk_keyboard_grab (GdkWindow *    window,
-                  gint            owner_events,
+                  gboolean        owner_events,
                   guint32         time)
 {
-  GdkWindowPrivate *window_private;
-  Window xwindow;
+  gint return_val;
   
   g_return_val_if_fail (window != NULL, 0);
-  
-  window_private = (GdkWindowPrivate*) window;
-  xwindow = window_private->xwindow;
-  
-  if (!window_private->destroyed)
-    return XGrabKeyboard (window_private->xdisplay,
-                         xwindow,
-                         owner_events,
-                         GrabModeAsync, GrabModeAsync,
-                         time);
+  g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
+  
+  if (!GDK_WINDOW_DESTROYED (window))
+    return_val = XGrabKeyboard (GDK_WINDOW_XDISPLAY (window),
+                               GDK_WINDOW_XID (window),
+                               owner_events,
+                               GrabModeAsync, GrabModeAsync,
+                               time);
   else
-    return AlreadyGrabbed;
+    return_val = AlreadyGrabbed;
+
+  return gdk_x11_convert_grab_status (return_val);
 }
 
 /*
@@ -938,72 +573,18 @@ gdk_set_sm_client_id (const gchar* sm_client_id)
                      gdk_atom_intern ("SM_CLIENT_ID", FALSE));
 }
 
-void
-gdk_key_repeat_disable (void)
-{
-  XAutoRepeatOff (gdk_display);
-}
-
-void
-gdk_key_repeat_restore (void)
-{
-  if (autorepeat)
-    XAutoRepeatOn (gdk_display);
-  else
-    XAutoRepeatOff (gdk_display);
-}
-
-
 void
 gdk_beep (void)
 {
-  XBell(gdk_display, 100);
+  XBell(gdk_display, 0);
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_exit_func
- *
- *   This is the "atexit" function that makes sure the
- *   library gets a chance to cleanup.
- *
- * Arguments:
- *
- * Results:
- *
- * Side effects:
- *   The library is un-initialized and the program exits.
- *
- *--------------------------------------------------------------
- */
-
-static void
-gdk_exit_func (void)
+void
+gdk_windowing_exit (void)
 {
-  static gboolean in_gdk_exit_func = FALSE;
-  
-  /* This is to avoid an infinite loop if a program segfaults in
-     an atexit() handler (and yes, it does happen, especially if a program
-     has trounced over memory too badly for even g_message to work) */
-  if (in_gdk_exit_func == TRUE)
-    return;
-  in_gdk_exit_func = TRUE;
+  pango_x_shutdown_display (gdk_display);
   
-  if (gdk_initialized)
-    {
-#ifdef USE_XIM
-      /* cleanup IC */
-      gdk_ic_cleanup ();
-      /* close IM */
-      gdk_im_close ();
-#endif
-      gdk_image_exit ();
-      gdk_input_exit ();
-      gdk_key_repeat_restore ();
-      
-      XCloseDisplay (gdk_display);
-      gdk_initialized = 0;
-    }
+  XCloseDisplay (gdk_display);
 }
 
 /*
@@ -1032,20 +613,43 @@ static int
 gdk_x_error (Display    *display,
             XErrorEvent *error)
 {
-  char buf[64];
-  
-  if (gdk_error_warnings)
+  if (error->error_code)
     {
-      XGetErrorText (display, error->error_code, buf, 63);
-      g_error ("%s\n  serial %ld error_code %d request_code %d minor_code %d\n", 
-              buf, 
-              error->serial, 
-              error->error_code, 
-              error->request_code,
-              error->minor_code);
+      if (gdk_error_warnings)
+       {
+         gchar buf[64];
+          gchar *msg;
+          
+         XGetErrorText (display, error->error_code, buf, 63);
+
+          msg =
+            g_strdup_printf ("The program '%s' received an X Window System error.\n"
+                             "This probably reflects a bug in the program.\n"
+                             "The error was '%s'.\n"
+                             "  (Details: serial %ld error_code %d request_code %d minor_code %d)\n"
+                             "  (Note to programmers: normally, X errors are reported asynchronously;\n"
+                             "   that is, you will receive the error a while after causing it.\n"
+                             "   To debug your program, run it with the --sync command line\n"
+                             "   option to change this behavior. You can then get a meaningful\n"
+                             "   backtrace from your debugger if you break on the gdk_x_error() function.)",
+                             g_get_prgname (),
+                             buf,
+                             error->serial, 
+                             error->error_code, 
+                             error->request_code,
+                             error->minor_code);
+          
+#ifdef G_ENABLE_DEBUG    
+         g_error ("%s", msg);
+#else /* !G_ENABLE_DEBUG */
+         fprintf (stderr, "%s\n", msg);
+
+         exit(1);
+#endif /* G_ENABLE_DEBUG */
+       }
+      gdk_error_code = error->error_code;
     }
   
-  gdk_error_code = -1;
   return 0;
 }
 
@@ -1071,85 +675,39 @@ gdk_x_error (Display      *display,
 static int
 gdk_x_io_error (Display *display)
 {
-  g_error ("an x io error occurred");
-  return 0;
-}
-
-gchar *
-gdk_get_display (void)
-{
-  return (gchar *)XDisplayName (gdk_display_name);
-}
-
-/*************************************************************
- * gdk_error_trap_push:
- *     Push an error trap. X errors will be trapped until
- *     the corresponding gdk_error_pop(), which will return
- *     the error code, if any.
- *   arguments:
- *     
- *   results:
- *************************************************************/
-
-void
-gdk_error_trap_push (void)
-{
-  GSList *node;
-  GdkErrorTrap *trap;
-
-  if (gdk_error_trap_free_list)
+  /* This is basically modelled after the code in XLib. We need
+   * an explicit error handler here, so we can disable our atexit()
+   * which would otherwise cause a nice segfault.
+   * We fprintf(stderr, instead of g_warning() because g_warning()
+   * could possibly be redirected to a dialog
+   */
+  if (errno == EPIPE)
     {
-      node = gdk_error_trap_free_list;
-      gdk_error_trap_free_list = gdk_error_trap_free_list->next;
+      fprintf (stderr,
+               "The application '%s' lost its connection to the display %s;\n"
+               "most likely the X server was shut down or you killed/destroyed\n"
+               "the application.\n",
+               g_get_prgname (),
+               gdk_display ? DisplayString (gdk_display) : gdk_get_display());
     }
   else
     {
-      node = g_slist_alloc();
-      node->data = g_new (GdkErrorTrap, 1);
+      fprintf (stderr, "%s: Fatal IO error %d (%s) on X server %s.\n",
+               g_get_prgname (),
+              errno, g_strerror (errno),
+              gdk_display ? DisplayString (gdk_display) : gdk_get_display());
     }
 
-  node->next = gdk_error_traps;
-  gdk_error_traps = node;
+  /* Disable the atexit shutdown for GDK */
+  gdk_initialized = 0;
   
-  trap = node->data;
-  trap->error_code = gdk_error_code;
-  trap->error_warnings = gdk_error_warnings;
-
-  gdk_error_code = 0;
-  gdk_error_warnings = 0;
+  exit(1);
 }
 
-/*************************************************************
- * gdk_error_trap_pop:
- *     Pop an error trap added with gdk_error_push()
- *   arguments:
- *     
- *   results:
- *     0, if no error occured, otherwise the error code.
- *************************************************************/
-
-gint
-gdk_error_trap_pop (void)
+gchar *
+gdk_get_display (void)
 {
-  GSList *node;
-  GdkErrorTrap *trap;
-  gint result;
-
-  g_return_val_if_fail (gdk_error_traps != NULL, 0);
-
-  node = gdk_error_traps;
-  gdk_error_traps = gdk_error_traps->next;
-
-  node->next = gdk_error_trap_free_list;
-  gdk_error_trap_free_list = node;
-  
-  result = gdk_error_code;
-  
-  trap = node->data;
-  gdk_error_code = trap->error_code;
-  gdk_error_warnings = trap->error_warnings;
-  
-  return result;
+  return (gchar *)XDisplayName (gdk_display_name);
 }
 
 gint 
@@ -1166,220 +724,28 @@ gdk_send_xevent (Window window, gboolean propagate, glong event_mask,
   XSync (gdk_display, False);
   gdk_error_warnings = old_warnings;
   
-  return result && (gdk_error_code != -1);
-}
-
-#ifndef HAVE_XCONVERTCASE
-/* compatibility function from X11R6.3, since XConvertCase is not
- * supplied by X11R5.
- */
-static void
-gdkx_XConvertCase (KeySym symbol,
-                  KeySym *lower,
-                  KeySym *upper)
-{
-  register KeySym sym = symbol;
-  
-  g_return_if_fail (lower != NULL);
-  g_return_if_fail (upper != NULL);
-  
-  *lower = sym;
-  *upper = sym;
-  
-  switch (sym >> 8)
-    {
-#if    defined (GDK_A) && defined (GDK_Ooblique)
-    case 0: /* Latin 1 */
-      if ((sym >= GDK_A) && (sym <= GDK_Z))
-       *lower += (GDK_a - GDK_A);
-      else if ((sym >= GDK_a) && (sym <= GDK_z))
-       *upper -= (GDK_a - GDK_A);
-      else if ((sym >= GDK_Agrave) && (sym <= GDK_Odiaeresis))
-       *lower += (GDK_agrave - GDK_Agrave);
-      else if ((sym >= GDK_agrave) && (sym <= GDK_odiaeresis))
-       *upper -= (GDK_agrave - GDK_Agrave);
-      else if ((sym >= GDK_Ooblique) && (sym <= GDK_Thorn))
-       *lower += (GDK_oslash - GDK_Ooblique);
-      else if ((sym >= GDK_oslash) && (sym <= GDK_thorn))
-       *upper -= (GDK_oslash - GDK_Ooblique);
-      break;
-#endif /* LATIN1 */
-      
-#if    defined (GDK_Aogonek) && defined (GDK_tcedilla)
-    case 1: /* Latin 2 */
-      /* Assume the KeySym is a legal value (ignore discontinuities) */
-      if (sym == GDK_Aogonek)
-       *lower = GDK_aogonek;
-      else if (sym >= GDK_Lstroke && sym <= GDK_Sacute)
-       *lower += (GDK_lstroke - GDK_Lstroke);
-      else if (sym >= GDK_Scaron && sym <= GDK_Zacute)
-       *lower += (GDK_scaron - GDK_Scaron);
-      else if (sym >= GDK_Zcaron && sym <= GDK_Zabovedot)
-       *lower += (GDK_zcaron - GDK_Zcaron);
-      else if (sym == GDK_aogonek)
-       *upper = GDK_Aogonek;
-      else if (sym >= GDK_lstroke && sym <= GDK_sacute)
-       *upper -= (GDK_lstroke - GDK_Lstroke);
-      else if (sym >= GDK_scaron && sym <= GDK_zacute)
-       *upper -= (GDK_scaron - GDK_Scaron);
-      else if (sym >= GDK_zcaron && sym <= GDK_zabovedot)
-       *upper -= (GDK_zcaron - GDK_Zcaron);
-      else if (sym >= GDK_Racute && sym <= GDK_Tcedilla)
-       *lower += (GDK_racute - GDK_Racute);
-      else if (sym >= GDK_racute && sym <= GDK_tcedilla)
-       *upper -= (GDK_racute - GDK_Racute);
-      break;
-#endif /* LATIN2 */
-      
-#if    defined (GDK_Hstroke) && defined (GDK_Cabovedot)
-    case 2: /* Latin 3 */
-      /* Assume the KeySym is a legal value (ignore discontinuities) */
-      if (sym >= GDK_Hstroke && sym <= GDK_Hcircumflex)
-       *lower += (GDK_hstroke - GDK_Hstroke);
-      else if (sym >= GDK_Gbreve && sym <= GDK_Jcircumflex)
-       *lower += (GDK_gbreve - GDK_Gbreve);
-      else if (sym >= GDK_hstroke && sym <= GDK_hcircumflex)
-       *upper -= (GDK_hstroke - GDK_Hstroke);
-      else if (sym >= GDK_gbreve && sym <= GDK_jcircumflex)
-       *upper -= (GDK_gbreve - GDK_Gbreve);
-      else if (sym >= GDK_Cabovedot && sym <= GDK_Scircumflex)
-       *lower += (GDK_cabovedot - GDK_Cabovedot);
-      else if (sym >= GDK_cabovedot && sym <= GDK_scircumflex)
-       *upper -= (GDK_cabovedot - GDK_Cabovedot);
-      break;
-#endif /* LATIN3 */
-      
-#if    defined (GDK_Rcedilla) && defined (GDK_Amacron)
-    case 3: /* Latin 4 */
-      /* Assume the KeySym is a legal value (ignore discontinuities) */
-      if (sym >= GDK_Rcedilla && sym <= GDK_Tslash)
-       *lower += (GDK_rcedilla - GDK_Rcedilla);
-      else if (sym >= GDK_rcedilla && sym <= GDK_tslash)
-       *upper -= (GDK_rcedilla - GDK_Rcedilla);
-      else if (sym == GDK_ENG)
-       *lower = GDK_eng;
-      else if (sym == GDK_eng)
-       *upper = GDK_ENG;
-      else if (sym >= GDK_Amacron && sym <= GDK_Umacron)
-       *lower += (GDK_amacron - GDK_Amacron);
-      else if (sym >= GDK_amacron && sym <= GDK_umacron)
-       *upper -= (GDK_amacron - GDK_Amacron);
-      break;
-#endif /* LATIN4 */
-      
-#if    defined (GDK_Serbian_DJE) && defined (GDK_Cyrillic_yu)
-    case 6: /* Cyrillic */
-      /* Assume the KeySym is a legal value (ignore discontinuities) */
-      if (sym >= GDK_Serbian_DJE && sym <= GDK_Serbian_DZE)
-       *lower -= (GDK_Serbian_DJE - GDK_Serbian_dje);
-      else if (sym >= GDK_Serbian_dje && sym <= GDK_Serbian_dze)
-       *upper += (GDK_Serbian_DJE - GDK_Serbian_dje);
-      else if (sym >= GDK_Cyrillic_YU && sym <= GDK_Cyrillic_HARDSIGN)
-       *lower -= (GDK_Cyrillic_YU - GDK_Cyrillic_yu);
-      else if (sym >= GDK_Cyrillic_yu && sym <= GDK_Cyrillic_hardsign)
-       *upper += (GDK_Cyrillic_YU - GDK_Cyrillic_yu);
-      break;
-#endif /* CYRILLIC */
-      
-#if    defined (GDK_Greek_ALPHAaccent) && defined (GDK_Greek_finalsmallsigma)
-    case 7: /* Greek */
-      /* Assume the KeySym is a legal value (ignore discontinuities) */
-      if (sym >= GDK_Greek_ALPHAaccent && sym <= GDK_Greek_OMEGAaccent)
-       *lower += (GDK_Greek_alphaaccent - GDK_Greek_ALPHAaccent);
-      else if (sym >= GDK_Greek_alphaaccent && sym <= GDK_Greek_omegaaccent &&
-              sym != GDK_Greek_iotaaccentdieresis &&
-              sym != GDK_Greek_upsilonaccentdieresis)
-       *upper -= (GDK_Greek_alphaaccent - GDK_Greek_ALPHAaccent);
-      else if (sym >= GDK_Greek_ALPHA && sym <= GDK_Greek_OMEGA)
-       *lower += (GDK_Greek_alpha - GDK_Greek_ALPHA);
-      else if (sym >= GDK_Greek_alpha && sym <= GDK_Greek_omega &&
-              sym != GDK_Greek_finalsmallsigma)
-       *upper -= (GDK_Greek_alpha - GDK_Greek_ALPHA);
-      break;
-#endif /* GREEK */
-    }
-}
-#endif
-
-gchar*
-gdk_keyval_name (guint       keyval)
-{
-  return XKeysymToString (keyval);
+  return result && !gdk_error_code;
 }
 
-guint
-gdk_keyval_from_name (const gchar *keyval_name)
+void
+_gdk_region_get_xrectangles (GdkRegion   *region,
+                             gint         x_offset,
+                             gint         y_offset,
+                             XRectangle **rects,
+                             gint        *n_rects)
 {
-  g_return_val_if_fail (keyval_name != NULL, 0);
+  XRectangle *rectangles = g_new (XRectangle, region->numRects);
+  GdkRegionBox *boxes = region->rects;
+  gint i;
   
-  return XStringToKeysym (keyval_name);
-}
-
-guint
-gdk_keyval_to_upper (guint       keyval)
-{
-  if (keyval)
+  for (i = 0; i < region->numRects; i++)
     {
-      KeySym lower_val = 0;
-      KeySym upper_val = 0;
-      
-      XConvertCase (keyval, &lower_val, &upper_val);
-      return upper_val;
+      rectangles[i].x = CLAMP (boxes[i].x1 + x_offset, G_MINSHORT, G_MAXSHORT);
+      rectangles[i].y = CLAMP (boxes[i].y1 + y_offset, G_MINSHORT, G_MAXSHORT);
+      rectangles[i].width = CLAMP (boxes[i].x2 + x_offset, G_MINSHORT, G_MAXSHORT) - rectangles[i].x;
+      rectangles[i].height = CLAMP (boxes[i].y2 + y_offset, G_MINSHORT, G_MAXSHORT) - rectangles[i].y;
     }
-  return 0;
-}
 
-guint
-gdk_keyval_to_lower (guint       keyval)
-{
-  if (keyval)
-    {
-      KeySym lower_val = 0;
-      KeySym upper_val = 0;
-      
-      XConvertCase (keyval, &lower_val, &upper_val);
-      return lower_val;
-    }
-  return 0;
-}
-
-gboolean
-gdk_keyval_is_upper (guint       keyval)
-{
-  if (keyval)
-    {
-      KeySym lower_val = 0;
-      KeySym upper_val = 0;
-      
-      XConvertCase (keyval, &lower_val, &upper_val);
-      return upper_val == keyval;
-    }
-  return TRUE;
+  *rects = rectangles;
+  *n_rects = region->numRects;
 }
-
-gboolean
-gdk_keyval_is_lower (guint       keyval)
-{
-  if (keyval)
-    {
-      KeySym lower_val = 0;
-      KeySym upper_val = 0;
-      
-      XConvertCase (keyval, &lower_val, &upper_val);
-      return lower_val == keyval;
-    }
-  return TRUE;
-}
-
-void
-gdk_threads_enter ()
-{
-  GDK_THREADS_ENTER ();
-}
-
-void
-gdk_threads_leave ()
-{
-  GDK_THREADS_LEAVE ();
-}
-