gdk3 2.0.2 → 2.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 515e58969322acc068898a33890c32c64fc2db3b
+  data.tar.gz: 3963f892f9bab2a5a1b20a6cb225fbcb2e235e81
+SHA512:
+  metadata.gz: d77b921fa1e1f56bc875dfe601035400010bbf24260c9e8129a826e191a78f5758a6d041f2d4040ec5af32de0efbab739371a4c8517451cf86f2262a7faba558
+  data.tar.gz: f487d9c51c11b8fd0fb8ddfbe84f598119feee03662ea8ada1130cef4e70395a361236e5f962e783c91ae91b321d255ede465252c6c90c19f0be41a1063942ef

data/Rakefile

@@ -26,15 +26,19 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "gtk+",
       :download_site => :gnome,
       :label => "GTK+",
-      :version => "3.8.2",
+      :version => "3.10.6",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
           "--enable-introspection",
         ],
+        :patches => [
+          "gdk+-3.10.6-remove-def-use.diff",
+        ],
+        :need_autoreconf => true,
+        :built_file => "bin/libgdk-3-0.dll",
       },
     }
   ]
-  package.required_ruby_version = ">= 1.9.2"
 end
 package_task.define

data/ext/gdk3/extconf.rb

@@ -54,7 +54,10 @@ rcairo_source_dir_names.each do |rcairo_source_dir_name|
     break
   end
 end
-check_cairo(rcairo_options)
+
+unless check_cairo(rcairo_options)
+  exit(false)
+end
 
 setup_win32(module_name, base_dir)
 

data/ext/gdk3/gdk3.def

@@ -7,6 +7,6 @@ EXPORTS
     gdk_geometry_get_type
     gdk_windowattr_get_type
     get_gdkatom
-    get_gdkevent
-    make_gdkevent
+    rbgdk_gdkevent2rval
+    rbgdk_rval2gdkevent
 

data/ext/gdk3/rbgdk.c

@@ -228,7 +228,7 @@ rg_s_display(G_GNUC_UNUSED VALUE self)
     return CSTR2RVAL(gdk_get_display());
 }
 
-#ifdef HAVE_X11_XLIB_H 
+#ifdef HAVE_X11_XLIB_H
 #ifdef HAVE_XGETERRORTEXT
 #include <X11/Xlib.h>
 #include <errno.h>
@@ -262,12 +262,12 @@ rbgdk_x_io_error(Display *display)
 
     error = g_strerror(errno_saved);
 
-    rb_funcall((VALUE)rb_x_io_error, id_call, 3, CSTR2RVAL(disp), 
+    rb_funcall((VALUE)rb_x_io_error, id_call, 3, CSTR2RVAL(disp),
                INT2NUM(errno), CSTR2RVAL(error));
     return 0;
 }
-#endif 
-#endif 
+#endif
+#endif
 
 static VALUE
 rg_s_set_x_error_handler(VALUE self)
@@ -326,44 +326,6 @@ rg_s_screen_height_mm(G_GNUC_UNUSED VALUE self)
     return INT2NUM(gdk_screen_height_mm());
 }
 
