[nautilus/rendering-cleanup: 5/17] [eel] Port EelEditableLabel to rendering-cleanup-next

[Christian Persch <chpe src gnome org>]

commit 5fc70ccad20a2355020c32d50742da81bbc7f5e6
Author: Christian Persch <chpe gnome org>
Date:   Thu Sep 16 15:02:10 2010 +0200

    [eel] Port EelEditableLabel to rendering-cleanup-next

 eel/eel-editable-label.c |   44 +++++++++++++++-----------------------------
 1 files changed, 15 insertions(+), 29 deletions(-)
---
diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c
index 88428b8..ab16c12 100644
--- a/eel/eel-editable-label.c
+++ b/eel/eel-editable-label.c
@@ -81,8 +81,8 @@ static void     eel_editable_label_style_set               (GtkWidget
 							    GtkStyle              *previous_style);
 static void     eel_editable_label_direction_changed       (GtkWidget             *widget,
 							    GtkTextDirection       previous_dir);
-static gint     eel_editable_label_expose                  (GtkWidget             *widget,
-							    GdkEventExpose        *event);
+static gint     eel_editable_label_draw                    (GtkWidget             *widget,
+							    cairo_t               *cr);
 static void     eel_editable_label_realize                 (GtkWidget             *widget);
 static void     eel_editable_label_unrealize               (GtkWidget             *widget);
 static void     eel_editable_label_map                     (GtkWidget             *widget);
@@ -217,7 +217,7 @@ eel_editable_label_class_init (EelEditableLabelClass *class)
   widget_class->state_changed = eel_editable_label_state_changed;
   widget_class->style_set = eel_editable_label_style_set;
   widget_class->direction_changed = eel_editable_label_direction_changed;
-  widget_class->expose_event = eel_editable_label_expose;
+  widget_class->draw = eel_editable_label_draw;
   widget_class->realize = eel_editable_label_realize;
   widget_class->unrealize = eel_editable_label_unrealize;
   widget_class->map = eel_editable_label_map;
