Commit 21e95fdf authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

Makefile.am cursors/selection_move.xbm cursors/selection_move_mask.xbm new

2000-03-04  Michael Natterer  <mitch@gimp.org>

	* Makefile.am
	* cursors/selection_move.xbm
	* cursors/selection_move_mask.xbm
	* app/cursorutil.[ch]: new cursor for moving the selection
	mask. Looks imho nicer than the ugly GDK_DIAMOND_CROSS.

	* app/move.c
	* app/rect_select.c: use the new cursor.

	* app/paint_core.c: check for the statusbar's context_id in the
	cursor_update function. Fixes gdk_criticals with the line preview
	(which doesn't need a mouse click). Minor cleanups.

	* app/tool_options.c: put the paint_pressure options in a
	GtkHWrapBox instead of a GtkHBox. Makes the size of the dialog a
	bit less locale-dependent.

	* plug-ins/common/xbm.c: use accessor functions instead of using
	the parasite's fields directly.
parent 62f41ebf
2000-03-04 Michael Natterer <mitch@gimp.org>
* Makefile.am
* cursors/selection_move.xbm
* cursors/selection_move_mask.xbm
* app/cursorutil.[ch]: new cursor for moving the selection
mask. Looks imho nicer than the ugly GDK_DIAMOND_CROSS.
* app/move.c
* app/rect_select.c: use the new cursor.
* app/paint_core.c: check for the statusbar's context_id in the
cursor_update function. Fixes gdk_criticals with the line preview
(which doesn't need a mouse click). Minor cleanups.
* app/tool_options.c: put the paint_pressure options in a
GtkHWrapBox instead of a GtkHBox. Makes the size of the dialog a
bit less locale-dependent.
* plug-ins/common/xbm.c: use accessor functions instead of using
the parasite's fields directly.
Fri Mar 3 19:35:43 PST 2000 Manish Singh <yosh@gimp.org>
 
* Made 1.1.18 release
......
......@@ -44,6 +44,8 @@ EXTRA_DIST = \
cursors/selection_subtract_mask.xbm \
cursors/selection_intersect.xbm \
cursors/selection_intersect_mask.xbm \
cursors/selection_move.xbm \
cursors/selection_move_mask.xbm \
cursors/bad.xbm \
cursors/bad_mask.xbm \
cursors/dropper.xbm \
......
......@@ -23,6 +23,7 @@
#include "paint_funcs.h"
#include "paint_options.h"
#include "selection_options.h"
#include "gtkhwrapbox.h"
#include "libgimp/gimpunitmenu.h"
......@@ -92,8 +93,6 @@ tool_options_paint_mode_changed (GimpContext *context,
LayerModeEffects paint_mode,
gpointer data)
{
g_print ("tool_options_paint_mode_changed\n");
gimp_option_menu_set_history (GTK_OPTION_MENU (data), (gpointer) paint_mode);
}
......@@ -660,7 +659,7 @@ paint_pressure_options_new (ToolType tool_type)
{
PaintPressureOptions *pressure = NULL;
GtkWidget *frame = NULL;
GtkWidget *hbox = NULL;
GtkWidget *wbox = NULL;
pressure = g_new (PaintPressureOptions, 1);
......@@ -687,9 +686,10 @@ paint_pressure_options_new (ToolType tool_type)
case PENCIL:
case SMUDGE:
frame = gtk_frame_new (_("Pressure Sensitivity"));
hbox = gtk_hbox_new (FALSE, 2);
gtk_container_add (GTK_CONTAINER (frame), hbox);
gtk_widget_show (hbox);
wbox = gtk_hwrap_box_new (FALSE);
gtk_wrap_box_set_aspect_ratio (GTK_WRAP_BOX (wbox), 6);
gtk_container_add (GTK_CONTAINER (frame), wbox);
gtk_widget_show (wbox);
break;
default:
break;
......@@ -705,7 +705,7 @@ paint_pressure_options_new (ToolType tool_type)
case PENCIL:
pressure->opacity_w =
gtk_check_button_new_with_label (_("Opacity"));
gtk_container_add (GTK_CONTAINER (hbox), pressure->opacity_w);
gtk_container_add (GTK_CONTAINER (wbox), pressure->opacity_w);
gtk_signal_connect (GTK_OBJECT (pressure->opacity_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pressure->opacity);
......@@ -728,7 +728,7 @@ paint_pressure_options_new (ToolType tool_type)
case PAINTBRUSH:
case SMUDGE:
pressure->pressure_w = gtk_check_button_new_with_label (_("Pressure"));
gtk_container_add (GTK_CONTAINER (hbox), pressure->pressure_w);
gtk_container_add (GTK_CONTAINER (wbox), pressure->pressure_w);
gtk_signal_connect (GTK_OBJECT (pressure->pressure_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pressure->pressure);
......@@ -748,7 +748,7 @@ paint_pressure_options_new (ToolType tool_type)
case SMUDGE:
pressure->rate_w =
gtk_check_button_new_with_label (_("Rate"));
gtk_container_add (GTK_CONTAINER (hbox), pressure->rate_w);
gtk_container_add (GTK_CONTAINER (wbox), pressure->rate_w);
gtk_signal_connect (GTK_OBJECT (pressure->rate_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pressure->rate);
......@@ -772,7 +772,7 @@ paint_pressure_options_new (ToolType tool_type)
case PENCIL:
pressure->size_w =
gtk_check_button_new_with_label (_("Size"));
gtk_container_add (GTK_CONTAINER (hbox), pressure->size_w);
gtk_container_add (GTK_CONTAINER (wbox), pressure->size_w);
gtk_signal_connect (GTK_OBJECT (pressure->size_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pressure->size);
......@@ -792,7 +792,7 @@ paint_pressure_options_new (ToolType tool_type)
case PENCIL:
pressure->color_w =
gtk_check_button_new_with_label (_("Color"));
gtk_container_add (GTK_CONTAINER (hbox), pressure->color_w);
gtk_container_add (GTK_CONTAINER (wbox), pressure->color_w);
gtk_signal_connect (GTK_OBJECT (pressure->color_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pressure->color);
......
......@@ -42,6 +42,8 @@
#include "cursors/selection_subtract_mask.xbm"
#include "cursors/selection_intersect.xbm"
#include "cursors/selection_intersect_mask.xbm"
#include "cursors/selection_move.xbm"
#include "cursors/selection_move_mask.xbm"
#include "cursors/bad.xbm"
#include "cursors/bad_mask.xbm"
#include "cursors/dropper.xbm"
......@@ -118,6 +120,11 @@ static BM_Cursor gimp_cursors[] =
selection_intersect_width, selection_intersect_height,
selection_intersect_x_hot, selection_intersect_y_hot, NULL
},
{
selection_move_bits, selection_move_mask_bits,
selection_move_width, selection_move_height,
selection_move_x_hot, selection_move_y_hot, NULL
},
{
bad_bits, bad_mask_bits,
bad_width, bad_height,
......
......@@ -41,6 +41,7 @@ typedef enum
GIMP_SELECTION_ADD_CURSOR,
GIMP_SELECTION_SUBTRACT_CURSOR,
GIMP_SELECTION_INTERSECT_CURSOR,
GIMP_SELECTION_MOVE_CURSOR,
GIMP_BAD_CURSOR,
GIMP_COLOR_PICKER_CURSOR,
GIMP_ZOOM_IN_CURSOR,
......
......@@ -16,7 +16,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <stdlib.h>
#include "appenv.h"
#include "cursorutil.h"
#include "draw_core.h"
#include "edit_selection.h"
#include "errors.h"
......@@ -35,8 +37,8 @@
typedef struct _MoveTool MoveTool;
struct _MoveTool
{
Layer *layer;
Guide *guide;
Layer *layer;
Guide *guide;
GDisplay *disp;
};
......@@ -308,7 +310,7 @@ move_tool_cursor_update (Tool *tool,
gdisplay_untransform_coords (gdisp, mevent->x, mevent->y, &x, &y, FALSE, FALSE);
if (mevent->state & GDK_MOD1_MASK)
gdisplay_install_tool_cursor (gdisp, GDK_DIAMOND_CROSS);
gdisplay_install_tool_cursor (gdisp, GIMP_SELECTION_MOVE_CURSOR);
else if (mevent->state & GDK_SHIFT_MASK)
gdisplay_install_tool_cursor (gdisp, GDK_FLEUR);
else
......@@ -445,7 +447,7 @@ move_tool_start_vguide (Tool *tool,
}
Tool *
tools_new_move_tool ()
tools_new_move_tool (void)
{
Tool * tool;
MoveTool * private;
......
This diff is collapsed.
......@@ -570,7 +570,7 @@ rect_select_cursor_update (Tool *tool,
gdisplay_install_tool_cursor (gdisp, GDK_TCROSS);
break;
case SELECTION_MOVE_MASK:
gdisplay_install_tool_cursor (gdisp, GDK_DIAMOND_CROSS);
gdisplay_install_tool_cursor (gdisp, GIMP_SELECTION_MOVE_CURSOR);
break;
case SELECTION_MOVE:
gdisplay_install_tool_cursor (gdisp, GDK_FLEUR);
......
......@@ -23,6 +23,7 @@
#include "paint_funcs.h"
#include "paint_options.h"
#include "selection_options.h"
#include "gtkhwrapbox.h"
#include "libgimp/gimpunitmenu.h"
......@@ -92,8 +93,6 @@ tool_options_paint_mode_changed (GimpContext *context,
LayerModeEffects paint_mode,
gpointer data)
{
g_print ("tool_options_paint_mode_changed\n");
gimp_option_menu_set_history (GTK_OPTION_MENU (data), (gpointer) paint_mode);
}
......@@ -660,7 +659,7 @@ paint_pressure_options_new (ToolType tool_type)
{
PaintPressureOptions *pressure = NULL;
GtkWidget *frame = NULL;
GtkWidget *hbox = NULL;
GtkWidget *wbox = NULL;
pressure = g_new (PaintPressureOptions, 1);
......@@ -687,9 +686,10 @@ paint_pressure_options_new (ToolType tool_type)
case PENCIL:
case SMUDGE:
frame = gtk_frame_new (_("Pressure Sensitivity"));
hbox = gtk_hbox_new (FALSE, 2);
gtk_container_add (GTK_CONTAINER (frame), hbox);
gtk_widget_show (hbox);
wbox = gtk_hwrap_box_new (FALSE);
gtk_wrap_box_set_aspect_ratio (GTK_WRAP_BOX (wbox), 6);
gtk_container_add (GTK_CONTAINER (frame), wbox);
gtk_widget_show (wbox);
break;
default:
break;
......@@ -705,7 +705,7 @@ paint_pressure_options_new (ToolType tool_type)
case PENCIL:
pressure->opacity_w =
gtk_check_button_new_with_label (_("Opacity"));
gtk_container_add (GTK_CONTAINER (hbox), pressure->opacity_w);
gtk_container_add (GTK_CONTAINER (wbox), pressure->opacity_w);
gtk_signal_connect (GTK_OBJECT (pressure->opacity_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pressure->opacity);
......@@ -728,7 +728,7 @@ paint_pressure_options_new (ToolType tool_type)
case PAINTBRUSH:
case SMUDGE:
pressure->pressure_w = gtk_check_button_new_with_label (_("Pressure"));
gtk_container_add (GTK_CONTAINER (hbox), pressure->pressure_w);
gtk_container_add (GTK_CONTAINER (wbox), pressure->pressure_w);
gtk_signal_connect (GTK_OBJECT (pressure->pressure_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pressure->pressure);
......@@ -748,7 +748,7 @@ paint_pressure_options_new (ToolType tool_type)
case SMUDGE:
pressure->rate_w =
gtk_check_button_new_with_label (_("Rate"));
gtk_container_add (GTK_CONTAINER (hbox), pressure->rate_w);
gtk_container_add (GTK_CONTAINER (wbox), pressure->rate_w);
gtk_signal_connect (GTK_OBJECT (pressure->rate_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pressure->rate);
......@@ -772,7 +772,7 @@ paint_pressure_options_new (ToolType tool_type)
case PENCIL:
pressure->size_w =
gtk_check_button_new_with_label (_("Size"));
gtk_container_add (GTK_CONTAINER (hbox), pressure->size_w);
gtk_container_add (GTK_CONTAINER (wbox), pressure->size_w);
gtk_signal_connect (GTK_OBJECT (pressure->size_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pressure->size);
......@@ -792,7 +792,7 @@ paint_pressure_options_new (ToolType tool_type)
case PENCIL:
pressure->color_w =
gtk_check_button_new_with_label (_("Color"));
gtk_container_add (GTK_CONTAINER (hbox), pressure->color_w);
gtk_container_add (GTK_CONTAINER (wbox), pressure->color_w);
gtk_signal_connect (GTK_OBJECT (pressure->color_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pressure->color);
......
......@@ -16,7 +16,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <stdlib.h>
#include "appenv.h"
#include "cursorutil.h"
#include "draw_core.h"
#include "edit_selection.h"
#include "errors.h"
......@@ -35,8 +37,8 @@
typedef struct _MoveTool MoveTool;
struct _MoveTool
{
Layer *layer;
Guide *guide;
Layer *layer;
Guide *guide;
GDisplay *disp;
};
......@@ -308,7 +310,7 @@ move_tool_cursor_update (Tool *tool,
gdisplay_untransform_coords (gdisp, mevent->x, mevent->y, &x, &y, FALSE, FALSE);
if (mevent->state & GDK_MOD1_MASK)
gdisplay_install_tool_cursor (gdisp, GDK_DIAMOND_CROSS);
gdisplay_install_tool_cursor (gdisp, GIMP_SELECTION_MOVE_CURSOR);
else if (mevent->state & GDK_SHIFT_MASK)
gdisplay_install_tool_cursor (gdisp, GDK_FLEUR);
else
......@@ -445,7 +447,7 @@ move_tool_start_vguide (Tool *tool,
}
Tool *
tools_new_move_tool ()
tools_new_move_tool (void)
{
Tool * tool;
MoveTool * private;
......
......@@ -570,7 +570,7 @@ rect_select_cursor_update (Tool *tool,
gdisplay_install_tool_cursor (gdisp, GDK_TCROSS);
break;
case SELECTION_MOVE_MASK:
gdisplay_install_tool_cursor (gdisp, GDK_DIAMOND_CROSS);
gdisplay_install_tool_cursor (gdisp, GIMP_SELECTION_MOVE_CURSOR);
break;
case SELECTION_MOVE:
gdisplay_install_tool_cursor (gdisp, GDK_FLEUR);
......
......@@ -16,7 +16,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <stdlib.h>
#include "appenv.h"
#include "cursorutil.h"
#include "draw_core.h"
#include "edit_selection.h"
#include "errors.h"
......@@ -35,8 +37,8 @@
typedef struct _MoveTool MoveTool;
struct _MoveTool
{
Layer *layer;
Guide *guide;
Layer *layer;
Guide *guide;
GDisplay *disp;
};
......@@ -308,7 +310,7 @@ move_tool_cursor_update (Tool *tool,
gdisplay_untransform_coords (gdisp, mevent->x, mevent->y, &x, &y, FALSE, FALSE);
if (mevent->state & GDK_MOD1_MASK)
gdisplay_install_tool_cursor (gdisp, GDK_DIAMOND_CROSS);
gdisplay_install_tool_cursor (gdisp, GIMP_SELECTION_MOVE_CURSOR);
else if (mevent->state & GDK_SHIFT_MASK)
gdisplay_install_tool_cursor (gdisp, GDK_FLEUR);
else
......@@ -445,7 +447,7 @@ move_tool_start_vguide (Tool *tool,
}
Tool *
tools_new_move_tool ()
tools_new_move_tool (void)
{
Tool * tool;
MoveTool * private;
......
This diff is collapsed.
......@@ -570,7 +570,7 @@ rect_select_cursor_update (Tool *tool,
gdisplay_install_tool_cursor (gdisp, GDK_TCROSS);
break;
case SELECTION_MOVE_MASK:
gdisplay_install_tool_cursor (gdisp, GDK_DIAMOND_CROSS);
gdisplay_install_tool_cursor (gdisp, GIMP_SELECTION_MOVE_CURSOR);
break;
case SELECTION_MOVE:
gdisplay_install_tool_cursor (gdisp, GDK_FLEUR);
......
......@@ -23,6 +23,7 @@
#include "paint_funcs.h"
#include "paint_options.h"
#include "selection_options.h"
#include "gtkhwrapbox.h"
#include "libgimp/gimpunitmenu.h"
......@@ -92,8 +93,6 @@ tool_options_paint_mode_changed (GimpContext *context,
LayerModeEffects paint_mode,
gpointer data)
{
g_print ("tool_options_paint_mode_changed\n");
gimp_option_menu_set_history (GTK_OPTION_MENU (data), (gpointer) paint_mode);
}
......@@ -660,7 +659,7 @@ paint_pressure_options_new (ToolType tool_type)
{
PaintPressureOptions *pressure = NULL;
GtkWidget *frame = NULL;
GtkWidget *hbox = NULL;
GtkWidget *wbox = NULL;
pressure = g_new (PaintPressureOptions, 1);
......@@ -687,9 +686,10 @@ paint_pressure_options_new (ToolType tool_type)
case PENCIL:
case SMUDGE:
frame = gtk_frame_new (_("Pressure Sensitivity"));
hbox = gtk_hbox_new (FALSE, 2);
gtk_container_add (GTK_CONTAINER (frame), hbox);
gtk_widget_show (hbox);
wbox = gtk_hwrap_box_new (FALSE);
gtk_wrap_box_set_aspect_ratio (GTK_WRAP_BOX (wbox), 6);
gtk_container_add (GTK_CONTAINER (frame), wbox);
gtk_widget_show (wbox);
break;
default:
break;
......@@ -705,7 +705,7 @@ paint_pressure_options_new (ToolType tool_type)
case PENCIL:
pressure->opacity_w =
gtk_check_button_new_with_label (_("Opacity"));
gtk_container_add (GTK_CONTAINER (hbox), pressure->opacity_w);
gtk_container_add (GTK_CONTAINER (wbox), pressure->opacity_w);
gtk_signal_connect (GTK_OBJECT (pressure->opacity_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pressure->opacity);
......@@ -728,7 +728,7 @@ paint_pressure_options_new (ToolType tool_type)
case PAINTBRUSH:
case SMUDGE:
pressure->pressure_w = gtk_check_button_new_with_label (_("Pressure"));
gtk_container_add (GTK_CONTAINER (hbox), pressure->pressure_w);
gtk_container_add (GTK_CONTAINER (wbox), pressure->pressure_w);
gtk_signal_connect (GTK_OBJECT (pressure->pressure_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pressure->pressure);
......@@ -748,7 +748,7 @@ paint_pressure_options_new (ToolType tool_type)
case SMUDGE:
pressure->rate_w =
gtk_check_button_new_with_label (_("Rate"));
gtk_container_add (GTK_CONTAINER (hbox), pressure->rate_w);
gtk_container_add (GTK_CONTAINER (wbox), pressure->rate_w);
gtk_signal_connect (GTK_OBJECT (pressure->rate_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pressure->rate);
......@@ -772,7 +772,7 @@ paint_pressure_options_new (ToolType tool_type)
case PENCIL:
pressure->size_w =
gtk_check_button_new_with_label (_("Size"));
gtk_container_add (GTK_CONTAINER (hbox), pressure->size_w);
gtk_container_add (GTK_CONTAINER (wbox), pressure->size_w);
gtk_signal_connect (GTK_OBJECT (pressure->size_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pressure->size);
......@@ -792,7 +792,7 @@ paint_pressure_options_new (ToolType tool_type)
case PENCIL:
pressure->color_w =
gtk_check_button_new_with_label (_("Color"));
gtk_container_add (GTK_CONTAINER (hbox), pressure->color_w);
gtk_container_add (GTK_CONTAINER (wbox), pressure->color_w);
gtk_signal_connect (GTK_OBJECT (pressure->color_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&pressure->color);
......
......@@ -42,6 +42,8 @@
#include "cursors/selection_subtract_mask.xbm"
#include "cursors/selection_intersect.xbm"
#include "cursors/selection_intersect_mask.xbm"
#include "cursors/selection_move.xbm"
#include "cursors/selection_move_mask.xbm"
#include "cursors/bad.xbm"
#include "cursors/bad_mask.xbm"
#include "cursors/dropper.xbm"
......@@ -118,6 +120,11 @@ static BM_Cursor gimp_cursors[] =
selection_intersect_width, selection_intersect_height,
selection_intersect_x_hot, selection_intersect_y_hot, NULL
},
{
selection_move_bits, selection_move_mask_bits,
selection_move_width, selection_move_height,
selection_move_x_hot, selection_move_y_hot, NULL
},
{
bad_bits, bad_mask_bits,
bad_width, bad_height,
......
......@@ -41,6 +41,7 @@ typedef enum
GIMP_SELECTION_ADD_CURSOR,
GIMP_SELECTION_SUBTRACT_CURSOR,
GIMP_SELECTION_INTERSECT_CURSOR,
GIMP_SELECTION_MOVE_CURSOR,
GIMP_BAD_CURSOR,
GIMP_COLOR_PICKER_CURSOR,
GIMP_ZOOM_IN_CURSOR,
......
/* Created with The GIMP */
#define selection_move_width 16
#define selection_move_height 19
#define selection_move_x_hot 0
#define selection_move_y_hot 0
static char selection_move_bits[] = {
0x00, 0x00, 0xda, 0x00, 0x02, 0x00, 0x80, 0x00, 0x82, 0x00, 0x02, 0x00,
0x80, 0x00, 0x82, 0x00, 0x02, 0x00, 0x80, 0x04, 0xb6, 0x0e, 0x00, 0x04,
0x80, 0x24, 0xc0, 0x7f, 0x80, 0x24, 0x00, 0x04, 0x00, 0x0e, 0x00, 0x04,
0x00, 0x00 };
/* Created with The GIMP */
#define selection_move_mask_width 16
#define selection_move_mask_height 19
static char selection_move_mask_bits[] = {
0xff, 0x01, 0xff, 0x01, 0xff, 0x01, 0xc7, 0x01, 0xc7, 0x01, 0xc7, 0x01,
0xc7, 0x01, 0xc7, 0x01, 0xc7, 0x0f, 0xff, 0x1f, 0xff, 0x1f, 0xff, 0x7f,
0xe0, 0xff, 0xe0, 0xff, 0xe0, 0xff, 0xc0, 0x7f, 0x00, 0x1f, 0x00, 0x1f,
0x00, 0x0e };
......@@ -306,9 +306,14 @@ run (gchar *name,
if (parasite)
{
strncpy (xsvals.comment, parasite->data,
MIN (parasite->size, MAX_COMMENT));
xsvals.comment[MIN (parasite->size, MAX_COMMENT) + 1] = 0;
gpointer data;
gint size;
data = parasite_data (parasite);
size = parasite_data_size (parasite);
strncpy (xsvals.comment, data, MIN (size, MAX_COMMENT));
xsvals.comment[MIN (size, MAX_COMMENT) + 1] = 0;
parasite_free (parasite);
}
......@@ -317,9 +322,12 @@ run (gchar *name,
if (parasite)
{
gint x, y;
gpointer data;
gint x, y;
if (sscanf (parasite->data, "%i %i", &x, &y) == 2)
data = parasite_data (parasite);
if (sscanf (data, "%i %i", &x, &y) == 2)
{
xsvals.use_hot = TRUE;
xsvals.x_hot = x;
......@@ -637,14 +645,16 @@ load_image (gchar *filename)
FILE *fp;
gint32 image_ID, layer_ID;
GPixelRgn pixel_rgn;
GPixelRgn pixel_rgn;
GDrawable *drawable;
guchar *data;
gint width, height, intbits;
gint x_hot = 0;
gint y_hot = 0;
gint c, i, j, k;
gint tileheight, rowoffset;
gint intbits;
gint width = 0;
gint height = 0;
gint x_hot = 0;
gint y_hot = 0;
gint c, i, j, k;
gint tileheight, rowoffset;
gchar *name_buf;
gchar *comment;
......@@ -784,7 +794,7 @@ load_image (gchar *filename)
if (x_hot > 0 || y_hot > 0)
{
Parasite *parasite;
gchar *str;
gchar *str;
str = g_strdup_printf ("%d %d", x_hot, y_hot);
parasite = parasite_new ("hot-spot", PARASITE_PERSISTENT,
......
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