-static VALUE
-rg_s_pointer_grab(G_GNUC_UNUSED VALUE self, VALUE win, VALUE owner_events, VALUE event_mask, VALUE confine_to, VALUE cursor, VALUE time)
-{
-    return GDKGRABSTATUS2RVAL(gdk_pointer_grab(RVAL2GDKWINDOW(win),
-                                               RVAL2CBOOL(owner_events),
-                                               RVAL2GDKEVENTMASK(event_mask),
-                                               NIL_P(confine_to) ? NULL : RVAL2GDKWINDOW(confine_to),
-                                               NIL_P(cursor) ? NULL : RVAL2GDKCURSOR(cursor),
-                                               NUM2INT(time)));
-}
-
-static VALUE
-rg_s_pointer_ungrab(VALUE self, VALUE time)
-{
-    gdk_pointer_ungrab(NUM2INT(time));
-    return self;
-}
-
-static VALUE
-rg_s_keyboard_grab(G_GNUC_UNUSED VALUE self, VALUE win, VALUE owner_events, VALUE time)
-{
-    return GDKGRABSTATUS2RVAL(gdk_keyboard_grab(RVAL2GDKWINDOW(win),
-                                                RVAL2CBOOL(owner_events), NUM2INT(time)));
-}
-
-static VALUE
-rg_s_keyboard_ungrab(VALUE self, VALUE time)
-{
-    gdk_keyboard_ungrab(NUM2INT(time));
-    return self;
-}
-
-static VALUE
-rg_s_pointer_is_grabbed_p(G_GNUC_UNUSED VALUE self)
-{
-    return CBOOL2RVAL(gdk_pointer_is_grabbed());
-}
-
 static VALUE
 rg_s_set_double_click_time(VALUE self, VALUE msec)
 {
@@ -451,11 +413,7 @@ rg_s_target(G_GNUC_UNUSED VALUE self)
 static VALUE
 rg_s_cairo_available_p(G_GNUC_UNUSED VALUE self)
 {
-#if CAIRO_AVAILABLE
     return Qtrue;
-#else
-    return Qfalse;
-#endif
 }
 
 void
@@ -484,11 +442,6 @@ Init_gdk(void)
     RG_DEF_SMETHOD(beep, 0);
     RG_DEF_SMETHOD(flush, 0);
     RG_DEF_SMETHOD(set_double_click_time, 1);
-    RG_DEF_SMETHOD(pointer_grab, 6);
-    RG_DEF_SMETHOD(pointer_ungrab, 1);
-    RG_DEF_SMETHOD(keyboard_grab, 3);
-    RG_DEF_SMETHOD(keyboard_ungrab, 1);
-    RG_DEF_SMETHOD_P(pointer_is_grabbed, 0);
     RG_DEF_SMETHOD(error_trap_push, 0);
     RG_DEF_SMETHOD(error_trap_pop, 0);
     RG_DEF_SMETHOD_P(windowing_x11, 0);
@@ -509,6 +462,7 @@ Init_gdk(void)
     Init_gdk_const(RG_TARGET_NAMESPACE);
     Init_gdk_cursor(RG_TARGET_NAMESPACE);
     Init_gdk_device(RG_TARGET_NAMESPACE);
+    Init_gdk_device_manager(RG_TARGET_NAMESPACE);
     Init_gdk_display(RG_TARGET_NAMESPACE);
     Init_gdk_display_manager(RG_TARGET_NAMESPACE);
     Init_gdk_dragcontext(RG_TARGET_NAMESPACE);

data/ext/gdk3/rbgdk3.h

@@ -41,8 +41,10 @@
 
 #define RVAL2GDKPIXBUFGLIST(value) rbgdk_rval2gdkpixbufglist(value)
 
-#define GEV2RVAL(ev) (make_gdkevent(ev))
-#define RVAL2GEV(ev) (get_gdkevent(ev))
+/* for backword compatibility. TODO: remove me. */
+#define GEV2RVAL(ev) GDKEVENT2RVAL(ev)
+#define RVAL2GEV(ev) RVAL2GDKEVENT(ev)
+
 #define RVAL2ATOM(atom) (get_gdkatom(atom))
 
 #define GDK_TYPE_GEOMETRY (gdk_geometry_get_type())
@@ -65,7 +67,7 @@ extern GType gdk_geometry_get_type(void);
 extern GType gdk_timecoord_get_type(void);
 
 extern GdkAtom get_gdkatom(VALUE atom);
-extern VALUE make_gdkevent(GdkEvent* event);
-extern GdkEvent* get_gdkevent(VALUE event);
+extern VALUE rbgdk_gdkevent2rval(GdkEvent *event);
+extern GdkEvent *rbgdk_rval2gdkevent(VALUE event);
 
 #endif /* __RBGDK3_H__ */

data/ext/gdk3/rbgdk3conversions.h

@@ -25,6 +25,7 @@
 #define RVAL2GDKDEVICE(o)                  (GDK_DEVICE(RVAL2GOBJ(o)))
 #define RVAL2GDKDISPLAY(o)                 (GDK_DISPLAY(RVAL2GOBJ(o)))
 #define RVAL2GDKDISPLAYMANAGER(o)          (GDK_DISPLAY_MANAGER(RVAL2GOBJ(o)))
+#define RVAL2GDKDEVICEMANAGER(o)           (GDK_DEVICE_MANAGER(RVAL2GOBJ(o)))
 #define RVAL2GDKDISPLAYOBJECT(o)           (GDK_DISPLAY_OBJECT(RVAL2GOBJ(o)))
 #define RVAL2GDKDRAGCONTEXT(o)             (GDK_DRAG_CONTEXT(RVAL2GOBJ(o)))
 #define RVAL2GDKDRAWABLE(o)                (GDK_DRAWABLE(RVAL2GOBJ(o)))
@@ -42,8 +43,8 @@
 #define GDKCOLOR2RVAL(o)                   (BOXED2RVAL(o, GDK_TYPE_COLOR))
 #define RVAL2GDKCURSOR(o)                  ((GdkCursor*)RVAL2BOXED(o, GDK_TYPE_CURSOR))
 #define GDKCURSOR2RVAL(o)                  (BOXED2RVAL(o, GDK_TYPE_CURSOR))
-#define RVAL2GDKEVENT(o)                   ((GdkEvent*)RVAL2BOXED(o, GDK_TYPE_EVENT))
-#define GDKEVENT2RVAL(o)                   (BOXED2RVAL(o, GDK_TYPE_EVENT))
+#define RVAL2GDKEVENT(o)                   (rbgdk_rval2gdkevent(o))
+#define GDKEVENT2RVAL(o)                   (rbgdk_gdkevent2rval(o))
 #define RVAL2GDKGEOMETRY(o)                ((GdkGeometry*)RVAL2BOXED(o, GDK_TYPE_GEOMETRY))
 #define GDKGEOMETRY2RVAL(o)                (BOXED2RVAL(o, GDK_TYPE_GEOMETRY))
 #define RVAL2GDKRECTANGLE(o)               ((GdkRectangle*)RVAL2BOXED(o, GDK_TYPE_RECTANGLE))
@@ -77,6 +78,8 @@
 #define GDKINPUTMODE2RVAL(o)               (GENUM2RVAL(o, GDK_TYPE_INPUT_MODE))
 #define RVAL2GDKINPUTSOURCE(o)             (RVAL2GENUM(o, GDK_TYPE_INPUT_SOURCE))
 #define GDKINPUTSOURCE2RVAL(o)             (GENUM2RVAL(o, GDK_TYPE_INPUT_SOURCE))
+#define RVAL2GDKGRABOWNERSHIP(o)           (RVAL2GENUM(o, GDK_TYPE_GRAB_OWNERSHIP))
+#define GDKGRABOWNERSHIP2RVAL(o)           (GENUM2RVAL(o, GDK_TYPE_GRAB_OWNERSHIP))
 #define RVAL2GDKPROPMODE(o)                (RVAL2GENUM(o, GDK_TYPE_PROP_MODE))
 #define GDKPROPMODE2RVAL(o)                (GENUM2RVAL(o, GDK_TYPE_PROP_MODE))
 #define RVAL2GDKRGBDITHER(o)               (RVAL2GENUM(o, GDK_TYPE_RGB_DITHER))

data/ext/gdk3/rbgdk3private.h

@@ -44,12 +44,6 @@
 #  define G_VALUE_INIT { 0, { { 0 } } }
 #endif
 
-#if defined(HAVE_RB_CAIRO_H)
-#  define CAIRO_AVAILABLE 1
-#else
-#  define CAIRO_AVAILABLE 0
-#endif
-
 extern ID id_call;
 
 G_GNUC_INTERNAL void Init_gdk(void);
@@ -59,6 +53,7 @@ G_GNUC_INTERNAL void Init_gdk_color(VALUE mGdk);
 G_GNUC_INTERNAL void Init_gdk_const(VALUE mGdk);
 G_GNUC_INTERNAL void Init_gdk_cursor(VALUE mGdk);
 G_GNUC_INTERNAL void Init_gdk_device(VALUE mGdk);
+G_GNUC_INTERNAL void Init_gdk_device_manager(VALUE mGdk);
 G_GNUC_INTERNAL void Init_gdk_display(VALUE mGdk);
 G_GNUC_INTERNAL void Init_gdk_display_manager(VALUE mGdk);
 G_GNUC_INTERNAL void Init_gdk_dragcontext(VALUE mGdk);

data/ext/gdk3/rbgdkcairo.c

@@ -21,7 +21,6 @@
 
 #include "rbgdk3private.h"
 
-#if CAIRO_AVAILABLE
 #include <gdk/gdk.h>
 #include <rb_cairo.h>
 
@@ -78,12 +77,10 @@ rg_gdk_region(VALUE self, VALUE region)
     rb_cairo_check_status(cairo_status(_SELF(self)));
     return self;
 }
