callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed the "TAB toggles dialogs" feature.

Browse Source 
2003-02-03  Michael Natterer  <mitch@gimp.org>

	* app/display/gimpdisplayshell-callbacks.c: fixed the "TAB toggles
	dialogs" feature.

	(gimp_display_shell_get_event_coords,device_coords): CLAMP() all
	extended axes to be safe against crappy XInput drivers and provide
	default values for not existing axes.
This commit is contained in:
Michael Natterer
2003-02-03 15:03:11 +00:00
committed by Michael Natterer
parent b55203abb5
commit e34df4d8d0
2 changed files with 92 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2003-02-03 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell-callbacks.c: fixed the "TAB toggles
dialogs" feature.
(gimp_display_shell_get_event_coords,device_coords): CLAMP() all
extended axes to be safe against crappy XInput drivers and provide
default values for not existing axes.
2003-02-03 Michael Natterer <mitch@gimp.org> 2003-02-03 Michael Natterer <mitch@gimp.org>
* app/config/gimpscanner.c (gimp_scanner_parse_int): handle * app/config/gimpscanner.c (gimp_scanner_parse_int): handle

137
app/display/gimpdisplayshell-callbacks.c
View File

@ -75,14 +75,14 @@ static void gimp_display_shell_vscrollbar_update (GtkAdjustment *adjustme
static void gimp_display_shell_hscrollbar_update (GtkAdjustment *adjustment, static void gimp_display_shell_hscrollbar_update (GtkAdjustment *adjustment,
GimpDisplayShell *shell); GimpDisplayShell *shell);
static gboolean gimp_display_shell_get_coords (GimpDisplayShell *shell, static gboolean gimp_display_shell_get_event_coords (GimpDisplayShell *shell,
GdkEvent *event, GdkEvent *event,
GdkDevice *device, GdkDevice *device,
GimpCoords *coords); GimpCoords *coords);
static void gimp_display_shell_get_device_coords (GimpDisplayShell *shell, static void gimp_display_shell_get_device_coords (GimpDisplayShell *shell,
GdkDevice *device, GdkDevice *device,
GimpCoords *coords); GimpCoords *coords);
static gboolean gimp_display_shell_get_state (GimpDisplayShell *shell, static gboolean gimp_display_shell_get_event_state (GimpDisplayShell *shell,
GdkEvent *event, GdkEvent *event,
GdkDevice *device, GdkDevice *device,
GdkModifierType *state); GdkModifierType *state);
@ -393,12 +393,12 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
gimp_display_shell_check_device_cursor (shell); gimp_display_shell_check_device_cursor (shell);
} }
gimp_display_shell_get_coords (shell, event, gimp_display_shell_get_event_coords (shell, event,
gimp_devices_get_current (gimp), gimp_devices_get_current (gimp),
&display_coords); &display_coords);
gimp_display_shell_get_state (shell, event, gimp_display_shell_get_event_state (shell, event,
gimp_devices_get_current (gimp), gimp_devices_get_current (gimp),
&state); &state);
time = gdk_event_get_time (event); time = gdk_event_get_time (event);
/* GimpCoords passed to tools are ALWAYS in image coordinates */ /* GimpCoords passed to tools are ALWAYS in image coordinates */
@ -796,12 +796,12 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
{ {
g_print ("gimp_display_shell_compress_motion() returned an event\n"); g_print ("gimp_display_shell_compress_motion() returned an event\n");
gimp_display_shell_get_coords (shell, compressed_motion, gimp_display_shell_get_event_coords (shell, compressed_motion,
gimp_devices_get_current (gimp), gimp_devices_get_current (gimp),
&display_coords); &display_coords);
gimp_display_shell_get_state (shell, compressed_motion, gimp_display_shell_get_event_state (shell, compressed_motion,
gimp_devices_get_current (gimp), gimp_devices_get_current (gimp),
&state); &state);
time = gdk_event_get_time (event); time = gdk_event_get_time (event);
/* GimpCoords passed to tools are ALWAYS in image coordinates */ /* GimpCoords passed to tools are ALWAYS in image coordinates */
@ -973,7 +973,13 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
break; break;
case GDK_Tab: case GDK_Tab:
if (! gimp_image_is_empty (gimage)) if (! state)
{
/* Hide or show all dialogs */
gimp_dialog_factories_toggle (global_toolbox_factory);
}
else if (! gimp_image_is_empty (gimage))
{ {
if (state & GDK_MOD1_MASK) if (state & GDK_MOD1_MASK)
{ {
@ -986,14 +992,6 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
-1, kevent->time); -1, kevent->time);
} }
} }
else if (! state)
{
/* Hide or show all dialogs */
g_print ("toggle dialogs\n");
gimp_dialog_factories_toggle (global_toolbox_factory);
}
return_val = TRUE; return_val = TRUE;
break; break;
@ -1407,27 +1405,39 @@ gimp_display_shell_hscrollbar_update (GtkAdjustment *adjustment,
} }
static gboolean static gboolean
gimp_display_shell_get_coords (GimpDisplayShell *shell, gimp_display_shell_get_event_coords (GimpDisplayShell *shell,
GdkEvent *event, GdkEvent *event,
GdkDevice *device, GdkDevice *device,
GimpCoords *coords) GimpCoords *coords)
{ {
/* initialize extended axes to something meaningful because each of
* the following *_get_axis() calls may return FALSE and leave the
* passed gdouble location untouched
*/
coords->pressure = 1.0;
coords->xtilt = 0.5;
coords->ytilt = 0.5;
coords->wheel = 0.5;
if (gdk_event_get_axis (event, GDK_AXIS_X, &coords->x)) if (gdk_event_get_axis (event, GDK_AXIS_X, &coords->x))
{ {
gdk_event_get_axis (event, GDK_AXIS_Y, &coords->y); gdk_event_get_axis (event, GDK_AXIS_Y, &coords->y);
gdk_event_get_axis (event, GDK_AXIS_PRESSURE, &coords->pressure);
gdk_event_get_axis (event, GDK_AXIS_XTILT, &coords->xtilt); /* CLAMP() the return value of each *_get_axis() call to be safe
gdk_event_get_axis (event, GDK_AXIS_YTILT, &coords->ytilt); * against buggy XInput drivers. Provide default values if the
gdk_event_get_axis (event, GDK_AXIS_WHEEL, &coords->wheel); * requested axis does not exist.
*/
if (gdk_event_get_axis (event, GDK_AXIS_PRESSURE, &coords->pressure))
coords->pressure = CLAMP (coords->pressure, 0.0, 1.0);
else
coords->pressure = 1.0;
if (gdk_event_get_axis (event, GDK_AXIS_XTILT, &coords->xtilt))
coords->xtilt = CLAMP (coords->xtilt, 0.0, 1.0);
else
coords->xtilt = 0.5;
if (gdk_event_get_axis (event, GDK_AXIS_YTILT, &coords->ytilt))
coords->ytilt = CLAMP (coords->ytilt, 0.0, 1.0);
else
coords->ytilt = 0.5;
if (gdk_event_get_axis (event, GDK_AXIS_WHEEL, &coords->wheel))
coords->wheel = CLAMP (coords->wheel, 0.0, 1.0);
else
coords->wheel = 0.5;
return TRUE; return TRUE;
} }
@ -1446,24 +1456,43 @@ gimp_display_shell_get_device_coords (GimpDisplayShell *shell,
gdk_device_get_state (device, shell->canvas->window, axes, NULL); gdk_device_get_state (device, shell->canvas->window, axes, NULL);
gdk_device_get_axis (device, axes, GDK_AXIS_X, &coords->x); gdk_device_get_axis (device, axes, GDK_AXIS_X, &coords->x);
gdk_device_get_axis (device, axes, GDK_AXIS_Y, &coords->y); gdk_device_get_axis (device, axes, GDK_AXIS_Y, &coords->y);
gdk_device_get_axis (device, axes, GDK_AXIS_PRESSURE, &coords->pressure);
gdk_device_get_axis (device, axes, GDK_AXIS_XTILT, &coords->xtilt); /* CLAMP() the return value of each *_get_axis() call to be safe
gdk_device_get_axis (device, axes, GDK_AXIS_YTILT, &coords->ytilt); * against buggy XInput drivers. Provide default values if the
gdk_device_get_axis (device, axes, GDK_AXIS_WHEEL, &coords->wheel); * requested axis does not exist.
*/
if (gdk_device_get_axis (device, axes, GDK_AXIS_PRESSURE, &coords->pressure))
coords->pressure = CLAMP (coords->pressure, 0.0, 1.0);
else
coords->pressure = 1.0;
if (gdk_device_get_axis (device, axes, GDK_AXIS_XTILT, &coords->xtilt))
coords->xtilt = CLAMP (coords->xtilt, 0.0, 1.0);
else
coords->xtilt = 0.5;
if (gdk_device_get_axis (device, axes, GDK_AXIS_YTILT, &coords->ytilt))
coords->ytilt = CLAMP (coords->ytilt, 0.0, 1.0);
else
coords->ytilt = 0.5;
if (gdk_device_get_axis (device, axes, GDK_AXIS_WHEEL, &coords->wheel))
coords->wheel = CLAMP (coords->wheel, 0.0, 1.0);
else
coords->wheel = 0.5;
} }
static gboolean static gboolean
gimp_display_shell_get_state (GimpDisplayShell *shell, gimp_display_shell_get_event_state (GimpDisplayShell *shell,
GdkEvent *event, GdkEvent *event,
GdkDevice *device, GdkDevice *device,
GdkModifierType *state) GdkModifierType *state)
{ {
if (gdk_event_get_state (event, state)) if (gdk_event_get_state (event, state))
{ return TRUE;
return TRUE;
}
gimp_display_shell_get_device_state (shell, device, state); gimp_display_shell_get_device_state (shell, device, state);