* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
-#include <gdk/gdktestutils.h>
-#include <gdk/gdkkeysyms.h>
-#include <x11/gdkx.h>
-#include "gdkalias.h"
+
+#include "config.h"
+
+#include "gdktestutils.h"
+
+#include "gdkkeysyms.h"
+#include "gdkx.h"
#include <X11/Xlib.h>
void
gdk_test_render_sync (GdkWindow *window)
{
- static GdkImage *p1image = NULL;
+ Display *display = GDK_WINDOW_XDISPLAY (window);
+ XImage *ximage;
+
/* syncronize to X drawing queue, see:
* http://mail.gnome.org/archives/gtk-devel-list/2006-October/msg00103.html
*/
- p1image = gdk_drawable_copy_to_image (window, p1image, 0, 0, 0, 0, 1, 1);
+ ximage = XGetImage (display, DefaultRootWindow (display),
+ 0, 0, 1, 1, AllPlanes, ZPixmap);
+ if (ximage != NULL)
+ XDestroyImage (ximage);
}
/**
{
GdkScreen *screen;
GdkKeymapKey *keys = NULL;
- GdkWindowObject *priv;
gboolean success;
gint n_keys = 0;
XKeyEvent xev = {
g_return_val_if_fail (window != NULL, FALSE);
if (!GDK_WINDOW_IS_MAPPED (window))
return FALSE;
- screen = gdk_colormap_get_screen (gdk_drawable_get_colormap (window));
+
+ screen = gdk_window_get_screen (window);
+
if (x < 0 && y < 0)
{
- gdk_drawable_get_size (window, &x, &y);
- x /= 2;
- y /= 2;
+ x = window->width / 2;
+ y = window->height / 2;
}
- priv = (GdkWindowObject *)window;
/* Convert to impl coordinates */
- x = x + priv->abs_x;
- y = y + priv->abs_y;
+ x = x + window->abs_x;
+ y = y + window->abs_y;
xev.type = key_pressrelease == GDK_KEY_PRESS ? KeyPress : KeyRelease;
- xev.display = GDK_DRAWABLE_XDISPLAY (window);
+ xev.display = GDK_WINDOW_XDISPLAY (window);
xev.window = GDK_WINDOW_XID (window);
xev.root = RootWindow (xev.display, GDK_SCREEN_XNUMBER (screen));
xev.subwindow = 0;
xev.y_root = 0;
xev.state = modifiers;
xev.keycode = 0;
- success = gdk_keymap_get_entries_for_keyval (gdk_keymap_get_for_display (gdk_drawable_get_display (window)), keyval, &keys, &n_keys);
+ 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)
{
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_colormap_get_screen (gdk_drawable_get_colormap (window));
+
+ screen = gdk_window_get_screen (window);
+
if (x < 0 && y < 0)
{
- gdk_drawable_get_size (window, &x, &y);
- x /= 2;
- y /= 2;
+ x = window->width / 2;
+ y = window->height / 2;
}
- priv = (GdkWindowObject *)window;
/* Convert to impl coordinates */
- x = x + priv->abs_x;
- y = y + priv->abs_y;
+ x = x + window->abs_x;
+ y = y + window->abs_y;
xev.type = button_pressrelease == GDK_BUTTON_PRESS ? ButtonPress : ButtonRelease;
- xev.display = GDK_DRAWABLE_XDISPLAY (window);
+ xev.display = GDK_WINDOW_XDISPLAY (window);
xev.window = GDK_WINDOW_XID (window);
xev.root = RootWindow (xev.display, GDK_SCREEN_XNUMBER (screen));
xev.subwindow = 0;
success &= 0 == gdk_error_trap_pop();
return success;
}
-
-#define __GDK_TEST_UTILS_X11_C__
-#include "gdkaliasdef.c"