]> Pileus Git - ~andy/gtk/commitdiff
Remove *_set_extension_events() and old API to query devices.
authorCarlos Garnacho <carlosg@gnome.org>
Fri, 17 Dec 2010 02:17:13 +0000 (03:17 +0100)
committerCarlos Garnacho <carlosg@gnome.org>
Fri, 17 Dec 2010 15:25:14 +0000 (16:25 +0100)
The old functions to get core pointer and devices list are gone as
well. This slice is entirely replaced internally by multidevice
handling and may just go.

17 files changed:
docs/reference/gdk/gdk3-sections.txt
docs/reference/gtk/gtk3-sections.txt
gdk/Makefile.am
gdk/gdk.h
gdk/gdk.symbols
gdk/gdkdevice.c
gdk/gdkdeviceprivate.h
gdk/gdkdisplay.c
gdk/gdkdisplay.h
gdk/gdkinput.h [deleted file]
gdk/gdkinternals.h
gdk/gdkwindow.c
gdk/x11/Makefile.am
gdk/x11/gdkinput.c [deleted file]
gtk/gtk.symbols
gtk/gtkwidget.c
gtk/gtkwidget.h

index a70c8bb2768e19a4037d85b9e91ed5c68a05fc35..1a1db3bf3f63e110339bdb0b3b50dde78c9ed521 100644 (file)
@@ -122,7 +122,6 @@ gdk_display_sync
 gdk_display_flush
 gdk_display_close
 gdk_display_is_closed
-gdk_display_list_devices
 gdk_display_get_event
 gdk_display_peek_event
 gdk_display_put_event
@@ -173,7 +172,6 @@ gdk_display_manager_get
 gdk_display_manager_get_default_display
 gdk_display_manager_set_default_display
 gdk_display_manager_list_displays
-gdk_display_get_core_pointer
 <SUBSECTION Standard>
 GDK_DISPLAY_MANAGER
 GDK_DISPLAY_MANAGER_CLASS
@@ -738,14 +736,6 @@ gdk_device_get_axis
 gdk_device_list_axes
 gdk_device_get_axis_value
 
-<SUBSECTION>
-gdk_input_set_extension_events
-GdkExtensionMode
-
-<SUBSECTION>
-gdk_devices_list
-gdk_device_get_core_pointer
-
 <SUBSECTION Standard>
 GDK_TYPE_AXIS_USE
 GDK_TYPE_EXTENSION_MODE
index 6fefb960ad5ba2ffdf8fd88ca12a8f17e874cad7..e16eb06bf32c8cb0c49cb80c3da18ef499516b12 100644 (file)
@@ -4937,8 +4937,6 @@ gtk_widget_get_parent_window
 gtk_widget_set_events
 gtk_widget_get_events
 gtk_widget_add_events
-gtk_widget_set_extension_events
-gtk_widget_get_extension_events
 gtk_widget_set_device_events
 gtk_widget_get_device_events
 gtk_widget_add_device_events
index c56c721cd62cbdff37002b599f0a89f5dd12b743..40aaaf777a24117d7784e8423cf5ee0fe30e0261 100644 (file)
@@ -72,7 +72,6 @@ gdk_public_h_sources =                                \
        gdkdisplaymanager.h                     \
        gdkdnd.h                                \
        gdkevents.h                             \
-       gdkinput.h                              \
        gdkkeys.h                               \
        gdkkeysyms.h                            \
        gdkkeysyms-compat.h                     \
@@ -195,7 +194,6 @@ x11_introspection_files =           \
        x11/gdkgeometry-x11.c           \
        x11/gdkglobals-x11.c            \
        x11/gdkim-x11.c                 \
-       x11/gdkinput.c                  \
        x11/gdkkeys-x11.c               \
        x11/gdkmain-x11.c               \
        x11/gdkproperty-x11.c           \
index 851185a8c036de19519666df09905614d5a0e58d..529dc0594905cbb6faa733a92dbaa19bf390fab1 100644 (file)
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -40,7 +40,6 @@
 #include <gdk/gdkdnd.h>
 #include <gdk/gdkenumtypes.h>
 #include <gdk/gdkevents.h>
-#include <gdk/gdkinput.h>
 #include <gdk/gdkkeys.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkmain.h>