-#endif
 
 void
 Init_gdk_cairo(void)
 {
-#if CAIRO_AVAILABLE
     RG_DEF_METHOD(set_source_gdk_color, 1);
     RG_DEF_METHOD(set_source_pixbuf, -1);
 /* deprecated
@@ -91,5 +88,4 @@ Init_gdk_cairo(void)
 */
     RG_DEF_METHOD(gdk_rectangle, 1);
     RG_DEF_METHOD(gdk_region, 1);
-#endif
 }

data/ext/gdk3/rbgdkdevice.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2003-2006 Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -70,7 +70,7 @@ rg_set_key(VALUE self, VALUE index, VALUE keyval, VALUE modifiers)
 static VALUE
 rg_set_axis_use(VALUE self, VALUE index, VALUE use)
 {
-    gdk_device_set_axis_use(_SELF(self), NUM2UINT(index), 
+    gdk_device_set_axis_use(_SELF(self), NUM2UINT(index),
                             RVAL2GDKAXISUSE(use));
     return self;
 }
@@ -137,6 +137,56 @@ rg_mode(VALUE self)
     return GDKINPUTMODE2RVAL(gdk_device_get_mode(_SELF(self)));
 }
 
+static VALUE
+rg_get_window_at_position(G_GNUC_UNUSED VALUE self)
+{
+    gint x, y;
+    GdkWindow *win = gdk_device_get_window_at_position(_SELF(self), &x ,&y);
+    return rb_ary_new3(3, GOBJ2RVAL(win), INT2FIX(x), INT2FIX(y));
+}
+
+static VALUE
+rg_ungrab(int argc, VALUE *argv, VALUE self)
+{
+    VALUE rb_time;
+    guint32 time = GDK_CURRENT_TIME;
+
+    rb_scan_args(argc, argv, "01", &rb_time);
+    if (!NIL_P(rb_time)) {
+        time = NUM2UINT(GDK_CURRENT_TIME);
+    }
+    gdk_device_ungrab(_SELF(self), time);
+    return self;
+}
+
+static VALUE
+rg_get_position(VALUE self)
+{
+    GdkScreen *screen;
+    gint x, y;
+    gdk_device_get_position(_SELF(self), &screen, &x, &y);
+    return rb_ary_new3(3, GOBJ2RVAL(screen), INT2NUM(x), INT2NUM(y));
+}
+
+static VALUE
+rg_warp(VALUE self, VALUE screen, VALUE x, VALUE y)
+{
+    gdk_device_warp(_SELF(self), RVAL2GDKSCREEN(screen), NUM2INT(x), NUM2INT(y));
+    return self;
+}
+
+static VALUE
+rg_grab(VALUE self, VALUE win, VALUE grab_ownership, VALUE owner_events, VALUE event_mask, VALUE cursor, VALUE time)
+{
+    return GDKGRABSTATUS2RVAL(gdk_device_grab(_SELF(self),
+                                              RVAL2GDKWINDOW(win),
+                                              RVAL2GDKGRABOWNERSHIP(grab_ownership),
+                                              RVAL2CBOOL(owner_events),
+                                              RVAL2GDKEVENTMASK(event_mask),
+                                              RVAL2GDKCURSOR(cursor),
+                                              NUM2INT(time)));
+}
+
 /* deprecated
 static VALUE
 rg_axes(VALUE self)
@@ -146,7 +196,7 @@ rg_axes(VALUE self)
     GdkDeviceAxis* axes = _SELF(self)->axes;
 
     for (i = 0; i < _SELF(self)->num_axes; i++){
-        rb_ary_push(ary, rb_ary_new3(3, GDKAXISUSE2RVAL(axes[i].use), 
+        rb_ary_push(ary, rb_ary_new3(3, GDKAXISUSE2RVAL(axes[i].use),
                                      rb_float_new(axes[i].min), rb_float_new(axes[i].max)));
     }
     return ary;
@@ -167,7 +217,7 @@ rg_keys(VALUE self)
 }
 */
 
