X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcellrendereraccel.c;h=32f385ea59556f7e2803257a0c4e402407e5726f;hb=aa08f4d8f5ed60e3fe9e4bd970493582411c25c4;hp=b0a42dbc36446b6fd9a30823444452c2474fa969;hpb=fb5dd9f72fea478ab219b690763b8372f574d1ff;p=~andy%2Fgtk
diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index b0a42dbc3..32f385ea5 100644
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -12,17 +12,13 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
#include "config.h"
#include "gtkcellrendereraccel.h"
-#include "gdk/gdkkeysyms.h"
-
#include "gtkintl.h"
#include "gtkaccelgroup.h"
#include "gtkmarshalers.h"
@@ -30,9 +26,25 @@
#include "gtkeventbox.h"
#include "gtkmain.h"
#include "gtksizerequest.h"
+#include "gtktypebuiltins.h"
#include "gtkprivate.h"
+/**
+ * SECTION:gtkcellrendereraccel
+ * @Short_description: Renders a keyboard accelerator in a cell
+ * @Title: GtkCellRendererAccel
+ *
+ * #GtkCellRendererAccel displays a keyboard accelerator (i.e. a
+ * key combination like Controla.
+ * If the cell renderer is editable, the accelerator can be changed by
+ * simply typing the new combination.
+ *
+ * The #GtkCellRendererAccel cell renderer was added in GTK+ 2.10.
+ */
+
+
+
static void gtk_cell_renderer_accel_get_property (GObject *object,
guint param_id,
GValue *value,
@@ -41,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,
@@ -77,8 +87,6 @@ enum {
struct _GtkCellRendererAccelPrivate
{
- GtkCellRendererAccelMode accel_mode;
-
GtkWidget *edit_widget;
GtkWidget *grab_widget;
GtkWidget *sizing_label;
@@ -86,6 +94,8 @@ struct _GtkCellRendererAccelPrivate
GdkDevice *grab_keyboard;
GdkDevice *grab_pointer;
+ GtkCellRendererAccelMode accel_mode;
+
GdkModifierType accel_mods;
guint accel_key;
@@ -122,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;
/**
@@ -168,14 +178,14 @@ gtk_cell_renderer_accel_class_init (GtkCellRendererAccelClass *cell_accel_class)
* Since: 2.10
*/
g_object_class_install_property (object_class,
- PROP_KEYCODE,
- g_param_spec_uint ("keycode",
- P_("Accelerator keycode"),
- P_("The hardware keycode of the accelerator"),
- 0,
- G_MAXINT,
- 0,
- GTK_PARAM_READWRITE));
+ PROP_KEYCODE,
+ g_param_spec_uint ("keycode",
+ P_("Accelerator keycode"),
+ P_("The hardware keycode of the accelerator"),
+ 0,
+ G_MAXINT,
+ 0,
+ GTK_PARAM_READWRITE));
/**
* GtkCellRendererAccel:accel-mode:
@@ -190,11 +200,11 @@ gtk_cell_renderer_accel_class_init (GtkCellRendererAccelClass *cell_accel_class)
g_object_class_install_property (object_class,
PROP_ACCEL_MODE,
g_param_spec_enum ("accel-mode",
- P_("Accelerator Mode"),
- P_("The type of accelerators"),
- GTK_TYPE_CELL_RENDERER_ACCEL_MODE,
- GTK_CELL_RENDERER_ACCEL_MODE_GTK,
- GTK_PARAM_READWRITE));
+ P_("Accelerator Mode"),
+ P_("The type of accelerators"),
+ GTK_TYPE_CELL_RENDERER_ACCEL_MODE,
+ GTK_CELL_RENDERER_ACCEL_MODE_GTK,
+ GTK_PARAM_READWRITE));
/**
* GtkCellRendererAccel::accel-edited:
@@ -209,16 +219,16 @@ gtk_cell_renderer_accel_class_init (GtkCellRendererAccelClass *cell_accel_class)
* Since: 2.10
*/
signals[ACCEL_EDITED] = g_signal_new (I_("accel-edited"),
- GTK_TYPE_CELL_RENDERER_ACCEL,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkCellRendererAccelClass, accel_edited),
- NULL, NULL,
- _gtk_marshal_VOID__STRING_UINT_FLAGS_UINT,
- G_TYPE_NONE, 4,
- G_TYPE_STRING,
- G_TYPE_UINT,
- GDK_TYPE_MODIFIER_TYPE,
- G_TYPE_UINT);
+ GTK_TYPE_CELL_RENDERER_ACCEL,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkCellRendererAccelClass, accel_edited),
+ NULL, NULL,
+ _gtk_marshal_VOID__STRING_UINT_FLAGS_UINT,
+ G_TYPE_NONE, 4,
+ G_TYPE_STRING,
+ G_TYPE_UINT,
+ GDK_TYPE_MODIFIER_TYPE,
+ G_TYPE_UINT);
/**
* GtkCellRendererAccel::accel-cleared:
@@ -230,13 +240,13 @@ gtk_cell_renderer_accel_class_init (GtkCellRendererAccelClass *cell_accel_class)
* Since: 2.10
*/
signals[ACCEL_CLEARED] = g_signal_new (I_("accel-cleared"),
- GTK_TYPE_CELL_RENDERER_ACCEL,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkCellRendererAccelClass, accel_cleared),
- NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE, 1,
- G_TYPE_STRING);
+ GTK_TYPE_CELL_RENDERER_ACCEL,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkCellRendererAccelClass, accel_cleared),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1,
+ G_TYPE_STRING);
g_type_class_add_private (cell_accel_class, sizeof (GtkCellRendererAccelPrivate));
}
@@ -259,9 +269,9 @@ gtk_cell_renderer_accel_new (void)
static gchar *
convert_keysym_state_to_string (GtkCellRendererAccel *accel,
- guint keysym,
+ guint keysym,
GdkModifierType mask,
- guint keycode)
+ guint keycode)
{
GtkCellRendererAccelPrivate *priv = accel->priv;
@@ -284,24 +294,15 @@ convert_keysym_state_to_string (GtkCellRendererAccel *accel,
return gtk_accelerator_get_label (keysym, mask);
}
else
- {
- gchar *name;
-
- name = gtk_accelerator_get_label (keysym, mask);
- if (name == NULL)
- name = gtk_accelerator_name (keysym, mask);
-
- if (keysym == 0)
- {
- gchar *tmp;
+ {
+ gchar *name;
- tmp = name;
- name = g_strdup_printf ("%s0x%02x", tmp, keycode);
- g_free (tmp);
- }
+ name = gtk_accelerator_get_label_with_keycode (NULL, keysym, keycode, mask);
+ if (name == NULL)
+ name = gtk_accelerator_name_with_keycode (NULL, keysym, keycode, mask);
- return name;
- }
+ return name;
+ }
}
}
@@ -350,36 +351,36 @@ gtk_cell_renderer_accel_set_property (GObject *object,
{
case PROP_ACCEL_KEY:
{
- guint accel_key = g_value_get_uint (value);
+ guint accel_key = g_value_get_uint (value);
- if (priv->accel_key != accel_key)
- {
- priv->accel_key = accel_key;
- changed = TRUE;
- }
+ if (priv->accel_key != accel_key)
+ {
+ priv->accel_key = accel_key;
+ changed = TRUE;
+ }
}
break;
case PROP_ACCEL_MODS:
{
- guint accel_mods = g_value_get_flags (value);
+ guint accel_mods = g_value_get_flags (value);
- if (priv->accel_mods != accel_mods)
- {
- priv->accel_mods = accel_mods;
- changed = TRUE;
- }
+ if (priv->accel_mods != accel_mods)
+ {
+ priv->accel_mods = accel_mods;
+ changed = TRUE;
+ }
}
break;
case PROP_KEYCODE:
{
- guint keycode = g_value_get_uint (value);
+ guint keycode = g_value_get_uint (value);
- if (priv->keycode != keycode)
- {
- priv->keycode = keycode;
- changed = TRUE;
- }
+ if (priv->keycode != keycode)
+ {
+ priv->keycode = keycode;
+ changed = TRUE;
+ }
}
break;
@@ -402,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
@@ -437,6 +435,7 @@ grab_key_callback (GtkWidget *widget,
GtkCellRendererAccelPrivate *priv = accel->priv;
GdkModifierType accel_mods = 0;
guint accel_key;
+ guint keyval;
gchar *path;
gboolean edited;
gboolean cleared;
@@ -451,17 +450,32 @@ grab_key_callback (GtkWidget *widget,
edited = FALSE;
cleared = FALSE;
- gdk_keymap_translate_keyboard_state (gdk_keymap_get_for_display (display),
- event->hardware_keycode,
- event->state,
- event->group,
- NULL, NULL, NULL, &consumed_modifiers);
+ accel_mods = event->state;
+
+ 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 (event->keyval);
+ accel_key = gdk_keyval_to_lower (keyval);
if (accel_key == GDK_KEY_ISO_Left_Tab)
accel_key = GDK_KEY_Tab;
- accel_mods = event->state & gtk_accelerator_get_default_mod_mask ();
+ accel_mods &= gtk_accelerator_get_default_mod_mask ();
/* Filter consumed modifiers
*/
@@ -470,12 +484,12 @@ grab_key_callback (GtkWidget *widget,
/* Put shift back if it changed the case of the key, not otherwise.
*/
- if (accel_key != event->keyval)
+ if (accel_key != keyval)
accel_mods |= GDK_SHIFT_MASK;
if (accel_mods == 0)
{
- switch (event->keyval)
+ switch (keyval)
{
case GDK_KEY_Escape:
goto out; /* cancel */
@@ -491,11 +505,11 @@ grab_key_callback (GtkWidget *widget,
if (priv->accel_mode == GTK_CELL_RENDERER_ACCEL_MODE_GTK)
{
if (!gtk_accelerator_valid (accel_key, accel_mods))
- {
- gtk_widget_error_bell (widget);
+ {
+ gtk_widget_error_bell (widget);
- return TRUE;
- }
+ return TRUE;
+ }
}
edited = TRUE;
@@ -516,7 +530,7 @@ grab_key_callback (GtkWidget *widget,
if (edited)
g_signal_emit (accel, signals[ACCEL_EDITED], 0, path,
- accel_key, accel_mods, event->hardware_keycode);
+ accel_key, accel_mods, event->hardware_keycode);
else if (cleared)
g_signal_emit (accel, signals[ACCEL_CLEARED], 0, path);
@@ -545,7 +559,7 @@ ungrab_stuff (GtkWidget *widget,
static void
_gtk_cell_editable_event_box_start_editing (GtkCellEditable *cell_editable,
- GdkEvent *event)
+ GdkEvent *event)
{
/* do nothing, because we are pointless */
}
@@ -556,17 +570,75 @@ _gtk_cell_editable_event_box_cell_editable_init (GtkCellEditableIface *iface)
iface->start_editing = _gtk_cell_editable_event_box_start_editing;
}
-typedef GtkEventBox GtkCellEditableEventBox;
-typedef GtkEventBoxClass GtkCellEditableEventBoxClass;
+typedef struct _GtkCellEditableEventBox GtkCellEditableEventBox;
+typedef GtkEventBoxClass GtkCellEditableEventBoxClass;
+
+struct _GtkCellEditableEventBox
+{
+ GtkEventBox box;
+ 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) \
})
+enum {
+ PROP_ZERO,
+ PROP_EDITING_CANCELED
+};
+
+static void
+gtk_cell_editable_event_box_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GtkCellEditableEventBox *box = (GtkCellEditableEventBox*)object;
+
+ switch (prop_id)
+ {
+ case PROP_EDITING_CANCELED:
+ box->editing_canceled = g_value_get_boolean (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_cell_editable_event_box_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkCellEditableEventBox *box = (GtkCellEditableEventBox*)object;
+
+ switch (prop_id)
+ {
+ case PROP_EDITING_CANCELED:
+ g_value_set_boolean (value, box->editing_canceled);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
static void
_gtk_cell_editable_event_box_class_init (GtkCellEditableEventBoxClass *class)
{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+
+ gobject_class->set_property = gtk_cell_editable_event_box_set_property;
+ gobject_class->get_property = gtk_cell_editable_event_box_get_property;
+
+ g_object_class_override_property (gobject_class,
+ PROP_EDITING_CANCELED,
+ "editing-canceled");
}
static void
@@ -586,7 +658,8 @@ gtk_cell_renderer_accel_start_editing (GtkCellRenderer *cell,
GtkCellRendererAccelPrivate *priv;
GtkCellRendererText *celltext;
GtkCellRendererAccel *accel;
- GtkStyle *style;
+ GtkStyleContext *context;
+ GdkRGBA color;
GtkWidget *label;
GtkWidget *eventbox;
GdkDevice *device, *keyb, *pointer;
@@ -604,7 +677,7 @@ gtk_cell_renderer_accel_start_editing (GtkCellRenderer *cell,
return NULL;
window = gtk_widget_get_window (widget);
- style = gtk_widget_get_style (widget);
+ context = gtk_widget_get_style_context (widget);
g_return_val_if_fail (window != NULL, NULL);
@@ -658,21 +731,20 @@ gtk_cell_renderer_accel_start_editing (GtkCellRenderer *cell,
(gpointer) &priv->edit_widget);
label = gtk_label_new (NULL);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-
-
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
- gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL,
- &style->bg[GTK_STATE_SELECTED]);
+ gtk_style_context_get_background_color (context, GTK_STATE_FLAG_SELECTED, &color);
+ gtk_widget_override_background_color (eventbox, 0, &color);
- gtk_widget_modify_fg (label, GTK_STATE_NORMAL,
- &style->fg[GTK_STATE_SELECTED]);
+ gtk_style_context_get_color (context, GTK_STATE_FLAG_SELECTED, &color);
+ gtk_widget_override_color (label, 0, &color);
/* This label is displayed in a treeview cell displaying
* 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);