index 8d5cba8333a12bb89281c9fda526882c2fc08551..f9a2f4dfd0bc0a0701788d072518bc868d319f88 100644 (file)
@@ -50,7 +50,6 @@ gdk_device_get_associated_device
 gdk_device_get_axis
 gdk_device_get_axis_use
 gdk_device_get_axis_value
-gdk_device_get_core_pointer
 gdk_device_get_device_type
 gdk_device_get_display
 gdk_device_get_has_cursor
@@ -77,7 +76,6 @@ gdk_device_set_axis_use
 gdk_device_set_key
 gdk_device_set_mode
 gdk_device_set_source
-gdk_devices_list
 gdk_device_type_get_type G_GNUC_CONST
 gdk_device_ungrab
 gdk_disable_multidevice
@@ -86,7 +84,6 @@ gdk_display_beep
 gdk_display_close
 gdk_display_device_is_grabbed
 gdk_display_flush
-gdk_display_get_core_pointer
 gdk_display_get_default
 gdk_display_get_default_cursor_size
 gdk_display_get_default_group
@@ -104,7 +101,6 @@ gdk_display_get_window_at_device_position
 gdk_display_get_window_at_pointer
 gdk_display_is_closed
 gdk_display_keyboard_ungrab
-gdk_display_list_devices
 gdk_display_manager_get
 gdk_display_manager_get_default_display
 gdk_display_manager_get_type G_GNUC_CONST
@@ -208,7 +204,6 @@ gdk_gravity_get_type G_GNUC_CONST
 gdk_init
 gdk_init_check
 gdk_input_mode_get_type G_GNUC_CONST
-gdk_input_set_extension_events
 gdk_input_source_get_type G_GNUC_CONST
 gdk_keyboard_grab
 gdk_keyboard_ungrab
index 57a1a83368bec9eae97f2911f1a9a8534586dc7e..755f78acd680420543441c1ca69edaf2232a3135 100644 (file)
@@ -621,14 +621,9 @@ gdk_device_set_mode (GdkDevice    *device,
       gdk_device_get_device_type (device) == GDK_DEVICE_TYPE_MASTER)
     return FALSE;
 
-  /* FIXME: setting has_cursor when mode is window? */
-
   device->priv->mode = mode;
   g_object_notify (G_OBJECT (device), "input-mode");
 
-  if (gdk_device_get_device_type (device) != GDK_DEVICE_TYPE_MASTER)
-    _gdk_input_check_extension_events (device);
-
   return TRUE;
 }
 