@@ -1378,7 +1378,7 @@ eel_editable_label_get_block_cursor_location (EelEditableLabel  *label,
 /* These functions are copies from gtk+, as they are not exported from gtk+ */
 
 static void
-eel_editable_label_draw_cursor (EelEditableLabel  *label, gint xoffset, gint yoffset)
+eel_editable_label_draw_cursor (EelEditableLabel  *label, cairo_t *cr, gint xoffset, gint yoffset)
 {
   if (gtk_widget_is_drawable (GTK_WIDGET (label)))
     {
@@ -1445,8 +1445,9 @@ eel_editable_label_draw_cursor (EelEditableLabel  *label, gint xoffset, gint yof
 	  cursor_location.width = 0;
 	  cursor_location.height = PANGO_PIXELS (cursor1->height);
 
-	  gtk_draw_insertion_cursor (widget, gtk_widget_get_window (widget),
-				     NULL, &cursor_location,
+	  gtk_draw_insertion_cursor (widget,
+                                     cr,
+				     &cursor_location,
 				     TRUE, dir1, dir2 != GTK_TEXT_DIR_NONE);
 
 	  if (dir2 != GTK_TEXT_DIR_NONE)
@@ -1456,17 +1457,14 @@ eel_editable_label_draw_cursor (EelEditableLabel  *label, gint xoffset, gint yof
 	      cursor_location.width = 0;
 	      cursor_location.height = PANGO_PIXELS (cursor2->height);
 
-	      gtk_draw_insertion_cursor (widget, gtk_widget_get_window (widget),
-					 NULL, &cursor_location,
+	      gtk_draw_insertion_cursor (widget, cr,
+					 &cursor_location,
 					 FALSE, dir1, TRUE);
 	    }
 	}
       else /* Block cursor */
 	{
 	  cairo_region_t *clip;
-	  cairo_t *cr;
-
-	  cr = gdk_cairo_create (gtk_widget_get_window (widget));
 
 	  cairo_set_source_rgb (cr, 0, 0, 0);
 	  cairo_rectangle (cr,
@@ -1495,23 +1493,20 @@ eel_editable_label_draw_cursor (EelEditableLabel  *label, gint xoffset, gint yof
 
 	      cairo_region_destroy (clip);
 	    }
-
-	  cairo_destroy (cr);
-	}	  
+	}
     }
 }
 
 
 static gint
-eel_editable_label_expose (GtkWidget      *widget,
-			   GdkEventExpose *event)
+eel_editable_label_draw (GtkWidget *widget,
+                         cairo_t   *cr)
 {
   EelEditableLabel *label;
   GtkStyle *style;
   gint x, y;
   
   g_assert (EEL_IS_EDITABLE_LABEL (widget));
-  g_assert (event != NULL);
   
   label = EEL_EDITABLE_LABEL (widget);
   style = gtk_widget_get_style (widget);
@@ -1524,10 +1519,9 @@ eel_editable_label_expose (GtkWidget      *widget,
       get_layout_location (label, &x, &y);
       
       gtk_paint_layout (style,
-                        gtk_widget_get_window (widget),
+                        cr,
                         gtk_widget_get_state (widget),
 			TRUE,
-                        &event->area,
                         widget,
                         "label",
                         x, y,
@@ -1539,7 +1533,6 @@ eel_editable_label_expose (GtkWidget      *widget,
 	  const char *text;
           cairo_region_t *clip;
 	  GtkStateType state;
-	  cairo_t *cr;
 	  
           range[0] = label->selection_anchor;
           range[1] = label->selection_end;
@@ -1559,7 +1552,6 @@ eel_editable_label_expose (GtkWidget      *widget,
               range[1] = tmp;
             }
 
-	  cr = gdk_cairo_create (gtk_widget_get_window (widget));
           clip = gdk_pango_layout_get_clip_region (label->layout,
                                                    x, y,
                                                    range,
@@ -1578,26 +1570,21 @@ eel_editable_label_expose (GtkWidget      *widget,
 	  cairo_move_to (cr, x, y);
 	  pango_cairo_show_layout (cr, label->layout);
 
-	  cairo_destroy (cr);
 	  cairo_region_destroy (clip);
         }
       else if (gtk_widget_has_focus (widget))
-	eel_editable_label_draw_cursor (label, x, y);
+	eel_editable_label_draw_cursor (label, cr, x, y);
 
       if (label->draw_outline) {
         GtkAllocation allocation;
-	cairo_t *cr;
 
         gtk_widget_get_allocation (widget, &allocation);
-	cr = gdk_cairo_create (gtk_widget_get_window (widget));
 	gdk_cairo_set_source_color (cr, &style->text [gtk_widget_get_state (widget)]);
 	cairo_set_line_width (cr, 1.0);
 	cairo_rectangle (cr, 0.5, 0.5, 
 			 allocation.width - 1,
 			 allocation.height - 1);
 	cairo_stroke (cr);
-
-	cairo_destroy (cr);
       }
     }
 
@@ -1625,7 +1612,6 @@ eel_editable_label_realize (GtkWidget *widget)
   attributes.width = allocation.width;
   attributes.height = allocation.height;
   attributes.visual = gtk_widget_get_visual (widget);
-  attributes.colormap = gtk_widget_get_colormap (widget);
   attributes.cursor = gdk_cursor_new (GDK_XTERM);
   attributes.event_mask = gtk_widget_get_events (widget) |
     (GDK_EXPOSURE_MASK |
@@ -1638,7 +1624,7 @@ eel_editable_label_realize (GtkWidget *widget)
      GDK_ENTER_NOTIFY_MASK |
      GDK_LEAVE_NOTIFY_MASK);
 
-  attributes_mask = GDK_WA_X | GDK_WA_Y  | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_CURSOR;
+  attributes_mask = GDK_WA_X | GDK_WA_Y  | GDK_WA_VISUAL | GDK_WA_CURSOR;
 
   window = gdk_window_new (gtk_widget_get_parent_window (widget),
 			   &attributes, attributes_mask);