Author: mitch
Date: Sat Feb 16 17:51:02 2008
New Revision: 24894
URL: http://svn.gnome.org/viewvc/gimp?rev=24894&view=rev
Log:
2008-02-16 Michael Natterer <[EMAIL PROTECTED]>
* app/display/gimpdisplayshell-callbacks.c
* app/tools/gimpforegroundselecttool.c
* app/tools/gimpimagemaptool.c
* app/tools/gimpiscissorstool.c
* app/tools/gimppolygonselecttool.c
* app/tools/gimprectangletool.c
* app/tools/gimptransformtool.c
* app/tools/gimpvectortool.c
* app/widgets/gimpcontainerpopup.c
* app/widgets/gimppaletteview.c
* libgimpwidgets/gimpcolorhexentry.c
* libgimpwidgets/gimpnumberpairentry.c
* plug-ins/script-fu/script-fu-console.c: Unify the handling of
various "Enter" and "Space" keysyms all over the place. Fixes bug
#516544 (also see gtk bug #515047).
Modified:
trunk/ChangeLog
trunk/app/display/gimpdisplayshell-callbacks.c
trunk/app/tools/gimpforegroundselecttool.c
trunk/app/tools/gimpimagemaptool.c
trunk/app/tools/gimpiscissorstool.c
trunk/app/tools/gimppolygonselecttool.c
trunk/app/tools/gimprectangletool.c
trunk/app/tools/gimptransformtool.c
trunk/app/tools/gimpvectortool.c
trunk/app/widgets/gimpcontainerpopup.c
trunk/app/widgets/gimppaletteview.c
trunk/libgimpwidgets/gimpcolorhexentry.c
trunk/libgimpwidgets/gimpnumberpairentry.c
trunk/plug-ins/script-fu/script-fu-console.c
Modified: trunk/app/display/gimpdisplayshell-callbacks.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-callbacks.c (original)
+++ trunk/app/display/gimpdisplayshell-callbacks.c Sat Feb 16 17:51:02 2008
@@ -141,7 +141,8 @@
if (event->type == GDK_KEY_PRESS)
{
- if (kevent->keyval == GDK_space &&
shell->space_release_pending)
+ if ((kevent->keyval == GDK_space ||
+ kevent->keyval == GDK_KP_Space) &&
shell->space_release_pending)
{
shell->space_pressed = TRUE;
shell->space_release_pending = FALSE;
@@ -149,7 +150,8 @@
}
else
{
- if (kevent->keyval == GDK_space && shell->space_pressed)
+ if ((kevent->keyval == GDK_space ||
+ kevent->keyval == GDK_KP_Space) && shell->space_pressed)
{
shell->space_pressed = FALSE;
shell->space_release_pending = TRUE;
@@ -164,12 +166,15 @@
case GDK_Left: case GDK_Right:
case GDK_Up: case GDK_Down:
case GDK_space:
+ case GDK_KP_Space:
case GDK_Tab:
case GDK_ISO_Left_Tab:
case GDK_Alt_L: case GDK_Alt_R:
case GDK_Shift_L: case GDK_Shift_R:
case GDK_Control_L: case GDK_Control_R:
- case GDK_Return: case GDK_KP_Enter:
+ case GDK_Return:
+ case GDK_KP_Enter:
+ case GDK_ISO_Enter:
case GDK_BackSpace: case GDK_Delete:
break;
@@ -1346,6 +1351,7 @@
{
case GDK_Return:
case GDK_KP_Enter:
+ case GDK_ISO_Enter:
case GDK_BackSpace:
case GDK_Delete:
case GDK_Escape:
@@ -1369,6 +1375,7 @@
break;
case GDK_space:
+ case GDK_KP_Space:
gimp_display_shell_space_pressed (shell, state, time);
return_val = TRUE;
break;
@@ -1460,6 +1467,7 @@
switch (kevent->keyval)
{
case GDK_space:
+ case GDK_KP_Space:
gimp_display_shell_space_released (shell, state, time);
return_val = TRUE;
break;
Modified: trunk/app/tools/gimpforegroundselecttool.c
==============================================================================
--- trunk/app/tools/gimpforegroundselecttool.c (original)
+++ trunk/app/tools/gimpforegroundselecttool.c Sat Feb 16 17:51:02 2008
@@ -398,8 +398,9 @@
switch (kevent->keyval)
{
- case GDK_KP_Enter:
case GDK_Return:
+ case GDK_KP_Enter:
+ case GDK_ISO_Enter:
gimp_foreground_select_tool_apply (fg_select, display);
return TRUE;
Modified: trunk/app/tools/gimpimagemaptool.c
==============================================================================
--- trunk/app/tools/gimpimagemaptool.c (original)
+++ trunk/app/tools/gimpimagemaptool.c Sat Feb 16 17:51:02 2008
@@ -476,8 +476,9 @@
{
switch (kevent->keyval)
{
- case GDK_KP_Enter:
case GDK_Return:
+ case GDK_KP_Enter:
+ case GDK_ISO_Enter:
gimp_image_map_tool_response (NULL, GTK_RESPONSE_OK, image_map_tool);
return TRUE;
Modified: trunk/app/tools/gimpiscissorstool.c
==============================================================================
--- trunk/app/tools/gimpiscissorstool.c (original)
+++ trunk/app/tools/gimpiscissorstool.c Sat Feb 16 17:51:02 2008
@@ -1060,8 +1060,9 @@
switch (kevent->keyval)
{
- case GDK_KP_Enter:
case GDK_Return:
+ case GDK_KP_Enter:
+ case GDK_ISO_Enter:
if (iscissors->connected && iscissors->mask)
{
gimp_iscissors_tool_apply (iscissors, display);
Modified: trunk/app/tools/gimppolygonselecttool.c
==============================================================================
--- trunk/app/tools/gimppolygonselecttool.c (original)
+++ trunk/app/tools/gimppolygonselecttool.c Sat Feb 16 17:51:02 2008
@@ -412,8 +412,9 @@
handled_key = TRUE;
break;
- case GDK_KP_Enter:
case GDK_Return:
+ case GDK_KP_Enter:
+ case GDK_ISO_Enter:
gimp_polygon_select_tool_commit (poly_sel_tool, display);
handled_key = TRUE;
break;
Modified: trunk/app/tools/gimprectangletool.c
==============================================================================
--- trunk/app/tools/gimprectangletool.c (original)
+++ trunk/app/tools/gimprectangletool.c Sat Feb 16 17:51:02 2008
@@ -1350,8 +1350,9 @@
dy = 1;
break;
- case GDK_KP_Enter:
case GDK_Return:
+ case GDK_KP_Enter:
+ case GDK_ISO_Enter:
if (gimp_rectangle_tool_execute (rect_tool))
gimp_rectangle_tool_halt (rect_tool);
return TRUE;
Modified: trunk/app/tools/gimptransformtool.c
==============================================================================
--- trunk/app/tools/gimptransformtool.c (original)
+++ trunk/app/tools/gimptransformtool.c Sat Feb 16 17:51:02 2008
@@ -505,8 +505,9 @@
{
switch (kevent->keyval)
{
- case GDK_KP_Enter:
case GDK_Return:
+ case GDK_KP_Enter:
+ case GDK_ISO_Enter:
gimp_transform_tool_response (NULL, GTK_RESPONSE_OK, trans_tool);
return TRUE;
Modified: trunk/app/tools/gimpvectortool.c
==============================================================================
--- trunk/app/tools/gimpvectortool.c (original)
+++ trunk/app/tools/gimpvectortool.c Sat Feb 16 17:51:02 2008
@@ -767,8 +767,9 @@
switch (kevent->keyval)
{
- case GDK_KP_Enter:
case GDK_Return:
+ case GDK_KP_Enter:
+ case GDK_ISO_Enter:
gimp_vector_tool_to_selection_extended (vector_tool, kevent->state);
break;
Modified: trunk/app/widgets/gimpcontainerpopup.c
==============================================================================
--- trunk/app/widgets/gimpcontainerpopup.c (original)
+++ trunk/app/widgets/gimpcontainerpopup.c Sat Feb 16 17:51:02 2008
@@ -123,8 +123,12 @@
"confirm", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
"confirm", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0,
+ "confirm", 0);
gtk_binding_entry_add_signal (binding_set, GDK_space, 0,
"confirm", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, 0,
+ "confirm", 0);
}
static void
Modified: trunk/app/widgets/gimppaletteview.c
==============================================================================
--- trunk/app/widgets/gimppaletteview.c (original)
+++ trunk/app/widgets/gimppaletteview.c Sat Feb 16 17:51:02 2008
@@ -266,9 +266,11 @@
GimpPaletteView *view = GIMP_PALETTE_VIEW (widget);
if (view->selected &&
- (kevent->keyval == GDK_space ||
- kevent->keyval == GDK_Return ||
- kevent->keyval == GDK_KP_Enter))
+ (kevent->keyval == GDK_space ||
+ kevent->keyval == GDK_KP_Space ||
+ kevent->keyval == GDK_Return ||
+ kevent->keyval == GDK_KP_Enter ||
+ kevent->keyval == GDK_ISO_Enter))
{
g_signal_emit (view, view_signals[ENTRY_CLICKED], 0,
view->selected, kevent->state);
Modified: trunk/libgimpwidgets/gimpcolorhexentry.c
==============================================================================
--- trunk/libgimpwidgets/gimpcolorhexentry.c (original)
+++ trunk/libgimpwidgets/gimpcolorhexentry.c Sat Feb 16 17:51:02 2008
@@ -216,39 +216,48 @@
GdkEvent *event)
{
GimpColorHexEntry *entry = GIMP_COLOR_HEX_ENTRY (widget);
- const gchar *text;
- gchar buffer[8];
- guchar r, g, b;
switch (event->type)
{
case GDK_KEY_PRESS:
- if (((GdkEventKey *) event)->keyval != GDK_Return)
- break;
- /* else fall through */
+ {
+ GdkEventKey *kevent = (GdkEventKey *) event;
- case GDK_FOCUS_CHANGE:
- text = gtk_entry_get_text (GTK_ENTRY (widget));
-
- gimp_rgb_get_uchar (&entry->color, &r, &g, &b);
- g_snprintf (buffer, sizeof (buffer), "%.2x%.2x%.2x", r, g, b);
+ if (kevent->keyval != GDK_Return &&
+ kevent->keyval != GDK_KP_Enter &&
+ kevent->keyval != GDK_ISO_Enter)
+ break;
+ /* else fall through */
+ }
- if (g_ascii_strcasecmp (buffer, text) != 0)
- {
- GimpRGB color;
- gsize len = strlen (text);
-
- if (len > 0 &&
- (gimp_rgb_parse_hex (&color, text, len) ||
- gimp_rgb_parse_name (&color, text, -1)))
- {
- gimp_color_hex_entry_set_color (entry, &color);
- }
- else
- {
- gtk_entry_set_text (GTK_ENTRY (entry), buffer);
- }
- }
+ case GDK_FOCUS_CHANGE:
+ {
+ const gchar *text;
+ gchar buffer[8];
+ guchar r, g, b;
+
+ text = gtk_entry_get_text (GTK_ENTRY (widget));
+
+ gimp_rgb_get_uchar (&entry->color, &r, &g, &b);
+ g_snprintf (buffer, sizeof (buffer), "%.2x%.2x%.2x", r, g, b);
+
+ if (g_ascii_strcasecmp (buffer, text) != 0)
+ {
+ GimpRGB color;
+ gsize len = strlen (text);
+
+ if (len > 0 &&
+ (gimp_rgb_parse_hex (&color, text, len) ||
+ gimp_rgb_parse_name (&color, text, -1)))
+ {
+ gimp_color_hex_entry_set_color (entry, &color);
+ }
+ else
+ {
+ gtk_entry_set_text (GTK_ENTRY (entry), buffer);
+ }
+ }
+ }
break;
default:
Modified: trunk/libgimpwidgets/gimpnumberpairentry.c
==============================================================================
--- trunk/libgimpwidgets/gimpnumberpairentry.c (original)
+++ trunk/libgimpwidgets/gimpnumberpairentry.c Sat Feb 16 17:51:02 2008
@@ -818,7 +818,9 @@
{
GdkEventKey *kevent = (GdkEventKey *) event;
- if (kevent->keyval != GDK_Return)
+ if (kevent->keyval != GDK_Return &&
+ kevent->keyval != GDK_KP_Enter &&
+ kevent->keyval != GDK_ISO_Enter)
break;
/* If parsing was done due to widgets focus being lost, we only change
Modified: trunk/plug-ins/script-fu/script-fu-console.c
==============================================================================
--- trunk/plug-ins/script-fu/script-fu-console.c (original)
+++ trunk/plug-ins/script-fu/script-fu-console.c Sat Feb 16 17:51:02 2008
@@ -564,6 +564,8 @@
switch (event->keyval)
{
case GDK_Return:
+ case GDK_KP_Enter:
+ case GDK_ISO_Enter:
if (script_fu_cc_is_empty (console))
return TRUE;
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
