Commit 7890b7ac authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

Makefile.am cursors/gimp-tool-cursors.xcf cursors/perspective_small.xbm

2000-06-16  Michael Natterer  <mitch@gimp.org>

	* Makefile.am
	* cursors/gimp-tool-cursors.xcf
	* cursors/perspective_small.xbm
	* cursors/perspective_small_mask.xbm
	* cursors/rotate_small.xbm
	* cursors/rotate_small_mask.xbm
	* cursors/shear_small.xbm
	* cursors/shear_small_mask.xbm: new cursors.

	* app/tools.c
	* app/transform_core.c: use them.
parent 858715f6
2000-06-16 Michael Natterer <mitch@gimp.org>
* Makefile.am
* cursors/gimp-tool-cursors.xcf
* cursors/perspective_small.xbm
* cursors/perspective_small_mask.xbm
* cursors/rotate_small.xbm
* cursors/rotate_small_mask.xbm
* cursors/shear_small.xbm
* cursors/shear_small_mask.xbm: new cursors.
* app/tools.c
* app/transform_core.c: use them.
2000-06-16 Sven Neumann <sven@gimp.org>
* app/dodgeburn.c (tools_new_dodgeburn): Dodge/Burn
......
......@@ -72,6 +72,12 @@ EXTRA_DIST = \
cursors/crop_small_mask.xbm \
cursors/resize_small.xbm \
cursors/resize_small_mask.xbm \
cursors/rotate_small.xbm \
cursors/rotate_small_mask.xbm \
cursors/shear_small.xbm \
cursors/shear_small_mask.xbm \
cursors/perspective_small.xbm \
cursors/perspective_small_mask.xbm \
cursors/flip_horizontal_small.xbm \
cursors/flip_horizontal_small_mask.xbm \
cursors/flip_vertical_small.xbm \
......
......@@ -86,6 +86,12 @@
#include "cursors/crop_small_mask.xbm"
#include "cursors/resize_small.xbm"
#include "cursors/resize_small_mask.xbm"
#include "cursors/rotate_small.xbm"
#include "cursors/rotate_small_mask.xbm"
#include "cursors/shear_small.xbm"
#include "cursors/shear_small_mask.xbm"
#include "cursors/perspective_small.xbm"
#include "cursors/perspective_small_mask.xbm"
#include "cursors/flip_horizontal_small.xbm"
#include "cursors/flip_horizontal_small_mask.xbm"
#include "cursors/flip_vertical_small.xbm"
......@@ -406,8 +412,8 @@ ToolInfo tool_info[] =
NULL,
NULL,
{
NULL, NULL,
0, 0,
rotate_small_bits, rotate_small_mask_bits,
rotate_small_width, rotate_small_height,
0, 0, NULL, NULL, NULL
},
{
......@@ -434,8 +440,8 @@ ToolInfo tool_info[] =
NULL,
NULL,
{
NULL, NULL,
0, 0,
resize_small_bits, resize_small_mask_bits,
resize_small_width, resize_small_height,
0, 0, NULL, NULL, NULL
},
{
......@@ -462,8 +468,8 @@ ToolInfo tool_info[] =
NULL,
NULL,
{
NULL, NULL,
0, 0,
shear_small_bits, shear_small_mask_bits,
shear_small_width, shear_small_height,
0, 0, NULL, NULL, NULL
},
{
......@@ -490,8 +496,8 @@ ToolInfo tool_info[] =
NULL,
NULL,
{
NULL, NULL,
0, 0,
perspective_small_bits, perspective_small_mask_bits,
perspective_small_width, perspective_small_height,
0, 0, NULL, NULL, NULL
},
{
......
......@@ -86,6 +86,12 @@
#include "cursors/crop_small_mask.xbm"
#include "cursors/resize_small.xbm"
#include "cursors/resize_small_mask.xbm"
#include "cursors/rotate_small.xbm"
#include "cursors/rotate_small_mask.xbm"
#include "cursors/shear_small.xbm"
#include "cursors/shear_small_mask.xbm"
#include "cursors/perspective_small.xbm"
#include "cursors/perspective_small_mask.xbm"
#include "cursors/flip_horizontal_small.xbm"
#include "cursors/flip_horizontal_small_mask.xbm"
#include "cursors/flip_vertical_small.xbm"
......@@ -406,8 +412,8 @@ ToolInfo tool_info[] =
NULL,
NULL,
{
NULL, NULL,
0, 0,
rotate_small_bits, rotate_small_mask_bits,
rotate_small_width, rotate_small_height,
0, 0, NULL, NULL, NULL
},
{
......@@ -434,8 +440,8 @@ ToolInfo tool_info[] =
NULL,
NULL,
{
NULL, NULL,
0, 0,
resize_small_bits, resize_small_mask_bits,
resize_small_width, resize_small_height,
0, 0, NULL, NULL, NULL
},
{
......@@ -462,8 +468,8 @@ ToolInfo tool_info[] =
NULL,
NULL,
{
NULL, NULL,
0, 0,
shear_small_bits, shear_small_mask_bits,
shear_small_width, shear_small_height,
0, 0, NULL, NULL, NULL
},
{
......@@ -490,8 +496,8 @@ ToolInfo tool_info[] =
NULL,
NULL,
{
NULL, NULL,
0, 0,
perspective_small_bits, perspective_small_mask_bits,
perspective_small_width, perspective_small_height,
0, 0, NULL, NULL, NULL
},
{
......
......@@ -650,8 +650,6 @@ transform_core_cursor_update (Tool *tool,
GDisplay *gdisp;
TransformCore *transform_core;
GimpDrawable *drawable;
gboolean use_transform_cursor = FALSE;
gboolean use_bad_cursor = FALSE;
GdkCursorType ctype = GDK_TOP_LEFT_ARROW;
gint x, y;
......@@ -666,7 +664,7 @@ transform_core_cursor_update (Tool *tool,
if (GIMP_IS_LAYER (drawable) &&
layer_get_mask (GIMP_LAYER (drawable)))
{
use_bad_cursor = TRUE;
ctype = GIMP_BAD_CURSOR;
}
else if (x >= drawable->offset_x &&
y >= drawable->offset_y &&
......@@ -676,26 +674,13 @@ transform_core_cursor_update (Tool *tool,
if (gimage_mask_is_empty (gdisp->gimage) ||
gimage_mask_value (gdisp->gimage, x, y))
{
use_transform_cursor = TRUE;
ctype = GIMP_MOUSE_CURSOR;
}
}
}
if (use_transform_cursor)
/* ctype based on transform tool type */
switch (tool->type)
{
case ROTATE: ctype = GDK_EXCHANGE; break;
case SCALE: ctype = GDK_SIZING; break;
case SHEAR: ctype = GDK_TCROSS; break;
case PERSPECTIVE: ctype = GDK_TCROSS; break;
default: break;
}
else if (use_bad_cursor)
ctype = GIMP_BAD_CURSOR;
gdisplay_install_tool_cursor (gdisp, ctype,
TOOL_TYPE_NONE,
tool->type,
CURSOR_MODIFIER_NONE,
FALSE);
}
......
......@@ -650,8 +650,6 @@ transform_core_cursor_update (Tool *tool,
GDisplay *gdisp;
TransformCore *transform_core;
GimpDrawable *drawable;
gboolean use_transform_cursor = FALSE;
gboolean use_bad_cursor = FALSE;
GdkCursorType ctype = GDK_TOP_LEFT_ARROW;
gint x, y;
......@@ -666,7 +664,7 @@ transform_core_cursor_update (Tool *tool,
if (GIMP_IS_LAYER (drawable) &&
layer_get_mask (GIMP_LAYER (drawable)))
{
use_bad_cursor = TRUE;
ctype = GIMP_BAD_CURSOR;
}
else if (x >= drawable->offset_x &&
y >= drawable->offset_y &&
......@@ -676,26 +674,13 @@ transform_core_cursor_update (Tool *tool,
if (gimage_mask_is_empty (gdisp->gimage) ||
gimage_mask_value (gdisp->gimage, x, y))
{
use_transform_cursor = TRUE;
ctype = GIMP_MOUSE_CURSOR;
}
}
}
if (use_transform_cursor)
/* ctype based on transform tool type */
switch (tool->type)
{
case ROTATE: ctype = GDK_EXCHANGE; break;
case SCALE: ctype = GDK_SIZING; break;
case SHEAR: ctype = GDK_TCROSS; break;
case PERSPECTIVE: ctype = GDK_TCROSS; break;
default: break;
}
else if (use_bad_cursor)
ctype = GIMP_BAD_CURSOR;
gdisplay_install_tool_cursor (gdisp, ctype,
TOOL_TYPE_NONE,
tool->type,
CURSOR_MODIFIER_NONE,
FALSE);
}
......
/* Created with The GIMP */
#define perspective_small_width 32
#define perspective_small_height 32
#define perspective_small_x_hot 0
#define perspective_small_y_hot 0
static unsigned char perspective_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,
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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xc0, 0xff, 0x07, 0x00, 0x40, 0x00, 0x04, 0x00, 0x20, 0x00, 0x08,
0x00, 0x20, 0x00, 0x08, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10,
0x00, 0x08, 0x00, 0x20, 0x00, 0x08, 0x00, 0x20, 0x00, 0x04, 0x00, 0x40,
0x00, 0xfc, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00 };
/* Created with The GIMP */
#define perspective_small_mask_width 32
#define perspective_small_mask_height 32
#define perspective_small_mask_x_hot 0
#define perspective_small_mask_y_hot 0
static unsigned char perspective_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,
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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0x0f,
0x00, 0xe0, 0xff, 0x0f, 0x00, 0xe0, 0xff, 0x0f, 0x00, 0x70, 0x00, 0x1c,
0x00, 0x70, 0x00, 0x1c, 0x00, 0x38, 0x00, 0x38, 0x00, 0x38, 0x00, 0x38,
0x00, 0x1c, 0x00, 0x70, 0x00, 0x1c, 0x00, 0x70, 0x00, 0xfe, 0xff, 0xff,
0x00, 0xfe, 0xff, 0xff, 0x00, 0xfe, 0xff, 0xff };
/* Created with The GIMP */
#define rotate_small_width 32
#define rotate_small_height 32
#define rotate_small_x_hot 0
#define rotate_small_y_hot 0
static unsigned char rotate_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,
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, 0x07, 0x00, 0x00, 0xc4, 0x1d, 0x00, 0x00, 0x6c, 0x30,
0x00, 0x00, 0x34, 0x60, 0x00, 0x00, 0x24, 0x40, 0x00, 0x00, 0x44, 0x00,
0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x04, 0x48,
0x00, 0x00, 0x0c, 0x58, 0x00, 0x00, 0x18, 0x6c, 0x00, 0x00, 0x70, 0x47,
0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00 };
/* Created with The GIMP */
#define rotate_small_mask_width 32
#define rotate_small_mask_height 32
#define rotate_small_mask_x_hot 0
#define rotate_small_mask_y_hot 0
static unsigned char rotate_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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
0x00, 0x00, 0xc6, 0x1f, 0x00, 0x00, 0xee, 0x3f, 0x00, 0x00, 0xfe, 0x7d,
0x00, 0x00, 0x7e, 0xf0, 0x00, 0x00, 0x7e, 0xe0, 0x00, 0x00, 0xfe, 0x40,
0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0x00, 0xff,
0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x04, 0xfe, 0x00, 0x00, 0x0e, 0xfc,
0x00, 0x00, 0x1e, 0xfc, 0x00, 0x00, 0x7c, 0xff, 0x00, 0x00, 0xf8, 0xef,
0x00, 0x00, 0xf0, 0xc7, 0x00, 0x00, 0xc0, 0x01 };
/* Created with The GIMP */
#define shear_small_width 32
#define shear_small_height 32
#define shear_small_x_hot 0
#define shear_small_y_hot 0
static unsigned char shear_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,
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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0x04, 0x20,
0x00, 0x00, 0x02, 0x10, 0x00, 0x00, 0x02, 0x10, 0x00, 0x00, 0x01, 0x08,
0x00, 0x00, 0x01, 0x08, 0x00, 0x80, 0x00, 0x04, 0x00, 0x80, 0x00, 0x04,
0x00, 0x40, 0x00, 0x02, 0x00, 0x40, 0x00, 0x02, 0x00, 0x20, 0x00, 0x01,
0x00, 0xe0, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00 };
/* Created with The GIMP */
#define shear_small_mask_width 32
#define shear_small_mask_height 32
#define shear_small_mask_x_hot 0
#define shear_small_mask_y_hot 0
static unsigned char shear_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,
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,
0x00, 0x00, 0xfe, 0x7f, 0x00, 0x00, 0xfe, 0x7f, 0x00, 0x00, 0xfe, 0x7f,
0x00, 0x00, 0x07, 0x38, 0x00, 0x00, 0x07, 0x38, 0x00, 0x80, 0x03, 0x1c,
0x00, 0x80, 0x03, 0x1c, 0x00, 0xc0, 0x01, 0x0e, 0x00, 0xc0, 0x01, 0x0e,
0x00, 0xe0, 0x00, 0x07, 0x00, 0xe0, 0x00, 0x07, 0x00, 0xf0, 0xff, 0x03,
0x00, 0xf0, 0xff, 0x03, 0x00, 0xf0, 0xff, 0x03 };
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment