dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/devices.c app/disp_callbacks.c app/gimprc.c app/scroll.c 

2001-03-30  Michael Natterer  <mitch@gimp.org>

	* app/devices.c
	* app/disp_callbacks.c
	* app/gimprc.c
	* app/scroll.c
	* app/tools/gimppainttool.[ch]
	* modules/colorsel_water.c: removed the GTK_HAVE_SIX_VALUATORS stuff
	in preparation of gtk 2.0 migration.
This commit is contained in:
Michael Natterer 2001-03-30 16:39:14 +00:00 committed by Michael Natterer
parent 7e8f21f547
commit c32c14552f
20 changed files with 41 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2001-03-30 Michael Natterer <mitch@gimp.org>
* app/devices.c
* app/disp_callbacks.c
* app/gimprc.c
* app/scroll.c
* app/tools/gimppainttool.[ch]
* modules/colorsel_water.c: removed the GTK_HAVE_SIX_VALUATORS stuff
in preparation of gtk 2.0 migration.
2001-03-30 Michael Natterer <mitch@gimp.org>
* app/fileops.[ch]

7
app/devices.c
View File

@ -614,7 +614,7 @@ devices_write_rc_device (DeviceInfo *device_info,
for (i=0; i< (gdk_info ? gdk_info->num_axes : device_info->num_axes); i++)
{
gchar *axis_type = NULL; /* Quiet gcc */
gchar *axis_type = NULL;
switch (gdk_info ? gdk_info->axes[i] : device_info->axes[i])
{
@ -636,11 +636,6 @@ devices_write_rc_device (DeviceInfo *device_info,
case GDK_AXIS_YTILT:
axis_type = "ytilt";
break;
#ifdef GTK_HAVE_SIX_VALUATORS
case GDK_AXIS_WHEEL:
axis_type = "wheel";
break;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
fprintf (fp, " %s",axis_type);
}

21
app/disp_callbacks.c
View File

@ -471,12 +471,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
if (mevent->is_hint)
{
gdk_input_window_get_pointer (canvas->window, current_device, &tx, &ty,
#ifdef GTK_HAVE_SIX_VALUATORS
NULL, NULL, NULL, NULL, NULL
#else /* !GTK_HAVE_SIX_VALUATORS */
NULL, NULL, NULL, NULL
#endif /* GTK_HAVE_SIX_VALUATORS */
);
NULL, NULL, NULL, NULL);
}
else
{
@ -583,12 +578,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
if (active_tool && !gimp_image_is_empty (gdisp->gimage))
{
gdk_input_window_get_pointer (canvas->window, current_device,
#ifdef GTK_HAVE_SIX_VALUATORS
&tx, &ty, NULL, NULL, NULL, NULL, NULL
#else /* !GTK_HAVE_SIX_VALUATORS */
&tx, &ty, NULL, NULL, NULL, NULL
#endif /* GTK_HAVE_SIX_VALUATORS */
);
&tx, &ty, NULL, NULL, NULL, NULL);
gimp_tool_modifier_key (active_tool, kevent, gdisp);
return_val = TRUE;
}
@ -614,12 +604,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
if (active_tool && !gimp_image_is_empty (gdisp->gimage))
{
gdk_input_window_get_pointer (canvas->window, current_device,
#ifdef GTK_HAVE_SIX_VALUATORS
&tx, &ty, NULL, NULL, NULL, NULL, NULL
#else /* !GTK_HAVE_SIX_VALUATORS */
&tx, &ty, NULL, NULL, NULL, NULL
#endif /* GTK_HAVE_SIX_VALUATORS */
);
&tx, &ty, NULL, NULL, NULL, NULL);
gimp_tool_modifier_key (active_tool, kevent, gdisp);
return_val = TRUE;
}

21
app/display/gimpdisplay-callbacks.c
View File

@ -471,12 +471,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
if (mevent->is_hint)
{
gdk_input_window_get_pointer (canvas->window, current_device, &tx, &ty,
#ifdef GTK_HAVE_SIX_VALUATORS
NULL, NULL, NULL, NULL, NULL
#else /* !GTK_HAVE_SIX_VALUATORS */
NULL, NULL, NULL, NULL
#endif /* GTK_HAVE_SIX_VALUATORS */
);
NULL, NULL, NULL, NULL);
}
else
{
@ -583,12 +578,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
if (active_tool && !gimp_image_is_empty (gdisp->gimage))
{
gdk_input_window_get_pointer (canvas->window, current_device,
#ifdef GTK_HAVE_SIX_VALUATORS
&tx, &ty, NULL, NULL, NULL, NULL, NULL
#else /* !GTK_HAVE_SIX_VALUATORS */
&tx, &ty, NULL, NULL, NULL, NULL
#endif /* GTK_HAVE_SIX_VALUATORS */
);
&tx, &ty, NULL, NULL, NULL, NULL);
gimp_tool_modifier_key (active_tool, kevent, gdisp);
return_val = TRUE;
}
@ -614,12 +604,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
if (active_tool && !gimp_image_is_empty (gdisp->gimage))
{
gdk_input_window_get_pointer (canvas->window, current_device,
#ifdef GTK_HAVE_SIX_VALUATORS
&tx, &ty, NULL, NULL, NULL, NULL, NULL
#else /* !GTK_HAVE_SIX_VALUATORS */
&tx, &ty, NULL, NULL, NULL, NULL
#endif /* GTK_HAVE_SIX_VALUATORS */
);
&tx, &ty, NULL, NULL, NULL, NULL);
gimp_tool_modifier_key (active_tool, kevent, gdisp);
return_val = TRUE;
}

