From f4942b72551a84718436051f1e86b2c71f67e10e Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 17 Sep 2003 10:42:26 +0000 Subject: [PATCH] cursors/hand.xbm removed. 2003-09-17 Michael Natterer * cursors/hand.xbm * cursors/hand_mask.xbm: removed. * cursors/hand_small.xbm * cursors/hand_small_mask.xbm: ...and added under new names. * cursors/Makefile.am * cursors/gimp-tool-cursors.xcf: changed accordingly. * app/widgets/widgets-enums.h * app/widgets/gimpcursor.c: removed HAND from the GimpCursorModifier enum and added it to the GimpToolCursorType enum. We don't have a hand tool but this way the hand cursor (which is in the lower right corner) can be used together with other cursor modifiers (which are in the upper right corner). * app/tools/gimpmovetool.c * app/tools/gimpvectortool.c: show cursor modifers with the hand cursor where appropriate. --- ChangeLog | 25 +++++++++++++++++- app/tools/gimpmovetool.c | 18 ++++++------- app/tools/gimpvectortool.c | 9 ++++--- app/widgets/gimpcursor.c | 14 +++++----- app/widgets/widgets-enums.h | 2 +- cursors/Makefile.am | 6 ++--- cursors/gimp-tool-cursors.xcf | Bin 48726 -> 48918 bytes cursors/{hand.xbm => hand_small.xbm} | 10 +++---- .../{hand_mask.xbm => hand_small_mask.xbm} | 10 +++---- 9 files changed, 59 insertions(+), 35 deletions(-) rename cursors/{hand.xbm => hand_small.xbm} (84%) rename cursors/{hand_mask.xbm => hand_small_mask.xbm} (82%) diff --git a/ChangeLog b/ChangeLog index ed54c59fa5..80fb9e73cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2003-09-17 Michael Natterer + + * cursors/hand.xbm + * cursors/hand_mask.xbm: removed. + + * cursors/hand_small.xbm + * cursors/hand_small_mask.xbm: ...and added under new names. + + * cursors/Makefile.am + * cursors/gimp-tool-cursors.xcf: changed accordingly. + + * app/widgets/widgets-enums.h + * app/widgets/gimpcursor.c: removed HAND from the GimpCursorModifier + enum and added it to the GimpToolCursorType enum. We don't have a + hand tool but this way the hand cursor (which is in the lower + right corner) can be used together with other cursor modifiers + (which are in the upper right corner). + + * app/tools/gimpmovetool.c + * app/tools/gimpvectortool.c: show cursor modifers with the hand + cursor where appropriate. + 2003-09-16 Helvetix Victorinox * app/composite/gimp-composite-{mmx,sse,sse2,altivec,vis}.c: Regenerated. @@ -5,7 +27,8 @@ * app/composite/gimp-composite-regression.[ch]: Ensure all ints are now unsigned longs. - * app/composite/gimp-composite-sse2.c (gimp_composite_addition_rgba8_rgba8_rgba8_sse2): + * app/composite/gimp-composite-sse2.c + (gimp_composite_addition_rgba8_rgba8_rgba8_sse2): Enclosed the troublesome (rather dense) asm construct in __OPTIMIZE__ in which case the compiler can successfully allocate enough registers to load up the asm() diff --git a/app/tools/gimpmovetool.c b/app/tools/gimpmovetool.c index 0f8e587e54..9456a0fdec 100644 --- a/app/tools/gimpmovetool.c +++ b/app/tools/gimpmovetool.c @@ -607,9 +607,9 @@ gimp_move_tool_cursor_update (GimpTool *tool, NULL, NULL, NULL, NULL, NULL)) { gimp_tool_set_cursor (tool, gdisp, - GIMP_MOUSE_CURSOR, - GIMP_TOOL_CURSOR_NONE, - GIMP_CURSOR_MODIFIER_HAND); + GDK_HAND2, + GIMP_HAND_TOOL_CURSOR, + GIMP_CURSOR_MODIFIER_MOVE); } else { @@ -661,8 +661,8 @@ gimp_move_tool_cursor_update (GimpTool *tool, { gimp_tool_set_cursor (tool, gdisp, GDK_HAND2, - GIMP_TOOL_CURSOR_NONE, - GIMP_CURSOR_MODIFIER_HAND); + GIMP_HAND_TOOL_CURSOR, + GIMP_CURSOR_MODIFIER_MOVE); if (! gimp_tool_control_is_active (tool->control)) { @@ -714,8 +714,8 @@ gimp_move_tool_cursor_update (GimpTool *tool, { gimp_tool_set_cursor (tool, gdisp, GDK_HAND2, - GIMP_TOOL_CURSOR_NONE, - GIMP_CURSOR_MODIFIER_HAND); + GIMP_HAND_TOOL_CURSOR, + GIMP_CURSOR_MODIFIER_MOVE); } } else @@ -809,8 +809,8 @@ gimp_move_tool_start_guide (GimpTool *tool, gimp_tool_set_cursor (tool, gdisp, GDK_HAND2, - GIMP_TOOL_CURSOR_NONE, - GIMP_CURSOR_MODIFIER_HAND); + GIMP_HAND_TOOL_CURSOR, + GIMP_CURSOR_MODIFIER_MOVE); gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), gdisp); } diff --git a/app/tools/gimpvectortool.c b/app/tools/gimpvectortool.c index da3b3bb854..025324619a 100644 --- a/app/tools/gimpvectortool.c +++ b/app/tools/gimpvectortool.c @@ -940,8 +940,8 @@ gimp_vector_tool_cursor_update (GimpTool *tool, switch (vector_tool->function) { case VECTORS_SELECT_VECTOR: - tool_cursor = GIMP_TOOL_CURSOR_NONE; - cmodifier = GIMP_CURSOR_MODIFIER_HAND; + cursor = GDK_HAND2; + tool_cursor = GIMP_HAND_TOOL_CURSOR; break; case VECTORS_CREATE_VECTOR: case VECTORS_CREATE_STROKE: @@ -957,8 +957,9 @@ gimp_vector_tool_cursor_update (GimpTool *tool, break; case VECTORS_MOVE_HANDLE: case VECTORS_CONVERT_EDGE: - tool_cursor = GIMP_TOOL_CURSOR_NONE; - cmodifier = GIMP_CURSOR_MODIFIER_HAND; + cursor = GDK_HAND2; + tool_cursor = GIMP_HAND_TOOL_CURSOR; + cmodifier = GIMP_CURSOR_MODIFIER_CONTROL; break; case VECTORS_MOVE_ANCHOR: case VECTORS_MOVE_CURVE: diff --git a/app/widgets/gimpcursor.c b/app/widgets/gimpcursor.c index ddc774c9f6..b10dcb4272 100644 --- a/app/widgets/gimpcursor.c +++ b/app/widgets/gimpcursor.c @@ -99,6 +99,8 @@ #include "cursors/smudge_small_mask.xbm" #include "cursors/measure_small.xbm" #include "cursors/measure_small_mask.xbm" +#include "cursors/hand_small.xbm" +#include "cursors/hand_small_mask.xbm" /* modifiers */ #include "cursors/plus.xbm" @@ -121,8 +123,6 @@ #include "cursors/background_mask.xbm" #include "cursors/pattern.xbm" #include "cursors/pattern_mask.xbm" -#include "cursors/hand.xbm" -#include "cursors/hand_mask.xbm" typedef struct _GimpBitmapCursor GimpBitmapCursor; @@ -333,6 +333,11 @@ static GimpBitmapCursor gimp_stock_tool_cursors[] = measure_small_bits, measure_small_mask_bits, measure_small_width, measure_small_height, 0, 0, NULL, NULL + }, + { + hand_small_bits, hand_small_mask_bits, + hand_small_width, hand_small_height, + hand_small_x_hot, hand_small_y_hot, NULL, NULL } }; @@ -394,11 +399,6 @@ static GimpBitmapCursor gimp_modifier_cursors[] = pattern_bits, pattern_mask_bits, pattern_width, pattern_height, pattern_x_hot, pattern_y_hot, NULL, NULL - }, - { - hand_bits, hand_mask_bits, - hand_width, hand_height, - hand_x_hot, hand_y_hot, NULL, NULL } }; diff --git a/app/widgets/widgets-enums.h b/app/widgets/widgets-enums.h index bbeae838f5..2ec9ea7710 100644 --- a/app/widgets/widgets-enums.h +++ b/app/widgets/widgets-enums.h @@ -158,6 +158,7 @@ typedef enum /*< skip >*/ GIMP_DODGE_TOOL_CURSOR, GIMP_BURN_TOOL_CURSOR, GIMP_MEASURE_TOOL_CURSOR, + GIMP_HAND_TOOL_CURSOR, GIMP_LAST_STOCK_TOOL_CURSOR_ENTRY } GimpToolCursorType; @@ -174,7 +175,6 @@ typedef enum /*< skip >*/ GIMP_CURSOR_MODIFIER_FOREGROUND, GIMP_CURSOR_MODIFIER_BACKGROUND, GIMP_CURSOR_MODIFIER_PATTERN, - GIMP_CURSOR_MODIFIER_HAND, GIMP_LAST_CURSOR_MODIFIER_ENTRY } GimpCursorModifier; diff --git a/cursors/Makefile.am b/cursors/Makefile.am index 2c7259fe60..368cebf742 100644 --- a/cursors/Makefile.am +++ b/cursors/Makefile.am @@ -34,8 +34,6 @@ EXTRA_DIST = \ background_mask.xbm \ pattern.xbm \ pattern_mask.xbm \ - hand.xbm \ - hand_mask.xbm \ \ rect_select_small.xbm \ rect_select_small_mask.xbm \ @@ -96,4 +94,6 @@ EXTRA_DIST = \ smudge_small.xbm \ smudge_small_mask.xbm \ measure_small.xbm \ - measure_small_mask.xbm + measure_small_mask.xbm \ + hand_small.xbm \ + hand_small_mask.xbm diff --git a/cursors/gimp-tool-cursors.xcf b/cursors/gimp-tool-cursors.xcf index d793d22759a662bbd8918ac9b6ef5c90b7e17dc9..7420c1d69718da411e1479ce4c97a4a3c006fc34 100644 GIT binary patch delta 2727 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 YZ^)@Sdp*TE0cR-4O8@`> diff --git a/cursors/hand.xbm b/cursors/hand_small.xbm similarity index 84% rename from cursors/hand.xbm rename to cursors/hand_small.xbm index 364cc7e9e8..9ee30290d5 100644 --- a/cursors/hand.xbm +++ b/cursors/hand_small.xbm @@ -1,9 +1,9 @@ /* Created with The GIMP */ -#define hand_width 32 -#define hand_height 32 -#define hand_x_hot 0 -#define hand_y_hot 0 -static unsigned char hand_bits[] = { +#define hand_small_width 32 +#define hand_small_height 32 +#define hand_small_x_hot 0 +#define hand_small_y_hot 0 +static unsigned char hand_small_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/cursors/hand_mask.xbm b/cursors/hand_small_mask.xbm similarity index 82% rename from cursors/hand_mask.xbm rename to cursors/hand_small_mask.xbm index 53b2145392..4d0478a639 100644 --- a/cursors/hand_mask.xbm +++ b/cursors/hand_small_mask.xbm @@ -1,9 +1,9 @@ /* Created with The GIMP */ -#define hand_mask_width 32 -#define hand_mask_height 32 -#define hand_mask_x_hot 0 -#define hand_mask_y_hot 0 -static unsigned char hand_mask_bits[] = { +#define hand_small_mask_width 32 +#define hand_small_mask_height 32 +#define hand_small_mask_x_hot 0 +#define hand_small_mask_y_hot 0 +static unsigned char hand_small_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,