[gtk+] gdk: Remove testing functions
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gdk: Remove testing functions
- Date: Sun, 8 Jan 2017 02:47:07 +0000 (UTC)
commit 7ade6e3f4668220f0fa1382944a87e63691ad9ad
Author: Benjamin Otte <otte redhat com>
Date: Sun Jan 8 03:34:58 2017 +0100
gdk: Remove testing functions
They were unused and unimplemented.
docs/reference/gdk/gdk4-sections.txt | 8 --
gdk/Makefile.am | 3 -
gdk/broadway/Makefile.am | 1 -
gdk/broadway/gdkprivate-broadway.h | 13 ---
gdk/broadway/gdktestutils-broadway.c | 66 ------------
gdk/broadway/gdkwindow-broadway.c | 3 -
gdk/gdk.h | 1 -
gdk/gdktestutils.h | 61 -----------
gdk/gdkwindow.c | 100 ------------------
gdk/gdkwindowimpl.h | 14 ---
gdk/mir/gdkmirwindowimpl.c | 34 ------
gdk/quartz/Makefile.am | 1 -
gdk/quartz/gdkprivate-quartz.h | 15 ---
gdk/quartz/gdktestutils-quartz.c | 65 ------------
gdk/quartz/gdkwindow-quartz.c | 3 -
gdk/wayland/gdkwindow-wayland.c | 30 ------
gdk/win32/Makefile.am | 1 -
gdk/win32/gdkprivate-win32.h | 12 --
gdk/win32/gdktestutils-win32.c | 127 -----------------------
gdk/win32/gdkwindow-win32.c | 3 -
gdk/x11/Makefile.am | 1 -
gdk/x11/gdkprivate-x11.h | 13 ---
gdk/x11/gdktestutils-x11.c | 184 ----------------------------------
gdk/x11/gdkwindow-x11.c | 3 -
24 files changed, 0 insertions(+), 762 deletions(-)
---
diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index e507881..0eec4fe 100644
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -1218,14 +1218,6 @@ gdk_app_launch_context_get_type
</SECTION>
<SECTION>
-<TITLE>Testing</TITLE>
-<FILE>gdktestutils</FILE>
-gdk_test_render_sync
-gdk_test_simulate_button
-gdk_test_simulate_key
-</SECTION>
-
-<SECTION>
<TITLE>GdkFrameClock</TITLE>
<FILE>gdkframeclock</FILE>
GdkFrameClock
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index f40ffc7..064fe39 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -87,7 +87,6 @@ gdk_public_h_sources = \
gdkscreen.h \
gdkseat.h \
gdkselection.h \
- gdktestutils.h \
gdkthreads.h \
gdktypes.h \
gdkvisual.h \
@@ -264,7 +263,6 @@ x11_introspection_files = \
x11/gdkscreen-x11.c \
x11/gdkselection-x11.c \
x11/gdksettings.c \
- x11/gdktestutils-x11.c \
x11/gdkvisual-x11.c \
x11/gdkwindow-x11.c \
x11/gdkxftdefaults.c \
@@ -321,7 +319,6 @@ w32_introspection_files = \
win32/gdkproperty-win32.c \
win32/gdkscreen-win32.c \
win32/gdkselection-win32.c \
- win32/gdktestutils-win32.c \
win32/gdkwin32.h \
win32/gdkwin32cursor.h \
win32/gdkwin32display.h \
diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index 47e6ed3..05fd5b1 100644
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -71,7 +71,6 @@ libgdk_broadway_la_SOURCES = \
gdkscreen-broadway.c \
gdkscreen-broadway.h \
gdkselection-broadway.c \
- gdktestutils-broadway.c \
gdkwindow-broadway.c \
gdkwindow-broadway.h \
gdkprivate-broadway.h \
diff --git a/gdk/broadway/gdkprivate-broadway.h b/gdk/broadway/gdkprivate-broadway.h
index b5710cf..4e56071 100644
--- a/gdk/broadway/gdkprivate-broadway.h
+++ b/gdk/broadway/gdkprivate-broadway.h
@@ -161,19 +161,6 @@ BroadwayInputMsg * _gdk_broadway_display_block_for_input (GdkDisplay *display,
gboolean remove);
/* Window methods - testing */
-void _gdk_broadway_window_sync_rendering (GdkWindow *window);
-gboolean _gdk_broadway_window_simulate_key (GdkWindow *window,
- gint x,
- gint y,
- guint keyval,
- GdkModifierType modifiers,
- GdkEventType key_pressrelease);
-gboolean _gdk_broadway_window_simulate_button (GdkWindow *window,
- gint x,
- gint y,
- guint button,
- GdkModifierType modifiers,
- GdkEventType button_pressrelease);
void _gdk_broadway_window_resize_surface (GdkWindow *window);
void _gdk_broadway_cursor_update_theme (GdkCursor *cursor);
diff --git a/gdk/broadway/gdkwindow-broadway.c b/gdk/broadway/gdkwindow-broadway.c
index 4701568..0967ffe 100644
--- a/gdk/broadway/gdkwindow-broadway.c
+++ b/gdk/broadway/gdkwindow-broadway.c
@@ -1534,9 +1534,6 @@ gdk_window_impl_broadway_class_init (GdkWindowImplBroadwayClass *klass)
impl_class->destroy_notify = gdk_broadway_window_destroy_notify;
impl_class->register_dnd = _gdk_broadway_window_register_dnd;
impl_class->drag_begin = _gdk_broadway_window_drag_begin;
- impl_class->sync_rendering = _gdk_broadway_window_sync_rendering;
- impl_class->simulate_key = _gdk_broadway_window_simulate_key;
- impl_class->simulate_button = _gdk_broadway_window_simulate_button;
impl_class->get_property = _gdk_broadway_window_get_property;
impl_class->change_property = _gdk_broadway_window_change_property;
impl_class->delete_property = _gdk_broadway_window_delete_property;
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 4f6c4c4..8bed080 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -58,7 +58,6 @@
#include <gdk/gdkscreen.h>
#include <gdk/gdkseat.h>
#include <gdk/gdkselection.h>
-#include <gdk/gdktestutils.h>
#include <gdk/gdkthreads.h>
#include <gdk/gdktypes.h>
#include <gdk/gdkvisual.h>
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index b761c49..6dffc61 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -8931,106 +8931,6 @@ gdk_drag_begin_from_point (GdkWindow *window,
}
/**
- * gdk_test_render_sync:
- * @window: a mapped #GdkWindow
- *
- * Retrieves a pixel from @window to force the windowing
- * system to carry out any pending rendering commands.
- *
- * This function is intended to be used to synchronize with rendering
- * pipelines, to benchmark windowing system rendering operations.
- *
- * Since: 2.14
- **/
-void
-gdk_test_render_sync (GdkWindow *window)
-{
- GDK_WINDOW_IMPL_GET_CLASS (window->impl)->sync_rendering (window);
-}
-
-/**
- * gdk_test_simulate_key:
- * @window: a #GdkWindow to simulate a key event for
- * @x: x coordinate within @window for the key event
- * @y: y coordinate within @window for the key event
- * @keyval: A GDK keyboard value
- * @modifiers: Keyboard modifiers the event is setup with
- * @key_pressrelease: either %GDK_KEY_PRESS or %GDK_KEY_RELEASE
- *
- * This function is intended to be used in GTK+ test programs.
- * If (@x,@y) are > (-1,-1), it will warp the mouse pointer to
- * the given (@x,@y) coordinates within @window and simulate a
- * key press or release event.
- *
- * When the mouse pointer is warped to the target location, use
- * of this function outside of test programs that run in their
- * own virtual windowing system (e.g. Xvfb) is not recommended.
- * If (@x,@y) are passed as (-1,-1), the mouse pointer will not
- * be warped and @window origin will be used as mouse pointer
- * location for the event.
- *
- * Also, gdk_test_simulate_key() is a fairly low level function,
- * for most testing purposes, gtk_test_widget_send_key() is the
- * right function to call which will generate a key press event
- * followed by its accompanying key release event.
- *
- * Returns: whether all actions necessary for a key event simulation
- * were carried out successfully
- *
- * Since: 2.14
- */
-gboolean
-gdk_test_simulate_key (GdkWindow *window,
- gint x,
- gint y,
- guint keyval,
- GdkModifierType modifiers,
- GdkEventType key_pressrelease)
-{
- return GDK_WINDOW_IMPL_GET_CLASS (window->impl)
- ->simulate_key (window, x, y, keyval, modifiers, key_pressrelease);
-}
-
-/**
- * gdk_test_simulate_button:
- * @window: a #GdkWindow to simulate a button event for
- * @x: x coordinate within @window for the button event
- * @y: y coordinate within @window for the button event
- * @button: Number of the pointer button for the event, usually 1, 2 or 3
- * @modifiers: Keyboard modifiers the event is setup with
- * @button_pressrelease: either %GDK_BUTTON_PRESS or %GDK_BUTTON_RELEASE
- *
- * This function is intended to be used in GTK+ test programs.
- * It will warp the mouse pointer to the given (@x,@y) coordinates
- * within @window and simulate a button press or release event.
- * Because the mouse pointer needs to be warped to the target
- * location, use of this function outside of test programs that
- * run in their own virtual windowing system (e.g. Xvfb) is not
- * recommended.
- *
-* Also, gdk_test_simulate_button() is a fairly low level function,
- * for most testing purposes, gtk_test_widget_click() is the right
- * function to call which will generate a button press event followed
- * by its accompanying button release event.
- *
- * Returns: whether all actions necessary for a button event simulation
- * were carried out successfully
- *
- * Since: 2.14
- */
-gboolean
-gdk_test_simulate_button (GdkWindow *window,
- gint x,
- gint y,
- guint button, /*1..3*/
- GdkModifierType modifiers,
- GdkEventType button_pressrelease)
-{
- return GDK_WINDOW_IMPL_GET_CLASS (window->impl)
- ->simulate_button (window, x, y, button, modifiers, button_pressrelease);
-}
-
-/**
* gdk_property_get:
* @window: a #GdkWindow
* @property: the property to retrieve
diff --git a/gdk/gdkwindowimpl.h b/gdk/gdkwindowimpl.h
index cdfe36f..6d76379 100644
--- a/gdk/gdkwindowimpl.h
+++ b/gdk/gdkwindowimpl.h
@@ -231,20 +231,6 @@ struct _GdkWindowImplClass
void (*process_updates_recurse) (GdkWindow *window,
cairo_region_t *region);
- void (*sync_rendering) (GdkWindow *window);
- gboolean (*simulate_key) (GdkWindow *window,
- gint x,
- gint y,
- guint keyval,
- GdkModifierType modifiers,
- GdkEventType event_type);
- gboolean (*simulate_button) (GdkWindow *window,
- gint x,
- gint y,
- guint button,
- GdkModifierType modifiers,
- GdkEventType event_type);
-
gboolean (*get_property) (GdkWindow *window,
GdkAtom property,
GdkAtom type,
diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index b00e35e..1939e7f 100644
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -1400,37 +1400,6 @@ gdk_mir_window_impl_process_updates_recurse (GdkWindow *window,
_gdk_window_process_updates_recurse (window, region);
}
-static void
-gdk_mir_window_impl_sync_rendering (GdkWindow *window)
-{
- //g_printerr ("gdk_mir_window_impl_sync_rendering window=%p\n", window);
- // FIXME: Only used for benchmarking
-}
-
-static gboolean
-gdk_mir_window_impl_simulate_key (GdkWindow *window,
- gint x,
- gint y,
- guint keyval,
- GdkModifierType modifiers,
- GdkEventType key_pressrelease)
-{
- //g_printerr ("gdk_mir_window_impl_simulate_key window=%p\n", window);
- return FALSE;
-}
-
-static gboolean
-gdk_mir_window_impl_simulate_button (GdkWindow *window,
- gint x,
- gint y,
- guint button,
- GdkModifierType modifiers,
- GdkEventType button_pressrelease)
-{
- //g_printerr ("gdk_mir_window_impl_simulate_button window=%p\n", window);
- return FALSE;
-}
-
static gboolean
gdk_mir_window_impl_get_property (GdkWindow *window,
GdkAtom property,
@@ -2007,9 +1976,6 @@ gdk_mir_window_impl_class_init (GdkMirWindowImplClass *klass)
impl_class->register_dnd = gdk_mir_window_impl_register_dnd;
impl_class->drag_begin = gdk_mir_window_impl_drag_begin;
impl_class->process_updates_recurse = gdk_mir_window_impl_process_updates_recurse;
- impl_class->sync_rendering = gdk_mir_window_impl_sync_rendering;
- impl_class->simulate_key = gdk_mir_window_impl_simulate_key;
- impl_class->simulate_button = gdk_mir_window_impl_simulate_button;
impl_class->get_property = gdk_mir_window_impl_get_property;
impl_class->change_property = gdk_mir_window_impl_change_property;
impl_class->delete_property = gdk_mir_window_impl_delete_property;
diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index eda5263..43b8eee 100644
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -44,7 +44,6 @@ libgdk_quartz_la_SOURCES = \
gdkscreen-quartz.c \
gdkscreen-quartz.h \
gdkselection-quartz.c \
- gdktestutils-quartz.c \
gdkutils-quartz.c \
gdkwindow-quartz.c \
gdkwindow-quartz.h \
diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h
index 7fcb2cb..576cac9 100644
--- a/gdk/quartz/gdkprivate-quartz.h
+++ b/gdk/quartz/gdkprivate-quartz.h
@@ -194,21 +194,6 @@ void _gdk_quartz_window_debug_highlight (GdkWindow *window,
void _gdk_quartz_window_update_position (GdkWindow *window);
void _gdk_quartz_window_update_fullscreen_state (GdkWindow *window);
-/* Window methods - testing */
-void _gdk_quartz_window_sync_rendering (GdkWindow *window);
-gboolean _gdk_quartz_window_simulate_key (GdkWindow *window,
- gint x,
- gint y,
- guint keyval,
- GdkModifierType modifiers,
- GdkEventType key_pressrelease);
-gboolean _gdk_quartz_window_simulate_button (GdkWindow *window,
- gint x,
- gint y,
- guint button,
- GdkModifierType modifiers,
- GdkEventType button_pressrelease);
-
/* Window methods - property */
gboolean _gdk_quartz_window_get_property (GdkWindow *window,
GdkAtom property,
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index e853a83..515a779 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -2791,9 +2791,6 @@ gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass)
impl_class->register_dnd = _gdk_quartz_window_register_dnd;
impl_class->drag_begin = _gdk_quartz_window_drag_begin;
impl_class->process_updates_recurse = _gdk_quartz_window_process_updates_recurse;
- impl_class->sync_rendering = _gdk_quartz_window_sync_rendering;
- impl_class->simulate_key = _gdk_quartz_window_simulate_key;
- impl_class->simulate_button = _gdk_quartz_window_simulate_button;
impl_class->get_property = _gdk_quartz_window_get_property;
impl_class->change_property = _gdk_quartz_window_change_property;
impl_class->delete_property = _gdk_quartz_window_delete_property;
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 823fc3b..466f7c3 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -3422,33 +3422,6 @@ gdk_wayland_window_destroy_notify (GdkWindow *window)
g_object_unref (window);
}
-static void
-gdk_wayland_window_sync_rendering (GdkWindow *window)
-{
-}
-
-static gboolean
-gdk_wayland_window_simulate_key (GdkWindow *window,
- gint x,
- gint y,
- guint keyval,
- GdkModifierType modifiers,
- GdkEventType key_pressrelease)
-{
- return FALSE;
-}
-
-static gboolean
-gdk_wayland_window_simulate_button (GdkWindow *window,
- gint x,
- gint y,
- guint button,
- GdkModifierType modifiers,
- GdkEventType button_pressrelease)
-{
- return FALSE;
-}
-
static gboolean
gdk_wayland_window_get_property (GdkWindow *window,
GdkAtom property,
@@ -3639,9 +3612,6 @@ _gdk_window_impl_wayland_class_init (GdkWindowImplWaylandClass *klass)
impl_class->get_drag_protocol = _gdk_wayland_window_get_drag_protocol;
impl_class->register_dnd = _gdk_wayland_window_register_dnd;
impl_class->drag_begin = _gdk_wayland_window_drag_begin;
- impl_class->sync_rendering = gdk_wayland_window_sync_rendering;
- impl_class->simulate_key = gdk_wayland_window_simulate_key;
- impl_class->simulate_button = gdk_wayland_window_simulate_button;
impl_class->get_property = gdk_wayland_window_get_property;
impl_class->change_property = gdk_wayland_window_change_property;
impl_class->delete_property = gdk_wayland_window_delete_property;
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 4497429..991dc9e 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -54,7 +54,6 @@ libgdk_win32_la_SOURCES = \
gdkproperty-win32.c \
gdkscreen-win32.c \
gdkselection-win32.c \
- gdktestutils-win32.c \
gdkvulkancontext-win32.c \
gdkvulkancontext-win32.h \
gdkwin32cursor.h \
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index f2c5b3b..ef51184 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -481,18 +481,6 @@ void _gdk_win32_display_create_window_impl (GdkDisplay *display,
/* stray GdkWindowImplWin32 members */
void _gdk_win32_window_register_dnd (GdkWindow *window);
GdkDragContext *_gdk_win32_window_drag_begin (GdkWindow *window, GdkDevice *device, GList *targets, gint
x_root, gint y_root);
-gboolean _gdk_win32_window_simulate_key (GdkWindow *window,
- gint x,
- gint y,
- guint keyval,
- GdkModifierType modifiers,
- GdkEventType key_pressrelease);
-gboolean _gdk_win32_window_simulate_button (GdkWindow *window,
- gint x,
- gint y,
- guint button, /*1..3*/
- GdkModifierType modifiers,
- GdkEventType button_pressrelease);
gint _gdk_win32_window_get_property (GdkWindow *window,
GdkAtom property,
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 7466f58..a545611 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -5939,9 +5939,6 @@ gdk_window_impl_win32_class_init (GdkWindowImplWin32Class *klass)
impl_class->get_drag_protocol = _gdk_win32_window_get_drag_protocol;
impl_class->register_dnd = _gdk_win32_window_register_dnd;
impl_class->drag_begin = _gdk_win32_window_drag_begin;
- //? impl_class->sync_rendering = _gdk_win32_window_sync_rendering;
- impl_class->simulate_key = _gdk_win32_window_simulate_key;
- impl_class->simulate_button = _gdk_win32_window_simulate_button;
impl_class->get_property = _gdk_win32_window_get_property;
impl_class->change_property = _gdk_win32_window_change_property;
impl_class->delete_property = _gdk_win32_window_delete_property;
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index d1f6df8..f318ef3 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -50,7 +50,6 @@ libgdk_x11_la_SOURCES = \
gdkscreen-x11.c \
gdkscreen-x11.h \
gdkselection-x11.c \
- gdktestutils-x11.c \
gdkvisual-x11.c \
gdkvulkancontext-x11.c \
gdkvulkancontext-x11.h \
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index ce6a9e6..30a388f 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -74,19 +74,6 @@ void _gdk_x11_window_process_expose (GdkWindow *window,
gulong serial,
GdkRectangle *area);
-void _gdk_x11_window_sync_rendering (GdkWindow *window);
-gboolean _gdk_x11_window_simulate_key (GdkWindow *window,
- gint x,
- gint y,
- guint keyval,
- GdkModifierType modifiers,
- GdkEventType key_pressrelease);
-gboolean _gdk_x11_window_simulate_button (GdkWindow *window,
- gint x,
- gint y,
- guint button,
- GdkModifierType modifiers,
- GdkEventType button_pressrelease);
gboolean _gdk_x11_window_get_property (GdkWindow *window,
GdkAtom property,
GdkAtom type,
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index e00c018..661b5cc 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -5105,9 +5105,6 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
impl_class->get_drag_protocol = gdk_x11_window_get_drag_protocol;
impl_class->register_dnd = _gdk_x11_window_register_dnd;
impl_class->drag_begin = _gdk_x11_window_drag_begin;
- impl_class->sync_rendering = _gdk_x11_window_sync_rendering;
- impl_class->simulate_key = _gdk_x11_window_simulate_key;
- impl_class->simulate_button = _gdk_x11_window_simulate_button;
impl_class->get_property = _gdk_x11_window_get_property;
impl_class->change_property = _gdk_x11_window_change_property;
impl_class->delete_property = _gdk_x11_window_delete_property;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