-void 
+void
 Init_gdk_device(VALUE mGdk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_DEVICE, "Device", mGdk);
@@ -186,6 +236,12 @@ Init_gdk_device(VALUE mGdk)
     RG_DEF_METHOD(get_history, 3);
     RG_DEF_METHOD(get_axis, 2);
     RG_DEF_METHOD(mode, 0);
+    RG_DEF_METHOD(get_window_at_position, 0);
+    RG_DEF_METHOD(ungrab, -1);
+    RG_DEF_METHOD(get_position, 0);
+    RG_DEF_METHOD(warp, 3);
+    RG_DEF_METHOD(grab, 6);
+
 /* deprecated
     RG_DEF_METHOD(axes, 0);
     RG_DEF_METHOD(keys, 0);

data/ext/gdk3/rbgdkdevicemanager.c

@@ -0,0 +1,39 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2013  Ruby-GNOME2 Project Team
+ *
+ *  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.1 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., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "rbgdk3private.h"
+
+#define RG_TARGET_NAMESPACE cDeviceManager
+#define _SELF(obj) RVAL2GDKDEVICEMANAGER(obj)
+
+static VALUE
+rg_devices(VALUE self)
+{
+    return GOBJGLIST2RVAL_FREE(gdk_device_manager_list_devices(_SELF(self), GDK_TYPE_DEVICE),
+                               g_list_free, NULL);
+}
+
+void
+Init_gdk_device_manager(VALUE mGdk)
+{
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_DISPLAY_MANAGER, "DeviceManager", mGdk);
+
+    RG_DEF_METHOD(devices, 0);
+}

data/ext/gdk3/rbgdkdisplay.c

@@ -36,7 +36,7 @@ rg_s_open(G_GNUC_UNUSED VALUE self, VALUE display_name)
 {
     GdkDisplay* gdisplay = gdk_display_open(RVAL2CSTR(display_name));
     if (! gdisplay) {
-        rb_raise(rb_eRuntimeError, "The display `%s' could not be opened.", 
+        rb_raise(rb_eRuntimeError, "The display `%s' could not be opened.",
                  RVAL2CSTR(display_name));
     } else {
         VALUE display;
@@ -87,23 +87,9 @@ rg_default_screen(VALUE self)
 }
 
 static VALUE
-rg_pointer_ungrab(VALUE self, VALUE time)
+rg_device_is_grabbed_p(VALUE self, VALUE device)
 {
-    gdk_display_pointer_ungrab(_SELF(self), NUM2ULONG(time));
-    return self;
-}
-
-static VALUE
-rg_keyboard_ungrab(VALUE self, VALUE time)
-{
-    gdk_display_keyboard_ungrab(_SELF(self), NUM2ULONG(time));
-    return self;
-}
-
-static VALUE
-rg_pointer_grabbed_p(VALUE self)
-{
-    return CBOOL2RVAL(gdk_display_pointer_is_grabbed(_SELF(self)));
+    return CBOOL2RVAL(gdk_display_device_is_grabbed(_SELF(self), RVAL2GDKDEVICE(device)));
 }
 
 static VALUE
@@ -127,12 +113,6 @@ rg_flush(VALUE self)
     return self;
 }
 
-static VALUE
-rg_devices(VALUE self)
-{
-    return rbgutil_glist2ary(gdk_display_list_devices(_SELF(self)));
-}
-
 static VALUE
 rg_event(VALUE self)
 {
@@ -156,8 +136,8 @@ rg_put_event(VALUE self, VALUE event)
 static GdkFilterReturn
 filter_func(GdkXEvent xevent, GdkEvent event, gpointer func)
 {
-    return GENUM2RVAL(rb_funcall((VALUE)func, id_call, 2, 
-                                 ????, GEV2RVAL(event)), 
+    return GENUM2RVAL(rb_funcall((VALUE)func, id_call, 2,
+                                 ????, GEV2RVAL(event)),
                       GDK_TYPE_FILTER_RETURN);
 }
 
@@ -192,28 +172,6 @@ rg_set_double_click_distance(VALUE self, VALUE distance)
     return self;
 }
 
-static VALUE
-rg_pointer(VALUE self)
-{
-    GdkScreen *screen;
-    int x,y;
-    GdkModifierType mask;
-
-    gdk_display_get_pointer(_SELF(self), &screen, &x, &y, &mask);
-
-    return rb_ary_new3(4, GOBJ2RVAL(screen), INT2NUM(x), INT2NUM(y), INT2NUM(mask));
-}
-static VALUE
-rg_window_at_pointer(VALUE self)
-{
-    GdkWindow *window;
-    int x,y;
-
-    window = gdk_display_get_window_at_pointer(_SELF(self), &x, &y);
-
-    return rb_ary_new3(3, GOBJ2RVAL(window), INT2NUM(x), INT2NUM(y));
-}
-
 /* Don't implement this.
 GdkDisplayPointerHooks* gdk_display_set_pointer_hooks
                                             (GdkDisplay *display,
@@ -261,7 +219,7 @@ rg_supports_selection_notification_p(VALUE self)
 static VALUE
 rg_request_selection_notification_p(VALUE self, VALUE selection)
 {
-    return CBOOL2RVAL(gdk_display_request_selection_notification(_SELF(self), 
+    return CBOOL2RVAL(gdk_display_request_selection_notification(_SELF(self),
                                                                  RVAL2ATOM(selection)));
 }
 
@@ -295,13 +253,6 @@ rg_core_pointer(VALUE self)
 }
 */
 
