mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-22 04:22:29 +00:00
plug-ins/color-rotate/color-rotate-callbacks.c
2008-09-04 Michael Natterer <mitch@gimp.org> * plug-ins/color-rotate/color-rotate-callbacks.c * plug-ins/common/filter-pack.c * plug-ins/common/nova.c * plug-ins/common/sample-colorize.c: get rid of calls to gdk_window_get_pointer(), use the coords from the motion event and use gdk_event_request_motions(). * plug-ins/color-rotate/color-rotate-callbacks.[ch]: some unrelated cleanup while i was at it. svn path=/trunk/; revision=26853
This commit is contained in:
parent
8ec1d65a4a
commit
02b11257dd
12
ChangeLog
12
ChangeLog
|
@ -1,3 +1,15 @@
|
|||
2008-09-04 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* plug-ins/color-rotate/color-rotate-callbacks.c
|
||||
* plug-ins/common/filter-pack.c
|
||||
* plug-ins/common/nova.c
|
||||
* plug-ins/common/sample-colorize.c: get rid of calls to
|
||||
gdk_window_get_pointer(), use the coords from the motion event
|
||||
and use gdk_event_request_motions().
|
||||
|
||||
* plug-ins/color-rotate/color-rotate-callbacks.[ch]: some
|
||||
unrelated cleanup while i was at it.
|
||||
|
||||
2008-09-04 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* app/composite/make-installer.py
|
||||
|
|
|
@ -65,7 +65,7 @@ rcm_units_factor (gint units)
|
|||
}
|
||||
}
|
||||
|
||||
gchar *
|
||||
const gchar *
|
||||
rcm_units_string (gint units)
|
||||
{
|
||||
switch (units)
|
||||
|
@ -349,7 +349,7 @@ rcm_combo_callback (GtkWidget *widget,
|
|||
|
||||
gboolean
|
||||
rcm_expose_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventExpose *event,
|
||||
RcmCircle *circle)
|
||||
{
|
||||
if (circle->action_flag == VIRGIN)
|
||||
|
@ -366,24 +366,22 @@ rcm_expose_event (GtkWidget *widget,
|
|||
|
||||
gboolean
|
||||
rcm_button_press_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventButton *event,
|
||||
RcmCircle *circle)
|
||||
{
|
||||
float clicked_angle;
|
||||
float *alpha;
|
||||
float *beta;
|
||||
GdkEventButton *bevent;
|
||||
|
||||
alpha = &circle->angle->alpha;
|
||||
beta = &circle->angle->beta;
|
||||
bevent = (GdkEventButton *) event;
|
||||
|
||||
circle->action_flag = DRAG_START;
|
||||
clicked_angle = angle_mod_2PI (arctg (CENTER-bevent->y, bevent->x-CENTER));
|
||||
clicked_angle = angle_mod_2PI (arctg (CENTER - event->y, event->x - CENTER));
|
||||
circle->prev_clicked = clicked_angle;
|
||||
|
||||
if ((sqrt (SQR (bevent->y-CENTER) +
|
||||
SQR (bevent->x-CENTER)) > RADIUS * EACH_OR_BOTH) &&
|
||||
if ((sqrt (SQR (event->y - CENTER) +
|
||||
SQR (event->x - CENTER)) > RADIUS * EACH_OR_BOTH) &&
|
||||
(min_prox (*alpha, *beta, clicked_angle) < G_PI / 12))
|
||||
{
|
||||
circle->mode = EACH;
|
||||
|
@ -419,7 +417,7 @@ rcm_button_press_event (GtkWidget *widget,
|
|||
|
||||
gboolean
|
||||
rcm_release_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventButton *event,
|
||||
RcmCircle *circle)
|
||||
{
|
||||
if (circle->action_flag == DRAGING)
|
||||
|
@ -441,10 +439,9 @@ rcm_release_event (GtkWidget *widget,
|
|||
|
||||
gboolean
|
||||
rcm_motion_notify_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventMotion *event,
|
||||
RcmCircle *circle)
|
||||
{
|
||||
gint x, y;
|
||||
gfloat clicked_angle, delta;
|
||||
gfloat *alpha, *beta;
|
||||
gint cw_ccw;
|
||||
|
@ -460,8 +457,7 @@ rcm_motion_notify_event (GtkWidget *widget,
|
|||
&values,
|
||||
GDK_GC_FUNCTION);
|
||||
|
||||
gdk_window_get_pointer (widget->window, &x, &y, NULL);
|
||||
clicked_angle = angle_mod_2PI (arctg (CENTER-y, x-CENTER));
|
||||
clicked_angle = angle_mod_2PI (arctg (CENTER - event->y, event->x - CENTER));
|
||||
|
||||
delta = clicked_angle - circle->prev_clicked;
|
||||
circle->prev_clicked = clicked_angle;
|
||||
|
@ -504,6 +500,8 @@ rcm_motion_notify_event (GtkWidget *widget,
|
|||
rcm_render_preview (Current.Bna->after);
|
||||
}
|
||||
|
||||
gdk_event_request_motions (event);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
@ -512,7 +510,7 @@ rcm_motion_notify_event (GtkWidget *widget,
|
|||
|
||||
gboolean
|
||||
rcm_gray_expose_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventExpose *event,
|
||||
RcmGray *circle)
|
||||
{
|
||||
if (circle->action_flag == VIRGIN)
|
||||
|
@ -533,16 +531,14 @@ rcm_gray_expose_event (GtkWidget *widget,
|
|||
|
||||
gboolean
|
||||
rcm_gray_button_press_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventButton *event,
|
||||
RcmGray *circle)
|
||||
{
|
||||
GtkStyle *style = gtk_widget_get_style (widget);
|
||||
GdkEventButton *bevent;
|
||||
int x, y;
|
||||
|
||||
bevent = (GdkEventButton *) event;
|
||||
x = bevent->x - GRAY_CENTER - LITTLE_RADIUS;
|
||||
y = GRAY_CENTER - bevent->y + LITTLE_RADIUS;
|
||||
x = event->x - GRAY_CENTER - LITTLE_RADIUS;
|
||||
y = GRAY_CENTER - event->y + LITTLE_RADIUS;
|
||||
|
||||
circle->action_flag = DRAG_START;
|
||||
circle->hue = angle_mod_2PI(arctg(y, x));
|
||||
|
@ -574,7 +570,7 @@ rcm_gray_button_press_event (GtkWidget *widget,
|
|||
|
||||
gboolean
|
||||
rcm_gray_release_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventButton *event,
|
||||
RcmGray *circle)
|
||||
{
|
||||
if (circle->action_flag == DRAGING)
|
||||
|
@ -596,7 +592,7 @@ rcm_gray_release_event (GtkWidget *widget,
|
|||
|
||||
gboolean
|
||||
rcm_gray_motion_notify_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventMotion *event,
|
||||
RcmGray *circle)
|
||||
{
|
||||
gint x, y;
|
||||
|
@ -624,10 +620,8 @@ rcm_gray_motion_notify_event (GtkWidget *widget,
|
|||
circle->hue, circle->satur); /* erase */
|
||||
}
|
||||
|
||||
gdk_window_get_pointer (widget->window, &x, &y, NULL);
|
||||
|
||||
x = x - GRAY_CENTER - LITTLE_RADIUS;
|
||||
y = GRAY_CENTER - y + LITTLE_RADIUS;
|
||||
x = event->x - GRAY_CENTER - LITTLE_RADIUS;
|
||||
y = GRAY_CENTER - event->y + LITTLE_RADIUS;
|
||||
|
||||
circle->hue = angle_mod_2PI (arctg (y, x));
|
||||
circle->satur = sqrt (SQR (x) + SQR (y)) / GRAY_RADIUS;
|
||||
|
@ -647,6 +641,8 @@ rcm_gray_motion_notify_event (GtkWidget *widget,
|
|||
if (Current.RealTime)
|
||||
rcm_render_preview (Current.Bna->after);
|
||||
|
||||
gdk_event_request_motions (event);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
@ -655,9 +651,8 @@ rcm_gray_motion_notify_event (GtkWidget *widget,
|
|||
|
||||
void
|
||||
rcm_set_alpha (GtkWidget *entry,
|
||||
gpointer data)
|
||||
RcmCircle *circle)
|
||||
{
|
||||
RcmCircle *circle = data;
|
||||
GtkStyle *style = gtk_widget_get_style (circle->preview);
|
||||
|
||||
if (circle->action_flag != VIRGIN)
|
||||
|
@ -677,9 +672,8 @@ rcm_set_alpha (GtkWidget *entry,
|
|||
|
||||
void
|
||||
rcm_set_beta (GtkWidget *entry,
|
||||
gpointer data)
|
||||
RcmCircle *circle)
|
||||
{
|
||||
RcmCircle *circle = data;
|
||||
GtkStyle *style = gtk_widget_get_style (circle->preview);
|
||||
|
||||
if (circle->action_flag != VIRGIN)
|
||||
|
@ -699,9 +693,8 @@ rcm_set_beta (GtkWidget *entry,
|
|||
|
||||
void
|
||||
rcm_set_hue (GtkWidget *entry,
|
||||
gpointer data)
|
||||
RcmGray *circle)
|
||||
{
|
||||
RcmGray *circle = data;
|
||||
GtkStyle *style = gtk_widget_get_style (circle->preview);
|
||||
|
||||
if (circle->action_flag != VIRGIN)
|
||||
|
@ -725,9 +718,8 @@ rcm_set_hue (GtkWidget *entry,
|
|||
|
||||
void
|
||||
rcm_set_satur (GtkWidget *entry,
|
||||
gpointer data)
|
||||
RcmGray *circle)
|
||||
{
|
||||
RcmGray *circle = data;
|
||||
GtkStyle *style = gtk_widget_get_style (circle->preview);
|
||||
|
||||
if (circle->action_flag != VIRGIN)
|
||||
|
@ -750,9 +742,8 @@ rcm_set_satur (GtkWidget *entry,
|
|||
|
||||
void
|
||||
rcm_set_gray_sat (GtkWidget *entry,
|
||||
gpointer data)
|
||||
RcmGray *circle)
|
||||
{
|
||||
RcmGray *circle = data;
|
||||
GtkStyle *style = gtk_widget_get_style (circle->preview);
|
||||
|
||||
circle->gray_sat = gtk_spin_button_get_value (GTK_SPIN_BUTTON (entry));
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
float rcm_units_factor (gint units);
|
||||
|
||||
gchar *rcm_units_string (gint units);
|
||||
const gchar * rcm_units_string (gint units);
|
||||
|
||||
void rcm_set_pixmap (GtkWidget **widget,
|
||||
GtkWidget *parent,
|
||||
|
@ -49,12 +49,6 @@ void rcm_set_pixmap (GtkWidget **widget,
|
|||
gchar **pixmap_data);
|
||||
|
||||
|
||||
/* Ok Button */
|
||||
|
||||
void rcm_ok_callback (GtkWidget *widget,
|
||||
gpointer data);
|
||||
|
||||
|
||||
/* Circle buttons */
|
||||
|
||||
void rcm_360_degrees (GtkWidget *button,
|
||||
|
@ -95,44 +89,45 @@ void rcm_combo_callback (GtkWidget *widget,
|
|||
/* Circle events */
|
||||
|
||||
gboolean rcm_expose_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventExpose *event,
|
||||
RcmCircle *circle);
|
||||
gboolean rcm_button_press_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventButton *event,
|
||||
RcmCircle *circle);
|
||||
gboolean rcm_release_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventButton *event,
|
||||
RcmCircle *circle);
|
||||
gboolean rcm_motion_notify_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventMotion *event,
|
||||
RcmCircle *circle);
|
||||
|
||||
|
||||
/* Gray circle events */
|
||||
|
||||
gboolean rcm_gray_expose_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventExpose *event,
|
||||
RcmGray *circle);
|
||||
gboolean rcm_gray_button_press_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventButton *event,
|
||||
RcmGray *circle);
|
||||
gboolean rcm_gray_release_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventButton *event,
|
||||
RcmGray *circle);
|
||||
gboolean rcm_gray_motion_notify_event (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
GdkEventMotion *event,
|
||||
RcmGray *circle);
|
||||
|
||||
|
||||
/* Spinbuttons */
|
||||
|
||||
void rcm_set_alpha (GtkWidget *entry,
|
||||
gpointer data);
|
||||
RcmCircle *circle);
|
||||
void rcm_set_beta (GtkWidget *entry,
|
||||
gpointer data);
|
||||
RcmCircle *circle);
|
||||
|
||||
void rcm_set_hue (GtkWidget *entry,
|
||||
gpointer data);
|
||||
RcmGray *circle);
|
||||
void rcm_set_satur (GtkWidget *entry,
|
||||
gpointer data);
|
||||
RcmGray *circle);
|
||||
void rcm_set_gray_sat (GtkWidget *entry,
|
||||
gpointer data);
|
||||
RcmGray *circle);
|
||||
|
|
|
@ -1545,7 +1545,7 @@ fp_range_change_events (GtkWidget *widget,
|
|||
|
||||
case GDK_MOTION_NOTIFY:
|
||||
mevent = (GdkEventMotion *) event;
|
||||
gdk_window_get_pointer (widget->window, &x, NULL, NULL);
|
||||
x = mevent->x;
|
||||
|
||||
if (x >= 0 && x < 256)
|
||||
{
|
||||
|
@ -1556,6 +1556,8 @@ fp_range_change_events (GtkWidget *widget,
|
|||
update_range_labels ();
|
||||
fp_create_smoothness_graph (AW.aliasing_preview);
|
||||
}
|
||||
|
||||
gdk_event_request_motions (mevent);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
@ -661,12 +661,12 @@ nova_center_preview_events (GtkWidget *widget,
|
|||
|
||||
if (mevent->state & GDK_BUTTON1_MASK)
|
||||
{
|
||||
GdkModifierType mask;
|
||||
gint x, y;
|
||||
gboolean retval = nova_center_update (widget, center,
|
||||
mevent->x, mevent->y);
|
||||
|
||||
gdk_window_get_pointer (widget->window, &x, &y, &mask);
|
||||
gdk_event_request_motions (mevent);
|
||||
|
||||
return nova_center_update (widget, center, x, y);
|
||||
return retval;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
|
@ -1133,7 +1133,8 @@ level_in_events (GtkWidget *widget,
|
|||
if (g_Sdebug)
|
||||
printf ("EVENT: GDK_MOTION_NOTIFY\n");
|
||||
mevent = (GdkEventMotion *) event;
|
||||
gdk_window_get_pointer (widget->window, &x, NULL, NULL);
|
||||
x = mevent->x;
|
||||
gdk_event_request_motions (mevent);
|
||||
update = TRUE;
|
||||
break;
|
||||
|
||||
|
@ -1240,7 +1241,8 @@ level_out_events (GtkWidget *widget,
|
|||
if (g_Sdebug)
|
||||
printf ("OUT_EVENT: GDK_MOTION_NOTIFY\n");
|
||||
mevent = (GdkEventMotion *) event;
|
||||
gdk_window_get_pointer (widget->window, &x, NULL, NULL);
|
||||
x = mevent->x;
|
||||
gdk_event_request_motions (mevent);
|
||||
update = TRUE;
|
||||
break;
|
||||
|
||||
|
|
Loading…
Reference in a new issue