4
app/display/gimpdisplay-scroll.c
View File

@ -106,11 +106,7 @@ scroll_to_pointer_position (GDisplay *gdisp,
{
gdk_input_window_get_pointer (gdisp->canvas->window, mevent->deviceid,
&child_x, &child_y,
#ifdef GTK_HAVE_SIX_VALUATORS
NULL, NULL, NULL, NULL, NULL);
#else /* !GTK_HAVE_SIX_VALUATORS */
NULL, NULL, NULL, NULL);
#endif /* GTK_HAVE_SIX_VALUATORS */
if (child_x == mevent->x && child_y == mevent->y)
/* Put this event back on the queue -- so it keeps scrolling */

21
app/display/gimpdisplayshell-callbacks.c
View File

@ -471,12 +471,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
if (mevent->is_hint)
{
gdk_input_window_get_pointer (canvas->window, current_device, &tx, &ty,
#ifdef GTK_HAVE_SIX_VALUATORS
NULL, NULL, NULL, NULL, NULL
#else /* !GTK_HAVE_SIX_VALUATORS */
NULL, NULL, NULL, NULL
#endif /* GTK_HAVE_SIX_VALUATORS */
);
NULL, NULL, NULL, NULL);
}
else
{
@ -583,12 +578,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
if (active_tool && !gimp_image_is_empty (gdisp->gimage))
{
gdk_input_window_get_pointer (canvas->window, current_device,
#ifdef GTK_HAVE_SIX_VALUATORS
&tx, &ty, NULL, NULL, NULL, NULL, NULL
#else /* !GTK_HAVE_SIX_VALUATORS */
&tx, &ty, NULL, NULL, NULL, NULL
#endif /* GTK_HAVE_SIX_VALUATORS */
);
&tx, &ty, NULL, NULL, NULL, NULL);
gimp_tool_modifier_key (active_tool, kevent, gdisp);
return_val = TRUE;
}
@ -614,12 +604,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
if (active_tool && !gimp_image_is_empty (gdisp->gimage))
{
gdk_input_window_get_pointer (canvas->window, current_device,
#ifdef GTK_HAVE_SIX_VALUATORS
&tx, &ty, NULL, NULL, NULL, NULL, NULL
#else /* !GTK_HAVE_SIX_VALUATORS */
&tx, &ty, NULL, NULL, NULL, NULL
#endif /* GTK_HAVE_SIX_VALUATORS */
);
&tx, &ty, NULL, NULL, NULL, NULL);
gimp_tool_modifier_key (active_tool, kevent, gdisp);
return_val = TRUE;
}

4
app/display/gimpdisplayshell-scroll.c
View File