index f7318620d8371b4da3e8a5ac05e62bf78a013504..53536510d859ec5f84e645301dbf0adfbd8e891c 100644 (file)
@@ -123,8 +123,6 @@ gboolean   _gdk_device_translate_axis         (GdkDevice *device,
 GdkTimeCoord ** _gdk_device_allocate_history  (GdkDevice *device,
                                                gint       n_events);
 
-void _gdk_input_check_extension_events (GdkDevice *device);
-
 void _gdk_device_add_slave (GdkDevice *device,
                             GdkDevice *slave);
 void _gdk_device_remove_slave (GdkDevice *device,
index 9a083e18b745b830a4df69150d6fa6e03790d4d9..7ec0906280953c3dcad8702693b385865e1f9c36 100644 (file)
@@ -649,45 +649,6 @@ gdk_event_send_clientmessage_toall (GdkEvent *event)
   gdk_screen_broadcast_client_message (gdk_screen_get_default (), event);
 }
 
-/**
- * gdk_device_get_core_pointer:
- * 
- * Returns the core pointer device for the default display.
- * 
- * Return value: (transfer none): the core pointer device; this is owned
- *   by the display and should not be freed.
- *
- * Deprecated: 3.0: Use gdk_device_manager_get_client_pointer() instead, or
- *             gdk_event_get_device() if a #GdkEvent with pointer device
- *             information is available.
- **/
-GdkDevice *
-gdk_device_get_core_pointer (void)
-{
-  return gdk_display_get_core_pointer (gdk_display_get_default ());
-}
-
-/**
- * gdk_display_get_core_pointer:
- * @display: a #GdkDisplay
- * 
- * Returns the core pointer device for the given display
- * 
- * Return value: (transfer none): the core pointer device; this is owned by the
- *   display and should not be freed.
- *
- * Since: 2.2
- *
- * Deprecated: 3.0: Use gdk_device_manager_get_client_pointer() instead, or
- *             gdk_event_get_device() if a #GdkEvent with device
- *             information is available.
- **/
-GdkDevice *
-gdk_display_get_core_pointer (GdkDisplay *display)
-{
-  return display->core_pointer;
-}
-
 /**
  * gdk_set_sm_client_id:
  * @sm_client_id: the client id assigned by the session manager when the
index 17afa4bfc7955d00cf43643f0f86960c678c79cd..381f45e844683da449d087949555813c9b9a417f 100644 (file)
@@ -259,10 +259,6 @@ GdkDisplay *gdk_display_get_default (void);
 
 #ifndef GDK_MULTIDEVICE_SAFE
 
-#ifndef GDK_DISABLE_DEPRECATED
-GdkDevice  *gdk_display_get_core_pointer (GdkDisplay *display);
-#endif /* GDK_DISABLE_DEPRECATED */
-
 void             gdk_display_get_pointer           (GdkDisplay             *display,
                                                    GdkScreen             **screen,
                                                    gint                   *x,
diff --git a/gdk/gdkinput.h b/gdk/gdkinput.h
deleted file mode 100644 (file)
index 3ea024d..0000000
+++ /dev/null
@@ -1,60 +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/.
- */
-
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
-#ifndef __GDK_INPUT_H__
-#define __GDK_INPUT_H__
-
-#include <gdk/gdktypes.h>
-#include <gdk/gdkdevice.h>
-
-G_BEGIN_DECLS
-
-#if !defined (GDK_MULTIDEVICE_SAFE) && !defined (GDK_DISABLE_DEPRECATED)
-
-#ifndef GDK_MULTIHEAD_SAFE
-
-/* Returns a list of GdkDevice * */
-GList *    gdk_devices_list            (void);
-
-#ifndef GTK_DISABLE_DEPRECATED
-GdkDevice *gdk_device_get_core_pointer (void);
-#endif
-
-#endif /* GDK_MULTIHEAD_SAFE */
-
-void gdk_input_set_extension_events (GdkWindow        *window,
-                                    gint              mask,
-                                    GdkExtensionMode  mode);
-
-#endif /* !GDK_MULTIDEVICE_SAFE && GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_INPUT_H__ */
index c98d2180c514c0942f56fb5ffa3cb5a29c106ee1..c6173a747f8a471e5d937185662826c4f31153e7 100644 (file)
@@ -176,7 +176,6 @@ typedef struct
   guint implicit_ungrab : 1;
 } GdkDeviceGrabInfo;
 
-typedef struct _GdkInputWindow GdkInputWindow;
 typedef struct _GdkWindowPaint GdkWindowPaint;
 
 typedef void (* GdkDisplayPointerInfoForeach) (GdkDisplay           *display,
@@ -253,7 +252,6 @@ struct _GdkWindow
 
   guint num_offscreen_children;
   GdkWindowPaint *implicit_paint;
-  GdkInputWindow *input_window; /* only set for impl windows */
 
   GList *outstanding_moves;
 
@@ -527,10 +525,6 @@ cairo_region_t *_gdk_window_calculate_full_clip_region    (GdkWindow     *window
                                                       gint          *base_y_offset);
 gboolean    _gdk_window_has_impl (GdkWindow *window);
 GdkWindow * _gdk_window_get_impl_window (GdkWindow *window);
-GdkWindow *_gdk_window_get_input_window_for_event (GdkWindow *native_window,
-                                                  GdkEventType event_type,
-                                                  int x, int y,
-                                                  gulong serial);
 
 /*****************************
  * offscreen window routines *
index 54f5d2f5d12ee0c5d09b01ab53d3d70d55e7851a..d5e5e1488d036818e84a9202097ddf01771d7862 100644 (file)
@@ -1699,67 +1699,6 @@ gdk_window_reparent (GdkWindow *window,
     _gdk_synthesize_crossing_events_for_geometry_change (window);
 }
 
-static gboolean
-temporary_disable_extension_events (GdkWindow*window)
-{
-  GdkWindow*child;
-  GList *l;
-  gboolean res;
-
-  if (window->extension_events != 0)
-    {
-      g_object_set_data (G_OBJECT (window),
-                        "gdk-window-extension-events",
-                        GINT_TO_POINTER (window->extension_events));
-      gdk_input_set_extension_events ((GdkWindow *)window, 0,
-                                     GDK_EXTENSION_EVENTS_NONE);
-    }
-  else
-    res = FALSE;
-
-  for (l = window->children; l != NULL; l = l->next)
-    {
-      child = l->data;
-
-      if (window->impl_window == child->impl_window)
-       res |= temporary_disable_extension_events (child);
-    }
-
-  return res;
-}
-
-static void
-reenable_extension_events (GdkWindow *window)
-{
-  GdkWindow *child;
-  GList *l;
-  int mask;
-
-  mask = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window),
-                                             "gdk-window-extension-events"));
-
-  if (mask != 0)
-    {
-      /* We don't have the mode here, so we pass in cursor.
-        This works with the current code since mode is not
-        stored except as part of the mask, and cursor doesn't
-        change the mask. */
-      gdk_input_set_extension_events ((GdkWindow *)window, mask,
-                                     GDK_EXTENSION_EVENTS_CURSOR);
-      g_object_set_data (G_OBJECT (window),
-                        "gdk-window-extension-events",
-                        NULL);
-    }
-
-  for (l = window->children; l != NULL; l = l->next)
-    {
-      child = l->data;
-
-      if (window->impl_window == child->impl_window)
-       reenable_extension_events (window);
-    }
-}
-
 /**
  * gdk_window_ensure_native:
  * @window: a #GdkWindow
@@ -1784,7 +1723,6 @@ gdk_window_ensure_native (GdkWindow *window)
   GdkWindow *above;
   GList listhead;
   GdkWindowImplClass *impl_class;
-  gboolean disabled_extension_events;
 
   g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
 
@@ -1803,12 +1741,6 @@ gdk_window_ensure_native (GdkWindow *window)
 
   /* Need to create a native window */
 
