summaryrefslogtreecommitdiff
path: root/gdk/x11/gdkevents-x11.c
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2009-01-27 15:38:39 +0100
committerAlexander Larsson <alex@localhost.localdomain>2009-04-02 10:15:28 +0200
commit8de6ae26e40569dd15a3316ffdf62466490633ef (patch)
tree852e75bded878918aacf93c29661e7be00263f1f /gdk/x11/gdkevents-x11.c
parente542f734a83b54a8c1c89bb2fa5d8ccb0983747f (diff)
downloadgtk+-8de6ae26e40569dd15a3316ffdf62466490633ef.tar.gz
Remove_gdk_pixmap_set_as_backing etc, as this is not used anymore
We don't copy from a window to a pixmap anymore, so all the code for this can be removed.
Diffstat (limited to 'gdk/x11/gdkevents-x11.c')
-rw-r--r--gdk/x11/gdkevents-x11.c32
1 files changed, 4 insertions, 28 deletions
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 18a9b6d891..a6a165f414 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -902,9 +902,6 @@ gdk_event_translate (GdkDisplay *display,
GdkToplevelX11 *toplevel = NULL;
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
Window xwindow, filter_xwindow;
- int exposure_x_offset = 0;
- int exposure_y_offset = 0;
- GdkWindow *unref_pixmap = NULL;
return_val = FALSE;
@@ -932,31 +929,13 @@ gdk_event_translate (GdkDisplay *display,
* are reported same as structure events
*/
get_real_window (display, xevent, &xwindow, &filter_xwindow);
-
- window = gdk_window_lookup_for_display (display, xwindow);
+ window = gdk_window_lookup_for_display (display, xwindow);
/* We may receive events such as NoExpose/GraphicsExpose
* and ShmCompletion for pixmaps
*/
if (window && !GDK_IS_WINDOW (window))
- {
- GdkPixmapObject *pixmap = (GdkPixmapObject *)window;
- if ((xevent->type == GraphicsExpose ||
- xevent->type == NoExpose) &&
- GDK_IS_PIXMAP (window) &&
- pixmap->backing_for != NULL)
- {
- /* Unref the pixmap once for each finished set of GraphicsExposes */
- if (xevent->type == NoExpose ||
- xevent->xgraphicsexpose.count == 0)
- unref_pixmap = window;
- window = g_object_ref (pixmap->backing_for);
- exposure_x_offset = pixmap->backing_x_offset;
- exposure_y_offset = pixmap->backing_y_offset;
- }
- else
- window = NULL;
- }
+ window = NULL;
window_private = (GdkWindowObject *) window;
/* We always run the filters for the window where the event
@@ -1686,8 +1665,8 @@ gdk_event_translate (GdkDisplay *display,
break;
}
- expose_rect.x = xevent->xgraphicsexpose.x + exposure_x_offset;
- expose_rect.y = xevent->xgraphicsexpose.y + exposure_y_offset;
+ expose_rect.x = xevent->xgraphicsexpose.x;
+ expose_rect.y = xevent->xgraphicsexpose.y;
expose_rect.width = xevent->xgraphicsexpose.width;
expose_rect.height = xevent->xgraphicsexpose.height;
@@ -2228,9 +2207,6 @@ gdk_event_translate (GdkDisplay *display,
if (window)
g_object_unref (window);
-
- if (unref_pixmap)
- g_object_unref (unref_pixmap);
return return_val;
}