diff --git a/ChangeLog b/ChangeLog index daad8d95c4..a5026e3e7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Apr 26 10:34:15 2002 Owen Taylor + + * gdk/x11/Makefile.am (libgdk_x11_la_SOURCES): Add + missing gdkscreen/display-x11.h files. + Thu Apr 25 16:51:40 2002 Owen Taylor Start of integration of Erwann Chenede's multihead work diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index daad8d95c4..a5026e3e7f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Apr 26 10:34:15 2002 Owen Taylor + + * gdk/x11/Makefile.am (libgdk_x11_la_SOURCES): Add + missing gdkscreen/display-x11.h files. + Thu Apr 25 16:51:40 2002 Owen Taylor Start of integration of Erwann Chenede's multihead work diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index daad8d95c4..a5026e3e7f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Fri Apr 26 10:34:15 2002 Owen Taylor + + * gdk/x11/Makefile.am (libgdk_x11_la_SOURCES): Add + missing gdkscreen/display-x11.h files. + Thu Apr 25 16:51:40 2002 Owen Taylor Start of integration of Erwann Chenede's multihead work diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index daad8d95c4..a5026e3e7f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Apr 26 10:34:15 2002 Owen Taylor + + * gdk/x11/Makefile.am (libgdk_x11_la_SOURCES): Add + missing gdkscreen/display-x11.h files. + Thu Apr 25 16:51:40 2002 Owen Taylor Start of integration of Erwann Chenede's multihead work diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index daad8d95c4..a5026e3e7f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Apr 26 10:34:15 2002 Owen Taylor + + * gdk/x11/Makefile.am (libgdk_x11_la_SOURCES): Add + missing gdkscreen/display-x11.h files. + Thu Apr 25 16:51:40 2002 Owen Taylor Start of integration of Erwann Chenede's multihead work diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index daad8d95c4..a5026e3e7f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Apr 26 10:34:15 2002 Owen Taylor + + * gdk/x11/Makefile.am (libgdk_x11_la_SOURCES): Add + missing gdkscreen/display-x11.h files. + Thu Apr 25 16:51:40 2002 Owen Taylor Start of integration of Erwann Chenede's multihead work diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index e566af0fc7..0e0e95e6dc 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -356,8 +356,8 @@ gdk_event_copy (GdkEvent *event) * * Frees a #GdkEvent, freeing or decrementing any resources associated with it. * Note that this function should only be called with events returned from - * gdk_event_peek(), gdk_event_get(), gdk_event_get_graphics_expose() and - * gdk_event_copy(). + * functions such as gdk_event_peek(), gdk_event_get(), + * gdk_event_get_graphics_expose() and gdk_event_copy(). **/ void gdk_event_free (GdkEvent *event) @@ -774,9 +774,9 @@ gdk_set_show_events (gboolean show_events) /** * gdk_get_show_events: * - * Returns non-zero if event debugging output is enabled. + * Gets whether event debugging output is enabled. * - * Return value: non-zero if event debugging output is enabled. + * Return value: %TRUE if event debugging output is enabled. **/ gboolean gdk_get_show_events (void) diff --git a/gdk/gdkregion-generic.c b/gdk/gdkregion-generic.c index cba6daf37a..ff482eec3c 100644 --- a/gdk/gdkregion-generic.c +++ b/gdk/gdkregion-generic.c @@ -222,6 +222,15 @@ gdk_region_get_rectangles (GdkRegion *region, } } +/** + * gdk_region_union_with_rect: + * @region: a #GdkRegion. + * @rect: a #GdkRectangle. + * + * Sets the area of @region to the union of the areas of @region and + * @rect. The resulting area is the set of pixels contained in + * either @region or @rect. + **/ void gdk_region_union_with_rect (GdkRegion *region, GdkRectangle *rect) @@ -513,9 +522,9 @@ miIntersectO (GdkRegion *pReg, * @source1: a #GdkRegion * @source2: another #GdkRegion * - * Converts @source1 into the intersection between @source1 and @source2. - * That is, after calling this function @source2 will be unchanged and - * @source1 will be the areas the two regions have in common. + * Sets the area of @source1 to the intersection of the areas of @source1 + * and @source2. The resulting area is the set of pixels contained in + * both @source1 and @source2. **/ void gdk_region_intersect (GdkRegion *region, @@ -1123,6 +1132,15 @@ miUnionO (GdkRegion *pReg, } } +/** + * gdk_region_union: + * @source1: a #GdkRegion + * @source2: a #GdkRegion + * + * Sets the area of @source1 to the union of the areas of @source1 and + * @source2. The resulting area is the set of pixels contained in + * either @source1 or @source2. + **/ void gdk_region_union (GdkRegion *region, GdkRegion *other) @@ -1378,8 +1396,8 @@ miSubtractO (GdkRegion *pReg, * @source1: a #GdkRegion * @source2: another #GdkRegion * - * Subtracts any area in @source2 from the area in @source1. - * + * Subtracts the area of @source2 from the area @source1. The resulting + * area is the set of pixels contained in @source1 but not in @source2. **/ void gdk_region_subtract (GdkRegion *region, @@ -1407,11 +1425,9 @@ gdk_region_subtract (GdkRegion *region, * @source1: a #GdkRegion * @source2: another #GdkRegion * - * XORs the two regions, placing the result in @source1. The XOR of two - * regions contains all areas in one or the other ofthe regions, but not both. - * That is, it's the union of the regions minus the intersection of the - * regions. - * + * Sets the area of @source1 to the exclusive-OR of the areas of @source1 + * and @source2. The resulting area is the set of pixels contained in one + * or the other of the two sources but not in both. **/ void gdk_region_xor (GdkRegion *sra, diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index a9d3c59560..57688d70a0 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -32,6 +32,7 @@ libgdk_x11_la_SOURCES = \ gdkcolor-x11.c \ gdkcursor-x11.c \ gdkdisplay-x11.c \ + gdkdisplay-x11.h \ gdkdnd-x11.c \ gdkdrawable-x11.c \ gdkdrawable-x11.h \ @@ -50,6 +51,7 @@ libgdk_x11_la_SOURCES = \ gdkpixmap-x11.h \ gdkproperty-x11.c \ gdkscreen-x11.c \ + gdkscreen-x11.h \ gdkselection-x11.c \ gdkvisual-x11.c \ gdkwindow-x11.c \