-  /* First we disable any extension events on the window or its
-     descendants to handle the native input window moving */
-  disabled_extension_events = FALSE;
-  if (impl_window->input_window)
-    disabled_extension_events = temporary_disable_extension_events (window);
-
   gdk_window_drop_cairo_surface (window);
 
   screen = gdk_window_get_screen (window);
@@ -1859,9 +1791,6 @@ gdk_window_ensure_native (GdkWindow *window)
   if (gdk_window_is_viewable (window))
     impl_class->show (window, FALSE);
 
-  if (disabled_extension_events)
-    reenable_extension_events (window);
-
   return TRUE;
 }
 
@@ -9814,88 +9743,6 @@ _gdk_windowing_got_event (GdkDisplay *display,
     }
 }
 
-
-static GdkWindow *
-get_extension_event_window (GdkDisplay                 *display,
-                           GdkWindow                  *pointer_window,
-                           GdkEventType                type,
-                           gulong                      serial)
-{
-  guint evmask;
-  GdkWindow *w, *grab_window;
-  GdkDeviceGrabInfo *grab;
-
-  /* FIXME: which device? */
-  grab = _gdk_display_has_device_grab (display, display->core_pointer, serial);
-
-  if (grab != NULL && !grab->owner_events)
-    {
-      evmask = grab->event_mask;
-
-      grab_window = grab->window;
-
-      if (evmask & type_masks[type])
-       return grab_window;
-      else
-       return NULL;
-    }
-
-  w = pointer_window;
-  while (w != NULL)
-    {
-      evmask = w->extension_events;
-
-      if (evmask & type_masks[type])
-       return w;
-
-      w = get_event_parent (w);
-    }
-
-  if (grab != NULL &&
-      grab->owner_events)
-    {
-      evmask = grab->event_mask;
-
-      if (evmask & type_masks[type])
-       return grab->window;
-      else
-       return NULL;
-    }
-
-  return NULL;
-}
-
-
-GdkWindow *
-_gdk_window_get_input_window_for_event (GdkWindow *native_window,
-                                       GdkEventType event_type,
-                                       int x, int y,
-                                       gulong serial)
-{
-  GdkDisplay *display;
-  GdkWindow *toplevel_window;
-  GdkWindow *pointer_window;
-  GdkWindow *event_win;
-  gdouble toplevel_x, toplevel_y;
-
-  toplevel_x = x;
-  toplevel_y = y;
-
-  display = gdk_window_get_display (native_window);
-  toplevel_window = convert_native_coords_to_toplevel (native_window,
-                                                      toplevel_x, toplevel_y,
-                                                      &toplevel_x, &toplevel_y);
-  /* FIXME: which device? */
-  pointer_window = get_pointer_window (display, toplevel_window, NULL,
-                                      toplevel_x, toplevel_y, serial);
-  event_win = get_extension_event_window (display,
-                                         pointer_window,
-                                         event_type,
-                                         serial);
-
-  return event_win;
-}
-
 /**
  * gdk_window_create_similar_surface:
  * @window: window to make new surface similar to
index b6a4751b328571401eac845a77d76a16dbe463ca..30295b42f6220ca52a524536dd1192b648be9a96 100644 (file)
@@ -37,7 +37,6 @@ libgdk_x11_la_SOURCES =       \
        gdkgeometry-x11.c       \
        gdkglobals-x11.c        \
        gdkim-x11.c             \
-       gdkinput.c              \
        gdkkeys-x11.c           \
        gdkmain-x11.c           \
        gdkproperty-x11.c       \
diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
deleted file mode 100644 (file)
index bd41a42..0000000
+++ /dev/null
@@ -1,227 +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 "gdkscreen-x11.h"
-#include "gdkdisplay-x11.h"
-#include "gdkwindow.h"
-
-#include <stdlib.h>
-
-
-/* Addition used for extension_events mask */
-#define GDK_ALL_DEVICES_MASK (1<<30)
-
-struct _GdkInputWindow
-{
-  GList *windows; /* GdkWindow:s with extension_events set */
-
-  /* gdk window */
-  GdkWindow *impl_window; /* an impl window */
-};
-
-
-/**
- * gdk_devices_list:
- *
- * Returns the list of available input devices for the default display.
- * The list is statically allocated and should not be freed.
- *
- * Return value: (transfer none) (element-type GdkDevice): a list of #GdkDevice
- *
- * Deprecated: 3.0: Use gdk_device_manager_list_devices() instead.
- **/
-GList *
-gdk_devices_list (void)
-{
-  return gdk_display_list_devices (gdk_display_get_default ());
-}
-
-static void
-_gdk_input_select_device_events (GdkWindow *impl_window,
-                                 GdkDevice *device)
-{
-  guint event_mask;
-  GdkWindow *w;
-  GdkInputWindow *iw;
-  GdkInputMode mode;
-  gboolean has_cursor;
-  GdkDeviceType type;
-  GList *l;
-
-  event_mask = 0;
-  iw = impl_window->input_window;
-
-  g_object_get (device,
-                "type", &type,
-                "input-mode", &mode,
-                "has-cursor", &has_cursor,
-                NULL);
-
-  if (iw == NULL ||
-      mode == GDK_MODE_DISABLED ||
-      type == GDK_DEVICE_TYPE_MASTER)
-    return;
-
-  for (l = iw->windows; l != NULL; l = l->next)
-    {
-      w = l->data;
-
-      if (has_cursor || (w->extension_events & GDK_ALL_DEVICES_MASK))
-        {
-          event_mask = w->extension_events;
-
-          if (event_mask)
-            event_mask |= GDK_PROXIMITY_OUT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK;
-
-          gdk_window_set_device_events (w, device, event_mask);
-        }
-    }
-}
-
-static void
-unset_extension_events (GdkWindow *window)
-{
-  GdkWindow *impl_window;
-  GdkDisplayX11 *display_x11;
-  GdkInputWindow *iw;
-
-  impl_window = _gdk_window_get_impl_window (window);
-  iw = impl_window->input_window;
-
-  display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (window));
-
-  if (window->extension_events != 0)
-    {
-      g_assert (iw != NULL);
-      g_assert (g_list_find (iw->windows, window) != NULL);
-
-      iw->windows = g_list_remove (iw->windows, window);
-      if (iw->windows == NULL)
-       {
-         impl_window->input_window = NULL;
-         display_x11->input_windows = g_list_remove (display_x11->input_windows, iw);
-         g_free (iw);
-       }
-    }
-
-  window->extension_events = 0;
-}
-
-/**
- * gdk_input_set_extension_events:
- * @window: a #GdkWindow.
- * @mask: the event mask
- * @mode: the type of extension events that are desired.
- *
- * Turns extension events on or off for a particular window,
- * and specifies the event mask for extension events.
- *
- * Deprecated: 3.0: Use gdk_window_set_device_events() instead.
- **/
-void
-gdk_input_set_extension_events (GdkWindow        *window,
-                                gint              mask,
-                               GdkExtensionMode  mode)
-{
-  GdkWindow *impl_window;
-  GdkInputWindow *iw;
-  GdkDisplayX11 *display_x11;
-#ifndef XINPUT_NONE
-  GList *tmp_list;
-#endif
-
-  g_return_if_fail (window != NULL);
-  g_return_if_fail (GDK_WINDOW_IS_X11 (window));
-
-  display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (window));
-  if (GDK_WINDOW_DESTROYED (window))
-    return;
-
-  impl_window = _gdk_window_get_impl_window (window);
-
-  if (mode == GDK_EXTENSION_EVENTS_ALL && mask != 0)
-    mask |= GDK_ALL_DEVICES_MASK;
-
-  if (mode == GDK_EXTENSION_EVENTS_NONE)
-    mask = 0;
-
-  iw = impl_window->input_window;
-
-  if (mask != 0)
-    {
-      if (!iw)
-       {
-         iw = g_new0 (GdkInputWindow,1);
-
-         iw->impl_window = (GdkWindow *)impl_window;
-
-         iw->windows = NULL;
-
-         display_x11->input_windows = g_list_append (display_x11->input_windows, iw);
-         impl_window->input_window = iw;
-       }
-
-      if (window->extension_events == 0)
-       iw->windows = g_list_append (iw->windows, window);
-      window->extension_events = mask;
-    }
-  else
-    {
-      unset_extension_events (window);
-    }
-
-#ifndef XINPUT_NONE
-  for (tmp_list = display_x11->input_devices; tmp_list; tmp_list = tmp_list->next)
-    {
-      GdkDevice *dev = tmp_list->data;
-      _gdk_input_select_device_events (GDK_WINDOW (impl_window), dev);
-    }
-#endif /* !XINPUT_NONE */
-}
-
-void
-_gdk_input_window_destroy (GdkWindow *window)
-{
-  unset_extension_events (window);
-}
-
-void
-_gdk_input_check_extension_events (GdkDevice *device)
-{
-  GdkDisplayX11 *display_impl;
-  GdkInputWindow *input_window;
-  GList *tmp_list;
-
-  display_impl = GDK_DISPLAY_X11 (gdk_device_get_display (device));
-
-  for (tmp_list = display_impl->input_windows; tmp_list; tmp_list = tmp_list->next)
-    {
-      input_window = tmp_list->data;
-      _gdk_input_select_device_events (input_window->impl_window, device);
-    }
-}
index d12100067673cc835f0d08d212948ea2b38277a5..ad10d607e3fd3f1c84507a88ef3634f46a77f418 100644 (file)
@@ -3408,7 +3408,6 @@ gtk_widget_get_direction
 gtk_widget_get_display
 gtk_widget_get_double_buffered
 gtk_widget_get_events
-gtk_widget_get_extension_events
 gtk_widget_get_halign
 gtk_widget_get_has_tooltip
 gtk_widget_get_has_window
@@ -3554,7 +3553,6 @@ gtk_widget_set_device_events
 gtk_widget_set_direction
 gtk_widget_set_double_buffered
 gtk_widget_set_events
-gtk_widget_set_extension_events
 gtk_widget_set_halign
 gtk_widget_set_has_tooltip
 gtk_widget_set_has_window
index 5053b1f8fe35373db56fc836d6575668ee015b6a..3e3f7a0a934a70cb80da7eb3d090360dcdc72834 100644 (file)
@@ -24,8 +24,6 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#undef GDK_DISABLE_DEPRECATED /* gdk_input_set_extension_events() */
-
 #include "config.h"
 #include <stdarg.h>
 #include <string.h>
@@ -467,7 +465,6 @@ enum {
   PROP_COMPOSITE_CHILD,
   PROP_STYLE,
   PROP_EVENTS,
-  PROP_EXTENSION_EVENTS,
   PROP_NO_SHOW_ALL,
   PROP_HAS_TOOLTIP,
   PROP_TOOLTIP_MARKUP,
@@ -669,7 +666,6 @@ static GQuark               quark_accel_path = 0;
 static GQuark          quark_accel_closures = 0;
 static GQuark          quark_event_mask = 0;
 static GQuark           quark_device_event_mask = 0;
-static GQuark          quark_extension_event_mode = 0;
 static GQuark          quark_parent_window = 0;
 static GQuark          quark_pointer_window = 0;
 static GQuark          quark_shape_info = 0;
@@ -783,7 +779,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   quark_accel_closures = g_quark_from_static_string ("gtk-accel-closures");
   quark_event_mask = g_quark_from_static_string ("gtk-event-mask");
   quark_device_event_mask = g_quark_from_static_string ("gtk-device-event-mask");
-  quark_extension_event_mode = g_quark_from_static_string ("gtk-extension-event-mode");
   quark_parent_window = g_quark_from_static_string ("gtk-parent-window");
   quark_pointer_window = g_quark_from_static_string ("gtk-pointer-window");
   quark_shape_info = g_quark_from_static_string ("gtk-shape-info");
@@ -1000,14 +995,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                                       GDK_TYPE_EVENT_MASK,
                                                       GDK_STRUCTURE_MASK,
                                                       GTK_PARAM_READWRITE));
