+1999-07-09 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkdraw.c (gdk_draw_arc): Don't draw anything if width
+ or height is zero. Don't print a warning if Pie or Arc fails, they
+ always fail (?) for very narrow ellipses.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Call InvalidateRgn for
+ the part or the destination window corresponding to source area
+ outside of the source drawable's boundary.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_lines, gdk_draw_polygon): Don't do
+ anything if less than two points.
+
+ * gdk/win32/gdkselection.c (gdk_selection_owner_get): Always
+ return NULL. Gtk cut-and-paste inside a single program works
+ better this way. (It always gets the clipboard contents from
+ Windows, not from its own copy, which is cleared anyway. I can't
+ say I fully understand what happens... Emulating the X selection
+ and property stuff is a bit of a mess.)
+
+ * gdk/win32/gdkevents.c
+ * gdk/win32/gdkproperty.c: A bít more verbose logging.
+
+ * gdk/win32/gdkregion.c: Fix some memory leaks (temporary regions
+ that never got deleted). Revamp gdk_region_shrink.
+
+ * gdk/win32/gdkregion.c: Fix memory leak, delete temporary regions
+ after use.
+
+ * gtk/gtk.def: Add some missing entry points.
+
+ * gtk/gtkrc.c: Strip trailing directory separator from pixmap path
+ component.
+
1999-07-04 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents.c (gdk_event_translate): Handle
+1999-07-09 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkdraw.c (gdk_draw_arc): Don't draw anything if width
+ or height is zero. Don't print a warning if Pie or Arc fails, they
+ always fail (?) for very narrow ellipses.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Call InvalidateRgn for
+ the part or the destination window corresponding to source area
+ outside of the source drawable's boundary.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_lines, gdk_draw_polygon): Don't do
+ anything if less than two points.
+
+ * gdk/win32/gdkselection.c (gdk_selection_owner_get): Always
+ return NULL. Gtk cut-and-paste inside a single program works
+ better this way. (It always gets the clipboard contents from
+ Windows, not from its own copy, which is cleared anyway. I can't
+ say I fully understand what happens... Emulating the X selection
+ and property stuff is a bit of a mess.)
+
+ * gdk/win32/gdkevents.c
+ * gdk/win32/gdkproperty.c: A bít more verbose logging.
+
+ * gdk/win32/gdkregion.c: Fix some memory leaks (temporary regions
+ that never got deleted). Revamp gdk_region_shrink.
+
+ * gdk/win32/gdkregion.c: Fix memory leak, delete temporary regions
+ after use.
+
+ * gtk/gtk.def: Add some missing entry points.
+
+ * gtk/gtkrc.c: Strip trailing directory separator from pixmap path
+ component.
+
1999-07-04 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents.c (gdk_event_translate): Handle
+1999-07-09 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkdraw.c (gdk_draw_arc): Don't draw anything if width
+ or height is zero. Don't print a warning if Pie or Arc fails, they
+ always fail (?) for very narrow ellipses.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Call InvalidateRgn for
+ the part or the destination window corresponding to source area
+ outside of the source drawable's boundary.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_lines, gdk_draw_polygon): Don't do
+ anything if less than two points.
+
+ * gdk/win32/gdkselection.c (gdk_selection_owner_get): Always
+ return NULL. Gtk cut-and-paste inside a single program works
+ better this way. (It always gets the clipboard contents from
+ Windows, not from its own copy, which is cleared anyway. I can't
+ say I fully understand what happens... Emulating the X selection
+ and property stuff is a bit of a mess.)
+
+ * gdk/win32/gdkevents.c
+ * gdk/win32/gdkproperty.c: A bít more verbose logging.
+
+ * gdk/win32/gdkregion.c: Fix some memory leaks (temporary regions
+ that never got deleted). Revamp gdk_region_shrink.
+
+ * gdk/win32/gdkregion.c: Fix memory leak, delete temporary regions
+ after use.
+
+ * gtk/gtk.def: Add some missing entry points.
+
+ * gtk/gtkrc.c: Strip trailing directory separator from pixmap path
+ component.
+
1999-07-04 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents.c (gdk_event_translate): Handle
+1999-07-09 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkdraw.c (gdk_draw_arc): Don't draw anything if width
+ or height is zero. Don't print a warning if Pie or Arc fails, they
+ always fail (?) for very narrow ellipses.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Call InvalidateRgn for
+ the part or the destination window corresponding to source area
+ outside of the source drawable's boundary.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_lines, gdk_draw_polygon): Don't do
+ anything if less than two points.
+
+ * gdk/win32/gdkselection.c (gdk_selection_owner_get): Always
+ return NULL. Gtk cut-and-paste inside a single program works
+ better this way. (It always gets the clipboard contents from
+ Windows, not from its own copy, which is cleared anyway. I can't
+ say I fully understand what happens... Emulating the X selection
+ and property stuff is a bit of a mess.)
+
+ * gdk/win32/gdkevents.c
+ * gdk/win32/gdkproperty.c: A bít more verbose logging.
+
+ * gdk/win32/gdkregion.c: Fix some memory leaks (temporary regions
+ that never got deleted). Revamp gdk_region_shrink.
+
+ * gdk/win32/gdkregion.c: Fix memory leak, delete temporary regions
+ after use.
+
+ * gtk/gtk.def: Add some missing entry points.
+
+ * gtk/gtkrc.c: Strip trailing directory separator from pixmap path
+ component.
+
1999-07-04 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents.c (gdk_event_translate): Handle
+1999-07-09 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkdraw.c (gdk_draw_arc): Don't draw anything if width
+ or height is zero. Don't print a warning if Pie or Arc fails, they
+ always fail (?) for very narrow ellipses.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Call InvalidateRgn for
+ the part or the destination window corresponding to source area
+ outside of the source drawable's boundary.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_lines, gdk_draw_polygon): Don't do
+ anything if less than two points.
+
+ * gdk/win32/gdkselection.c (gdk_selection_owner_get): Always
+ return NULL. Gtk cut-and-paste inside a single program works
+ better this way. (It always gets the clipboard contents from
+ Windows, not from its own copy, which is cleared anyway. I can't
+ say I fully understand what happens... Emulating the X selection
+ and property stuff is a bit of a mess.)
+
+ * gdk/win32/gdkevents.c
+ * gdk/win32/gdkproperty.c: A bít more verbose logging.
+
+ * gdk/win32/gdkregion.c: Fix some memory leaks (temporary regions
+ that never got deleted). Revamp gdk_region_shrink.
+
+ * gdk/win32/gdkregion.c: Fix memory leak, delete temporary regions
+ after use.
+
+ * gtk/gtk.def: Add some missing entry points.
+
+ * gtk/gtkrc.c: Strip trailing directory separator from pixmap path
+ component.
+
1999-07-04 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents.c (gdk_event_translate): Handle
+1999-07-09 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkdraw.c (gdk_draw_arc): Don't draw anything if width
+ or height is zero. Don't print a warning if Pie or Arc fails, they
+ always fail (?) for very narrow ellipses.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Call InvalidateRgn for
+ the part or the destination window corresponding to source area
+ outside of the source drawable's boundary.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_lines, gdk_draw_polygon): Don't do
+ anything if less than two points.
+
+ * gdk/win32/gdkselection.c (gdk_selection_owner_get): Always
+ return NULL. Gtk cut-and-paste inside a single program works
+ better this way. (It always gets the clipboard contents from
+ Windows, not from its own copy, which is cleared anyway. I can't
+ say I fully understand what happens... Emulating the X selection
+ and property stuff is a bit of a mess.)
+
+ * gdk/win32/gdkevents.c
+ * gdk/win32/gdkproperty.c: A bít more verbose logging.
+
+ * gdk/win32/gdkregion.c: Fix some memory leaks (temporary regions
+ that never got deleted). Revamp gdk_region_shrink.
+
+ * gdk/win32/gdkregion.c: Fix memory leak, delete temporary regions
+ after use.
+
+ * gtk/gtk.def: Add some missing entry points.
+
+ * gtk/gtkrc.c: Strip trailing directory separator from pixmap path
+ component.
+
1999-07-04 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents.c (gdk_event_translate): Handle
+1999-07-09 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkdraw.c (gdk_draw_arc): Don't draw anything if width
+ or height is zero. Don't print a warning if Pie or Arc fails, they
+ always fail (?) for very narrow ellipses.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Call InvalidateRgn for
+ the part or the destination window corresponding to source area
+ outside of the source drawable's boundary.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_lines, gdk_draw_polygon): Don't do
+ anything if less than two points.
+
+ * gdk/win32/gdkselection.c (gdk_selection_owner_get): Always
+ return NULL. Gtk cut-and-paste inside a single program works
+ better this way. (It always gets the clipboard contents from
+ Windows, not from its own copy, which is cleared anyway. I can't
+ say I fully understand what happens... Emulating the X selection
+ and property stuff is a bit of a mess.)
+
+ * gdk/win32/gdkevents.c
+ * gdk/win32/gdkproperty.c: A bít more verbose logging.
+
+ * gdk/win32/gdkregion.c: Fix some memory leaks (temporary regions
+ that never got deleted). Revamp gdk_region_shrink.
+
+ * gdk/win32/gdkregion.c: Fix memory leak, delete temporary regions
+ after use.
+
+ * gtk/gtk.def: Add some missing entry points.
+
+ * gtk/gtkrc.c: Strip trailing directory separator from pixmap path
+ component.
+
1999-07-04 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents.c (gdk_event_translate): Handle
if (height == -1)
height = drawable_private->height;
- hdc = gdk_gc_predraw (drawable_private, gc_private);
-
- nXStartArc = x + width/2 + (int) (sin(angle1/64.*M_TWOPI)*width);
- nYStartArc = y + height/2 + (int) (cos(angle1/64.*M_TWOPI)*height);
- nXEndArc = x + width/2 + (int) (sin(angle2/64.*M_TWOPI)*width);
- nYEndArc = y + height/2 + (int) (cos(angle2/64.*M_TWOPI)*height);
-
- if (filled)
+ if (width != 0 && height != 0)
{
- if (!Pie (hdc, x, y, x+width, y+height,
- nXStartArc, nYStartArc, nXEndArc, nYEndArc))
- g_warning ("gdk_draw_arc: Pie failed");
- }
- else
- {
- if (!Arc (hdc, x, y, x+width, y+height,
- nXStartArc, nYStartArc, nXEndArc, nYEndArc))
- g_warning ("gdk_draw_arc: Arc failed");
+ hdc = gdk_gc_predraw (drawable_private, gc_private);
+
+ nXStartArc = x + width/2 + (int) (sin(angle1/64.*M_TWOPI)*width);
+ nYStartArc = y + height/2 + (int) (cos(angle1/64.*M_TWOPI)*height);
+ nXEndArc = x + width/2 + (int) (sin(angle2/64.*M_TWOPI)*width);
+ nYEndArc = y + height/2 + (int) (cos(angle2/64.*M_TWOPI)*height);
+
+ if (filled)
+ {
+ Pie (hdc, x, y, x+width, y+height,
+ nXStartArc, nYStartArc, nXEndArc, nYEndArc);
+ }
+ else
+ {
+ Arc (hdc, x, y, x+width, y+height,
+ nXStartArc, nYStartArc, nXEndArc, nYEndArc);
+ }
+ gdk_gc_postdraw (drawable_private, gc_private);
}
- gdk_gc_postdraw (drawable_private, gc_private);
}
void
return;
gc_private = (GdkGCPrivate*) gc;
- hdc = gdk_gc_predraw (drawable_private, gc_private);
- pts = g_malloc ((npoints+1) * sizeof (POINT));
-
GDK_NOTE (MISC, g_print ("gdk_draw_polygon: %#x (%d) %d\n",
drawable_private->xwindow, gc_private,
npoints));
+ if (npoints < 2)
+ return;
+
+ hdc = gdk_gc_predraw (drawable_private, gc_private);
+ pts = g_malloc ((npoints+1) * sizeof (POINT));
+
for (i = 0; i < npoints; i++)
{
pts[i].x = points[i].x;
HDC hdc;
HDC srcdc;
HGDIOBJ hgdiobj;
+ HRGN src_rgn, draw_rgn, outside_rgn;
+ RECT r;
g_return_if_fail (drawable != NULL);
g_return_if_fail (src != NULL);
gc_private = (GdkGCPrivate*) gc;
if (width == -1)
- width = src_private->width;
+ width = src_private->width; /* Or should we subtract xsrc? */
if (height == -1)
- height = src_private->height;
-
- hdc = gdk_gc_predraw (drawable_private, gc_private);
+ height = src_private->height; /* Ditto? */
GDK_NOTE (MISC, g_print ("gdk_draw_pixmap: dest: %#x destdc: (%d) %#x "
- "src: %#x %dx%d@+%d+%d\n",
+ "src: %#x %dx%d@+%d+%d"
+ " dest: %#x @+%d+%d\n",
drawable_private->xwindow, gc_private, hdc,
src_private->xwindow,
- width, height, xdest, ydest));
+ width, height, xsrc, ysrc,
+ drawable_private->xwindow, xdest, ydest));
+
+ hdc = gdk_gc_predraw (drawable_private, gc_private);
+
+ src_rgn = CreateRectRgn (0, 0, src_private->width + 1, src_private->height + 1);
+ draw_rgn = CreateRectRgn (xsrc, ysrc, xsrc + width + 1, ysrc + height + 1);
+ SetRectEmpty (&r);
+ outside_rgn = CreateRectRgnIndirect (&r);
+
+ if (drawable_private->window_type != GDK_WINDOW_PIXMAP)
+ {
+ /* If we are drawing on a window, calculate the region that is
+ * outside the source pixmap, and invalidate that, causing it to
+ * be cleared. XXX
+ */
+ if (CombineRgn (outside_rgn, draw_rgn, src_rgn, RGN_DIFF) != NULLREGION)
+ {
+ OffsetRgn (outside_rgn, xdest, ydest);
+ GDK_NOTE (MISC, (GetRgnBox (outside_rgn, &r),
+ g_print ("...calling InvalidateRgn, "
+ "bbox: %dx%d@+%d+%d\n",
+ r.right - r.left - 1, r.bottom - r.top - 1,
+ r.left, r.top)));
+ InvalidateRgn (drawable_private->xwindow, outside_rgn, TRUE);
+ }
+ }
+
+#if 1 /* Don't know if this is necessary */
+ if (CombineRgn (draw_rgn, draw_rgn, src_rgn, RGN_AND) == COMPLEXREGION)
+ g_warning ("gdk_draw_pixmap: CombineRgn returned a COMPLEXREGION");
+
+ GetRgnBox (draw_rgn, &r);
+ if (r.left != xsrc
+ || r.top != ysrc
+ || r.right != xsrc + width + 1
+ || r.bottom != ysrc + height + 1)
+ {
+ xdest += r.left - xsrc;
+ xsrc = r.left;
+ ydest += r.top - ysrc;
+ ysrc = r.top;
+ width = r.right - xsrc - 1;
+ height = r.bottom - ysrc - 1;
+
+ GDK_NOTE (MISC, g_print ("... restricted to src: %dx%d@+%d+%d, "
+ "dest: @+%d+%d\n",
+ width, height, xsrc, ysrc,
+ xdest, ydest));
+ }
+#endif
+
+ DeleteObject (src_rgn);
+ DeleteObject (draw_rgn);
+ DeleteObject (outside_rgn);
/* Strangely enough, this function is called also to bitblt
* from a window.
POINT *pts;
int i;
- if (npoints <= 0)
+ if (npoints < 2)
return;
g_return_if_fail (drawable != NULL);
}
if (!Polyline (hdc, pts, npoints))
- g_warning ("gdk_draw_lines: Polyline failed");
+ g_warning ("gdk_draw_lines: Polyline(,,%d) failed", npoints);
g_free (pts);
if (height == -1)
height = drawable_private->height;
- hdc = gdk_gc_predraw (drawable_private, gc_private);
-
- nXStartArc = x + width/2 + (int) (sin(angle1/64.*M_TWOPI)*width);
- nYStartArc = y + height/2 + (int) (cos(angle1/64.*M_TWOPI)*height);
- nXEndArc = x + width/2 + (int) (sin(angle2/64.*M_TWOPI)*width);
- nYEndArc = y + height/2 + (int) (cos(angle2/64.*M_TWOPI)*height);
-
- if (filled)
+ if (width != 0 && height != 0)
{
- if (!Pie (hdc, x, y, x+width, y+height,
- nXStartArc, nYStartArc, nXEndArc, nYEndArc))
- g_warning ("gdk_draw_arc: Pie failed");
- }
- else
- {
- if (!Arc (hdc, x, y, x+width, y+height,
- nXStartArc, nYStartArc, nXEndArc, nYEndArc))
- g_warning ("gdk_draw_arc: Arc failed");
+ hdc = gdk_gc_predraw (drawable_private, gc_private);
+
+ nXStartArc = x + width/2 + (int) (sin(angle1/64.*M_TWOPI)*width);
+ nYStartArc = y + height/2 + (int) (cos(angle1/64.*M_TWOPI)*height);
+ nXEndArc = x + width/2 + (int) (sin(angle2/64.*M_TWOPI)*width);
+ nYEndArc = y + height/2 + (int) (cos(angle2/64.*M_TWOPI)*height);
+
+ if (filled)
+ {
+ Pie (hdc, x, y, x+width, y+height,
+ nXStartArc, nYStartArc, nXEndArc, nYEndArc);
+ }
+ else
+ {
+ Arc (hdc, x, y, x+width, y+height,
+ nXStartArc, nYStartArc, nXEndArc, nYEndArc);
+ }
+ gdk_gc_postdraw (drawable_private, gc_private);
}
- gdk_gc_postdraw (drawable_private, gc_private);
}
void
return;
gc_private = (GdkGCPrivate*) gc;
- hdc = gdk_gc_predraw (drawable_private, gc_private);
- pts = g_malloc ((npoints+1) * sizeof (POINT));
-
GDK_NOTE (MISC, g_print ("gdk_draw_polygon: %#x (%d) %d\n",
drawable_private->xwindow, gc_private,
npoints));
+ if (npoints < 2)
+ return;
+
+ hdc = gdk_gc_predraw (drawable_private, gc_private);
+ pts = g_malloc ((npoints+1) * sizeof (POINT));
+
for (i = 0; i < npoints; i++)
{
pts[i].x = points[i].x;
HDC hdc;
HDC srcdc;
HGDIOBJ hgdiobj;
+ HRGN src_rgn, draw_rgn, outside_rgn;
+ RECT r;
g_return_if_fail (drawable != NULL);
g_return_if_fail (src != NULL);
gc_private = (GdkGCPrivate*) gc;
if (width == -1)
- width = src_private->width;
+ width = src_private->width; /* Or should we subtract xsrc? */
if (height == -1)
- height = src_private->height;
-
- hdc = gdk_gc_predraw (drawable_private, gc_private);
+ height = src_private->height; /* Ditto? */
GDK_NOTE (MISC, g_print ("gdk_draw_pixmap: dest: %#x destdc: (%d) %#x "
- "src: %#x %dx%d@+%d+%d\n",
+ "src: %#x %dx%d@+%d+%d"
+ " dest: %#x @+%d+%d\n",
drawable_private->xwindow, gc_private, hdc,
src_private->xwindow,
- width, height, xdest, ydest));
+ width, height, xsrc, ysrc,
+ drawable_private->xwindow, xdest, ydest));
+
+ hdc = gdk_gc_predraw (drawable_private, gc_private);
+
+ src_rgn = CreateRectRgn (0, 0, src_private->width + 1, src_private->height + 1);
+ draw_rgn = CreateRectRgn (xsrc, ysrc, xsrc + width + 1, ysrc + height + 1);
+ SetRectEmpty (&r);
+ outside_rgn = CreateRectRgnIndirect (&r);
+
+ if (drawable_private->window_type != GDK_WINDOW_PIXMAP)
+ {
+ /* If we are drawing on a window, calculate the region that is
+ * outside the source pixmap, and invalidate that, causing it to
+ * be cleared. XXX
+ */
+ if (CombineRgn (outside_rgn, draw_rgn, src_rgn, RGN_DIFF) != NULLREGION)
+ {
+ OffsetRgn (outside_rgn, xdest, ydest);
+ GDK_NOTE (MISC, (GetRgnBox (outside_rgn, &r),
+ g_print ("...calling InvalidateRgn, "
+ "bbox: %dx%d@+%d+%d\n",
+ r.right - r.left - 1, r.bottom - r.top - 1,
+ r.left, r.top)));
+ InvalidateRgn (drawable_private->xwindow, outside_rgn, TRUE);
+ }
+ }
+
+#if 1 /* Don't know if this is necessary */
+ if (CombineRgn (draw_rgn, draw_rgn, src_rgn, RGN_AND) == COMPLEXREGION)
+ g_warning ("gdk_draw_pixmap: CombineRgn returned a COMPLEXREGION");
+
+ GetRgnBox (draw_rgn, &r);
+ if (r.left != xsrc
+ || r.top != ysrc
+ || r.right != xsrc + width + 1
+ || r.bottom != ysrc + height + 1)
+ {
+ xdest += r.left - xsrc;
+ xsrc = r.left;
+ ydest += r.top - ysrc;
+ ysrc = r.top;
+ width = r.right - xsrc - 1;
+ height = r.bottom - ysrc - 1;
+
+ GDK_NOTE (MISC, g_print ("... restricted to src: %dx%d@+%d+%d, "
+ "dest: @+%d+%d\n",
+ width, height, xsrc, ysrc,
+ xdest, ydest));
+ }
+#endif
+
+ DeleteObject (src_rgn);
+ DeleteObject (draw_rgn);
+ DeleteObject (outside_rgn);
/* Strangely enough, this function is called also to bitblt
* from a window.
POINT *pts;
int i;
- if (npoints <= 0)
+ if (npoints < 2)
return;
g_return_if_fail (drawable != NULL);
}
if (!Polyline (hdc, pts, npoints))
- g_warning ("gdk_draw_lines: Polyline failed");
+ g_warning ("gdk_draw_lines: Polyline(,,%d) failed", npoints);
g_free (pts);
if (window_private->bg_type == GDK_WIN32_BG_PIXEL)
{
COLORREF bg;
- GDK_NOTE (EVENTS, g_print ("...BG_PIXEL %s\n",
- gdk_color_to_string (&window_private->bg_pixel)));
GetClipBox (hdc, &rect);
+ GDK_NOTE (EVENTS, g_print ("...%dx%d@+%d+%d BG_PIXEL %s\n",
+ rect.right - rect.left,
+ rect.bottom - rect.top,
+ rect.left, rect.top,
+ gdk_color_to_string (&window_private->bg_pixel)));
#ifdef MULTIPLE_WINDOW_CLASSES
bg = PALETTEINDEX (window_private->bg_pixel.pixel);
#else
if (window_private->bg_type == GDK_WIN32_BG_PIXEL)
{
COLORREF bg;
- GDK_NOTE (EVENTS, g_print ("...BG_PIXEL %s\n",
- gdk_color_to_string (&window_private->bg_pixel)));
GetClipBox (hdc, &rect);
+ GDK_NOTE (EVENTS, g_print ("...%dx%d@+%d+%d BG_PIXEL %s\n",
+ rect.right - rect.left,
+ rect.bottom - rect.top,
+ rect.left, rect.top,
+ gdk_color_to_string (&window_private->bg_pixel)));
#ifdef MULTIPLE_WINDOW_CLASSES
bg = PALETTEINDEX (window_private->bg_pixel.pixel);
#else
if (*ptr++ == '\n')
length++;
#if 1
+ GDK_NOTE (SELECTION, g_print ("...OpenClipboard(%#x)\n",
+ private->xwindow));
if (!OpenClipboard (private->xwindow))
{
g_warning ("gdk_property_change: OpenClipboard failed");
}
*ptr++ = '\0';
GlobalUnlock (hdata);
+ GDK_NOTE (SELECTION, g_print ("...SetClipboardData(CF_TEXT, %#x)\n",
+ hdata));
if (!SetClipboardData(CF_TEXT, hdata))
g_warning ("gdk_property_change: SetClipboardData failed: %d",
GetLastError ());
#if 1
+ GDK_NOTE (SELECTION, g_print ("...CloseClipboard()\n"));
if (!CloseClipboard ())
{
g_warning ("gdk_property_change: CloseClipboard failed");
if (*ptr++ == '\n')
length++;
#if 1
+ GDK_NOTE (SELECTION, g_print ("...OpenClipboard(%#x)\n",
+ private->xwindow));
if (!OpenClipboard (private->xwindow))
{
g_warning ("gdk_property_change: OpenClipboard failed");
}
*ptr++ = '\0';
GlobalUnlock (hdata);
+ GDK_NOTE (SELECTION, g_print ("...SetClipboardData(CF_TEXT, %#x)\n",
+ hdata));
if (!SetClipboardData(CF_TEXT, hdata))
g_warning ("gdk_property_change: SetClipboardData failed: %d",
GetLastError ());
#if 1
+ GDK_NOTE (SELECTION, g_print ("...CloseClipboard()\n"));
if (!CloseClipboard ())
{
g_warning ("gdk_property_change: CloseClipboard failed");
GdkRegionPrivate *private;
GdkRegion *region;
HRGN xregion;
+ RECT emptyRect;
/* Create an empty region */
- xregion = CreateRectRgn (1, 1, 0, 0);
+ SetRectEmpty (&emptyRect);
+ xregion = CreateRectRgnIndirect (&emptyRect);
private = g_new (GdkRegionPrivate, 1);
private->xregion = xregion;
region = (GdkRegion*) private;
gint dy)
{
GdkRegionPrivate *private;
+ HRGN shrunken_bbox;
RECT r;
g_return_if_fail (region != NULL);
private = (GdkRegionPrivate *) region;
- /* Is it correct just to intersect it with a smaller bounding box? */
- GetRgnBox (private->xregion, &r);
-
- if (-dx > r.right - r.left)
+ if (dx > 0 || dy > 0)
{
- r.left += dx/2;
- r.right -= dx/2;
+ /* We want to shrink it in one or both dimensions.
+ * Is it correct just to intersect it with a smaller bounding box?
+ * XXX
+ */
+ GetRgnBox (private->xregion, &r);
+ if (dx > 0)
+ {
+ r.left += dx - dx/2;
+ r.right -= dx/2;
+ }
+ if (dy > 0)
+ {
+ r.top += dy - dy/2;
+ r.bottom -= dy/2;
+ }
+
+ shrunken_bbox = CreateRectRgnIndirect (&r);
+ CombineRgn (private->xregion, private->xregion,
+ shrunken_bbox, RGN_AND);
+ DeleteObject (shrunken_bbox);
}
- if (-dy > r.bottom - r.top)
+ else
{
- r.top += dy/2;
- r.bottom -= dy/2;
+ /* Do nothing if the regions is expanded? XXX */
}
-
- CombineRgn (private->xregion, private->xregion,
- CreateRectRgnIndirect (&r), RGN_AND);
}
GdkRegion*
GdkRegion *res;
GdkRegionPrivate *res_private;
RECT xrect;
+ HRGN rectangle;
g_return_val_if_fail (region != NULL, NULL);
res = gdk_region_new ();
res_private = (GdkRegionPrivate *) res;
+ rectangle = CreateRectRgnIndirect (&xrect);
CombineRgn (res_private->xregion, private->xregion,
- CreateRectRgnIndirect (&xrect), RGN_OR);
+ rectangle, RGN_OR);
+ DeleteObject (rectangle);
return res;
}
GdkRegionPrivate *private;
GdkRegion *region;
HRGN xregion;
+ RECT emptyRect;
/* Create an empty region */
- xregion = CreateRectRgn (1, 1, 0, 0);
+ SetRectEmpty (&emptyRect);
+ xregion = CreateRectRgnIndirect (&emptyRect);
private = g_new (GdkRegionPrivate, 1);
private->xregion = xregion;
region = (GdkRegion*) private;
gint dy)
{
GdkRegionPrivate *private;
+ HRGN shrunken_bbox;
RECT r;
g_return_if_fail (region != NULL);
private = (GdkRegionPrivate *) region;
- /* Is it correct just to intersect it with a smaller bounding box? */
- GetRgnBox (private->xregion, &r);
-
- if (-dx > r.right - r.left)
+ if (dx > 0 || dy > 0)
{
- r.left += dx/2;
- r.right -= dx/2;
+ /* We want to shrink it in one or both dimensions.
+ * Is it correct just to intersect it with a smaller bounding box?
+ * XXX
+ */
+ GetRgnBox (private->xregion, &r);
+ if (dx > 0)
+ {
+ r.left += dx - dx/2;
+ r.right -= dx/2;
+ }
+ if (dy > 0)
+ {
+ r.top += dy - dy/2;
+ r.bottom -= dy/2;
+ }
+
+ shrunken_bbox = CreateRectRgnIndirect (&r);
+ CombineRgn (private->xregion, private->xregion,
+ shrunken_bbox, RGN_AND);
+ DeleteObject (shrunken_bbox);
}
- if (-dy > r.bottom - r.top)
+ else
{
- r.top += dy/2;
- r.bottom -= dy/2;
+ /* Do nothing if the regions is expanded? XXX */
}
-
- CombineRgn (private->xregion, private->xregion,
- CreateRectRgnIndirect (&r), RGN_AND);
}
GdkRegion*
GdkRegion *res;
GdkRegionPrivate *res_private;
RECT xrect;
+ HRGN rectangle;
g_return_val_if_fail (region != NULL, NULL);
res = gdk_region_new ();
res_private = (GdkRegionPrivate *) res;
+ rectangle = CreateRectRgnIndirect (&xrect);
CombineRgn (res_private->xregion, private->xregion,
- CreateRectRgnIndirect (&xrect), RGN_OR);
+ rectangle, RGN_OR);
+ DeleteObject (rectangle);
return res;
}
else
xwindow = NULL;
+ GDK_NOTE (SELECTION, g_print ("...OpenClipboard(%#x)\n", xwindow));
if (!OpenClipboard (xwindow))
{
g_warning ("gdk_selection_owner_set: OpenClipboard failed");
return FALSE;
}
+ GDK_NOTE (SELECTION, g_print ("...EmptyClipboard()\n"));
if (!EmptyClipboard ())
{
g_warning ("gdk_selection_owner_set: EmptyClipboard failed");
if (xwindow != NULL)
SetClipboardData (CF_TEXT, NULL);
#endif
+ GDK_NOTE (SELECTION, g_print ("...CloseClipboard()\n"));
if (!CloseClipboard ())
{
g_warning ("gdk_selection_owner_set: CloseClipboard failed");
GdkWindowPrivate *private;
gchar *sel_name;
+#if 1
+ /* XXX Hmm, gtk selections seem to work best with this. This causes
+ * gtk to always get the clipboard contents from Windows, and not
+ * from the editable's own stashed-away copy.
+ */
+ return NULL;
+#else
if (selection != gdk_clipboard_atom)
window = NULL;
else
window = gdk_window_lookup (GetClipboardOwner ());
private = (GdkWindowPrivate *) window;
+#endif
GDK_NOTE (SELECTION,
(sel_name = gdk_atom_name (selection),
* contents of the clipboard. Get the clipboard data,
* and store it for later.
*/
+ GDK_NOTE (SELECTION, g_print ("...OpenClipboard(%#x)\n",
+ private->xwindow));
if (!OpenClipboard (private->xwindow))
{
g_warning ("gdk_selection_convert: OpenClipboard failed");
return;
}
+ GDK_NOTE (SELECTION, g_print ("...GetClipboardData(CF_TEXT)\n"));
if ((hdata = GetClipboardData (CF_TEXT)) != NULL)
{
if ((ptr = GlobalLock (hdata)) != NULL)
GlobalUnlock (hdata);
}
}
+ GDK_NOTE (SELECTION, g_print ("...CloseClipboard()\n"));
CloseClipboard ();
g_free (tgt_name),
g_free (prop_name)));
- /* Send ourselves a selection clear message sot that gtk thinks we doen't
+ /* Send ourselves a selection clear message so that gtk thinks we don't
* have the selection, and will claim it anew when needed, and
* we thus get a chance to store data in the Windows clipboard.
* Otherwise, if a gtkeditable does a copy to clipboard several times
* only the first one actually gets copied to the Windows clipboard,
* as only he first one causes a call to gdk_property_change.
+ *
+ * Hmm, there is something fishy with this. Cut and paste inside the
+ * same app didn't work, the gtkeditable immediately forgot the
+ * clipboard contents in gtk_editable_selection_clear as a result of
+ * this message. OTOH, when I changed gdk_selection_owner_get to
+ * always return NULL, it works. Sigh.
*/
SendMessage ((HWND) requestor, gdk_selection_clear_msg, selection, 0);
else
xwindow = NULL;
+ GDK_NOTE (SELECTION, g_print ("...OpenClipboard(%#x)\n", xwindow));
if (!OpenClipboard (xwindow))
{
g_warning ("gdk_selection_owner_set: OpenClipboard failed");
return FALSE;
}
+ GDK_NOTE (SELECTION, g_print ("...EmptyClipboard()\n"));
if (!EmptyClipboard ())
{
g_warning ("gdk_selection_owner_set: EmptyClipboard failed");
if (xwindow != NULL)
SetClipboardData (CF_TEXT, NULL);
#endif
+ GDK_NOTE (SELECTION, g_print ("...CloseClipboard()\n"));
if (!CloseClipboard ())
{
g_warning ("gdk_selection_owner_set: CloseClipboard failed");
GdkWindowPrivate *private;
gchar *sel_name;
+#if 1
+ /* XXX Hmm, gtk selections seem to work best with this. This causes
+ * gtk to always get the clipboard contents from Windows, and not
+ * from the editable's own stashed-away copy.
+ */
+ return NULL;
+#else
if (selection != gdk_clipboard_atom)
window = NULL;
else
window = gdk_window_lookup (GetClipboardOwner ());
private = (GdkWindowPrivate *) window;
+#endif
GDK_NOTE (SELECTION,
(sel_name = gdk_atom_name (selection),
* contents of the clipboard. Get the clipboard data,
* and store it for later.
*/
+ GDK_NOTE (SELECTION, g_print ("...OpenClipboard(%#x)\n",
+ private->xwindow));
if (!OpenClipboard (private->xwindow))
{
g_warning ("gdk_selection_convert: OpenClipboard failed");
return;
}
+ GDK_NOTE (SELECTION, g_print ("...GetClipboardData(CF_TEXT)\n"));
if ((hdata = GetClipboardData (CF_TEXT)) != NULL)
{
if ((ptr = GlobalLock (hdata)) != NULL)
GlobalUnlock (hdata);
}
}
+ GDK_NOTE (SELECTION, g_print ("...CloseClipboard()\n"));
CloseClipboard ();
g_free (tgt_name),
g_free (prop_name)));
- /* Send ourselves a selection clear message sot that gtk thinks we doen't
+ /* Send ourselves a selection clear message so that gtk thinks we don't
* have the selection, and will claim it anew when needed, and
* we thus get a chance to store data in the Windows clipboard.
* Otherwise, if a gtkeditable does a copy to clipboard several times
* only the first one actually gets copied to the Windows clipboard,
* as only he first one causes a call to gdk_property_change.
+ *
+ * Hmm, there is something fishy with this. Cut and paste inside the
+ * same app didn't work, the gtkeditable immediately forgot the
+ * clipboard contents in gtk_editable_selection_clear as a result of
+ * this message. OTOH, when I changed gdk_selection_owner_get to
+ * always return NULL, it works. Sigh.
*/
SendMessage ((HWND) requestor, gdk_selection_clear_msg, selection, 0);
WINDOWPLACEMENT placement;
placement.length = sizeof (WINDOWPLACEMENT);
- /* go through all child windows and create/insert spans */
+ /* go through all child windows and combine regions */
for (i = 0; i < num; i++)
{
GetWindowPlacement (list[i], &placement);
childRegion = CreateRectRgnIndirect (&emptyRect);
GetWindowRgn (list[i], childRegion);
CombineRgn (region, region, childRegion, RGN_OR);
+ DeleteObject (childRegion);
}
}
SetWindowRgn (win, region, TRUE);
}
+ else
+ DeleteObject (region);
}
void
WINDOWPLACEMENT placement;
placement.length = sizeof (WINDOWPLACEMENT);
- /* go through all child windows and create/insert spans */
+ /* go through all child windows and combine regions */
for (i = 0; i < num; i++)
{
GetWindowPlacement (list[i], &placement);
childRegion = CreateRectRgnIndirect (&emptyRect);
GetWindowRgn (list[i], childRegion);
CombineRgn (region, region, childRegion, RGN_OR);
+ DeleteObject (childRegion);
}
}
SetWindowRgn (win, region, TRUE);
}
+ else
+ DeleteObject (region);
}
void
gtk_menu_bar_prepend
gtk_menu_bar_set_shadow_type
gtk_menu_detach
+ gtk_menu_ensure_uline_accel_group
gtk_menu_factory_add_entries
gtk_menu_factory_add_subfactory
gtk_menu_factory_destroy
gtk_menu_factory_remove_entries
gtk_menu_factory_remove_paths
gtk_menu_factory_remove_subfactory
+ gtk_menu_get_accel_group
gtk_menu_get_active
gtk_menu_get_attach_widget
gtk_menu_get_type
+ gtk_menu_get_uline_accel_group
gtk_menu_insert
gtk_menu_item_activate
gtk_menu_item_configure
dir = g_strdup(rc_file->canonical_name);
for (i = strlen(dir) - 1; (i >= 0) && (dir[i] != G_DIR_SEPARATOR); i--)
dir[i] = 0;
+ if (i >= 0 && dir[i] == G_DIR_SEPARATOR)
+ dir[i] = 0;
gtk_rc_append_pixmap_path(dir);
g_free(dir);
}
projects / ~andy / gtk / commitdiff