--- gimp-painter--2.6.6-20100521/app/config/gimpguiconfig.c 2010-06-27 02:33:35 +0900 +++ gimp-painter--2.6.6-20100627/app/config/gimpguiconfig.c 2008-11-21 07:43:04 +0900 @@ -84,8 +84,6 @@ PROP_DOCK_WINDOW_HINT, PROP_TRANSIENT_DOCKS, PROP_CURSOR_FORMAT, - PROP_SYSTEM_COORDS_STYLUS, - PROP_SYSTEM_COORDS_PUCK, /* ignored, only for backward compatibility: */ PROP_INFO_WINDOW_PER_DISPLAY, @@ -275,16 +273,6 @@ GIMP_TYPE_CURSOR_FORMAT, GIMP_CURSOR_FORMAT_PIXBUF, GIMP_PARAM_STATIC_STRINGS); - GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SYSTEM_COORDS_STYLUS, - "system-coords-stylus", - SYSTEM_COORDS_STYLUS_BLURB, - FALSE, - GIMP_PARAM_STATIC_STRINGS); - GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SYSTEM_COORDS_PUCK, - "system-coords-puck", - SYSTEM_COORDS_PUCK_BLURB, - FALSE, - GIMP_PARAM_STATIC_STRINGS); /* only for backward compatibility: */ GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_INFO_WINDOW_PER_DISPLAY, @@ -435,12 +423,6 @@ case PROP_CURSOR_FORMAT: gui_config->cursor_format = g_value_get_enum (value); break; - case PROP_SYSTEM_COORDS_STYLUS: - gui_config->system_coords_stylus = g_value_get_boolean (value); - break; - case PROP_SYSTEM_COORDS_PUCK: - gui_config->system_coords_puck = g_value_get_boolean (value); - break; case PROP_INFO_WINDOW_PER_DISPLAY: case PROP_SHOW_TOOL_TIPS: @@ -560,12 +542,6 @@ case PROP_CURSOR_FORMAT: g_value_set_enum (value, gui_config->cursor_format); break; - case PROP_SYSTEM_COORDS_STYLUS: - g_value_set_boolean (value, gui_config->system_coords_stylus); - break; - case PROP_SYSTEM_COORDS_PUCK: - g_value_set_boolean (value, gui_config->system_coords_puck); - break; case PROP_INFO_WINDOW_PER_DISPLAY: case PROP_SHOW_TOOL_TIPS: --- gimp-painter--2.6.6-20100521/app/config/gimpguiconfig.h 2010-06-27 02:33:35 +0900 +++ gimp-painter--2.6.6-20100627/app/config/gimpguiconfig.h 2008-11-21 07:43:04 +0900 @@ -72,8 +72,6 @@ GimpWindowHint dock_window_hint; gboolean transient_docks; GimpCursorFormat cursor_format; - gboolean system_coords_stylus; - gboolean system_coords_puck; gint last_tip; /* saved in sessionrc */ }; --- gimp-painter--2.6.6-20100521/app/config/gimprc-blurbs.h 2010-06-27 02:33:35 +0900 +++ gimp-painter--2.6.6-20100627/app/config/gimprc-blurbs.h 2008-11-21 07:43:04 +0900 @@ -450,11 +450,5 @@ #define ZOOM_QUALITY_BLURB \ "There's a tradeoff between speed and quality of the zoomed-out display." -#define SYSTEM_COORDS_STYLUS_BLURB \ -"Try to turn on when the cursor position is not correctly with stylus pen." - -#define SYSTEM_COORDS_PUCK_BLURB \ -"Try to turn on when the cursor position is not correctly with tablet mouse." - #endif /* __GIMP_RC_BLURBS_H__ */ --- gimp-painter--2.6.6-20100521/app/dialogs/about-dialog.c 2010-06-27 02:33:35 +0900 +++ gimp-painter--2.6.6-20100627/app/dialogs/about-dialog.c 2010-06-27 04:34:05 +0900 @@ -609,7 +609,7 @@ gtk_widget_show (label); #endif - label = gtk_label_new (_("gimp-painter- (release 20100521)")); + label = gtk_label_new (_("gimp-painter- (release 20100627)")); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); gtk_box_reorder_child (GTK_BOX (vbox), label, 2); gtk_widget_show (label); --- gimp-painter--2.6.6-20100521/app/dialogs/preferences-dialog.c 2010-06-27 02:33:35 +0900 +++ gimp-painter--2.6.6-20100627/app/dialogs/preferences-dialog.c 2010-06-27 04:34:06 +0900 @@ -2602,23 +2602,6 @@ g_object_set_data (G_OBJECT (button), "clear-button", button2); - /* Device coords */ - vbox2 = prefs_frame_new (_("Use System Coords"), - GTK_CONTAINER (vbox), FALSE); - - button = prefs_check_button_add (object, "system-coords-stylus", - _("_Stylus and Eraser"), - GTK_BOX (vbox2)); - - button2 = prefs_check_button_add (object, "system-coords-puck", - _("_Mouse and Lens Cursor"), - GTK_BOX (vbox2)); - -#ifndef G_OS_WIN32 - gtk_widget_set_sensitive (button, FALSE); - gtk_widget_set_sensitive (button2, FALSE); -#endif - /****************************/ /* Additional Controllers */ --- gimp-painter--2.6.6-20100521/app/display/gimpdisplay.c 2010-06-27 02:33:35 +0900 +++ gimp-painter--2.6.6-20100627/app/display/gimpdisplay.c 2008-11-21 07:43:04 +0900 @@ -26,7 +26,6 @@ #include "tools/tools-types.h" #include "config/gimpdisplayconfig.h" -#include "config/gimpguiconfig.h" #include "core/gimp.h" #include "core/gimparea.h" @@ -188,7 +187,6 @@ case PROP_GIMP: display->gimp = g_value_get_object (value); /* don't ref the gimp */ display->config = GIMP_DISPLAY_CONFIG (display->gimp->config); - display->gui_config = GIMP_GUI_CONFIG (display->gimp->config); break; case PROP_IMAGE: --- gimp-painter--2.6.6-20100521/app/display/gimpdisplay.h 2010-06-27 02:33:35 +0900 +++ gimp-painter--2.6.6-20100627/app/display/gimpdisplay.h 2008-11-21 07:43:04 +0900 @@ -41,7 +41,6 @@ Gimp *gimp; /* global gimp instance */ GimpDisplayConfig *config; - GimpGuiConfig *gui_config; GimpImage *image; /* pointer to the associated image */ gint instance; /* the instance # of this display as */ --- gimp-painter--2.6.6-20100521/app/display/gimpdisplayshell-callbacks.c 2010-06-27 02:33:35 +0900 +++ gimp-painter--2.6.6-20100627/app/display/gimpdisplayshell-callbacks.c 2010-06-27 04:34:06 +0900 @@ -24,10 +24,6 @@ #include #include -#ifdef G_OS_WIN32 -#include -#endif - #include "libgimpmath/gimpmath.h" #include "libgimpcolor/gimpcolor.h" #include "libgimpwidgets/gimpwidgets.h" @@ -36,7 +32,6 @@ #include "tools/tools-types.h" #include "config/gimpdisplayconfig.h" -#include "config/gimpguiconfig.h" #include "core/gimp.h" #include "core/gimpcontext.h" @@ -1756,32 +1751,6 @@ } -#ifdef G_OS_WIN32 -gboolean -gimp_display_shell_motion_notify (GimpDisplayShell *shell, - GdkEventMotion *event) -{ - GimpGuiConfig *gui_config = shell->display->gui_config; - GdkDevice *device = event->device; - - if ((gui_config->system_coords_stylus && - (device->source == GDK_SOURCE_PEN || device->source == GDK_SOURCE_ERASER))|| - (gui_config->system_coords_puck && device->source == GDK_SOURCE_CURSOR)) - { - GdkDevice *core_pointer = gdk_device_get_core_pointer (); - gdouble axes[GDK_AXIS_LAST]; - - gdk_device_get_state (core_pointer, shell->canvas->window, axes, NULL); - - gdk_device_get_axis (core_pointer, axes, GDK_AXIS_X, &event->x); - gdk_device_get_axis (core_pointer, axes, GDK_AXIS_Y, &event->y); - } - - return FALSE; -} -#endif - - /* private functions */ static void --- gimp-painter--2.6.6-20100521/app/display/gimpdisplayshell-callbacks.h 2010-06-27 02:33:35 +0900 +++ gimp-painter--2.6.6-20100627/app/display/gimpdisplayshell-callbacks.h 2008-11-21 07:43:04 +0900 @@ -57,10 +57,5 @@ GdkEventButton *bevent, GimpDisplayShell *shell); -#ifdef G_OS_WIN32 -gboolean gimp_display_shell_motion_notify (GimpDisplayShell *shell, - GdkEventMotion *event); -#endif - #endif /* __GIMP_DISPLAY_SHELL_CALLBACKS_H__ */ --- gimp-painter--2.6.6-20100521/app/display/gimpdisplayshell-coords.c 2010-06-27 02:33:35 +0900 +++ gimp-painter--2.6.6-20100627/app/display/gimpdisplayshell-coords.c 2008-11-21 07:43:04 +0900 @@ -24,9 +24,6 @@ #include "display-types.h" -#include "config/gimpguiconfig.h" - -#include "gimpdisplay.h" #include "gimpdisplayshell.h" #include "gimpdisplayshell-coords.h" @@ -43,29 +40,7 @@ { if (gdk_event_get_axis (event, GDK_AXIS_X, &coords->x)) { -#ifdef G_OS_WIN32 - GimpGuiConfig *gui_config = shell->display->gui_config; - - if ((gui_config->system_coords_stylus && - (device->source == GDK_SOURCE_PEN || device->source == GDK_SOURCE_ERASER))|| - (gui_config->system_coords_puck && device->source == GDK_SOURCE_CURSOR)) - { - GdkDevice *core_pointer = gdk_device_get_core_pointer (); - gdouble axes[GDK_AXIS_LAST]; - - gdk_device_get_state (core_pointer, shell->canvas->window, axes, NULL); - - gdk_device_get_axis (core_pointer, axes, GDK_AXIS_X, &coords->x); - gdk_device_get_axis (core_pointer, axes, GDK_AXIS_Y, &coords->y); - - event->motion.x = coords->x; - event->motion.y = coords->y; - } - else - gdk_event_get_axis (event, GDK_AXIS_Y, &coords->y); -#else gdk_event_get_axis (event, GDK_AXIS_Y, &coords->y); -#endif /* CLAMP() the return value of each *_get_axis() call to be safe * against buggy XInput drivers. Provide default values if the @@ -111,22 +86,8 @@ { gdouble axes[GDK_AXIS_LAST]; -#ifdef G_OS_WIN32 - GimpGuiConfig *gui_config = shell->display->gui_config; -#endif - gdk_device_get_state (device, shell->canvas->window, axes, NULL); -#ifdef G_OS_WIN32 - if ((gui_config->system_coords_stylus && - (device->source == GDK_SOURCE_PEN || device->source == GDK_SOURCE_ERASER)) || - (gui_config->system_coords_puck && device->source == GDK_SOURCE_CURSOR)) - { - gdk_device_get_state (gdk_device_get_core_pointer (), - shell->canvas->window, axes, NULL); - } -#endif - gdk_device_get_axis (device, axes, GDK_AXIS_X, &coords->x); gdk_device_get_axis (device, axes, GDK_AXIS_Y, &coords->y); --- gimp-painter--2.6.6-20100521/app/display/gimpdisplayshell.c 2010-06-27 02:33:35 +0900 +++ gimp-painter--2.6.6-20100627/app/display/gimpdisplayshell.c 2009-03-16 05:57:09 +0900 @@ -1039,24 +1039,11 @@ gimp_display_shell_dnd_init (shell); gimp_display_shell_selection_init (shell); -#ifdef G_OS_WIN32 - /* Modify the x-y coords of motion event before invoking rulers' - default handler */ - g_signal_connect_swapped (shell->canvas, "motion-notify-event", - G_CALLBACK (gimp_display_shell_motion_notify), - shell); -#endif - /* the horizontal ruler */ shell->hrule = gimp_ruler_new (GTK_ORIENTATION_HORIZONTAL); gtk_widget_set_events (GTK_WIDGET (shell->hrule), GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); -#ifdef G_OS_WIN32 - g_signal_connect_swapped (shell->hrule, "motion-notify-event", - G_CALLBACK (gimp_display_shell_motion_notify), - shell); -#endif g_signal_connect_swapped (shell->canvas, "motion-notify-event", G_CALLBACK (GTK_WIDGET_GET_CLASS (shell->hrule)->motion_notify_event), shell->hrule); @@ -1071,11 +1058,6 @@ gtk_widget_set_events (GTK_WIDGET (shell->vrule), GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); -#ifdef G_OS_WIN32 - g_signal_connect_swapped (shell->vrule, "motion-notify-event", - G_CALLBACK (gimp_display_shell_motion_notify), - shell); -#endif g_signal_connect_swapped (shell->canvas, "motion-notify-event", G_CALLBACK (GTK_WIDGET_GET_CLASS (shell->vrule)->motion_notify_event), shell->vrule); --- gimp-painter--2.6.6-20100521/app/widgets/gimpdeviceinfo.c 2010-06-27 02:33:36 +0900 +++ gimp-painter--2.6.6-20100627/app/widgets/gimpdeviceinfo.c 2008-11-21 07:43:05 +0900 @@ -428,18 +428,6 @@ device_info->num_keys = device->num_keys; device_info->keys = NULL; -#ifdef G_OS_WIN32 - //g_printerr ("- - - ->> device name : %s\n", device->name); - { - gchar *name = g_ascii_strdown (device->name, -1); - - if (g_strrstr (name, "puck")) - gdk_device_set_source (device, GDK_SOURCE_CURSOR); - - g_free (name); - } -#endif - return device_info; }