-  g_object_class_install_property (gobject_class,
-                                  PROP_EXTENSION_EVENTS,
-                                  g_param_spec_enum ("extension-events",
-                                                     P_("Extension events"),
-                                                     P_("The mask that decides what kind of extension events this widget gets"),
-                                                     GDK_TYPE_EXTENSION_MODE,
-                                                     GDK_EXTENSION_EVENTS_NONE,
-                                                     GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_NO_SHOW_ALL,
                                   g_param_spec_boolean ("no-show-all",
@@ -3231,9 +3218,6 @@ gtk_widget_set_property (GObject         *object,
       if (!gtk_widget_get_realized (widget) && gtk_widget_get_has_window (widget))
        gtk_widget_set_events (widget, g_value_get_flags (value));
       break;
-    case PROP_EXTENSION_EVENTS:
-      gtk_widget_set_extension_events (widget, g_value_get_enum (value));
-      break;
     case PROP_NO_SHOW_ALL:
       gtk_widget_set_no_show_all (widget, g_value_get_boolean (value));
       break;
@@ -3348,7 +3332,6 @@ gtk_widget_get_property (GObject         *object,
   switch (prop_id)
     {
       gpointer *eventp;
-      gpointer *modep;
 
     case PROP_NAME:
       if (priv->name)
@@ -3410,10 +3393,6 @@ gtk_widget_get_property (GObject         *object,
       eventp = g_object_get_qdata (G_OBJECT (widget), quark_event_mask);
       g_value_set_flags (value, GPOINTER_TO_INT (eventp));
       break;
-    case PROP_EXTENSION_EVENTS:
-      modep = g_object_get_qdata (G_OBJECT (widget), quark_extension_event_mode);
-      g_value_set_enum (value, GPOINTER_TO_INT (modep));
-      break;
     case PROP_NO_SHOW_ALL:
       g_value_set_boolean (value, gtk_widget_get_no_show_all (widget));
       break;
@@ -4181,52 +4160,6 @@ gtk_widget_unmap (GtkWidget *widget)
     }
 }
 
-static void
-gtk_widget_set_extension_events_internal (GtkWidget        *widget,
-                                          GdkExtensionMode  mode,
-                                          GList            *window_list)
-{
-  GtkWidgetPrivate *priv = widget->priv;
-  GList *free_list = NULL;
-  GList *l;
-
-  if (window_list == NULL)
-    {
-      if (gtk_widget_get_has_window (widget))
-        window_list = g_list_prepend (NULL, priv->window);
-      else
-        window_list = gdk_window_get_children (priv->window);
-
-      free_list = window_list;
-    }
-
-  for (l = window_list; l != NULL; l = l->next)
-    {
-      GdkWindow *window = l->data;
-      gpointer user_data;
-
-      gdk_window_get_user_data (window, &user_data);
-      if (user_data == widget)
-        {
-          GList *children;
-
-          gdk_input_set_extension_events (window,
-                                          gdk_window_get_events (window),
-                                          mode);
-
-          children = gdk_window_get_children (window);
-          if (children)
-            {
-              gtk_widget_set_extension_events_internal (widget, mode, children);
-              g_list_free (children);
-            }
-        }
-    }
-
-  if (free_list)
-    g_list_free (free_list);
-}
-
 static void
 _gtk_widget_enable_device_events (GtkWidget *widget)
 {
@@ -4279,7 +4212,6 @@ void
 gtk_widget_realize (GtkWidget *widget)
 {
   GtkWidgetPrivate *priv;
-  GdkExtensionMode mode;
   cairo_region_t *region;
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -4322,10 +4254,6 @@ gtk_widget_realize (GtkWidget *widget)
       if (region)
        gdk_window_input_shape_combine_region (priv->window, region, 0, 0);
 
-      mode = gtk_widget_get_extension_events (widget);
-      if (mode != GDK_EXTENSION_EVENTS_NONE)
-        gtk_widget_set_extension_events_internal (widget, mode, NULL);
-
       if (priv->multidevice)
         gdk_window_set_support_multidevice (priv->window, TRUE);
 
@@ -9759,28 +9687,6 @@ gtk_widget_add_device_events (GtkWidget    *widget,
   g_object_notify (G_OBJECT (widget), "events");
 }
 
-/**
- * gtk_widget_set_extension_events:
- * @widget: a #GtkWidget
- * @mode: bitfield of extension events to receive
- *
- * Sets the extension events mask to @mode. See #GdkExtensionMode
- * and gdk_input_set_extension_events().
- **/
-void
-gtk_widget_set_extension_events (GtkWidget *widget,
-                                GdkExtensionMode mode)
-{
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  if (gtk_widget_get_realized (widget))
-    gtk_widget_set_extension_events_internal (widget, mode, NULL);
-
-  g_object_set_qdata (G_OBJECT (widget), quark_extension_event_mode,
-                      GINT_TO_POINTER (mode));
-  g_object_notify (G_OBJECT (widget), "extension-events");
-}
-
 /**
  * gtk_widget_get_toplevel:
  * @widget: a #GtkWidget
@@ -9993,23 +9899,6 @@ gtk_widget_get_device_events (GtkWidget *widget,
   return GPOINTER_TO_UINT (g_hash_table_lookup (device_events, device));
 }
 
-/**
- * gtk_widget_get_extension_events:
- * @widget: a #GtkWidget
- *
- * Retrieves the extension events the widget will receive; see
- * gdk_input_set_extension_events().
- *
- * Return value: extension events for @widget
- **/
-GdkExtensionMode
-gtk_widget_get_extension_events (GtkWidget *widget)
-{
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
-
-  return GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (widget), quark_extension_event_mode));
-}
-
 /**
  * gtk_widget_get_pointer:
  * @widget: a #GtkWidget
@@ -13637,7 +13526,7 @@ gtk_widget_get_window (GtkWidget *widget)
  * Returns %TRUE if @widget is multiple pointer aware. See
  * gtk_widget_set_support_multidevice() for more information.
  *
- * Returns: %TRUE is @widget is multidevice aware.
+ * Returns: %TRUE if @widget is multidevice aware.
  **/
 gboolean
 gtk_widget_get_support_multidevice (GtkWidget *widget)
@@ -13668,17 +13557,7 @@ gtk_widget_set_support_multidevice (GtkWidget *widget,
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   priv = widget->priv;
-
-  if (support_multidevice)
-    {
-      priv->multidevice = TRUE;
-      gtk_widget_set_extension_events (widget, GDK_EXTENSION_EVENTS_ALL);
-    }
-  else
-    {
-      priv->multidevice = FALSE;
-      gtk_widget_set_extension_events (widget, GDK_EXTENSION_EVENTS_NONE);
-    }
+  priv->multidevice = (support_multidevice == TRUE);
 
   if (gtk_widget_get_realized (widget))
     gdk_window_set_support_multidevice (priv->window, support_multidevice);
index 30fafe690a7da011243ecceb8951be65d32eed46..54acc3d8a743c9b86f82c7c78269a64c3d9f0922 100644 (file)
@@ -671,10 +671,6 @@ void          gtk_widget_set_device_events   (GtkWidget           *widget,
 void       gtk_widget_add_device_events   (GtkWidget           *widget,
                                            GdkDevice           *device,
                                           GdkEventMask         events);
-void      gtk_widget_set_extension_events (GtkWidget           *widget,
-                                           GdkExtensionMode    mode);
-
-GdkExtensionMode gtk_widget_get_extension_events (GtkWidget    *widget);
 GtkWidget*   gtk_widget_get_toplevel   (GtkWidget      *widget);
 GtkWidget*   gtk_widget_get_ancestor   (GtkWidget      *widget,
                                         GType           widget_type);