GtkEntry: Sanity check the end_pos value in _get_display_text()

[~andy/gtk] / gtk / gtkcellrendereraccel.c

diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index 7143c47380cb8be6c0e5a0f3e71f934ad8f57d5a..32f385ea59556f7e2803257a0c4e402407e5726f 100644 (file)
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -53,13 +53,11 @@ static void gtk_cell_renderer_accel_set_property (GObject         *object,
                                                   guint            param_id,
                                                   const GValue    *value,
                                                   GParamSpec      *pspec);
-static void gtk_cell_renderer_accel_get_size     (GtkCellRenderer    *cell,
-                                                  GtkWidget          *widget,
-                                                  const GdkRectangle *cell_area,
-                                                  gint               *x_offset,
-                                                  gint               *y_offset,
-                                                  gint               *width,
-                                                  gint               *height);
+static void gtk_cell_renderer_accel_get_preferred_width 
+                                                 (GtkCellRenderer *cell,
+                                                  GtkWidget       *widget,
+                                                  gint            *minimum_size,
+                                                  gint            *natural_size);
 static GtkCellEditable *
            gtk_cell_renderer_accel_start_editing (GtkCellRenderer      *cell,
                                                   GdkEvent             *event,
@@ -134,7 +132,7 @@ gtk_cell_renderer_accel_class_init (GtkCellRendererAccelClass *cell_accel_class)
   object_class->set_property = gtk_cell_renderer_accel_set_property;
   object_class->get_property = gtk_cell_renderer_accel_get_property;
 
-  cell_renderer_class->get_size      = gtk_cell_renderer_accel_get_size;
+  cell_renderer_class->get_preferred_width = gtk_cell_renderer_accel_get_preferred_width;
   cell_renderer_class->start_editing = gtk_cell_renderer_accel_start_editing;
 
   /**
@@ -405,31 +403,28 @@ gtk_cell_renderer_accel_set_property  (GObject      *object,
 }
 
 static void
-gtk_cell_renderer_accel_get_size (GtkCellRenderer    *cell,
-                                  GtkWidget          *widget,
-                                  const GdkRectangle *cell_area,
-                                  gint               *x_offset,
-                                  gint               *y_offset,
-                                  gint               *width,
-                                  gint               *height)
+gtk_cell_renderer_accel_get_preferred_width (GtkCellRenderer    *cell,
+                                             GtkWidget          *widget,
+                                             gint               *minimum_size,
+                                             gint               *natural_size)
 
 {
   GtkCellRendererAccelPrivate *priv = GTK_CELL_RENDERER_ACCEL (cell)->priv;
-  GtkRequisition requisition;
+  GtkRequisition min_req, nat_req;
 
   if (priv->sizing_label == NULL)
-    priv->sizing_label = gtk_label_new (_("New accelerator..."));
+    priv->sizing_label = gtk_label_new (_("New accelerator…"));
 
-  gtk_widget_get_preferred_size (priv->sizing_label, &requisition, NULL);
+  gtk_widget_get_preferred_size (priv->sizing_label, &min_req, &nat_req);
 
-  GTK_CELL_RENDERER_CLASS (gtk_cell_renderer_accel_parent_class)->get_size (cell, widget, cell_area,
-                                                                            x_offset, y_offset, width, height);
+  GTK_CELL_RENDERER_CLASS (gtk_cell_renderer_accel_parent_class)->get_preferred_width (cell, widget,
+                                                                                       minimum_size, natural_size);
 
   /* FIXME: need to take the cell_area et al. into account */
-  if (width)
-    *width = MAX (*width, requisition.width);
-  if (height)
-    *height = MAX (*height, requisition.height);
+  if (minimum_size)
+    *minimum_size = MAX (*minimum_size, min_req.width);
+  if (natural_size)
+    *natural_size = MAX (*natural_size, nat_req.width);
 }
 
 static gboolean
@@ -457,12 +452,24 @@ grab_key_callback (GtkWidget            *widget,
 
   accel_mods = event->state;
 
-  _gtk_translate_keyboard_accel_state (gdk_keymap_get_for_display (display),
-                                       event->hardware_keycode,
-                                       event->state,
-                                       gtk_accelerator_get_default_mod_mask (),
-                                       event->group,
-                                       &keyval, NULL, NULL, &consumed_modifiers);
+  if (event->keyval == GDK_KEY_Sys_Req && 
+      (accel_mods & GDK_MOD1_MASK) != 0)
+    {
+      /* HACK: we don't want to use SysRq as a keybinding (but we do
+       * want Alt+Print), so we avoid translation from Alt+Print to SysRq
+       */
+      keyval = GDK_KEY_Print;
+      consumed_modifiers = 0;
+    }
+  else
+    {
+      _gtk_translate_keyboard_accel_state (gdk_keymap_get_for_display (display),
+                                           event->hardware_keycode,
+                                           event->state,
+                                           gtk_accelerator_get_default_mod_mask (),
+                                           event->group,
+                                           &keyval, NULL, NULL, &consumed_modifiers);
+    }
 
   accel_key = gdk_keyval_to_lower (keyval);
   if (accel_key == GDK_KEY_ISO_Left_Tab) 
@@ -572,6 +579,8 @@ struct _GtkCellEditableEventBox
   gboolean editing_canceled;
 };
 
+GType _gtk_cell_editable_event_box_get_type (void);
+
 G_DEFINE_TYPE_WITH_CODE (GtkCellEditableEventBox, _gtk_cell_editable_event_box, GTK_TYPE_EVENT_BOX, { \
     G_IMPLEMENT_INTERFACE (GTK_TYPE_CELL_EDITABLE, _gtk_cell_editable_event_box_cell_editable_init)   \
       })
@@ -735,7 +744,7 @@ gtk_cell_renderer_accel_start_editing (GtkCellRenderer      *cell,
    * an accelerator when the cell is clicked to change the 
    * acelerator.
    */
-  gtk_label_set_text (GTK_LABEL (label), _("New accelerator..."));
+  gtk_label_set_text (GTK_LABEL (label), _("New accelerator…"));
 
   gtk_container_add (GTK_CONTAINER (eventbox), label);