@ -106,11 +106,7 @@ scroll_to_pointer_position (GDisplay *gdisp,
{
gdk_input_window_get_pointer (gdisp->canvas->window, mevent->deviceid,
&child_x, &child_y,
#ifdef GTK_HAVE_SIX_VALUATORS
NULL, NULL, NULL, NULL, NULL);
#else /* !GTK_HAVE_SIX_VALUATORS */
NULL, NULL, NULL, NULL);
#endif /* GTK_HAVE_SIX_VALUATORS */
if (child_x == mevent->x && child_y == mevent->y)
/* Put this event back on the queue -- so it keeps scrolling */

4
app/gimprc.c
View File

@ -2198,10 +2198,6 @@ parse_device (gpointer val1p,
axes[i] = GDK_AXIS_XTILT;
else if (!strcmp ("ytilt", token_sym))
axes[i] = GDK_AXIS_YTILT;
#ifdef GTK_HAVE_SIX_VALUATORS
else if (!strcmp ("wheel", token_sym))
axes[i] = GDK_AXIS_WHEEL;
#endif /* GTK_HAVE_SIX_VALUATORS */
else
goto error;
}

7
app/gui/device-status-dialog.c
View File

@ -614,7 +614,7 @@ devices_write_rc_device (DeviceInfo *device_info,
for (i=0; i< (gdk_info ? gdk_info->num_axes : device_info->num_axes); i++)
{
gchar *axis_type = NULL; /* Quiet gcc */
gchar *axis_type = NULL;
switch (gdk_info ? gdk_info->axes[i] : device_info->axes[i])
{
@ -636,11 +636,6 @@ devices_write_rc_device (DeviceInfo *device_info,
case GDK_AXIS_YTILT:
axis_type = "ytilt";
break;
#ifdef GTK_HAVE_SIX_VALUATORS
case GDK_AXIS_WHEEL:
axis_type = "wheel";
break;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
fprintf (fp, " %s",axis_type);
}

7
app/gui/input-dialog.c
View File

@ -614,7 +614,7 @@ devices_write_rc_device (DeviceInfo *device_info,
for (i=0; i< (gdk_info ? gdk_info->num_axes : device_info->num_axes); i++)
{
gchar *axis_type = NULL; /* Quiet gcc */
gchar *axis_type = NULL;
switch (gdk_info ? gdk_info->axes[i] : device_info->axes[i])
{
@ -636,11 +636,6 @@ devices_write_rc_device (DeviceInfo *device_info,
case GDK_AXIS_YTILT:
axis_type = "ytilt";
break;
#ifdef GTK_HAVE_SIX_VALUATORS
case GDK_AXIS_WHEEL:
axis_type = "wheel";
break;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
fprintf (fp, " %s",axis_type);
}

48
app/paint/gimppaintcore.c
View File

@ -348,12 +348,9 @@ gimp_paint_tool_button_press (GimpTool *tool,
draw_line = FALSE;
paint_tool->curpressure = bevent->pressure;
paint_tool->curxtilt = bevent->xtilt;
paint_tool->curytilt = bevent->ytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->curwheel = bevent->wheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
paint_tool->state = bevent->state;
paint_tool->curxtilt = bevent->xtilt;
paint_tool->curytilt = bevent->ytilt;
paint_tool->state = bevent->state;
if (gdisp != tool->gdisp ||
paint_tool->context_id < 1)
@ -372,9 +369,6 @@ gimp_paint_tool_button_press (GimpTool *tool,
paint_tool->startpressure = paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->startytilt = paint_tool->lastytilt = paint_tool->curytilt;
paint_tool->startxtilt = paint_tool->lastxtilt = paint_tool->curxtilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->startwheel = paint_tool->lastwheel = paint_tool->curwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
/* If shift is down and this is not the first paint
@ -388,9 +382,6 @@ gimp_paint_tool_button_press (GimpTool *tool,
paint_tool->startpressure = paint_tool->lastpressure;
paint_tool->startxtilt = paint_tool->lastxtilt;
paint_tool->startytilt = paint_tool->lastytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->startwheel = paint_tool->lastwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
/* Restrict to multiples of 15 degrees if ctrl is pressed */
if (bevent->state & GDK_CONTROL_MASK)
@ -467,9 +458,6 @@ gimp_paint_tool_button_press (GimpTool *tool,
paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->lastxtilt = paint_tool->curxtilt;
paint_tool->lastytilt = paint_tool->curytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->lastwheel = paint_tool->curwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
else
{
@ -561,9 +549,6 @@ gimp_paint_tool_motion (GimpTool *tool,
paint_tool->curpressure = mevent->pressure;
paint_tool->curxtilt = mevent->xtilt;
paint_tool->curytilt = mevent->ytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->curwheel = mevent->wheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
paint_tool->state = mevent->state;
gimp_paint_tool_interpolate (paint_tool,
@ -586,9 +571,6 @@ gimp_paint_tool_motion (GimpTool *tool,
paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->lastxtilt = paint_tool->curxtilt;
paint_tool->lastytilt = paint_tool->curytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->lastwheel = paint_tool->curwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
@ -897,9 +879,6 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
paint_tool->startpressure = paint_tool->lastpressure = paint_tool->curpressure = 0.5;
paint_tool->startxtilt = paint_tool->lastxtilt = paint_tool->curxtilt = 0;
paint_tool->startytilt = paint_tool->lastytilt = paint_tool->curytilt = 0;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->startwheel = paint_tool->lastwheel = paint_tool->curwheel = 0.5;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
#endif
@ -957,9 +936,6 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
GimpBrush *current_brush;
GimpVector2 delta;
gdouble dpressure, dxtilt, dytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
gdouble dwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
/* double spacing; */
/* double lastscale, curscale; */
gdouble n;
@ -978,16 +954,9 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
dpressure = paint_tool->curpressure - paint_tool->lastpressure;
dxtilt = paint_tool->curxtilt - paint_tool->lastxtilt;
dytilt = paint_tool->curytilt - paint_tool->lastytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
dwheel = paint_tool->curwheel - paint_tool->lastwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
/* return if there has been no motion */
#ifdef GTK_HAVE_SIX_VALUATORS
if (!delta.x && !delta.y && !dpressure && !dxtilt && !dytilt && !dwheel)
#else /* !GTK_HAVE_SIX_VALUATORS */
/* return if there has been no motion */
if (!delta.x && !delta.y && !dpressure && !dxtilt && !dytilt)
#endif /* GTK_HAVE_SIX_VALUATORS */
return;
/* calculate the distance traveled in the coordinate space of the brush */
@ -1028,9 +997,6 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
paint_tool->curpressure = paint_tool->lastpressure + dpressure * t;
paint_tool->curxtilt = paint_tool->lastxtilt + dxtilt * t;
paint_tool->curytilt = paint_tool->lastytilt + dytilt * t;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->curwheel = paint_tool->lastwheel + dwheel * t;
#endif /* GTK_HAVE_SIX_VALUATORS */
/* save the current brush */
current_brush = paint_tool->brush;
@ -1053,9 +1019,6 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
paint_tool->curpressure = paint_tool->lastpressure + dpressure;
paint_tool->curxtilt = paint_tool->lastxtilt + dxtilt;
paint_tool->curytilt = paint_tool->lastytilt + dytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->curwheel = paint_tool->lastwheel + dwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
void
@ -1085,9 +1048,6 @@ gimp_paint_tool_finish (GimpPaintTool *paint_tool,
pu->lastpressure = paint_tool->startpressure;
pu->lastxtilt = paint_tool->startxtilt;
pu->lastytilt = paint_tool->startytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
pu->lastwheel = paint_tool->startwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
/* Push a paint undo */
undo_push_paint (gimage, pu);

15
app/paint/gimppaintcore.h
View File

@ -62,34 +62,25 @@ typedef struct _GimpPaintToolClass GimpPaintToolClass;
struct _GimpPaintTool
{
GimpDrawTool parent_instance;
GimpDrawTool parent_instance;
gdouble startx; /* starting x coord */
gdouble starty; /* starting y coord */
gdouble startpressure; /* starting pressure */
gdouble startxtilt; /* starting xtilt */
gdouble startytilt; /* starting ytilt */
#ifdef GTK_HAVE_SIX_VALUATORS
gdouble startwheel; /* starting wheel */
#endif /* GTK_HAVE_SIX_VALUATORS */
gdouble curx; /* current x coord */
gdouble cury; /* current y coord */
gdouble curpressure; /* current pressure */
gdouble curxtilt; /* current xtilt */
gdouble curytilt; /* current ytilt */
#ifdef GTK_HAVE_SIX_VALUATORS
gdouble curwheel; /* current wheel */
#endif /* GTK_HAVE_SIX_VALUATORS */
gdouble lastx; /* last x coord */
gdouble lasty; /* last y coord */
gdouble lastpressure; /* last pressure */
gdouble lastxtilt; /* last xtilt */
gdouble lastytilt; /* last ytilt */
#ifdef GTK_HAVE_SIX_VALUATORS
gdouble lastwheel; /* last wheel */
#endif /* GTK_HAVE_SIX_VALUATORS */
gint state; /* state of buttons and keys */
@ -126,15 +117,11 @@ struct _PaintUndo
{
GimpPaintTool *tool;
gdouble lastx;
gdouble lasty;
gdouble lastpressure;
gdouble lastxtilt;
gdouble lastytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
gdouble lastwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
};

4
app/scroll.c
View File

@ -106,11 +106,7 @@ scroll_to_pointer_position (GDisplay *gdisp,
{
gdk_input_window_get_pointer (gdisp->canvas->window, mevent->deviceid,
&child_x, &child_y,
#ifdef GTK_HAVE_SIX_VALUATORS
NULL, NULL, NULL, NULL, NULL);
#else /* !GTK_HAVE_SIX_VALUATORS */
NULL, NULL, NULL, NULL);
#endif /* GTK_HAVE_SIX_VALUATORS */
if (child_x == mevent->x && child_y == mevent->y)
/* Put this event back on the queue -- so it keeps scrolling */

48
app/tools/gimpbrushtool.c
View File

@ -348,12 +348,9 @@ gimp_paint_tool_button_press (GimpTool *tool,
draw_line = FALSE;
paint_tool->curpressure = bevent->pressure;
paint_tool->curxtilt = bevent->xtilt;
paint_tool->curytilt = bevent->ytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->curwheel = bevent->wheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
paint_tool->state = bevent->state;
paint_tool->curxtilt = bevent->xtilt;
paint_tool->curytilt = bevent->ytilt;
paint_tool->state = bevent->state;
if (gdisp != tool->gdisp ||
paint_tool->context_id < 1)
@ -372,9 +369,6 @@ gimp_paint_tool_button_press (GimpTool *tool,
paint_tool->startpressure = paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->startytilt = paint_tool->lastytilt = paint_tool->curytilt;
paint_tool->startxtilt = paint_tool->lastxtilt = paint_tool->curxtilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->startwheel = paint_tool->lastwheel = paint_tool->curwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
/* If shift is down and this is not the first paint
@ -388,9 +382,6 @@ gimp_paint_tool_button_press (GimpTool *tool,
paint_tool->startpressure = paint_tool->lastpressure;
paint_tool->startxtilt = paint_tool->lastxtilt;
paint_tool->startytilt = paint_tool->lastytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->startwheel = paint_tool->lastwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
/* Restrict to multiples of 15 degrees if ctrl is pressed */
if (bevent->state & GDK_CONTROL_MASK)
@ -467,9 +458,6 @@ gimp_paint_tool_button_press (GimpTool *tool,
paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->lastxtilt = paint_tool->curxtilt;
paint_tool->lastytilt = paint_tool->curytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->lastwheel = paint_tool->curwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
else
{
@ -561,9 +549,6 @@ gimp_paint_tool_motion (GimpTool *tool,
paint_tool->curpressure = mevent->pressure;
paint_tool->curxtilt = mevent->xtilt;
paint_tool->curytilt = mevent->ytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->curwheel = mevent->wheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
paint_tool->state = mevent->state;
gimp_paint_tool_interpolate (paint_tool,
@ -586,9 +571,6 @@ gimp_paint_tool_motion (GimpTool *tool,
paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->lastxtilt = paint_tool->curxtilt;
paint_tool->lastytilt = paint_tool->curytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->lastwheel = paint_tool->curwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
@ -897,9 +879,6 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
paint_tool->startpressure = paint_tool->lastpressure = paint_tool->curpressure = 0.5;
paint_tool->startxtilt = paint_tool->lastxtilt = paint_tool->curxtilt = 0;
paint_tool->startytilt = paint_tool->lastytilt = paint_tool->curytilt = 0;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->startwheel = paint_tool->lastwheel = paint_tool->curwheel = 0.5;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
#endif
@ -957,9 +936,6 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
GimpBrush *current_brush;
GimpVector2 delta;
gdouble dpressure, dxtilt, dytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
gdouble dwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
/* double spacing; */
/* double lastscale, curscale; */
gdouble n;
@ -978,16 +954,9 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
dpressure = paint_tool->curpressure - paint_tool->lastpressure;
dxtilt = paint_tool->curxtilt - paint_tool->lastxtilt;
dytilt = paint_tool->curytilt - paint_tool->lastytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
dwheel = paint_tool->curwheel - paint_tool->lastwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
/* return if there has been no motion */
#ifdef GTK_HAVE_SIX_VALUATORS
if (!delta.x && !delta.y && !dpressure && !dxtilt && !dytilt && !dwheel)
#else /* !GTK_HAVE_SIX_VALUATORS */
/* return if there has been no motion */
if (!delta.x && !delta.y && !dpressure && !dxtilt && !dytilt)
#endif /* GTK_HAVE_SIX_VALUATORS */
return;
/* calculate the distance traveled in the coordinate space of the brush */
@ -1028,9 +997,6 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
paint_tool->curpressure = paint_tool->lastpressure + dpressure * t;
paint_tool->curxtilt = paint_tool->lastxtilt + dxtilt * t;
paint_tool->curytilt = paint_tool->lastytilt + dytilt * t;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->curwheel = paint_tool->lastwheel + dwheel * t;
#endif /* GTK_HAVE_SIX_VALUATORS */
/* save the current brush */
current_brush = paint_tool->brush;
@ -1053,9 +1019,6 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
paint_tool->curpressure = paint_tool->lastpressure + dpressure;
paint_tool->curxtilt = paint_tool->lastxtilt + dxtilt;
paint_tool->curytilt = paint_tool->lastytilt + dytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->curwheel = paint_tool->lastwheel + dwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
void
@ -1085,9 +1048,6 @@ gimp_paint_tool_finish (GimpPaintTool *paint_tool,
pu->lastpressure = paint_tool->startpressure;
pu->lastxtilt = paint_tool->startxtilt;
pu->lastytilt = paint_tool->startytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
pu->lastwheel = paint_tool->startwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
/* Push a paint undo */
undo_push_paint (gimage, pu);

15
app/tools/gimpbrushtool.h
View File

@ -62,34 +62,25 @@ typedef struct _GimpPaintToolClass GimpPaintToolClass;
struct _GimpPaintTool
{
GimpDrawTool parent_instance;
GimpDrawTool parent_instance;
gdouble startx; /* starting x coord */
gdouble starty; /* starting y coord */
gdouble startpressure; /* starting pressure */
gdouble startxtilt; /* starting xtilt */
gdouble startytilt; /* starting ytilt */
#ifdef GTK_HAVE_SIX_VALUATORS
gdouble startwheel; /* starting wheel */
#endif /* GTK_HAVE_SIX_VALUATORS */
gdouble curx; /* current x coord */
gdouble cury; /* current y coord */
gdouble curpressure; /* current pressure */
gdouble curxtilt; /* current xtilt */
gdouble curytilt; /* current ytilt */
#ifdef GTK_HAVE_SIX_VALUATORS
gdouble curwheel; /* current wheel */
#endif /* GTK_HAVE_SIX_VALUATORS */
gdouble lastx; /* last x coord */
gdouble lasty; /* last y coord */
gdouble lastpressure; /* last pressure */
gdouble lastxtilt; /* last xtilt */
gdouble lastytilt; /* last ytilt */
#ifdef GTK_HAVE_SIX_VALUATORS
gdouble lastwheel; /* last wheel */
#endif /* GTK_HAVE_SIX_VALUATORS */
gint state; /* state of buttons and keys */
@ -126,15 +117,11 @@ struct _PaintUndo
{
GimpPaintTool *tool;
gdouble lastx;
gdouble lasty;
gdouble lastpressure;
gdouble lastxtilt;
gdouble lastytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
gdouble lastwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
};

48
app/tools/gimppainttool.c
View File

@ -348,12 +348,9 @@ gimp_paint_tool_button_press (GimpTool *tool,
draw_line = FALSE;
paint_tool->curpressure = bevent->pressure;
paint_tool->curxtilt = bevent->xtilt;
paint_tool->curytilt = bevent->ytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->curwheel = bevent->wheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
paint_tool->state = bevent->state;
paint_tool->curxtilt = bevent->xtilt;
paint_tool->curytilt = bevent->ytilt;
paint_tool->state = bevent->state;
if (gdisp != tool->gdisp ||
paint_tool->context_id < 1)
@ -372,9 +369,6 @@ gimp_paint_tool_button_press (GimpTool *tool,
paint_tool->startpressure = paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->startytilt = paint_tool->lastytilt = paint_tool->curytilt;
paint_tool->startxtilt = paint_tool->lastxtilt = paint_tool->curxtilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->startwheel = paint_tool->lastwheel = paint_tool->curwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
/* If shift is down and this is not the first paint
@ -388,9 +382,6 @@ gimp_paint_tool_button_press (GimpTool *tool,
paint_tool->startpressure = paint_tool->lastpressure;
paint_tool->startxtilt = paint_tool->lastxtilt;
paint_tool->startytilt = paint_tool->lastytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->startwheel = paint_tool->lastwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
/* Restrict to multiples of 15 degrees if ctrl is pressed */
if (bevent->state & GDK_CONTROL_MASK)
@ -467,9 +458,6 @@ gimp_paint_tool_button_press (GimpTool *tool,
paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->lastxtilt = paint_tool->curxtilt;
paint_tool->lastytilt = paint_tool->curytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->lastwheel = paint_tool->curwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
else
{
@ -561,9 +549,6 @@ gimp_paint_tool_motion (GimpTool *tool,
paint_tool->curpressure = mevent->pressure;
paint_tool->curxtilt = mevent->xtilt;
paint_tool->curytilt = mevent->ytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->curwheel = mevent->wheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
paint_tool->state = mevent->state;
gimp_paint_tool_interpolate (paint_tool,
@ -586,9 +571,6 @@ gimp_paint_tool_motion (GimpTool *tool,
paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->lastxtilt = paint_tool->curxtilt;
paint_tool->lastytilt = paint_tool->curytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->lastwheel = paint_tool->curwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
@ -897,9 +879,6 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
paint_tool->startpressure = paint_tool->lastpressure = paint_tool->curpressure = 0.5;
paint_tool->startxtilt = paint_tool->lastxtilt = paint_tool->curxtilt = 0;
paint_tool->startytilt = paint_tool->lastytilt = paint_tool->curytilt = 0;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->startwheel = paint_tool->lastwheel = paint_tool->curwheel = 0.5;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
#endif
@ -957,9 +936,6 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
GimpBrush *current_brush;
GimpVector2 delta;
gdouble dpressure, dxtilt, dytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
gdouble dwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
/* double spacing; */
/* double lastscale, curscale; */
gdouble n;
@ -978,16 +954,9 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
dpressure = paint_tool->curpressure - paint_tool->lastpressure;
dxtilt = paint_tool->curxtilt - paint_tool->lastxtilt;
dytilt = paint_tool->curytilt - paint_tool->lastytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
dwheel = paint_tool->curwheel - paint_tool->lastwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
/* return if there has been no motion */
#ifdef GTK_HAVE_SIX_VALUATORS
if (!delta.x && !delta.y && !dpressure && !dxtilt && !dytilt && !dwheel)
#else /* !GTK_HAVE_SIX_VALUATORS */
/* return if there has been no motion */
if (!delta.x && !delta.y && !dpressure && !dxtilt && !dytilt)
#endif /* GTK_HAVE_SIX_VALUATORS */
return;
/* calculate the distance traveled in the coordinate space of the brush */
@ -1028,9 +997,6 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
paint_tool->curpressure = paint_tool->lastpressure + dpressure * t;
paint_tool->curxtilt = paint_tool->lastxtilt + dxtilt * t;
paint_tool->curytilt = paint_tool->lastytilt + dytilt * t;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->curwheel = paint_tool->lastwheel + dwheel * t;
#endif /* GTK_HAVE_SIX_VALUATORS */
/* save the current brush */
current_brush = paint_tool->brush;
@ -1053,9 +1019,6 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
paint_tool->curpressure = paint_tool->lastpressure + dpressure;
paint_tool->curxtilt = paint_tool->lastxtilt + dxtilt;
paint_tool->curytilt = paint_tool->lastytilt + dytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
paint_tool->curwheel = paint_tool->lastwheel + dwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
void
@ -1085,9 +1048,6 @@ gimp_paint_tool_finish (GimpPaintTool *paint_tool,
pu->lastpressure = paint_tool->startpressure;
pu->lastxtilt = paint_tool->startxtilt;
pu->lastytilt = paint_tool->startytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
pu->lastwheel = paint_tool->startwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
/* Push a paint undo */
undo_push_paint (gimage, pu);

15
app/tools/gimppainttool.h
View File

@ -62,34 +62,25 @@ typedef struct _GimpPaintToolClass GimpPaintToolClass;
struct _GimpPaintTool
{
GimpDrawTool parent_instance;
GimpDrawTool parent_instance;
gdouble startx; /* starting x coord */
gdouble starty; /* starting y coord */
gdouble startpressure; /* starting pressure */
gdouble startxtilt; /* starting xtilt */
gdouble startytilt; /* starting ytilt */
#ifdef GTK_HAVE_SIX_VALUATORS
gdouble startwheel; /* starting wheel */
#endif /* GTK_HAVE_SIX_VALUATORS */
gdouble curx; /* current x coord */
gdouble cury; /* current y coord */
gdouble curpressure; /* current pressure */
gdouble curxtilt; /* current xtilt */
gdouble curytilt; /* current ytilt */
#ifdef GTK_HAVE_SIX_VALUATORS
gdouble curwheel; /* current wheel */
#endif /* GTK_HAVE_SIX_VALUATORS */
gdouble lastx; /* last x coord */
gdouble lasty; /* last y coord */
gdouble lastpressure; /* last pressure */
gdouble lastxtilt; /* last xtilt */
gdouble lastytilt; /* last ytilt */
#ifdef GTK_HAVE_SIX_VALUATORS
gdouble lastwheel; /* last wheel */
#endif /* GTK_HAVE_SIX_VALUATORS */
gint state; /* state of buttons and keys */
@ -126,15 +117,11 @@ struct _PaintUndo
{
GimpPaintTool *tool;
gdouble lastx;
gdouble lasty;
gdouble lastpressure;
gdouble lastxtilt;
gdouble lastytilt;
#ifdef GTK_HAVE_SIX_VALUATORS
gdouble lastwheel;
#endif /* GTK_HAVE_SIX_VALUATORS */
};

7
app/widgets/gimpdeviceinfo.c
View File

@ -614,7 +614,7 @@ devices_write_rc_device (DeviceInfo *device_info,
for (i=0; i< (gdk_info ? gdk_info->num_axes : device_info->num_axes); i++)
{
gchar *axis_type = NULL; /* Quiet gcc */
gchar *axis_type = NULL;
switch (gdk_info ? gdk_info->axes[i] : device_info->axes[i])
{
@ -636,11 +636,6 @@ devices_write_rc_device (DeviceInfo *device_info,
case GDK_AXIS_YTILT:
axis_type = "ytilt";
break;
#ifdef GTK_HAVE_SIX_VALUATORS
case GDK_AXIS_WHEEL:
axis_type = "wheel";
break;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
fprintf (fp, " %s",axis_type);
}

7
app/widgets/gimpdevices.c
View File

@ -614,7 +614,7 @@ devices_write_rc_device (DeviceInfo *device_info,
for (i=0; i< (gdk_info ? gdk_info->num_axes : device_info->num_axes); i++)
{
gchar *axis_type = NULL; /* Quiet gcc */
gchar *axis_type = NULL;
switch (gdk_info ? gdk_info->axes[i] : device_info->axes[i])
{
@ -636,11 +636,6 @@ devices_write_rc_device (DeviceInfo *device_info,
case GDK_AXIS_YTILT:
axis_type = "ytilt";
break;
#ifdef GTK_HAVE_SIX_VALUATORS
case GDK_AXIS_WHEEL:
axis_type = "wheel";
break;
#endif /* GTK_HAVE_SIX_VALUATORS */
}
fprintf (fp, " %s",axis_type);
}

14
modules/colorsel_water.c
View File

@ -336,12 +336,7 @@ motion_notify_event (GtkWidget *widget,
{
if (event->is_hint)
gdk_input_window_get_pointer (event->window, event->deviceid,
#ifdef GTK_HAVE_SIX_VALUATORS
NULL, NULL, NULL, NULL, NULL, NULL, NULL
#else /* !GTK_HAVE_SIX_VALUATORS */
NULL, NULL, NULL, NULL, NULL, NULL
#endif /* GTK_HAVE_SIX_VALUATORS */
);
NULL, NULL, NULL, NULL, NULL, NULL);
draw_brush (colorsel, widget,
erase,
@ -354,12 +349,7 @@ motion_notify_event (GtkWidget *widget,
{
gdk_input_window_get_pointer (event->window, event->deviceid,
&event->x, &event->y,
#ifdef GTK_HAVE_SIX_VALUATORS
NULL, NULL, NULL, NULL, NULL
#else /* !GTK_HAVE_SIX_VALUATORS */
NULL, NULL, NULL, NULL
#endif /* GTK_HAVE_SIX_VALUATORS */
);
NULL, NULL, NULL, NULL);
}
return TRUE;