From c6ba0ffbdfa33bbc2067ffa686707be4187bb9d1 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 26 Aug 2012 22:53:04 +0200 Subject: [PATCH] app/cursors/libgimpwidgets: bye bye stone age B&W bitmap cursors --- app/config/gimpguiconfig.c | 21 ++- app/config/gimpguiconfig.h | 1 - app/dialogs/preferences-dialog.c | 7 +- app/display/gimpdisplayshell-cursor.c | 11 +- app/display/gimpdisplayshell.c | 1 - app/display/gimpdisplayshell.h | 1 - app/widgets/gimpcursor.c | 165 ++++++++-------------- app/widgets/gimpcursor.h | 2 - app/widgets/gimpdialogfactory.c | 1 - cursors/Makefile.am | 57 +------- cursors/cursor-bad-bw.png | Bin 211 -> 0 bytes cursors/cursor-color-picker-bw.png | Bin 222 -> 0 bytes cursors/cursor-corner-bottom-left-bw.png | Bin 198 -> 0 bytes cursors/cursor-corner-bottom-right-bw.png | Bin 158 -> 0 bytes cursors/cursor-corner-top-left-bw.png | Bin 268 -> 0 bytes cursors/cursor-corner-top-right-bw.png | Bin 207 -> 0 bytes cursors/cursor-crosshair-bw.png | Bin 156 -> 0 bytes cursors/cursor-crosshair-small-bw.png | Bin 146 -> 0 bytes cursors/cursor-mouse-bw.png | Bin 180 -> 0 bytes cursors/cursor-move-bw.png | Bin 196 -> 0 bytes cursors/cursor-none-bw.png | Bin 96 -> 0 bytes cursors/cursor-side-bottom-bw.png | Bin 166 -> 0 bytes cursors/cursor-side-left-bw.png | Bin 181 -> 0 bytes cursors/cursor-side-right-bw.png | Bin 182 -> 0 bytes cursors/cursor-side-top-bw.png | Bin 171 -> 0 bytes cursors/cursor-zoom-bw.png | Bin 203 -> 0 bytes cursors/gimp-tool-cursors.xcf | Bin 122905 -> 64376 bytes cursors/tool-airbrush-bw.png | Bin 220 -> 0 bytes cursors/tool-blend-bw.png | Bin 179 -> 0 bytes cursors/tool-blur-bw.png | Bin 204 -> 0 bytes cursors/tool-bucket-fill-bw.png | Bin 214 -> 0 bytes cursors/tool-burn-bw.png | Bin 189 -> 0 bytes cursors/tool-clone-bw.png | Bin 207 -> 0 bytes cursors/tool-color-picker-bw.png | Bin 213 -> 0 bytes cursors/tool-crop-bw.png | Bin 184 -> 0 bytes cursors/tool-dodge-bw.png | Bin 189 -> 0 bytes cursors/tool-ellipse-select-bw.png | Bin 188 -> 0 bytes cursors/tool-eraser-bw.png | Bin 190 -> 0 bytes cursors/tool-flip-horizontal-bw.png | Bin 155 -> 0 bytes cursors/tool-flip-vertical-bw.png | Bin 174 -> 0 bytes cursors/tool-free-select-bw.png | Bin 210 -> 0 bytes cursors/tool-fuzzy-select-bw.png | Bin 227 -> 0 bytes cursors/tool-hand-bw.png | Bin 218 -> 0 bytes cursors/tool-heal-bw.png | Bin 883 -> 0 bytes cursors/tool-ink-bw.png | Bin 238 -> 0 bytes cursors/tool-iscissors-bw.png | Bin 245 -> 0 bytes cursors/tool-measure-bw.png | Bin 206 -> 0 bytes cursors/tool-move-bw.png | Bin 192 -> 0 bytes cursors/tool-paintbrush-bw.png | Bin 206 -> 0 bytes cursors/tool-paths-anchor-bw.png | Bin 245 -> 0 bytes cursors/tool-paths-bw.png | Bin 241 -> 0 bytes cursors/tool-paths-control-bw.png | Bin 256 -> 0 bytes cursors/tool-paths-segment-bw.png | Bin 258 -> 0 bytes cursors/tool-pencil-bw.png | Bin 165 -> 0 bytes cursors/tool-perspective-bw.png | Bin 174 -> 0 bytes cursors/tool-polygon-select-bw.png | Bin 219 -> 0 bytes cursors/tool-rect-select-bw.png | Bin 172 -> 0 bytes cursors/tool-resize-bw.png | Bin 193 -> 0 bytes cursors/tool-rotate-bw.png | Bin 255 -> 0 bytes cursors/tool-shear-bw.png | Bin 173 -> 0 bytes cursors/tool-smudge-bw.png | Bin 236 -> 0 bytes cursors/tool-text-bw.png | Bin 191 -> 0 bytes cursors/tool-zoom-bw.png | Bin 190 -> 0 bytes libgimpwidgets/gimppickbutton.c | 13 +- 64 files changed, 78 insertions(+), 202 deletions(-) delete mode 100644 cursors/cursor-bad-bw.png delete mode 100644 cursors/cursor-color-picker-bw.png delete mode 100644 cursors/cursor-corner-bottom-left-bw.png delete mode 100644 cursors/cursor-corner-bottom-right-bw.png delete mode 100644 cursors/cursor-corner-top-left-bw.png delete mode 100644 cursors/cursor-corner-top-right-bw.png delete mode 100644 cursors/cursor-crosshair-bw.png delete mode 100644 cursors/cursor-crosshair-small-bw.png delete mode 100644 cursors/cursor-mouse-bw.png delete mode 100644 cursors/cursor-move-bw.png delete mode 100644 cursors/cursor-none-bw.png delete mode 100644 cursors/cursor-side-bottom-bw.png delete mode 100644 cursors/cursor-side-left-bw.png delete mode 100644 cursors/cursor-side-right-bw.png delete mode 100644 cursors/cursor-side-top-bw.png delete mode 100644 cursors/cursor-zoom-bw.png delete mode 100644 cursors/tool-airbrush-bw.png delete mode 100644 cursors/tool-blend-bw.png delete mode 100644 cursors/tool-blur-bw.png delete mode 100644 cursors/tool-bucket-fill-bw.png delete mode 100644 cursors/tool-burn-bw.png delete mode 100644 cursors/tool-clone-bw.png delete mode 100644 cursors/tool-color-picker-bw.png delete mode 100644 cursors/tool-crop-bw.png delete mode 100644 cursors/tool-dodge-bw.png delete mode 100644 cursors/tool-ellipse-select-bw.png delete mode 100644 cursors/tool-eraser-bw.png delete mode 100644 cursors/tool-flip-horizontal-bw.png delete mode 100644 cursors/tool-flip-vertical-bw.png delete mode 100644 cursors/tool-free-select-bw.png delete mode 100644 cursors/tool-fuzzy-select-bw.png delete mode 100644 cursors/tool-hand-bw.png delete mode 100644 cursors/tool-heal-bw.png delete mode 100644 cursors/tool-ink-bw.png delete mode 100644 cursors/tool-iscissors-bw.png delete mode 100644 cursors/tool-measure-bw.png delete mode 100644 cursors/tool-move-bw.png delete mode 100644 cursors/tool-paintbrush-bw.png delete mode 100644 cursors/tool-paths-anchor-bw.png delete mode 100644 cursors/tool-paths-bw.png delete mode 100644 cursors/tool-paths-control-bw.png delete mode 100644 cursors/tool-paths-segment-bw.png delete mode 100644 cursors/tool-pencil-bw.png delete mode 100644 cursors/tool-perspective-bw.png delete mode 100644 cursors/tool-polygon-select-bw.png delete mode 100644 cursors/tool-rect-select-bw.png delete mode 100644 cursors/tool-resize-bw.png delete mode 100644 cursors/tool-rotate-bw.png delete mode 100644 cursors/tool-shear-bw.png delete mode 100644 cursors/tool-smudge-bw.png delete mode 100644 cursors/tool-text-bw.png delete mode 100644 cursors/tool-zoom-bw.png diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c index a1fc46496a..b3e4eb07ca 100644 --- a/app/config/gimpguiconfig.c +++ b/app/config/gimpguiconfig.c @@ -70,7 +70,6 @@ enum PROP_USER_MANUAL_ONLINE, PROP_USER_MANUAL_ONLINE_URI, PROP_DOCK_WINDOW_HINT, - PROP_CURSOR_FORMAT, PROP_CURSOR_HANDEDNESS, PROP_HIDE_DOCKS, @@ -78,6 +77,7 @@ enum PROP_LAST_TIP_SHOWN, /* ignored, only for backward compatibility: */ + PROP_CURSOR_FORMAT, PROP_INFO_WINDOW_PER_DISPLAY, PROP_MENU_MNEMONICS, PROP_SHOW_TOOL_TIPS, @@ -244,11 +244,6 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass) GIMP_WINDOW_HINT_UTILITY, GIMP_PARAM_STATIC_STRINGS | GIMP_CONFIG_PARAM_RESTART); - GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_CURSOR_FORMAT, - "cursor-format", CURSOR_FORMAT_BLURB, - GIMP_TYPE_CURSOR_FORMAT, - GIMP_CURSOR_FORMAT_PIXBUF, - GIMP_PARAM_STATIC_STRINGS); GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_CURSOR_HANDEDNESS, "cursor-handedness", CURSOR_HANDEDNESS_BLURB, GIMP_TYPE_HANDEDNESS, @@ -280,6 +275,12 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass) GIMP_PARAM_STATIC_STRINGS)); /* only for backward compatibility: */ + GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_CURSOR_FORMAT, + "cursor-format", CURSOR_FORMAT_BLURB, + GIMP_TYPE_CURSOR_FORMAT, + GIMP_CURSOR_FORMAT_PIXBUF, + GIMP_PARAM_STATIC_STRINGS | + GIMP_CONFIG_PARAM_IGNORE); GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_INFO_WINDOW_PER_DISPLAY, "info-window-per-display", NULL, @@ -434,9 +435,6 @@ gimp_gui_config_set_property (GObject *object, case PROP_DOCK_WINDOW_HINT: gui_config->dock_window_hint = g_value_get_enum (value); break; - case PROP_CURSOR_FORMAT: - gui_config->cursor_format = g_value_get_enum (value); - break; case PROP_CURSOR_HANDEDNESS: gui_config->cursor_handedness = g_value_get_enum (value); break; @@ -451,6 +449,7 @@ gimp_gui_config_set_property (GObject *object, gui_config->last_tip_shown = g_value_get_int (value); break; + case PROP_CURSOR_FORMAT: case PROP_INFO_WINDOW_PER_DISPLAY: case PROP_MENU_MNEMONICS: case PROP_SHOW_TOOL_TIPS: @@ -558,9 +557,6 @@ gimp_gui_config_get_property (GObject *object, case PROP_DOCK_WINDOW_HINT: g_value_set_enum (value, gui_config->dock_window_hint); break; - case PROP_CURSOR_FORMAT: - g_value_set_enum (value, gui_config->cursor_format); - break; case PROP_CURSOR_HANDEDNESS: g_value_set_enum (value, gui_config->cursor_handedness); break; @@ -575,6 +571,7 @@ gimp_gui_config_get_property (GObject *object, g_value_set_int (value, gui_config->last_tip_shown); break; + case PROP_CURSOR_FORMAT: case PROP_INFO_WINDOW_PER_DISPLAY: case PROP_MENU_MNEMONICS: case PROP_SHOW_TOOL_TIPS: diff --git a/app/config/gimpguiconfig.h b/app/config/gimpguiconfig.h index bf6a6c653b..12dc2c3339 100644 --- a/app/config/gimpguiconfig.h +++ b/app/config/gimpguiconfig.h @@ -65,7 +65,6 @@ struct _GimpGuiConfig gboolean user_manual_online; gchar *user_manual_online_uri; GimpWindowHint dock_window_hint; - GimpCursorFormat cursor_format; GimpHandedness cursor_handedness; /* saved in sessionrc */ diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index 8cb75252ff..e4b0b04ef3 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -2122,17 +2122,14 @@ prefs_dialog_new (Gimp *gimp, _("Show pointer for paint _tools"), GTK_BOX (vbox2)); - table = prefs_table_new (3, GTK_CONTAINER (vbox2)); + table = prefs_table_new (2, GTK_CONTAINER (vbox2)); prefs_enum_combo_box_add (object, "cursor-mode", 0, 0, _("Pointer _mode:"), GTK_TABLE (table), 0, size_group); - prefs_enum_combo_box_add (object, "cursor-format", 0, 0, - _("Pointer re_ndering:"), - GTK_TABLE (table), 1, size_group); prefs_enum_combo_box_add (object, "cursor-handedness", 0, 0, _("Pointer _handedness:"), - GTK_TABLE (table), 2, NULL); + GTK_TABLE (table), 1, NULL); g_object_unref (size_group); size_group = NULL; diff --git a/app/display/gimpdisplayshell-cursor.c b/app/display/gimpdisplayshell-cursor.c index 9c23e3d254..8c61e7bf17 100644 --- a/app/display/gimpdisplayshell-cursor.c +++ b/app/display/gimpdisplayshell-cursor.c @@ -92,7 +92,6 @@ gimp_display_shell_set_override_cursor (GimpDisplayShell *shell, shell->using_override_cursor = TRUE; gimp_cursor_set (shell->canvas, - shell->cursor_format, shell->cursor_handedness, cursor_type, GIMP_TOOL_CURSOR_NONE, @@ -221,8 +220,7 @@ gimp_display_shell_real_set_cursor (GimpDisplayShell *shell, GimpCursorModifier modifier, gboolean always_install) { - GimpCursorFormat cursor_format; - GimpHandedness cursor_handedness; + GimpHandedness cursor_handedness; g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); @@ -268,24 +266,21 @@ gimp_display_shell_real_set_cursor (GimpDisplayShell *shell, } } - cursor_format = GIMP_GUI_CONFIG (shell->display->config)->cursor_format; cursor_handedness = GIMP_GUI_CONFIG (shell->display->config)->cursor_handedness; - if (shell->cursor_format != cursor_format || - shell->cursor_handedness != cursor_handedness || + if (shell->cursor_handedness != cursor_handedness || shell->current_cursor != cursor_type || shell->tool_cursor != tool_cursor || shell->cursor_modifier != modifier || always_install) { - shell->cursor_format = cursor_format; shell->cursor_handedness = cursor_handedness; shell->current_cursor = cursor_type; shell->tool_cursor = tool_cursor; shell->cursor_modifier = modifier; gimp_cursor_set (shell->canvas, - cursor_format, cursor_handedness, + cursor_handedness, cursor_type, tool_cursor, modifier); } } diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index 4479dd39fc..6d4603cc77 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -299,7 +299,6 @@ gimp_display_shell_init (GimpDisplayShell *shell) shell->icon_size = 32; - shell->cursor_format = GIMP_CURSOR_FORMAT_BITMAP; shell->cursor_handedness = GIMP_HANDEDNESS_RIGHT; shell->current_cursor = (GimpCursorType) -1; shell->tool_cursor = GIMP_TOOL_CURSOR_NONE; diff --git a/app/display/gimpdisplayshell.h b/app/display/gimpdisplayshell.h index e2e38156fd..af825f889a 100644 --- a/app/display/gimpdisplayshell.h +++ b/app/display/gimpdisplayshell.h @@ -139,7 +139,6 @@ struct _GimpDisplayShell guint fill_idle_id; /* display_shell_fill() idle ID */ - GimpCursorFormat cursor_format; /* Currently used cursor format */ GimpHandedness cursor_handedness;/* Handedness for cursor display */ GimpCursorType current_cursor; /* Currently installed main cursor */ GimpToolCursorType tool_cursor; /* Current Tool cursor */ diff --git a/app/widgets/gimpcursor.c b/app/widgets/gimpcursor.c index 9c47bd37a4..f09dcd3163 100644 --- a/app/widgets/gimpcursor.c +++ b/app/widgets/gimpcursor.c @@ -65,11 +65,9 @@ typedef struct _GimpCursor GimpCursor; struct _GimpCursor { const guint8 *pixbuf_data; - const guint8 *pixbuf_data_bw; const gint x_hot, y_hot; GdkPixbuf *pixbuf; - GdkPixbuf *pixbuf_bw; }; @@ -79,82 +77,66 @@ static GimpCursor gimp_cursors[] = { cursor_none, - cursor_none_bw, cursor_none_x_hot, cursor_none_y_hot }, { cursor_mouse, - cursor_mouse_bw, cursor_mouse_x_hot, cursor_mouse_y_hot }, { cursor_crosshair, - cursor_crosshair_bw, cursor_crosshair_x_hot, cursor_crosshair_y_hot }, { cursor_crosshair_small, - cursor_crosshair_small_bw, cursor_crosshair_small_x_hot, cursor_crosshair_small_y_hot }, { cursor_bad, - cursor_bad_bw, cursor_bad_x_hot, cursor_bad_y_hot }, { cursor_move, - cursor_move_bw, cursor_move_x_hot, cursor_move_y_hot }, { cursor_zoom, - cursor_zoom_bw, cursor_zoom_x_hot, cursor_zoom_y_hot }, { cursor_color_picker, - cursor_color_picker_bw, cursor_color_picker_x_hot, cursor_color_picker_y_hot }, { cursor_corner_top_left, - cursor_corner_top_left_bw, cursor_corner_top_left_x_hot, cursor_corner_top_left_y_hot }, { cursor_corner_top_right, - cursor_corner_top_right_bw, cursor_corner_top_right_x_hot, cursor_corner_top_right_y_hot }, { cursor_corner_bottom_left, - cursor_corner_bottom_left_bw, cursor_corner_bottom_left_x_hot, cursor_corner_bottom_left_y_hot }, { cursor_corner_bottom_right, - cursor_corner_bottom_right_bw, cursor_corner_bottom_right_x_hot, cursor_corner_bottom_right_y_hot }, { cursor_side_top, - cursor_side_top_bw, cursor_side_top_x_hot, cursor_side_top_y_hot }, { cursor_side_left, - cursor_side_left_bw, cursor_side_left_x_hot, cursor_side_left_y_hot }, { cursor_side_right, - cursor_side_right_bw, cursor_side_right_x_hot, cursor_side_right_y_hot }, { cursor_side_bottom, - cursor_side_bottom_bw, cursor_side_bottom_x_hot, cursor_side_bottom_y_hot } }; @@ -164,42 +146,42 @@ static GimpCursor gimp_tool_cursors[] = /* these have to match up with enum GimpToolCursorType in widgets-enums.h */ { NULL }, - { tool_rect_select, tool_rect_select_bw }, - { tool_ellipse_select, tool_ellipse_select_bw }, - { tool_free_select, tool_free_select_bw }, - { tool_polygon_select, tool_polygon_select_bw }, - { tool_fuzzy_select, tool_fuzzy_select_bw }, - { tool_paths, tool_paths_bw }, - { tool_paths_anchor, tool_paths_anchor_bw }, - { tool_paths_control, tool_paths_control_bw }, - { tool_paths_segment, tool_paths_segment_bw }, - { tool_iscissors, tool_iscissors_bw }, - { tool_move, tool_move_bw }, - { tool_zoom, tool_zoom_bw }, - { tool_crop, tool_crop_bw }, - { tool_resize, tool_resize_bw }, - { tool_rotate, tool_rotate_bw }, - { tool_shear, tool_shear_bw }, - { tool_perspective, tool_perspective_bw }, - { tool_flip_horizontal, tool_flip_horizontal_bw }, - { tool_flip_vertical, tool_flip_vertical_bw }, - { tool_text, tool_text_bw }, - { tool_color_picker, tool_color_picker_bw }, - { tool_bucket_fill, tool_bucket_fill_bw }, - { tool_blend, tool_blend_bw }, - { tool_pencil, tool_pencil_bw }, - { tool_paintbrush, tool_paintbrush_bw }, - { tool_airbrush, tool_airbrush_bw }, - { tool_ink, tool_ink_bw }, - { tool_clone, tool_clone_bw }, - { tool_heal, tool_heal_bw }, - { tool_eraser, tool_eraser_bw }, - { tool_smudge, tool_smudge_bw }, - { tool_blur, tool_blur_bw }, - { tool_dodge, tool_dodge_bw }, - { tool_burn, tool_burn_bw }, - { tool_measure, tool_measure_bw }, - { tool_hand, tool_hand_bw } + { tool_rect_select }, + { tool_ellipse_select }, + { tool_free_select }, + { tool_polygon_select }, + { tool_fuzzy_select }, + { tool_paths }, + { tool_paths_anchor }, + { tool_paths_control }, + { tool_paths_segment }, + { tool_iscissors }, + { tool_move }, + { tool_zoom }, + { tool_crop }, + { tool_resize }, + { tool_rotate }, + { tool_shear }, + { tool_perspective }, + { tool_flip_horizontal }, + { tool_flip_vertical }, + { tool_text }, + { tool_color_picker }, + { tool_bucket_fill }, + { tool_blend }, + { tool_pencil }, + { tool_paintbrush }, + { tool_airbrush }, + { tool_ink }, + { tool_clone }, + { tool_heal }, + { tool_eraser }, + { tool_smudge }, + { tool_blur }, + { tool_dodge }, + { tool_burn }, + { tool_measure }, + { tool_hand } }; static GimpCursor gimp_cursor_modifiers[] = @@ -207,46 +189,35 @@ static GimpCursor gimp_cursor_modifiers[] = /* these have to match up with enum GimpCursorModifier in widgets-enums.h */ { NULL }, - { modifier_bad, modifier_bad }, - { modifier_plus, modifier_plus }, - { modifier_minus, modifier_minus }, - { modifier_intersect, modifier_intersect }, - { modifier_move, modifier_move }, - { modifier_resize, modifier_resize }, - { modifier_control, modifier_control }, - { modifier_anchor, modifier_anchor }, - { modifier_foreground, modifier_foreground }, - { modifier_background, modifier_background }, - { modifier_pattern, modifier_pattern }, - { modifier_join, modifier_join }, - { modifier_select, modifier_select } + { modifier_bad }, + { modifier_plus }, + { modifier_minus }, + { modifier_intersect }, + { modifier_move }, + { modifier_resize }, + { modifier_control }, + { modifier_anchor }, + { modifier_foreground }, + { modifier_background }, + { modifier_pattern }, + { modifier_join }, + { modifier_select } }; static const GdkPixbuf * -get_cursor_pixbuf (GimpCursor *cursor, - gboolean bw) +get_cursor_pixbuf (GimpCursor *cursor) { - GdkPixbuf **pixbuf; + if (! cursor->pixbuf) + cursor->pixbuf = gdk_pixbuf_new_from_inline (-1, + cursor->pixbuf_data, + FALSE, NULL); + g_return_val_if_fail (cursor->pixbuf != NULL, NULL); - if (bw) - pixbuf = &cursor->pixbuf_bw; - else - pixbuf = &cursor->pixbuf; - - if (! *pixbuf) - *pixbuf = gdk_pixbuf_new_from_inline (-1, - bw ? - cursor->pixbuf_data_bw : - cursor->pixbuf_data, - FALSE, NULL); - g_return_val_if_fail (*pixbuf != NULL, NULL); - - return *pixbuf; + return cursor->pixbuf; } GdkCursor * gimp_cursor_new (GdkDisplay *display, - GimpCursorFormat cursor_format, GimpHandedness cursor_handedness, GimpCursorType cursor_type, GimpToolCursorType tool_cursor, @@ -257,7 +228,6 @@ gimp_cursor_new (GdkDisplay *display, GimpCursor *bmtool = NULL; GdkCursor *cursor; GdkPixbuf *pixbuf; - gboolean bw; g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); g_return_val_if_fail (cursor_type < GIMP_CURSOR_LAST, NULL); @@ -347,18 +317,7 @@ gimp_cursor_new (GdkDisplay *display, bmmodifier = &gimp_cursor_modifiers[modifier]; } - if (cursor_format != GIMP_CURSOR_FORMAT_BITMAP && - gdk_display_supports_cursor_alpha (display) && - gdk_display_supports_cursor_color (display)) - { - bw = FALSE; - } - else - { - bw = TRUE; - } - - pixbuf = gdk_pixbuf_copy (get_cursor_pixbuf (bmcursor, bw)); + pixbuf = gdk_pixbuf_copy (get_cursor_pixbuf (bmcursor)); if (bmmodifier || bmtool) { @@ -366,16 +325,16 @@ gimp_cursor_new (GdkDisplay *display, gint height = gdk_pixbuf_get_height (pixbuf); if (bmmodifier) - gdk_pixbuf_composite (get_cursor_pixbuf (bmmodifier, bw), pixbuf, + gdk_pixbuf_composite (get_cursor_pixbuf (bmmodifier), pixbuf, 0, 0, width, height, 0.0, 0.0, 1.0, 1.0, - GDK_INTERP_NEAREST, bw ? 255 : 200); + GDK_INTERP_NEAREST, 200); if (bmtool) - gdk_pixbuf_composite (get_cursor_pixbuf (bmtool, bw), pixbuf, + gdk_pixbuf_composite (get_cursor_pixbuf (bmtool), pixbuf, 0, 0, width, height, 0.0, 0.0, 1.0, 1.0, - GDK_INTERP_NEAREST, bw ? 255 : 200); + GDK_INTERP_NEAREST, 200); } /* flip the cursor if mouse setting is left-handed */ @@ -404,7 +363,6 @@ gimp_cursor_new (GdkDisplay *display, void gimp_cursor_set (GtkWidget *widget, - GimpCursorFormat cursor_format, GimpHandedness cursor_handedness, GimpCursorType cursor_type, GimpToolCursorType tool_cursor, @@ -416,7 +374,6 @@ gimp_cursor_set (GtkWidget *widget, g_return_if_fail (gtk_widget_get_realized (widget)); cursor = gimp_cursor_new (gtk_widget_get_display (widget), - cursor_format, cursor_handedness, cursor_type, tool_cursor, diff --git a/app/widgets/gimpcursor.h b/app/widgets/gimpcursor.h index bd8769e838..9bb3029e1b 100644 --- a/app/widgets/gimpcursor.h +++ b/app/widgets/gimpcursor.h @@ -20,13 +20,11 @@ GdkCursor * gimp_cursor_new (GdkDisplay *display, - GimpCursorFormat cursor_format, GimpHandedness cursor_handedness, GimpCursorType cursor_type, GimpToolCursorType tool_cursor, GimpCursorModifier modifier); void gimp_cursor_set (GtkWidget *widget, - GimpCursorFormat cursor_format, GimpHandedness cursor_handedness, GimpCursorType cursor_type, GimpToolCursorType tool_cursor, diff --git a/app/widgets/gimpdialogfactory.c b/app/widgets/gimpdialogfactory.c index d401358803..04e743ad68 100644 --- a/app/widgets/gimpdialogfactory.c +++ b/app/widgets/gimpdialogfactory.c @@ -1546,7 +1546,6 @@ gimp_dialog_factory_set_busy (GimpDialogFactory *factory) gdk_cursor_unref (cursor); cursor = gimp_cursor_new (display, - GIMP_CURSOR_FORMAT_BITMAP, GIMP_HANDEDNESS_RIGHT, GDK_WATCH, GIMP_TOOL_CURSOR_NONE, diff --git a/cursors/Makefile.am b/cursors/Makefile.am index 02dcd7ecac..262a216eeb 100644 --- a/cursors/Makefile.am +++ b/cursors/Makefile.am @@ -2,37 +2,21 @@ CURSOR_IMAGES = \ cursor-bad.png \ - cursor-bad-bw.png \ cursor-color-picker.png \ - cursor-color-picker-bw.png \ cursor-corner-bottom-left.png \ - cursor-corner-bottom-left-bw.png \ cursor-corner-bottom-right.png \ - cursor-corner-bottom-right-bw.png \ cursor-corner-top-left.png \ - cursor-corner-top-left-bw.png \ cursor-corner-top-right.png \ - cursor-corner-top-right-bw.png \ cursor-crosshair.png \ - cursor-crosshair-bw.png \ cursor-crosshair-small.png \ - cursor-crosshair-small-bw.png \ cursor-mouse.png \ - cursor-mouse-bw.png \ cursor-move.png \ - cursor-move-bw.png \ cursor-none.png \ - cursor-none-bw.png \ cursor-side-bottom.png \ - cursor-side-bottom-bw.png \ cursor-side-left.png \ - cursor-side-left-bw.png \ cursor-side-right.png \ - cursor-side-right-bw.png \ cursor-side-top.png \ - cursor-side-top-bw.png \ cursor-zoom.png \ - cursor-zoom-bw.png \ \ modifier-anchor.png \ modifier-bad.png \ @@ -49,81 +33,44 @@ CURSOR_IMAGES = \ modifier-select.png \ \ tool-airbrush.png \ - tool-airbrush-bw.png \ tool-blend.png \ - tool-blend-bw.png \ tool-blur.png \ - tool-blur-bw.png \ tool-bucket-fill.png \ - tool-bucket-fill-bw.png \ tool-burn.png \ - tool-burn-bw.png \ tool-clone.png \ - tool-clone-bw.png \ tool-color-picker.png \ - tool-color-picker-bw.png \ tool-crop.png \ - tool-crop-bw.png \ tool-dodge.png \ - tool-dodge-bw.png \ tool-ellipse-select.png \ - tool-ellipse-select-bw.png \ tool-eraser.png \ - tool-eraser-bw.png \ tool-flip-horizontal.png \ - tool-flip-horizontal-bw.png \ tool-flip-vertical.png \ - tool-flip-vertical-bw.png \ tool-free-select.png \ - tool-free-select-bw.png \ tool-fuzzy-select.png \ - tool-fuzzy-select-bw.png \ tool-hand.png \ - tool-hand-bw.png \ tool-heal.png \ - tool-heal-bw.png \ tool-ink.png \ - tool-ink-bw.png \ tool-iscissors.png \ - tool-iscissors-bw.png \ tool-measure.png \ - tool-measure-bw.png \ tool-move.png \ - tool-move-bw.png \ tool-paintbrush.png \ - tool-paintbrush-bw.png \ tool-paths.png \ - tool-paths-bw.png \ tool-paths-anchor.png \ - tool-paths-anchor-bw.png \ tool-paths-control.png \ - tool-paths-control-bw.png \ tool-paths-segment.png \ - tool-paths-segment-bw.png \ tool-pencil.png \ - tool-pencil-bw.png \ tool-perspective.png \ - tool-perspective-bw.png \ tool-polygon-select.png \ - tool-polygon-select-bw.png \ tool-rect-select.png \ - tool-rect-select-bw.png \ tool-resize.png \ - tool-resize-bw.png \ tool-rotate.png \ - tool-rotate-bw.png \ tool-shear.png \ - tool-shear-bw.png \ tool-smudge.png \ - tool-smudge-bw.png \ tool-text.png \ - tool-text-bw.png \ - tool-zoom.png \ - tool-zoom-bw.png + tool-zoom.png COLOR_PICKER_IMAGES = \ - cursor-color-picker.png \ - cursor-color-picker-bw.png + cursor-color-picker.png EXTRA_DIST = \ $(CURSOR_IMAGES) \ diff --git a/cursors/cursor-bad-bw.png b/cursors/cursor-bad-bw.png deleted file mode 100644 index 70ed9572b55a3244cc628c4d07e55703959073f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}y`CG&i2RgLjL%#u~!ydn>0`F%7!+!6KY zVl5-j>;V5gL5!8hduE)lUH WzNi$Q$1V7_&H(mYUwq+kVHM>2g1Z{9t z(3)6mw=LwtXO)NVZcK78>5N*PFUsL@M{UABK9 e(ZcDtMk9~<cF*5+_Wv8X z144S9$8Uv9-DVaVxK}pr@Kuom!E6RrEqfa~KtNb)qUk%sL&ohuI~Y7&{an^LB{Ts5 D+W0!~ diff --git a/cursors/cursor-corner-top-left-bw.png b/cursors/cursor-corner-top-left-bw.png deleted file mode 100644 index 171990e7a43ef8c5763cbe6dcfd09c0d64902261..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}$2?seLn02p zoodK;Sb@hixB18o<^t}bw=tZZw#wdZV&x|%G+Iq?xaDP|$*u8kK0jN-!32XJMitN0 z)1LLS3ND?+!jNgd;CzR-)NPw-dOL10C_QRrIj7ti<`90QGQFvFJy)&b#F#&m&TWoW z`MG!cuCCkfJm*>n1ingp;BhBvb+A{hkcALCLxxZf?lX#1ghg_!HJ%4?@L z**I}z_a9%+@jT|_Qn$N274N;nuA4BX_5@xwd3g7E+rOs`kJH2w4FoEfH|6+Ex$^mD QGSEj1p00i_>zopr0BSpIlmGw# diff --git a/cursors/cursor-corner-top-right-bw.png b/cursors/cursor-corner-top-right-bw.png deleted file mode 100644 index b0562332ee03bdb816022c8f3d231cbf43d681d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ot`d^ArXh) zPIKgPR^)L}4=nh*ev$fzeQ_r@`-IEy%2?WcYvLsKcPf%Mk~a&L{Y@@|yme`|sAQc7OY7&rYi^>+adu*Z!^l#`ogo z-uUDm9pQlNvq9|7=A53)6c&ZKLj3*p(I2kcFa+E(xV-ndNCD7M44$rjF6*2U FngGLSQDOi9 diff --git a/cursors/cursor-crosshair-bw.png b/cursors/cursor-crosshair-bw.png deleted file mode 100644 index 481d5cfbaac0a19a226b5c63a405b532b23ba206..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}VV*9IArXh) zPIKg9P~>5j{{R1Zg^FVdQ&MBb@0Mg4f A{{R30 diff --git a/cursors/cursor-crosshair-small-bw.png b/cursors/cursor-crosshair-small-bw.png deleted file mode 100644 index f0468b4808862048e30a6fb8cc90a8ecefbb7c68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}KAtX)ArXh) zPBr9WP~c&n{qO(zLU9qmdKI;Vst0Qhb&iU0rr diff --git a/cursors/cursor-mouse-bw.png b/cursors/cursor-mouse-bw.png deleted file mode 100644 index f0fa4e54fd452acbf833aba067a3fe496a943286..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}d7dtgArXh) zPPOJcV8G#g@YUb-KGXREukf!lc>BP-Y2y7UGddeBUc5PCQ&9eT%7L33f|PV!QaPVr1oJu~6JE61%Y_hdr7a=6cb(RoSjF u{9mr1FO4E|4UWc7cw{c(#GzPsmTS)B0|kGhr%3=^!rug~*v05RXQ2`DfyPX8W$9mrwuboFyt=akR{0M@M+c>n+a diff --git a/cursors/cursor-side-bottom-bw.png b/cursors/cursor-side-bottom-bw.png deleted file mode 100644 index 5a5b6b91007f3ae4e573ed1ab94ac3224dd318eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}37#&FArXh) zUUuYbP~dS1RQvcZ{9oP;iPWUU9o?1DTyss9ZjJDH*3d(~GnhKAkDGIDFL{jXyZ1Oe+VV?&ml4ee4uyBIuO L{an^LB{Ts5m<2o! diff --git a/cursors/cursor-side-left-bw.png b/cursors/cursor-side-left-bw.png deleted file mode 100644 index c6925943e3fb168be6683479b2d1764faa838c23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}`JOJ0ArXh) zPIKfsV8Fq0_rm}B%HoaFFFAL(dEab|d7Kj1b5ltrGq$2|-UNwjJuG#K4)(fCrI&vO zb(&9PnedP~;rF_WvcLNn{v6%P)StfG%cab52j}8s3BN~P92{4DSHymhWSlZ<+ds}$ d0jD`BOj-x+zbtL^O#xcX;OXk;vd$@?2>>OSLUsTE diff --git a/cursors/cursor-side-right-bw.png b/cursors/cursor-side-right-bw.png deleted file mode 100644 index 233e856720ac423fe53621c9607308e7ae71469c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}1)eUBArXh) zPP67aV8G#Ac;$Ee&DfxotCTLW&N=v=DdJhOQk~PJg-K%RtsR0%VN46e9JVrKa%+?) z@L5fj{=P=q`W?fjYUTws+Q*LdeJWeRw1lswyFAs=tid+&LgMe)-ZPnxFI&hur}K-t e$uWuGlf2SZ4ximWu`2@YX7F_Nb6Mw<&;$U2L_kge diff --git a/cursors/cursor-side-top-bw.png b/cursors/cursor-side-top-bw.png deleted file mode 100644 index 20cff2be5dc9e9c1dcd206b0e9084c7fa55f8c5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}sh%#5ArXh) zPBP>>V8Frb`|tnr*O&O#&f=Kj^7etWGBaO<(Xko*oSsZCxRf6K47VonrEj TPcnQ4&_V`JS3j3^P6H&5q0%su<^8fldW-MZhl+%Q|3urOWWAUTs-0ExbX6 zaY@*k8vWHS=k`p0IW<-)hRg8R3$G5{UA(*kd>?xCB<3<}Gq$NGKD4$Ky?A=d*St2X z+i8k&xrc=UcFDiX^EtWPq($*cb}VONzopr0Kt7w A!vFvP diff --git a/cursors/gimp-tool-cursors.xcf b/cursors/gimp-tool-cursors.xcf index ba23279519b8c909590ad9ebd13b6c8379d93437..127d63cb03aa0f6c5c14663a4688da82f9d757a4 100644 GIT binary patch delta 4805 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 VC~_dU;^Rs5qc{jIBbRGF`ya>>i*x`0 literal 122905 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 b?>}U`SKJ}ur!CqEw3xxu)z4*}Q$iB}2t+~< diff --git a/cursors/tool-blur-bw.png b/cursors/tool-blur-bw.png deleted file mode 100644 index 1f581f474b499b652ef16402b9167755e6d67d68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ZJsWUArXh) zPCdxiV8G$b{{R2^ibA$sIp(W6a~~ayjeDupr|3CJ#Z$;pP%!^+a{8hF0=0937N{kp zdCTu9{v~a3|G2tUgQi9DuabN75Ae-frmt!7b9KbJLo+Ww7s*ha^FZWp@wF_5gBeX5 z*|{XVJtFtd4z2lPxpj6%`(n--fjk!Bh;xVbFx-sYyd>`x(_Wy97(8A5T-G@yGywqE C*iI|} diff --git a/cursors/tool-bucket-fill-bw.png b/cursors/tool-bucket-fill-bw.png deleted file mode 100644 index eff908d4d67591f5bf73f11f47c7920597e6bf0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6FglULn02p z4SUOVK!M}SlJE7Y-_@O?c-dAaR|tgEzq7KRv?4%5gsXMGvx~~?m>?IQC((j)WR=Pp z8H!j}d}f%&c{1+f`xbNaG(j2HeZ@@oo|v(_q|Es(C-b$)TQ086x=3kJ*@im{^!5lI zZqJtUk2PPToc(+2>9o2N_Y+)oP8^T@EVRIK;qO_3c81DpWOgt-u$Z%ZR?KI9pxYQc MUHx3vIVCg!08-6P!Tt5gnIhk7#lKla2MBbyfdnai=b^UM_U+ym|< luVsG}&wFoq^eX>HM(!*5+?6Qv!mibw4W)zk#qkDDMXb-HotzEf@ug zW1Pg2ka~X0dS9k{XQNdP3j zexEP)R+&-h{>31=_d=-emy-H^oBL)DJ$SVDHO{=rXwjVYZ{JtdH$X=*c)I$ztaD0e F0st!VP!#|G diff --git a/cursors/tool-color-picker-bw.png b/cursors/tool-color-picker-bw.png deleted file mode 100644 index 786d666c918389b1dca52e62f5781dc085329608..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}{hlt4ArXh) zPCdwXK!L;g?W6zyi^?aSUHE3v1l7fz&#yamE?p9|GUU~JCxvd~yeW*6%;gUpbu)>X zZ869F+{=57mwYz5EzRp>uk>YLV!5C$7a}YEpCMcLQsXPrdhOEfTswRm4zsQ}b6_cR ze!=RN-P!&V=P0iIrfTyrzEOYvLMzjjrSI>by0P(@^Iw~Zw?elGM|?Xp|D4SXL!i?b NJYD@<);T3K0RYzzSL6Ty diff --git a/cursors/tool-crop-bw.png b/cursors/tool-crop-bw.png deleted file mode 100644 index bb2ada80d521ea52c8c50ad165c08c0191dbdb18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}MV>B>ArXh) zPC3ZeV8G!Vefazopr0Oiy}A^-pY diff --git a/cursors/tool-ellipse-select-bw.png b/cursors/tool-ellipse-select-bw.png deleted file mode 100644 index 99e0011062b5ac27860931eece7d5e9824847b0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Wu7jMArXh) zPW9$G;K1SB`+a}$E{)(N5gP)uc`9#5svJ8%gHy3Zz^Nngg091)=@Je1d2}AG*ty3= z`GpXB!omt}O^K5xz53ef#$TV@o$X^2#=&rLcDYOZtbdzDzq~ZPbNayE{ZlP7Jrlle lH&TCGo^am#$1{Bk29CxE#xH-;ZGkRe@O1TaS?83{1OSp58nvm~Q|1Q0NNrQ&kVx(^Joaa9P^21rK-6)e%J1xLf*~h8 zm44kapEQN_%#+O>Z?kviu!cXKBx*BtIm@1j%kLd1*sor6vw8Cq##c+5C5}Yu^(z+U n3HtQSxXaF;ICrUeVY{qS?AFD9#ceu(ZeZ|q^>bP0l+XkKrx{0g diff --git a/cursors/tool-flip-horizontal-bw.png b/cursors/tool-flip-horizontal-bw.png deleted file mode 100644 index 23aaa4bd32b62f2535c2ff88c15784dcb479d425..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}p`I>|ArXh) zPPxd%ARxf<_J94CDkV*&@I^D#cU{gA4`KqUX^7wOc5+qA9p#g2)^Y4yvPtgSR$Hyv zml@X9e2(E==<)Lu%P)cVehRPnV(MAz|1f_rkv!uOf5|_Qe?L$&gQu&X%Q~loCIC=L BHk1GW diff --git a/cursors/tool-flip-vertical-bw.png b/cursors/tool-flip-vertical-bw.png deleted file mode 100644 index 76edbbf23030b33728a2160dc2c3aa7f4fba34ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}8J;eVArXh) zPIKfspuodo{O|wymzvX)mayLTxWVYpW!=>|i&L>hV3GE_cUK?ADG5F_ted){-F{+1 zy2XZB=4#wO9z9|d%-C2dw0mQ)0(WAe$>Loxsu#Q!R)1go+o4kZ%~vs*k5c>o^2co1 WnR#rrPqzcmP6kg`KbLh*2~7YHL_ll+ diff --git a/cursors/tool-free-select-bw.png b/cursors/tool-free-select-bw.png deleted file mode 100644 index 681234e9262d16b9f23c18ed73fec91f6bc49537..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}J)SO(ArXh) zPVwezFyL^Jy!<;}(mcp>$v-AD!_Q`V3OqqIShZo*D@PuON@g{gjLxr5 zq#d{IxXQ<-U?=9Q{P_G;iKjpI2z^}s^K_2*pY@HK(>KU6ToB*5RBmeR>90!nVjFZ` z=eqtbpHRJnS@$>Rnoh?x&pypsd+Bejd&R09;{QTyW*o>4TP!wZhj@mJE6`mGp00i_ I>zopr0NjsJTL1t6 diff --git a/cursors/tool-fuzzy-select-bw.png b/cursors/tool-fuzzy-select-bw.png deleted file mode 100644 index 15314fe4d802d493944e1d9853b7ab6fec8df1c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b3I)gLn02p z4Rz#eP~ge_`G5X%)=8TdWE?U$W@^|pecj!#Mi-@t9xDHsj5lvTnVT&*FQ<$@)Mj_P zRf1^I6{Q0&%qFyO<(5xkX%JeuXJ6pX2i=kH8np73EHaMIww0318&S zuT;vIekakP`kbfIC7B0@Oav1pKkQKK+_5eA&g?>So5h@h8)mhC$X@aE;E4m-JSB%1 z_nCKj6gnscGfVzl^GVuJwZG(mROc4Hvkm6r*Scq@EtPx&ElET{R9M69m0wJgR~W{BEjZe*c3p8}VznsHf>7LShE;KdS2+_Ef-M!689TbN7shYLZsh??qbvV?_3V6d?S?6+3ghEjq>1p@u^+18uy z!V9mK&#U#hI(g4|&-3Jc-}4+uBaJlDNF$9j{_n_m4tF|%CLjs?tHg|e19$)=o~M8^ zV5f3#0k8msfcJrIN?dw6L8~J9Mxf@yZMpqDZKe6Z4DdE^EH6i=J$u0JH5oE-qEW~u4p^G8Zbfox#Ank{ew)hC+@BgfqZ?HO8) zYhfudaBnuYWie^`$6zqbjt0WUVyoe0yG8g;tJVB599XacdBB7k6=(*Aw>r(AX*HC_ zw@*}6RoxH-VeaZcxNy)vpFO)ES1Q$aXjGbk&48#p zu@EpcGBUC;5{WbhgTeI;4Gq8f{r>y4wY5{z)6+I3XB0TE))3wVa)CGM>+7d{KHs~Y zot^JgR8*LqPN&)JcHeP099zrF%NLb%R^Sd0QlkRPfxXro-7>pHpZev``4>GNkH+P4 zwYIgj`C40B|1uhlS)wRo*DMKvn03t0F02kY*(Hy6J8$v*4r zb#--#{{H?iIyyQI$+9epqUaePAK#q6@&)6`rh=Ni;ww{t87NRgz)E1*;jeDX(Rk9d z!?hxCy2ZACfBkM#cXxMnUtgb3k|Ys`w>KA-_56C@{eyQ}P-bOR4Ic;q*2QRIymNffJVi?zzn>nv}6)k1DO5@3zu3Eu*P3V9yz6EOaC(i0$L8xqRe%9{WH002ov JPDHLkV1k7$%~P3eUd2sa mka_;qlm_Px#uSrBfR9M69R$C6hAP58F{jc2pXhIyIZc~$m{;82x9*snSKp+qZ{1qrTMovVi zI*yQw47eiF*W}Dh0En4c5w=!r}xsYHRZ4ntA-G;>Z_e;@p8{tG$)h$mhHCVuNf5ps-^6MU3!G~xT00000NkvXXu0mjfcgSm% diff --git a/cursors/tool-measure-bw.png b/cursors/tool-measure-bw.png deleted file mode 100644 index 4557f5ac12681a280933df630a8598312e72a398..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9iA?ZArXh) zPCLtYK!Kw<`u_j9cU^^3x^Id+G^qNl{*%kpQDLgr(x8?5SD3XPWW4fDnMKdaV8(+? z3(psee#?1YVzx7V7`d}$d$q=L?fD1KDp#zES!a6Zi{QSKF^A9c)SQed-&>JhXZ`)$ zoihiro~f~w8C}0s#jHJ3es+PPu)ovc$puo|x`|tn%HNPh%9LkX1>v4zKQK+bE*-{S076B)p7M1euVs8Ppy!1?gz?w_} zwL@LIi>myO%=(`5SW1=e!N%Wvc^7PT@2>x#eL()apMc%ZS-Hv89}`s>8WdW7$Qj$e o7hf`iSyL^sD|SMX^uDKTi$5GFXnVzU3+M_4Pgg&ebxsLQ04sG!ApigX diff --git a/cursors/tool-paintbrush-bw.png b/cursors/tool-paintbrush-bw.png deleted file mode 100644 index 87d99d7156706241cf22485e4cde9260c4a4c2e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9iA?ZArXh) zPPxd}pupj}^UVMMsZ|$yJ#uxYY_srR#?QV}B5;z5=OmSScEKRQiQArOST_7+jre(u zW6hqW2LjF4-+#cdbJoGFf@hwrn7wEB+bBPmkg&b)=iQO{?Pid*eQwo^RS$HpUpjrD z^pl46Q{#`XnM&>{SLzpE=bKZvlKkIgQu&X%Q~lo FCIB*rRSWpfi@Ln02p z4UOh&HsD!Z{ogv>-utQIch)Tmy3+y_{e@X42Pp_}urU2+Fy6d;_HAXAJv-y0J!NKJ z_jnR|mhnUJPWBDy>Tc>AN}`vSC0yP1?bS1Lu4B2u5-Y#2<2>V&c%eRT*4`(p>)5VH zGd6U0&i)uGrfT#?d81}o=>K*H|D89E6&|k;y`c1O@>M%LBVhe{wFc%9`ql3Z*1{aszM>D+zy=rm=qrS8# z9eY$CVlH&vNZ`Py-m~iWu4i^XdT70x*?9Md&f}BceAsy;QIM%&hv?O`J2Q^OCGEC5 z%j&7oG?~LJ*Y$zvG=8PpH_w$eWyLzH3B5YbGA&m0rme)|sxyaIY?|P()!?Pz%8R9+ p?^qi|1!bSRcYlw0`pMme%=4GA&)@$d@i@@g44$rjF6*2UngDW?V-)}Z diff --git a/cursors/tool-paths-control-bw.png b/cursors/tool-paths-control-bw.png deleted file mode 100644 index f634e6f596c13284280eefaa13ab7652ab17cada..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}yF6VSLn02p z4R+)^Y`}3i^xyx~GD+dm6CO*=&N6!M73k_^oanSLKtqI!d%>z-W;^#OHJ!NLm2gSc z<;fHO6{k<|&*w<^c}&jw-s{|Mqu_jf_ID+T+xXl#@3)FDNC>LrPx{KhaP~x#(xdf< zCjabyXwkj>&We2<9^N^BIzRhaHtD_Vj<<9Ezc@TM<=f78yDU0G)*a5UDOWP(7PMHv z_)>GeyFl-vRI!^q?A8}_GpGFLfBWjpj>{(}%j~OV5HI*~D8I;27w8KHPgg&ebxsLQ E06TVQRR910 diff --git a/cursors/tool-paths-segment-bw.png b/cursors/tool-paths-segment-bw.png deleted file mode 100644 index e8f7f075b7cef591b496a16a65cbaafbf7492cd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 258 zcmV+d0sa1oP)Px#yh%hsR9M69R?!ZGFbG@8{r@j>FUO^6V3|>;5A;blXmL_>j7Fo;Xfzrd;O_pk zxIa>ai0>^zMVE@Wy26zcFb)QAOTz#t_e{jc9YxIO>}_7XtYcUC?2Qxa^eLR;$&xdI zYVD{vDnfQe*2%G-*^S&Z@LOblkT1bDRNJtKdYOx>@&F)&l|PEG%CCF^aUJ_a{=e7Q zm?znTF+SDAnmvJ%>uZWU&aWn7+5<=;s~(XxtbAu?aoc|~zDe9La}RXCKL7v#07*qo IM6N<$f=HfkZvX%Q diff --git a/cursors/tool-pencil-bw.png b/cursors/tool-pencil-bw.png deleted file mode 100644 index fde4a144c68f5db9f04d724af8de5369e9e4811b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}@t!V@ArXh) zPBs)epdi3>@Z{3tJhcD- diff --git a/cursors/tool-perspective-bw.png b/cursors/tool-perspective-bw.png deleted file mode 100644 index 1c33974d0d136adfaec5abf8d01a083d6c1781d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}8J;eVArXh) zP6^~XpupoS{qpbnIko(OJyvZqzH7FbT{Jr+k=$c=><(Yp5fx2wmN?Vmn~V!gV&*>W zlW=bekP3bD{DtwBchi;Y*S*@eT>JWt{Fn9q3|Ze9k}lPlPE&dQ?ZCO2=k%xb9b*2T W>2p8X?#6zgoeZ9?elF{r5}E*B2}2$L diff --git a/cursors/tool-polygon-select-bw.png b/cursors/tool-polygon-select-bw.png deleted file mode 100644 index 5e4d4ef305a46b97851f855574a0bb79a52424ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Q$1ZALn02p zoqCY3!GObg<-`B=k^0UjjZBI+1m8dTV&T?S-xdKU4#g!iHVf9eZ?#~ku5)?2wByAx zkt3O1s!R;KHge5Bkef1_QGWOOXDiiopp1+_}j0GLQb_6OgQlGwt?3H>Aej0S93I6 T)uvhl9mwG6>gTe~DWM4fp0-+U diff --git a/cursors/tool-rect-select-bw.png b/cursors/tool-rect-select-bw.png deleted file mode 100644 index 45547f56e4d3000c774c8f120678e887be0d6aa4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}X`U{QArXh) zPTk1Ipvd8@x%2=3)VxD6F?_;OGQZT?R^4DT6?WoKY!NuTpm=jf$7R!db;<`Aro3)X z%$E9SnzBCJcn!w{^*=8(1n0b{sp6V5wLWw?$1&v$d1r>DYC-Ou3qA?OeHPyn!)>G` TZ{mLrXd{ECtDnm{r-UW|srNd3 diff --git a/cursors/tool-resize-bw.png b/cursors/tool-resize-bw.png deleted file mode 100644 index 0d5892fce588bb3a8681dba9a0dd08c80d78c4f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R})t)YnArXh) zPQA!=K!L+`_rw4HH&x$U)XBgTe~DWM4f1c^(U diff --git a/cursors/tool-rotate-bw.png b/cursors/tool-rotate-bw.png deleted file mode 100644 index d62dcb6d5c9109b81055c45e317fcdd89ddebb4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 255 zcmVPx#xk*GpR9M69R?!N=KnzO`_5Z)um-y5X+0Jv&s$c^LyRFbRZPNjbMx)Va{5x3f zK$13RBufGaC+@)Bx!p97i~tl);~r;n2LO!JdXkW&NKg_afh6PE?W!2qWqD*9Hlv{F zRxHtNMp5U#q&b2hc}p$9(OK2{@+sE?pr@1fd}up*rBN7kNf}t002ovPDHLk FV1huhZp;7x diff --git a/cursors/tool-shear-bw.png b/cursors/tool-shear-bw.png deleted file mode 100644 index 88d251495e6e1a256dd5c74e63f9a2b88f4ae807..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>7Fi*ArXh) zPC3YTK!L}p`{V!mnREBdkiD|$NZOvwW)9LyJ%-05lK=6AG<$q{5? zj@Zum+SxPiZ~GKJr!d~Wan0{roEmrHCo=fmWxk;$JE?K{H&4@ri_TU(VpGwsU|69a VcV0zq`+A_244$rjF6*2UngG9!L0A9) diff --git a/cursors/tool-smudge-bw.png b/cursors/tool-smudge-bw.png deleted file mode 100644 index 9cf220bd7794afb94be973f5ca6c97c68ce938d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 236 zcmVPx#rb$FWR9M69mca^uFbqSR;s5_~yjX~%6B+AvX-*=;7t*fPtW+wMN~Oa>=Eq6$ z1p~0n07>>d_oGIT3GV_h=cN7--M{0000 diff --git a/cursors/tool-text-bw.png b/cursors/tool-text-bw.png deleted file mode 100644 index 83a9560c007db13b8ffd620bb461569cafc95b1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}m7Xq+ArXh) zPPOK1FyL`cKJs^c&N3&dpiaik56rg)hVGU>DtJsHx#y>KMYZ#!IV=n%TMh52F5mTy zf0EAU%(X`j2rw4RT6t)b`U-zW1?gQcb2pt2Jz`b3vT^y12HqPDXB^)CkJ;jsDY4c_ o!CdtuZ;9lD?D?%1wfc>kdw;e(TUFM`Ii>zkfpnRvWmyc%MY9=)7VlU&dD)RptHgs} n+E_Mwo;m+f`*zx728KH>>laQa4maoqx`Dyd)z4*}Q$iB}**QlX diff --git a/libgimpwidgets/gimppickbutton.c b/libgimpwidgets/gimppickbutton.c index 259e6194d1..f1e2f3132e 100644 --- a/libgimpwidgets/gimppickbutton.c +++ b/libgimpwidgets/gimppickbutton.c @@ -174,19 +174,8 @@ make_cursor (GdkDisplay *display) { GdkCursor *cursor; GdkPixbuf *pixbuf; - static const guint8 *data; - if (gdk_display_supports_cursor_alpha (display) && - gdk_display_supports_cursor_color (display)) - { - data = cursor_color_picker; - } - else - { - data = cursor_color_picker_bw; - } - - pixbuf = gdk_pixbuf_new_from_inline (-1, data, FALSE, NULL); + pixbuf = gdk_pixbuf_new_from_inline (-1, cursor_color_picker, FALSE, NULL); cursor = gdk_cursor_new_from_pixbuf (display, pixbuf, 1, 30);