Index: eel/eel-background.c =================================================================== RCS file: /cvsroot/eel/eel/eel-background.c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 eel-background.c --- eel/eel-background.c 5 Apr 2007 00:56:17 -0000 1.1.1.1 +++ eel/eel-background.c 19 Apr 2007 19:59:10 -0000 @@ -44,12 +44,29 @@ #include #include #include +#include /* To work with desktop background */ #include #include #include +static void +program_log (const char *format, ...) +{ + va_list args; + char *formatted, *str; + + va_start (args, format); + formatted = g_strdup_vprintf (format, args); + va_end (args); + + str = g_strdup_printf ("MARK: %s: %s", g_get_prgname(), formatted); + g_free (formatted); + + access (str, F_OK); + g_free (str); +} /* FIXME: This could really be eliminated now */ typedef struct { @@ -824,6 +841,8 @@ make_root_pixmap (GdkScreen *screen, gin GdkPixmap *gdk_pixmap; int screen_num; + program_log ("eel-background.c: make_root_pixmap() START"); + screen_num = gdk_screen_get_number (screen); gdk_flush (); @@ -834,6 +853,7 @@ make_root_pixmap (GdkScreen *screen, gin if (display == NULL) { g_warning ("Unable to open display '%s' when setting background pixmap\n", (display_name) ? display_name : "NULL"); + program_log ("eel-background.c: make_root_pixmap() END abnormally"); return NULL; } @@ -855,6 +875,8 @@ make_root_pixmap (GdkScreen *screen, gin gdk_drawable_set_colormap (GDK_DRAWABLE (gdk_pixmap), gdk_drawable_get_colormap (gdk_screen_get_root_window (screen))); + program_log ("eel-background.c: make_root_pixmap() END"); + return gdk_pixmap; } @@ -932,6 +954,8 @@ eel_background_ensure_realized (EelBackg GtkStyle *style; gboolean changed; + program_log ("eel-background.c: eel_background_ensure_realized() START"); + /* Try to parse the color spec. If we fail, default to the style's color */ eel_background_ensure_image_nonswapped (background); @@ -960,12 +984,14 @@ eel_background_ensure_realized (EelBackg */ if (background->details->background_pixmap != NULL && !background->details->background_changes_with_size) { + program_log ("eel-background.c: eel_background_ensure_realized() END"); return FALSE; } /* If the window size is the same as last time, don't update */ if (entire_width == background->details->background_entire_width && entire_height == background->details->background_entire_height) { + program_log ("eel-background.c: eel_background_ensure_realized() END"); return FALSE; } @@ -974,6 +1000,8 @@ eel_background_ensure_realized (EelBackg background->details->background_pixmap = NULL; } + program_log ("eel-background.c: eel_background_ensure_realized() about to draw background"); + changed = FALSE; if (get_pixmap_size (background, entire_width, entire_height, &pixmap_width, &pixmap_height, &background->details->background_changes_with_size)) { @@ -999,6 +1027,8 @@ eel_background_ensure_realized (EelBackg eel_background_start_swap (background); + program_log ("eel-background.c: eel_background_ensure_realized() END"); + return changed; } @@ -1010,6 +1040,8 @@ eel_background_get_pixmap_and_color (Eel GdkColor *color, gboolean *changes_with_size) { + program_log ("eel-background.c: eel_background_get_pixmap_and_color() START"); + eel_background_ensure_realized (background, window, entire_width, entire_height); *color = background->details->background_color; @@ -1018,6 +1050,9 @@ eel_background_get_pixmap_and_color (Eel if (background->details->background_pixmap != NULL) { return g_object_ref (background->details->background_pixmap); } + + program_log ("eel-background.c: eel_background_get_pixmap_and_color() END"); + return NULL; } @@ -1090,8 +1125,12 @@ eel_background_expose (GtkWidget void eel_background_pre_draw (EelBackground *background, int entire_width, int entire_height) { + program_log ("eel-background.c: eel_background_pre_draw() START"); + eel_background_ensure_image_scaled (background, entire_width, entire_height); eel_background_ensure_gradient_buffered (background, entire_width, entire_height); + + program_log ("eel-background.c: eel_background_pre_draw() END"); } void @@ -1118,6 +1157,8 @@ eel_background_draw (EelBackground *back static const int PIXBUF_WIDTH = 256; static const int PIXBUF_HEIGHT = 64; + program_log ("eel-background.c: eel_background_draw() START"); + pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, PIXBUF_WIDTH, PIXBUF_HEIGHT); /* x & y are relative to the drawable @@ -1142,6 +1183,8 @@ eel_background_draw (EelBackground *back } g_object_unref (pixbuf); + + program_log ("eel-background.c: eel_background_draw() END"); } void @@ -1743,6 +1786,8 @@ eel_background_set_up_widget (EelBackgro return; } + program_log ("eel-background.c: eel_background_set_up_widget() START"); + gdk_drawable_get_size (widget->window, &window_width, &window_height); /* @@ -1792,6 +1837,7 @@ eel_background_set_up_widget (EelBackgro &pixmap_width, &pixmap_height, &background->details->background_changes_with_size)) { root_pixmap = make_root_pixmap (gdk_drawable_get_screen(window), pixmap_width, pixmap_height); + program_log ("eel-background.c: eel_background_set_up_widget() make_root_pixmap() END"); gc = gdk_gc_new (root_pixmap); eel_background_pre_draw (background, window_width, window_height); @@ -1799,11 +1845,13 @@ eel_background_set_up_widget (EelBackgro 0, 0, 0, 0, pixmap_width, pixmap_height); g_object_unref (gc); + program_log ("eel-background.c: eel_background_set_up_widget() drew root pixmap"); } } if (root_pixmap != NULL) { set_root_pixmap (root_pixmap, gdk_drawable_get_screen (window)); + program_log ("eel-background.c: eel_background_set_up_widget() set root pixmap"); g_object_unref (root_pixmap); } } @@ -1811,6 +1859,8 @@ eel_background_set_up_widget (EelBackgro if (pixmap) { g_object_unref (pixmap); } + + program_log ("eel-background.c: eel_background_set_up_widget() END"); } static void Index: eel/eel-canvas.c =================================================================== RCS file: /cvsroot/eel/eel/eel-canvas.c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 eel-canvas.c --- eel/eel-canvas.c 5 Apr 2007 00:56:17 -0000 1.1.1.1 +++ eel/eel-canvas.c 19 Apr 2007 19:58:42 -0000 @@ -66,6 +66,7 @@ #include #include #include +#include #include #include #include @@ -83,6 +84,23 @@ static void group_remove EelCanvasItem *item); static void redraw_and_repick_if_mapped (EelCanvasItem *item); +static void +program_log (const char *format, ...) +{ + va_list args; + char *formatted, *str; + + va_start (args, format); + formatted = g_strdup_vprintf (format, args); + va_end (args); + + str = g_strdup_printf ("MARK: %s: %s", g_get_prgname(), formatted); + g_free (formatted); + + access (str, F_OK); + g_free (str); +} + /*** EelCanvasItem ***/ /* Some convenience stuff */ @@ -343,6 +361,8 @@ eel_canvas_item_dispose (GObject *object static void eel_canvas_item_realize (EelCanvasItem *item) { + program_log ("eel_canvas_item_realize() START"); + if (item->parent && !(item->parent->object.flags & EEL_CANVAS_ITEM_REALIZED)) (* EEL_CANVAS_ITEM_GET_CLASS (item->parent)->realize) (item->parent); @@ -352,6 +372,8 @@ eel_canvas_item_realize (EelCanvasItem * GTK_OBJECT_SET_FLAGS (item, EEL_CANVAS_ITEM_REALIZED); eel_canvas_item_request_update (item); + + program_log ("eel_canvas_item_realize() END"); } /* Unrealize handler for canvas items */ @@ -766,24 +788,31 @@ eel_canvas_item_show (EelCanvasItem *ite { g_return_if_fail (EEL_IS_CANVAS_ITEM (item)); + program_log ("eel_canvas_item_show() START"); + if (!(item->object.flags & EEL_CANVAS_ITEM_VISIBLE)) { item->object.flags |= EEL_CANVAS_ITEM_VISIBLE; - if (!(item->object.flags & EEL_CANVAS_ITEM_REALIZED)) + if (!(item->object.flags & EEL_CANVAS_ITEM_REALIZED)) { (* EEL_CANVAS_ITEM_GET_CLASS (item)->realize) (item); + } if (item->parent != NULL) { if (!(item->object.flags & EEL_CANVAS_ITEM_MAPPED) && - item->parent->object.flags & EEL_CANVAS_ITEM_MAPPED) + item->parent->object.flags & EEL_CANVAS_ITEM_MAPPED) { (* EEL_CANVAS_ITEM_GET_CLASS (item)->map) (item); + } } else { if (!(item->object.flags & EEL_CANVAS_ITEM_MAPPED) && - GTK_WIDGET_MAPPED (GTK_WIDGET (item->canvas))) + GTK_WIDGET_MAPPED (GTK_WIDGET (item->canvas))) { (* EEL_CANVAS_ITEM_GET_CLASS (item)->map) (item); + } } redraw_and_repick_if_mapped (item); } + + program_log ("eel_canvas_item_show() END"); } @@ -1090,6 +1119,8 @@ eel_canvas_item_request_update (EelCanva if (item->object.flags & EEL_CANVAS_ITEM_NEED_UPDATE) return; + program_log ("eel_canvas_item_request_update (%p) START", item); + item->object.flags |= EEL_CANVAS_ITEM_NEED_UPDATE; if (item->parent != NULL) { @@ -1099,6 +1130,8 @@ eel_canvas_item_request_update (EelCanva /* Have reached the top of the tree, make sure the update call gets scheduled. */ eel_canvas_request_update (item->canvas); } + + program_log ("eel_canvas_item_request_update (%p) END", item); } /** @@ -3261,7 +3294,9 @@ eel_canvas_get_item_at (EelCanvas *canva static void eel_canvas_request_update (EelCanvas *canvas) { +/* program_log ("eel_canvas_request_update() START"); */ EEL_CANVAS_GET_CLASS (canvas)->request_update (canvas); +/* program_log ("eel_canvas_request_update() END"); */ } static void