-static VALUE
-rg_warp_pointer(VALUE self, VALUE screen, VALUE x, VALUE y)
-{
-    gdk_display_warp_pointer(_SELF(self), RVAL2GDKSCREEN(screen), NUM2INT(x), NUM2INT(y));
-    return self;
-}
-
 #ifdef GDK_WINDOWING_X11
 static VALUE
 rg_grab(VALUE self)
@@ -419,7 +370,7 @@ rg_supports_composite_p(VALUE self)
     return CBOOL2RVAL(gdk_display_supports_composite(_SELF(self)));
 }
 
-void 
+void
 Init_gdk_display(VALUE mGdk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_DISPLAY, "Display", mGdk);
@@ -432,24 +383,19 @@ Init_gdk_display(VALUE mGdk)
     RG_DEF_ALIAS("[]", "get_screen");
     RG_DEF_METHOD(default_screen, 0);
 
-    RG_DEF_METHOD(pointer_ungrab, 1);
-    RG_DEF_METHOD(keyboard_ungrab, 1);
-    RG_DEF_METHOD_P(pointer_grabbed, 0);
+    RG_DEF_METHOD_P(device_is_grabbed, 1);
 
     RG_DEF_METHOD(beep, 0);
     RG_DEF_METHOD(sync, 0);
     RG_DEF_METHOD(flush, 0);
     RG_DEF_METHOD(close, 0);
 
-    RG_DEF_METHOD(devices, 0);
     RG_DEF_METHOD(event, 0);
     RG_DEF_METHOD(peek_event, 0);
     RG_DEF_METHOD(put_event, 1);
     RG_DEF_METHOD(set_double_click_time, 1);
     RG_DEF_METHOD_P(closed, 0);
     RG_DEF_METHOD(set_double_click_distance, 1);
-    RG_DEF_METHOD(pointer, 0);
-    RG_DEF_METHOD(window_at_pointer, 0);
     RG_DEF_METHOD_P(supports_cursor_color, 0);
     RG_DEF_METHOD_P(supports_cursor_alpha, 0);
     RG_DEF_METHOD(default_cursor_size, 0);
@@ -462,7 +408,6 @@ Init_gdk_display(VALUE mGdk)
 /* deprecated
     RG_DEF_METHOD(core_pointer, 0);
 */
-    RG_DEF_METHOD(warp_pointer, 3);
 #ifdef GDK_WINDOWING_X11
     RG_DEF_METHOD(grab, 0);
     RG_DEF_METHOD(ungrab, 0);