Commit 7164c0ac authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

When actually returning expose events, make sure to set the count field

Sat Jul  1 16:28:32 2000  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkevents-x11.c (gdk_event_translate): When
	actually returning expose events, make sure to set
	the count field properly.

	* gdk/x11/gdkgc-x11.c (gdk_x11_gc_values_to_xvalues): Fix
	accidentally reintroced bug which always cleared
	the graphics_exposures value.
parent a893dba0
Sat Jul 1 16:28:32 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate): When
actually returning expose events, make sure to set
the count field properly.
* gdk/x11/gdkgc-x11.c (gdk_x11_gc_values_to_xvalues): Fix
accidentally reintroced bug which always cleared
the graphics_exposures value.
Wed Jun 28 18:03:09 BST 2000 Tony Gale <gale@gtk.org>
* docs/faq/gtk-faq.sgml: Change DocBook layout slightly
......
Sat Jul 1 16:28:32 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate): When
actually returning expose events, make sure to set
the count field properly.
* gdk/x11/gdkgc-x11.c (gdk_x11_gc_values_to_xvalues): Fix
accidentally reintroced bug which always cleared
the graphics_exposures value.
Wed Jun 28 18:03:09 BST 2000 Tony Gale <gale@gtk.org>
* docs/faq/gtk-faq.sgml: Change DocBook layout slightly
......
Sat Jul 1 16:28:32 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate): When
actually returning expose events, make sure to set
the count field properly.
* gdk/x11/gdkgc-x11.c (gdk_x11_gc_values_to_xvalues): Fix
accidentally reintroced bug which always cleared
the graphics_exposures value.
Wed Jun 28 18:03:09 BST 2000 Tony Gale <gale@gtk.org>
* docs/faq/gtk-faq.sgml: Change DocBook layout slightly
......
Sat Jul 1 16:28:32 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate): When
actually returning expose events, make sure to set
the count field properly.
* gdk/x11/gdkgc-x11.c (gdk_x11_gc_values_to_xvalues): Fix
accidentally reintroced bug which always cleared
the graphics_exposures value.
Wed Jun 28 18:03:09 BST 2000 Tony Gale <gale@gtk.org>
* docs/faq/gtk-faq.sgml: Change DocBook layout slightly
......
Sat Jul 1 16:28:32 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate): When
actually returning expose events, make sure to set
the count field properly.
* gdk/x11/gdkgc-x11.c (gdk_x11_gc_values_to_xvalues): Fix
accidentally reintroced bug which always cleared
the graphics_exposures value.
Wed Jun 28 18:03:09 BST 2000 Tony Gale <gale@gtk.org>
* docs/faq/gtk-faq.sgml: Change DocBook layout slightly
......
Sat Jul 1 16:28:32 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate): When
actually returning expose events, make sure to set
the count field properly.
* gdk/x11/gdkgc-x11.c (gdk_x11_gc_values_to_xvalues): Fix
accidentally reintroced bug which always cleared
the graphics_exposures value.
Wed Jun 28 18:03:09 BST 2000 Tony Gale <gale@gtk.org>
* docs/faq/gtk-faq.sgml: Change DocBook layout slightly
......
Sat Jul 1 16:28:32 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate): When
actually returning expose events, make sure to set
the count field properly.
* gdk/x11/gdkgc-x11.c (gdk_x11_gc_values_to_xvalues): Fix
accidentally reintroced bug which always cleared
the graphics_exposures value.
Wed Jun 28 18:03:09 BST 2000 Tony Gale <gale@gtk.org>
* docs/faq/gtk-faq.sgml: Change DocBook layout slightly
......
......@@ -819,6 +819,7 @@ gdk_event_translate (GdkEvent *event,
event->expose.type = GDK_EXPOSE;
event->expose.area = expose_rect;
event->expose.window = window;
event->expose.count = xevent->xexpose.count;
return_val = TRUE;
}
......@@ -852,6 +853,7 @@ gdk_event_translate (GdkEvent *event,
event->expose.type = GDK_EXPOSE;
event->expose.area = expose_rect;
event->expose.window = window;
event->expose.count = xevent->xgraphicsexpose.count;
return_val = TRUE;
}
......
......@@ -10,8 +10,7 @@ typedef enum {
static void gdk_x11_gc_values_to_xvalues (GdkGCValues *values,
GdkGCValuesMask mask,
XGCValues *xvalues,
unsigned long *xvalues_mask,
gboolean initial);
unsigned long *xvalues_mask);
static void gdk_x11_gc_get_values (GdkGC *gc,
GdkGCValues *values);
......@@ -125,10 +124,10 @@ _gdk_x11_gc_new (GdkDrawable *drawable,
xvalues.fill_style = FillSolid;
xvalues.arc_mode = ArcPieSlice;
xvalues.subwindow_mode = ClipByChildren;
xvalues.graphics_exposures = True;
xvalues.graphics_exposures = False;
xvalues_mask = GCFunction | GCFillStyle | GCArcMode | GCSubwindowMode | GCGraphicsExposures;
gdk_x11_gc_values_to_xvalues (values, values_mask, &xvalues, &xvalues_mask, TRUE);
gdk_x11_gc_values_to_xvalues (values, values_mask, &xvalues, &xvalues_mask);
private->xgc = XCreateGC (GDK_GC_XDISPLAY (gc),
GDK_DRAWABLE_IMPL_X11 (drawable)->xid,
......@@ -359,7 +358,7 @@ gdk_x11_gc_set_values (GdkGC *gc,
}
}
gdk_x11_gc_values_to_xvalues (values, values_mask, &xvalues, &xvalues_mask, FALSE);
gdk_x11_gc_values_to_xvalues (values, values_mask, &xvalues, &xvalues_mask);
XChangeGC (GDK_GC_XDISPLAY (gc),
GDK_GC_XGC (gc),
......@@ -384,18 +383,10 @@ static void
gdk_x11_gc_values_to_xvalues (GdkGCValues *values,
GdkGCValuesMask mask,
XGCValues *xvalues,
unsigned long *xvalues_mask,
gboolean initial)
unsigned long *xvalues_mask)
{
if (mask & GDK_GC_EXPOSURES)
xvalues->graphics_exposures = values->graphics_exposures;
else
xvalues->graphics_exposures = False;
*xvalues_mask |= GCGraphicsExposures;
/* Optimization for the common case (gdk_gc_new()) */
if (values == NULL ||
mask == 0)
if (values == NULL || mask == 0)
return;
if (mask & GDK_GC_FOREGROUND)
......@@ -546,11 +537,6 @@ gdk_x11_gc_values_to_xvalues (GdkGCValues *values,
xvalues->graphics_exposures = values->graphics_exposures;
*xvalues_mask |= GCGraphicsExposures;
}
else if (initial)
{
xvalues->graphics_exposures = False;
*xvalues_mask |= GCGraphicsExposures;
}
if (mask & GDK_GC_LINE_WIDTH)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment