Remove X use from broadway backend

1 files changed, 2 insertions, 204 deletions

diff --git a/gdk/broadway/gdktestutils-broadway.c b/gdk/broadway/gdktestutils-broadway.c
index d4d47fbad7..ad41d767d2 100644
--- a/gdk/broadway/gdktestutils-broadway.c
+++ b/gdk/broadway/gdktestutils-broadway.c
@@ -23,67 +23,12 @@
 #include "gdktestutils.h"
 
 #include "gdkkeysyms.h"
-#include "gdkx.h"
 
-#include <X11/Xlib.h>
-
-/**
- * gdk_test_render_sync:
- * @window: a mapped #GdkWindow
- *
- * This function 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 syncronize with rendering
- * pipelines, to benchmark windowing system rendering operations.
- *
- * Since: 2.14
- **/
 void
 gdk_test_render_sync (GdkWindow *window)
 {
-  Display *display = gdk_x11_drawable_get_xdisplay (window);
-  XImage *ximage;
-
-  /* syncronize to X drawing queue, see:
-   * http://mail.gnome.org/archives/gtk-devel-list/2006-October/msg00103.html
-   */
-  ximage = XGetImage (display, DefaultRootWindow (display),
-	     	      0, 0, 1, 1, AllPlanes, ZPixmap);
-  if (ximage != NULL)
-    XDestroyImage (ximage);
 }
 
-/**
- * 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) corrdinates 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, gtk_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 neccessary for a key event simulation 
- *     were carried out successfully.
- *
- * Since: 2.14
- **/
 gboolean
 gdk_test_simulate_key (GdkWindow      *window,
                        gint            x,
@@ -92,105 +37,9 @@ gdk_test_simulate_key (GdkWindow      *window,
                        GdkModifierType modifiers,
                        GdkEventType    key_pressrelease)
 {
-  GdkScreen *screen;
-  GdkKeymapKey *keys = NULL;
-  GdkWindowObject *priv;
-  gboolean success;
-  gint n_keys = 0;
-  XKeyEvent xev = {
-    0,  /* type */
-    0,  /* serial */
-    1,  /* send_event */
-  };
-  g_return_val_if_fail (key_pressrelease == GDK_KEY_PRESS || key_pressrelease == GDK_KEY_RELEASE, FALSE);
-  g_return_val_if_fail (window != NULL, FALSE);
-  if (!GDK_WINDOW_IS_MAPPED (window))
-    return FALSE;
-
-  screen = gdk_window_get_screen (window);
-  priv = (GdkWindowObject *)window;
-
-  if (x < 0 && y < 0)
-    {
-      x = priv->width / 2;
-      y = priv->height / 2;
-    }
-
-  /* Convert to impl coordinates */
-  x = x + priv->abs_x;
-  y = y + priv->abs_y;
-
-  xev.type = key_pressrelease == GDK_KEY_PRESS ? KeyPress : KeyRelease;
-  xev.display = GDK_DRAWABLE_XDISPLAY (window);
-  xev.window = GDK_WINDOW_XID (window);
-  xev.root = RootWindow (xev.display, GDK_SCREEN_XNUMBER (screen));
-  xev.subwindow = 0;
-  xev.time = 0;
-  xev.x = MAX (x, 0);
-  xev.y = MAX (y, 0);
-  xev.x_root = 0;
-  xev.y_root = 0;
-  xev.state = modifiers;
-  xev.keycode = 0;
-  success = gdk_keymap_get_entries_for_keyval (gdk_keymap_get_for_display (gdk_window_get_display (window)), keyval, &keys, &n_keys);
-  success &= n_keys > 0;
-  if (success)
-    {
-      gint i;
-      for (i = 0; i < n_keys; i++)
-        if (keys[i].group == 0 && keys[i].level == 0)
-          {
-            xev.keycode = keys[i].keycode;
-            break;
-          }
-      if (i >= n_keys) /* no match for group==0 and level==0 */
-        xev.keycode = keys[0].keycode;
-    }
-  g_free (keys);
-  if (!success)
-    return FALSE;
-  gdk_error_trap_push ();
-  xev.same_screen = XTranslateCoordinates (xev.display, xev.window, xev.root,
-                                           xev.x, xev.y, &xev.x_root, &xev.y_root,
-                                           &xev.subwindow);
-  if (!xev.subwindow)
-    xev.subwindow = xev.window;
-  success &= xev.same_screen;
-  if (x >= 0 && y >= 0)
-    success &= 0 != XWarpPointer (xev.display, None, xev.window, 0, 0, 0, 0, xev.x, xev.y);
-  success &= 0 != XSendEvent (xev.display, xev.window, True, key_pressrelease == GDK_KEY_PRESS ? KeyPressMask : KeyReleaseMask, (XEvent*) &xev);
-  XSync (xev.display, False);
-  success &= 0 == gdk_error_trap_pop();
-  return success;
+  return FALSE;
 }
 
-/**
- * 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) corrdinates
- * 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, gtk_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 neccessary for a button event simulation 
- *     were carried out successfully.
- *
- * Since: 2.14
- **/
 gboolean
 gdk_test_simulate_button (GdkWindow      *window,
                           gint            x,
@@ -199,56 +48,5 @@ gdk_test_simulate_button (GdkWindow      *window,
                           GdkModifierType modifiers,
                           GdkEventType    button_pressrelease)
 {
-  GdkScreen *screen;
-  XButtonEvent xev = {
-    0,  /* type */
-    0,  /* serial */
-    1,  /* send_event */
-  };
-  gboolean success;
-  GdkWindowObject *priv;
-
-  g_return_val_if_fail (button_pressrelease == GDK_BUTTON_PRESS || button_pressrelease == GDK_BUTTON_RELEASE, FALSE);
-  g_return_val_if_fail (window != NULL, FALSE);
-
-  if (!GDK_WINDOW_IS_MAPPED (window))
-    return FALSE;
-
-  screen = gdk_window_get_screen (window);
-  priv = (GdkWindowObject *)window;
-
-  if (x < 0 && y < 0)
-    {
-      x = priv->width / 2;
-      y = priv->height / 2;
-    }
-
-  /* Convert to impl coordinates */
-  x = x + priv->abs_x;
-  y = y + priv->abs_y;
-
-  xev.type = button_pressrelease == GDK_BUTTON_PRESS ? ButtonPress : ButtonRelease;
-  xev.display = GDK_DRAWABLE_XDISPLAY (window);
-  xev.window = GDK_WINDOW_XID (window);
-  xev.root = RootWindow (xev.display, GDK_SCREEN_XNUMBER (screen));
-  xev.subwindow = 0;
-  xev.time = 0;
-  xev.x = x;
-  xev.y = y;
-  xev.x_root = 0;
-  xev.y_root = 0;
-  xev.state = modifiers;
-  xev.button = button;
-  gdk_error_trap_push ();
-  xev.same_screen = XTranslateCoordinates (xev.display, xev.window, xev.root,
-                                           xev.x, xev.y, &xev.x_root, &xev.y_root,
-                                           &xev.subwindow);
-  if (!xev.subwindow)
-    xev.subwindow = xev.window;
-  success = xev.same_screen;
-  success &= 0 != XWarpPointer (xev.display, None, xev.window, 0, 0, 0, 0, xev.x, xev.y);
-  success &= 0 != XSendEvent (xev.display, xev.window, True, button_pressrelease == GDK_BUTTON_PRESS ? ButtonPressMask : ButtonReleaseMask, (XEvent*) &xev);
-  XSync (xev.display, False);
-  success &= 0 == gdk_error_trap_pop();
-  return success;
+  return FALSE;
 }