diff --git a/ChangeLog b/ChangeLog index b76f424e9e..aea6196f06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ +Wed Jan 19 21:36:06 CET 2000 Sven Neumann + + * cursors/bigcirc + * cursors/bigcircmsk: removed + + * cursors/mouse1_selu + * cursors/mouse1_selumsk: new files + + * Makefile.am + * app/bezier_select.c + * app/cursorutil.c + * app/cursorutil.h: got rid of the big fat bigcirc cursor and added + a new one in the style of the others + 2000-01-19 Garry R. Osgood - * gimp/app/disp_callbacks.c + + * gimp/app/disp_callbacks.c * gimp/app/ellipse_select.c * gimp/app/free_select.c * gimp/app/fuzzy_select.c @@ -77,7 +92,7 @@ Tue Jan 18 21:46:25 CET 2000 Sven Neumann * plug-ins/gap/gap_filter_iterators.c * plug-ins/gap/iter_ALT/gen/plug_in_gauss_iir2_iter_ALT.inc * plug-ins/gap/iter_ALT/gen/plug_in_gauss_rle2_iter_ALT.inc: added - iteraror functions for the new gauss_blur functions. + iterator functions for the new gauss_blur functions. * plug-ins/common/grid.c: small changes to the way the size_entries are set up diff --git a/Makefile.am b/Makefile.am index 76c803de0e..35b96be92d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,8 +9,6 @@ EXTRA_SCRIPTS = gimpinstall EXTRA_DIST = \ cursors/bad \ cursors/badmsk \ - cursors/bigcirc \ - cursors/bigcircmsk \ cursors/dropper \ cursors/droppermsk \ cursors/mouse1 \ @@ -31,6 +29,8 @@ EXTRA_DIST = \ cursors/mouse1_selmmsk \ cursors/mouse1_selp \ cursors/mouse1_selpmsk \ + cursors/mouse1_selu \ + cursors/mouse1_selumsk \ cursors/mouse1_u \ cursors/mouse1_umsk \ pixmaps/anchor.xpm \ diff --git a/app/bezier_select.c b/app/bezier_select.c index e447a601f3..4395c162b7 100644 --- a/app/bezier_select.c +++ b/app/bezier_select.c @@ -1536,7 +1536,7 @@ bezier_select_cursor_update (Tool *tool, else if ((mevent->state & GDK_CONTROL_MASK) && !(mevent->state & GDK_SHIFT_MASK)) gdisplay_install_tool_cursor (gdisp,GIMP_MOUSE1SELM_CURSOR ); else if ((mevent->state & GDK_CONTROL_MASK) && (mevent->state & GDK_SHIFT_MASK)) - gdisplay_install_tool_cursor (gdisp, GIMP_BIGCIRC_CURSOR); + gdisplay_install_tool_cursor (gdisp, GIMP_MOUSE1SELU_CURSOR); else gdisplay_install_tool_cursor (gdisp, GIMP_MOUSE1SEL_CURSOR); return; diff --git a/app/cursorutil.c b/app/cursorutil.c index 55fa9e5428..a8072ea625 100644 --- a/app/cursorutil.c +++ b/app/cursorutil.c @@ -27,8 +27,6 @@ #include "../cursors/mouse1_mmsk" #include "../cursors/mouse1_u" #include "../cursors/mouse1_umsk" -#include "../cursors/bigcirc" -#include "../cursors/bigcircmsk" #include "../cursors/dropper" #include "../cursors/droppermsk" #include "../cursors/mouse1_ap" @@ -37,12 +35,14 @@ #include "../cursors/mouse1_cpmsk" #include "../cursors/mouse1_mm" #include "../cursors/mouse1_mmmsk" -#include "../cursors/mouse1_sel" -#include "../cursors/mouse1_selmsk" #include "../cursors/mouse1_selm" #include "../cursors/mouse1_selmmsk" #include "../cursors/mouse1_selp" #include "../cursors/mouse1_selpmsk" +#include "../cursors/mouse1_selu" +#include "../cursors/mouse1_selumsk" +#include "../cursors/mouse1_sel" +#include "../cursors/mouse1_selmsk" #include "../cursors/bad" #include "../cursors/badmsk" @@ -66,8 +66,6 @@ static BM_Cursor gimp_cursors[] = mouse1_m_x_hot, mouse1_m_y_hot, NULL}, { mouse1_u_bits, mouse1_umsk_bits, mouse1_u_width, mouse1_u_height, mouse1_u_x_hot, mouse1_u_y_hot, NULL}, - { bigcirc_bits, bigcircmsk_bits, bigcirc_width, bigcirc_height, - bigcirc_x_hot, bigcirc_y_hot, NULL}, { dropper_bits, droppermsk_bits, dropper_width, dropper_height, dropper_x_hot, dropper_y_hot, NULL}, { mouse1_ap_bits, mouse1_apmsk_bits, mouse1_ap_width, mouse1_ap_height, @@ -80,6 +78,8 @@ static BM_Cursor gimp_cursors[] = mouse1_selp_x_hot, mouse1_selp_y_hot, NULL}, { mouse1_selm_bits, mouse1_selmmsk_bits, mouse1_selm_width, mouse1_selm_height, mouse1_selm_x_hot, mouse1_selm_y_hot, NULL}, + { mouse1_selu_bits, mouse1_selumsk_bits, mouse1_selu_width, mouse1_selu_height, + mouse1_selu_x_hot, mouse1_selu_y_hot, NULL}, { mouse1_sel_bits, mouse1_selmsk_bits, mouse1_sel_width, mouse1_sel_height, mouse1_sel_x_hot, mouse1_sel_y_hot, NULL}, { bad_bits, badmsk_bits, bad_width, bad_height, diff --git a/app/cursorutil.h b/app/cursorutil.h index bd1e5f51da..6586097476 100644 --- a/app/cursorutil.h +++ b/app/cursorutil.h @@ -30,13 +30,13 @@ typedef enum GIMP_MOUSE1P_CURSOR, GIMP_MOUSE1M_CURSOR, GIMP_MOUSE1U_CURSOR, - GIMP_BIGCIRC_CURSOR, GIMP_COLOR_PICKER_CURSOR, GIMP_MOUSE1AP_CURSOR, GIMP_MOUSE1CP_CURSOR, GIMP_MOUSE1MM_CURSOR, GIMP_MOUSE1SELP_CURSOR, GIMP_MOUSE1SELM_CURSOR, + GIMP_MOUSE1SELU_CURSOR, GIMP_MOUSE1SEL_CURSOR, GIMP_BAD_CURSOR, GIMP_LAST_CURSOR_ENTRY diff --git a/app/tools/bezier_select.c b/app/tools/bezier_select.c index e447a601f3..4395c162b7 100644 --- a/app/tools/bezier_select.c +++ b/app/tools/bezier_select.c @@ -1536,7 +1536,7 @@ bezier_select_cursor_update (Tool *tool, else if ((mevent->state & GDK_CONTROL_MASK) && !(mevent->state & GDK_SHIFT_MASK)) gdisplay_install_tool_cursor (gdisp,GIMP_MOUSE1SELM_CURSOR ); else if ((mevent->state & GDK_CONTROL_MASK) && (mevent->state & GDK_SHIFT_MASK)) - gdisplay_install_tool_cursor (gdisp, GIMP_BIGCIRC_CURSOR); + gdisplay_install_tool_cursor (gdisp, GIMP_MOUSE1SELU_CURSOR); else gdisplay_install_tool_cursor (gdisp, GIMP_MOUSE1SEL_CURSOR); return; diff --git a/app/widgets/gimpcursor.c b/app/widgets/gimpcursor.c index 55fa9e5428..a8072ea625 100644 --- a/app/widgets/gimpcursor.c +++ b/app/widgets/gimpcursor.c @@ -27,8 +27,6 @@ #include "../cursors/mouse1_mmsk" #include "../cursors/mouse1_u" #include "../cursors/mouse1_umsk" -#include "../cursors/bigcirc" -#include "../cursors/bigcircmsk" #include "../cursors/dropper" #include "../cursors/droppermsk" #include "../cursors/mouse1_ap" @@ -37,12 +35,14 @@ #include "../cursors/mouse1_cpmsk" #include "../cursors/mouse1_mm" #include "../cursors/mouse1_mmmsk" -#include "../cursors/mouse1_sel" -#include "../cursors/mouse1_selmsk" #include "../cursors/mouse1_selm" #include "../cursors/mouse1_selmmsk" #include "../cursors/mouse1_selp" #include "../cursors/mouse1_selpmsk" +#include "../cursors/mouse1_selu" +#include "../cursors/mouse1_selumsk" +#include "../cursors/mouse1_sel" +#include "../cursors/mouse1_selmsk" #include "../cursors/bad" #include "../cursors/badmsk" @@ -66,8 +66,6 @@ static BM_Cursor gimp_cursors[] = mouse1_m_x_hot, mouse1_m_y_hot, NULL}, { mouse1_u_bits, mouse1_umsk_bits, mouse1_u_width, mouse1_u_height, mouse1_u_x_hot, mouse1_u_y_hot, NULL}, - { bigcirc_bits, bigcircmsk_bits, bigcirc_width, bigcirc_height, - bigcirc_x_hot, bigcirc_y_hot, NULL}, { dropper_bits, droppermsk_bits, dropper_width, dropper_height, dropper_x_hot, dropper_y_hot, NULL}, { mouse1_ap_bits, mouse1_apmsk_bits, mouse1_ap_width, mouse1_ap_height, @@ -80,6 +78,8 @@ static BM_Cursor gimp_cursors[] = mouse1_selp_x_hot, mouse1_selp_y_hot, NULL}, { mouse1_selm_bits, mouse1_selmmsk_bits, mouse1_selm_width, mouse1_selm_height, mouse1_selm_x_hot, mouse1_selm_y_hot, NULL}, + { mouse1_selu_bits, mouse1_selumsk_bits, mouse1_selu_width, mouse1_selu_height, + mouse1_selu_x_hot, mouse1_selu_y_hot, NULL}, { mouse1_sel_bits, mouse1_selmsk_bits, mouse1_sel_width, mouse1_sel_height, mouse1_sel_x_hot, mouse1_sel_y_hot, NULL}, { bad_bits, badmsk_bits, bad_width, bad_height, diff --git a/app/widgets/gimpcursor.h b/app/widgets/gimpcursor.h index bd1e5f51da..6586097476 100644 --- a/app/widgets/gimpcursor.h +++ b/app/widgets/gimpcursor.h @@ -30,13 +30,13 @@ typedef enum GIMP_MOUSE1P_CURSOR, GIMP_MOUSE1M_CURSOR, GIMP_MOUSE1U_CURSOR, - GIMP_BIGCIRC_CURSOR, GIMP_COLOR_PICKER_CURSOR, GIMP_MOUSE1AP_CURSOR, GIMP_MOUSE1CP_CURSOR, GIMP_MOUSE1MM_CURSOR, GIMP_MOUSE1SELP_CURSOR, GIMP_MOUSE1SELM_CURSOR, + GIMP_MOUSE1SELU_CURSOR, GIMP_MOUSE1SEL_CURSOR, GIMP_BAD_CURSOR, GIMP_LAST_CURSOR_ENTRY diff --git a/cursors/bigcirc b/cursors/bigcirc deleted file mode 100644 index a677a1ffb2..0000000000 --- a/cursors/bigcirc +++ /dev/null @@ -1,35 +0,0 @@ -#define bigcirc_width 50 -#define bigcirc_height 50 -#define bigcirc_x_hot 23 -#define bigcirc_y_hot 25 -static unsigned char bigcirc_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7f, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x03, 0x80, 0x03, 0x00, 0x00, 0x00, 0x60, 0x00, - 0x00, 0x0c, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, - 0x04, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x01, - 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x00, 0x04, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x20, 0x00, - 0x00, 0x00, 0x00, 0x08, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, - 0x08, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x08, 0x00, 0xc0, 0x01, 0x00, - 0x20, 0x00, 0x04, 0x00, 0x38, 0x0e, 0x00, 0x40, 0x00, 0x04, 0x00, 0x06, - 0x30, 0x00, 0x40, 0x00, 0x02, 0x80, 0x01, 0xc0, 0x00, 0x80, 0x00, 0x02, - 0x40, 0x00, 0x00, 0x01, 0x80, 0x00, 0x02, 0x40, 0x00, 0x00, 0x01, 0x80, - 0x00, 0x01, 0x20, 0x00, 0x00, 0x02, 0x00, 0x01, 0x01, 0x20, 0x00, 0x00, - 0x02, 0x00, 0x01, 0x01, 0x10, 0x00, 0x00, 0x04, 0x00, 0x01, 0x01, 0x10, - 0x00, 0x00, 0x04, 0x00, 0x01, 0x01, 0x10, 0x00, 0x00, 0x04, 0x00, 0x01, - 0x01, 0x08, 0x00, 0x00, 0x08, 0x00, 0x01, 0x01, 0x08, 0x00, 0x00, 0x08, - 0x00, 0x01, 0x01, 0x08, 0x00, 0x00, 0x08, 0x00, 0x01, 0x01, 0x10, 0x00, - 0x00, 0x04, 0x00, 0x01, 0x01, 0x10, 0x00, 0x00, 0x04, 0x00, 0x01, 0x01, - 0x10, 0x00, 0x00, 0x04, 0x00, 0x01, 0x01, 0x20, 0x00, 0x00, 0x02, 0x00, - 0x01, 0x01, 0x20, 0x00, 0x00, 0x02, 0x00, 0x01, 0x02, 0x40, 0x00, 0x00, - 0x01, 0x80, 0x00, 0x02, 0x40, 0x00, 0x00, 0x01, 0x80, 0x00, 0x02, 0x80, - 0x01, 0xc0, 0x00, 0x80, 0x00, 0x04, 0x00, 0x06, 0x30, 0x00, 0x40, 0x00, - 0x04, 0x00, 0x38, 0x0e, 0x00, 0x40, 0x00, 0x08, 0x00, 0xc0, 0x01, 0x00, - 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x10, 0x00, 0x00, - 0x00, 0x00, 0x10, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x20, - 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x04, - 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x03, 0x00, 0x00, - 0x80, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x18, - 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x0c, 0x00, 0x00, - 0x00, 0x80, 0x03, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7f, 0x00, - 0x00, 0x00}; diff --git a/cursors/bigcircmsk b/cursors/bigcircmsk deleted file mode 100644 index 129a59b493..0000000000 --- a/cursors/bigcircmsk +++ /dev/null @@ -1,33 +0,0 @@ -#define bigcircmsk_width 50 -#define bigcircmsk_height 50 -static unsigned char bigcircmsk_bits[] = { - 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, - 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0xf0, 0x0f, - 0xe0, 0x0f, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, - 0x3f, 0x00, 0x00, 0x78, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, 0xf0, 0x01, - 0x00, 0xc0, 0x07, 0x00, 0x00, 0xc0, 0x03, 0x00, 0xe0, 0x03, 0x00, 0x00, - 0x80, 0x07, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x78, 0x00, - 0x00, 0x00, 0x00, 0x0e, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, - 0x3c, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x1c, 0x00, 0xf8, 0x0f, 0x00, - 0x30, 0x00, 0x1e, 0x00, 0xfe, 0x3f, 0x00, 0x70, 0x00, 0x0e, 0x00, 0x1f, - 0x7c, 0x00, 0x60, 0x00, 0x0e, 0xc0, 0x03, 0xe0, 0x01, 0xe0, 0x00, 0x07, - 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x00, 0x07, 0xe0, 0x00, 0x80, 0x03, 0xc0, - 0x00, 0x07, 0x70, 0x00, 0x00, 0x07, 0xc0, 0x01, 0x07, 0x30, 0x00, 0x00, - 0x06, 0xc0, 0x01, 0x03, 0x38, 0x00, 0x00, 0x0e, 0x80, 0x01, 0x03, 0x38, - 0x00, 0x00, 0x0e, 0x80, 0x01, 0x03, 0x18, 0x00, 0x00, 0x0c, 0x80, 0x01, - 0x03, 0x18, 0x00, 0x00, 0x0c, 0x80, 0x01, 0x03, 0x18, 0x00, 0x00, 0x0c, - 0x80, 0x01, 0x03, 0x18, 0x00, 0x00, 0x0c, 0x80, 0x01, 0x03, 0x18, 0x00, - 0x00, 0x0c, 0x80, 0x01, 0x03, 0x38, 0x00, 0x00, 0x0e, 0x80, 0x01, 0x03, - 0x38, 0x00, 0x00, 0x0e, 0x80, 0x01, 0x07, 0x30, 0x00, 0x00, 0x06, 0xc0, - 0x01, 0x07, 0x70, 0x00, 0x00, 0x07, 0xc0, 0x01, 0x07, 0xe0, 0x00, 0x80, - 0x03, 0xc0, 0x00, 0x07, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x00, 0x0f, 0xc0, - 0x03, 0xe0, 0x01, 0xe0, 0x00, 0x0e, 0x00, 0x1f, 0x7c, 0x00, 0x60, 0x00, - 0x1e, 0x00, 0xfe, 0x3f, 0x00, 0x70, 0x00, 0x1c, 0x00, 0xf8, 0x0f, 0x00, - 0x30, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x38, 0x00, 0x00, - 0x00, 0x00, 0x1c, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0xf0, - 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0xe0, 0x01, 0x00, 0x00, 0x80, 0x07, - 0x00, 0xc0, 0x03, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x80, 0x07, 0x00, 0x00, - 0xe0, 0x01, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x7c, - 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0xe0, 0x0f, 0x00, 0x00, - 0x00, 0xc0, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, - 0x00, 0x00}; diff --git a/cursors/mouse1_selu b/cursors/mouse1_selu new file mode 100644 index 0000000000..036460a260 --- /dev/null +++ b/cursors/mouse1_selu @@ -0,0 +1,8 @@ +#define mouse1_selu_width 14 +#define mouse1_selu_height 17 +#define mouse1_selu_x_hot 1 +#define mouse1_selu_y_hot 1 +static unsigned char mouse1_selu_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0xd8, 0x00, 0x04, 0x01, 0x04, 0x01, 0x00, 0x00, + 0x04, 0x01, 0x04, 0x01, 0x00, 0x00, 0x04, 0x01, 0x04, 0x01, 0xd8, 0x00, + 0x00, 0x12, 0x00, 0x12, 0x00, 0x12, 0x00, 0x0c, 0x00, 0x00 }; diff --git a/cursors/mouse1_selumsk b/cursors/mouse1_selumsk new file mode 100644 index 0000000000..4f79512df9 --- /dev/null +++ b/cursors/mouse1_selumsk @@ -0,0 +1,6 @@ +#define mouse1_selumsk_width 14 +#define mouse1_selumsk_height 17 +static unsigned char mouse1_selumsk_bits[] = { + 0x00, 0x00, 0xfe, 0x03, 0xfe, 0x03, 0xfe, 0x03, 0x8e, 0x03, 0x8e, 0x03, + 0x8e, 0x03, 0x8e, 0x03, 0x8e, 0x03, 0x8e, 0x03, 0xfe, 0x03, 0xfe, 0x3f, + 0xfe, 0x3f, 0x00, 0x3f, 0x00, 0x3f, 0x00, 0x3f, 0x00, 0x1e };