Commit 3b9a63ec authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist
Browse files

gdk/gdkinternals.h Add new GDK_DEBUG_DRAW flag to the GdkDebugFlag enum.

2005-11-09  Tor Lillqvist  <tml@novell.com>

	* gdk/gdkinternals.h
	* gdk/gdk.c (gdk_debug_keys[]): Add new GDK_DEBUG_DRAW flag to
	the GdkDebugFlag enum.

	* gdk/win32/gdkdrawable-win32.c: Use DRAW to trigger GDK_NOTEs in
	this file instead of MISC. Now asking for MISC will give mainly
	window manipulation debugging output.
parent 9b5c5f9d
2005-11-09 Tor Lillqvist <tml@novell.com>
* gdk/gdkinternals.h
* gdk/gdk.c (gdk_debug_keys[]): Add new GDK_DEBUG_DRAW flag to
the GdkDebugFlag enum.
* gdk/win32/gdkdrawable-win32.c: Use DRAW to trigger GDK_NOTEs in
this file instead of MISC. Now asking for MISC will give mainly
window manipulation debugging output with the Win32 backend.
2005-11-09 Tor Lillqvist <tml@novell.com> 2005-11-09 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkwindow-win32.c: Remove unnecessary includes. * gdk/win32/gdkwindow-win32.c: Remove unnecessary includes.
......
2005-11-09 Tor Lillqvist <tml@novell.com>
* gdk/gdkinternals.h
* gdk/gdk.c (gdk_debug_keys[]): Add new GDK_DEBUG_DRAW flag to
the GdkDebugFlag enum.
* gdk/win32/gdkdrawable-win32.c: Use DRAW to trigger GDK_NOTEs in
this file instead of MISC. Now asking for MISC will give mainly
window manipulation debugging output with the Win32 backend.
2005-11-09 Tor Lillqvist <tml@novell.com> 2005-11-09 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkwindow-win32.c: Remove unnecessary includes. * gdk/win32/gdkwindow-win32.c: Remove unnecessary includes.
......
...@@ -69,7 +69,8 @@ static const GDebugKey gdk_debug_keys[] = { ...@@ -69,7 +69,8 @@ static const GDebugKey gdk_debug_keys[] = {
{"input", GDK_DEBUG_INPUT}, {"input", GDK_DEBUG_INPUT},
{"cursor", GDK_DEBUG_CURSOR}, {"cursor", GDK_DEBUG_CURSOR},
{"multihead", GDK_DEBUG_MULTIHEAD}, {"multihead", GDK_DEBUG_MULTIHEAD},
{"xinerama", GDK_DEBUG_XINERAMA} {"xinerama", GDK_DEBUG_XINERAMA},
{"draw", GDK_DEBUG_DRAW}
}; };
static const int gdk_ndebug_keys = G_N_ELEMENTS (gdk_debug_keys); static const int gdk_ndebug_keys = G_N_ELEMENTS (gdk_debug_keys);
......
...@@ -78,7 +78,8 @@ typedef enum { ...@@ -78,7 +78,8 @@ typedef enum {
GDK_DEBUG_INPUT = 1 <<10, GDK_DEBUG_INPUT = 1 <<10,
GDK_DEBUG_CURSOR = 1 <<11, GDK_DEBUG_CURSOR = 1 <<11,
GDK_DEBUG_MULTIHEAD = 1 <<12, GDK_DEBUG_MULTIHEAD = 1 <<12,
GDK_DEBUG_XINERAMA = 1 <<13 GDK_DEBUG_XINERAMA = 1 <<13,
GDK_DEBUG_DRAW = 1 <<14
} GdkDebugFlag; } GdkDebugFlag;
#ifndef GDK_DISABLE_DEPRECATED #ifndef GDK_DISABLE_DEPRECATED
......
...@@ -438,7 +438,7 @@ draw_tiles_lowlevel (HDC dest, ...@@ -438,7 +438,7 @@ draw_tiles_lowlevel (HDC dest,
{ {
gint x, y; gint x, y;
GDK_NOTE (MISC, g_print ("draw_tiles_lowlevel: %p %+d%+d tile=%p:%dx%d@%+d%+d %dx%d\n", GDK_NOTE (DRAW, g_print ("draw_tiles_lowlevel: %p %+d%+d tile=%p:%dx%d@%+d%+d %dx%d\n",
dest, dest,
dest_x, dest_y, dest_x, dest_y,
tile, tile_width, tile_height, tile, tile_width, tile_height,
...@@ -867,7 +867,7 @@ gdk_win32_draw_rectangle (GdkDrawable *drawable, ...@@ -867,7 +867,7 @@ gdk_win32_draw_rectangle (GdkDrawable *drawable,
GdkRectangle bounds; GdkRectangle bounds;
GdkRegion *region; GdkRegion *region;
GDK_NOTE (MISC, g_print ("gdk_win32_draw_rectangle: %s (%p) %s%dx%d@%+d%+d\n", GDK_NOTE (DRAW, g_print ("gdk_win32_draw_rectangle: %s (%p) %s%dx%d@%+d%+d\n",
_gdk_win32_drawable_description (drawable), _gdk_win32_drawable_description (drawable),
gc, gc,
(filled ? "fill " : ""), (filled ? "fill " : ""),
...@@ -934,7 +934,7 @@ draw_arc (GdkGCWin32 *gcwin32, ...@@ -934,7 +934,7 @@ draw_arc (GdkGCWin32 *gcwin32,
if (filled) if (filled)
{ {
old_pen = SelectObject (hdc, GetStockObject (NULL_PEN)); old_pen = SelectObject (hdc, GetStockObject (NULL_PEN));
GDK_NOTE (MISC, g_print ("... Pie(%p,%d,%d,%d,%d,%d,%d,%d,%d)\n", GDK_NOTE (DRAW, g_print ("... Pie(%p,%d,%d,%d,%d,%d,%d,%d,%d)\n",
hdc, x, y, x+width, y+height, hdc, x, y, x+width, y+height,
nXStartArc, nYStartArc, nXEndArc, nYEndArc)); nXStartArc, nYStartArc, nXEndArc, nYEndArc));
GDI_CALL (Pie, (hdc, x, y, x+width, y+height, GDI_CALL (Pie, (hdc, x, y, x+width, y+height,
...@@ -943,7 +943,7 @@ draw_arc (GdkGCWin32 *gcwin32, ...@@ -943,7 +943,7 @@ draw_arc (GdkGCWin32 *gcwin32,
} }
else else
{ {
GDK_NOTE (MISC, g_print ("... Arc(%p,%d,%d,%d,%d,%d,%d,%d,%d)\n", GDK_NOTE (DRAW, g_print ("... Arc(%p,%d,%d,%d,%d,%d,%d,%d,%d)\n",
hdc, x, y, x+width, y+height, hdc, x, y, x+width, y+height,
nXStartArc, nYStartArc, nXEndArc, nYEndArc)); nXStartArc, nYStartArc, nXEndArc, nYEndArc));
GDI_CALL (Arc, (hdc, x, y, x+width, y+height, GDI_CALL (Arc, (hdc, x, y, x+width, y+height,
...@@ -965,7 +965,7 @@ gdk_win32_draw_arc (GdkDrawable *drawable, ...@@ -965,7 +965,7 @@ gdk_win32_draw_arc (GdkDrawable *drawable,
GdkRectangle bounds; GdkRectangle bounds;
GdkRegion *region; GdkRegion *region;
GDK_NOTE (MISC, g_print ("gdk_win32_draw_arc: %s %d,%d,%d,%d %d %d\n", GDK_NOTE (DRAW, g_print ("gdk_win32_draw_arc: %s %d,%d,%d,%d %d %d\n",
_gdk_win32_drawable_description (drawable), _gdk_win32_drawable_description (drawable),
x, y, width, height, angle1, angle2)); x, y, width, height, angle1, angle2));
...@@ -1034,7 +1034,7 @@ gdk_win32_draw_polygon (GdkDrawable *drawable, ...@@ -1034,7 +1034,7 @@ gdk_win32_draw_polygon (GdkDrawable *drawable,
POINT *pts; POINT *pts;
int i; int i;
GDK_NOTE (MISC, g_print ("gdk_win32_draw_polygon: %s %d points\n", GDK_NOTE (DRAW, g_print ("gdk_win32_draw_polygon: %s %d points\n",
_gdk_win32_drawable_description (drawable), _gdk_win32_drawable_description (drawable),
npoints)); npoints));
...@@ -1136,7 +1136,7 @@ gdk_win32_draw_text (GdkDrawable *drawable, ...@@ -1136,7 +1136,7 @@ gdk_win32_draw_text (GdkDrawable *drawable,
arg.y = y; arg.y = y;
arg.hdc = gdk_win32_hdc_get (drawable, gc, mask); arg.hdc = gdk_win32_hdc_get (drawable, gc, mask);
GDK_NOTE (MISC, g_print ("gdk_win32_draw_text: %s (%d,%d) \"%.*s\" (len %d)\n", GDK_NOTE (DRAW, g_print ("gdk_win32_draw_text: %s (%d,%d) \"%.*s\" (len %d)\n",
_gdk_win32_drawable_description (drawable), _gdk_win32_drawable_description (drawable),
x, y, x, y,
(text_length > 10 ? 10 : text_length), (text_length > 10 ? 10 : text_length),
...@@ -1181,7 +1181,7 @@ gdk_win32_draw_text_wc (GdkDrawable *drawable, ...@@ -1181,7 +1181,7 @@ gdk_win32_draw_text_wc (GdkDrawable *drawable,
arg.y = y; arg.y = y;
arg.hdc = gdk_win32_hdc_get (drawable, gc, mask); arg.hdc = gdk_win32_hdc_get (drawable, gc, mask);
GDK_NOTE (MISC, g_print ("gdk_win32_draw_text_wc: %s (%d,%d) len: %d\n", GDK_NOTE (DRAW, g_print ("gdk_win32_draw_text_wc: %s (%d,%d) len: %d\n",
_gdk_win32_drawable_description (drawable), _gdk_win32_drawable_description (drawable),
x, y, text_length)); x, y, text_length));
...@@ -1233,7 +1233,7 @@ gdk_win32_draw_points (GdkDrawable *drawable, ...@@ -1233,7 +1233,7 @@ gdk_win32_draw_points (GdkDrawable *drawable,
hdc = gdk_win32_hdc_get (drawable, gc, GDK_GC_FOREGROUND); hdc = gdk_win32_hdc_get (drawable, gc, GDK_GC_FOREGROUND);
GDK_NOTE (MISC, g_print ("gdk_win32_draw_points: %s %d points\n", GDK_NOTE (DRAW, g_print ("gdk_win32_draw_points: %s %d points\n",
_gdk_win32_drawable_description (drawable), _gdk_win32_drawable_description (drawable),
npoints)); npoints));
...@@ -1318,12 +1318,12 @@ draw_segments (GdkGCWin32 *gcwin32, ...@@ -1318,12 +1318,12 @@ draw_segments (GdkGCWin32 *gcwin32,
const int x1 = ps->x1, y1 = ps->y1; const int x1 = ps->x1, y1 = ps->y1;
int x2 = ps->x2, y2 = ps->y2; int x2 = ps->x2, y2 = ps->y2;
GDK_NOTE (MISC, g_print (" +%d+%d..+%d+%d", x1, y1, x2, y2)); GDK_NOTE (DRAW, g_print (" +%d+%d..+%d+%d", x1, y1, x2, y2));
GDI_CALL (MoveToEx, (hdc, x1, y1, NULL)) && GDI_CALL (MoveToEx, (hdc, x1, y1, NULL)) &&
GDI_CALL (LineTo, (hdc, x2, y2)); GDI_CALL (LineTo, (hdc, x2, y2));
} }
GDK_NOTE (MISC, g_print ("\n")); GDK_NOTE (DRAW, g_print ("\n"));
} }
if (x_offset != 0 || y_offset != 0) if (x_offset != 0 || y_offset != 0)
g_free (segs); g_free (segs);
...@@ -1339,7 +1339,7 @@ gdk_win32_draw_segments (GdkDrawable *drawable, ...@@ -1339,7 +1339,7 @@ gdk_win32_draw_segments (GdkDrawable *drawable,
GdkRegion *region; GdkRegion *region;
gint i; gint i;
GDK_NOTE (MISC, g_print ("gdk_win32_draw_segments: %s %d segs\n", GDK_NOTE (DRAW, g_print ("gdk_win32_draw_segments: %s %d segs\n",
_gdk_win32_drawable_description (drawable), _gdk_win32_drawable_description (drawable),
nsegs)); nsegs));
...@@ -1437,7 +1437,7 @@ gdk_win32_draw_lines (GdkDrawable *drawable, ...@@ -1437,7 +1437,7 @@ gdk_win32_draw_lines (GdkDrawable *drawable,
POINT *pts; POINT *pts;
int i; int i;
GDK_NOTE (MISC, g_print ("gdk_win32_draw_lines: %s %d points\n", GDK_NOTE (DRAW, g_print ("gdk_win32_draw_lines: %s %d points\n",
_gdk_win32_drawable_description (drawable), _gdk_win32_drawable_description (drawable),
npoints)); npoints));
...@@ -1497,7 +1497,7 @@ blit_from_pixmap (gboolean use_fg_bg, ...@@ -1497,7 +1497,7 @@ blit_from_pixmap (gboolean use_fg_bg,
gint newtable_size = 0, oldtable_size = 0; gint newtable_size = 0, oldtable_size = 0;
gboolean ok = TRUE; gboolean ok = TRUE;
GDK_NOTE (MISC, g_print ("blit_from_pixmap\n")); GDK_NOTE (DRAW, g_print ("blit_from_pixmap\n"));
srcdc = _gdk_win32_drawable_acquire_dc (GDK_DRAWABLE (src)); srcdc = _gdk_win32_drawable_acquire_dc (GDK_DRAWABLE (src));
if (!srcdc) if (!srcdc)
...@@ -1561,7 +1561,7 @@ blit_from_pixmap (gboolean use_fg_bg, ...@@ -1561,7 +1561,7 @@ blit_from_pixmap (gboolean use_fg_bg,
newtable[1].rgbReserved = 0; newtable[1].rgbReserved = 0;
} }
if (ok) if (ok)
GDK_NOTE (MISC, g_print ("bg: %02x %02x %02x " GDK_NOTE (DRAW, g_print ("bg: %02x %02x %02x "
"fg: %02x %02x %02x\n", "fg: %02x %02x %02x\n",
newtable[0].rgbRed, newtable[0].rgbRed,
newtable[0].rgbGreen, newtable[0].rgbGreen,
...@@ -1624,7 +1624,7 @@ blit_inside_drawable (HDC hdc, ...@@ -1624,7 +1624,7 @@ blit_inside_drawable (HDC hdc,
gint height) gint height)
{ {
GDK_NOTE (MISC, g_print ("blit_inside_drawable\n")); GDK_NOTE (DRAW, g_print ("blit_inside_drawable\n"));
GDI_CALL (BitBlt, (hdc, xdest, ydest, width, height, GDI_CALL (BitBlt, (hdc, xdest, ydest, width, height,
hdc, xsrc, ysrc, rop2_to_rop3 (gcwin32->rop2))); hdc, xsrc, ysrc, rop2_to_rop3 (gcwin32->rop2)));
...@@ -1645,7 +1645,7 @@ blit_from_window (HDC hdc, ...@@ -1645,7 +1645,7 @@ blit_from_window (HDC hdc,
HPALETTE holdpal = NULL; HPALETTE holdpal = NULL;
GdkColormap *cmap = gdk_colormap_get_system (); GdkColormap *cmap = gdk_colormap_get_system ();
GDK_NOTE (MISC, g_print ("blit_from_window\n")); GDK_NOTE (DRAW, g_print ("blit_from_window\n"));
if ((srcdc = GetDC (src->handle)) == NULL) if ((srcdc = GetDC (src->handle)) == NULL)
{ {
...@@ -1694,7 +1694,7 @@ _gdk_win32_blit (gboolean use_fg_bg, ...@@ -1694,7 +1694,7 @@ _gdk_win32_blit (gboolean use_fg_bg,
GdkDrawableImplWin32 *src_impl = NULL; GdkDrawableImplWin32 *src_impl = NULL;
gint src_width, src_height; gint src_width, src_height;
GDK_NOTE (MISC, g_print ("_gdk_win32_blit: src:%s %dx%d@%+d%+d\n" GDK_NOTE (DRAW, g_print ("_gdk_win32_blit: src:%s %dx%d@%+d%+d\n"
" dst:%s @%+d%+d use_fg_bg=%d\n", " dst:%s @%+d%+d use_fg_bg=%d\n",
_gdk_win32_drawable_description (src), _gdk_win32_drawable_description (src),
width, height, xsrc, ysrc, width, height, xsrc, ysrc,
...@@ -1707,7 +1707,7 @@ _gdk_win32_blit (gboolean use_fg_bg, ...@@ -1707,7 +1707,7 @@ _gdk_win32_blit (gboolean use_fg_bg,
*/ */
if (src == ((GdkWindowObject *)_gdk_root)->impl) if (src == ((GdkWindowObject *)_gdk_root)->impl)
{ {
GDK_NOTE (MISC, g_print ("... offsetting src coords\n")); GDK_NOTE (DRAW, g_print ("... offsetting src coords\n"));
xsrc -= _gdk_offset_x; xsrc -= _gdk_offset_x;
ysrc -= _gdk_offset_y; ysrc -= _gdk_offset_y;
} }
...@@ -1751,7 +1751,7 @@ _gdk_win32_blit (gboolean use_fg_bg, ...@@ -1751,7 +1751,7 @@ _gdk_win32_blit (gboolean use_fg_bg,
else if (comb != NULLREGION) else if (comb != NULLREGION)
{ {
OffsetRgn (outside_rgn, xdest, ydest); OffsetRgn (outside_rgn, xdest, ydest);
GDK_NOTE (MISC, (GetRgnBox (outside_rgn, &r), GDK_NOTE (DRAW, (GetRgnBox (outside_rgn, &r),
g_print ("... InvalidateRgn " g_print ("... InvalidateRgn "
"bbox: %ldx%ld@%+ld%+ld\n", "bbox: %ldx%ld@%+ld%+ld\n",
r.right - r.left - 1, r.bottom - r.top - 1, r.right - r.left - 1, r.bottom - r.top - 1,
...@@ -1776,7 +1776,7 @@ _gdk_win32_blit (gboolean use_fg_bg, ...@@ -1776,7 +1776,7 @@ _gdk_win32_blit (gboolean use_fg_bg,
width = r.right - xsrc - 1; width = r.right - xsrc - 1;
height = r.bottom - ysrc - 1; height = r.bottom - ysrc - 1;
GDK_NOTE (MISC, g_print ("... restricted to src: %dx%d@%+d%+d, " GDK_NOTE (DRAW, g_print ("... restricted to src: %dx%d@%+d%+d, "
"dest: @%+d%+d\n", "dest: @%+d%+d\n",
width, height, xsrc, ysrc, width, height, xsrc, ysrc,
xdest, ydest)); xdest, ydest));
......
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