callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

untabified, removed useless inclusion of <gdk/gdkkeysyms.h>.

Browse Source 
2004-09-10  Michael Natterer  <mitch@gimp.org>

	* libgimpwidgets/gimpcolorselect.c: untabified, removed useless
	inclusion of <gdk/gdkkeysyms.h>.
This commit is contained in:
Michael Natterer
2004-09-10 13:16:55 +00:00
committed by Michael Natterer
parent a840af33ea
commit 6b4f7b3955
2 changed files with 148 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-09-10 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/gimpcolorselect.c: untabified, removed useless
inclusion of <gdk/gdkkeysyms.h>.
2004-09-10 Sven Neumann <sven@gimp.org> 2004-09-10 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpcolorselect.c: ported to GimpPreviewArea. * libgimpwidgets/gimpcolorselect.c: ported to GimpPreviewArea.

287
libgimpwidgets/gimpcolorselect.c
View File

@ -26,7 +26,6 @@
#include "config.h" #include "config.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h" #include "libgimpmath/gimpmath.h"
@ -45,7 +44,7 @@
#define COLOR_AREA_EVENT_MASK (GDK_EXPOSURE_MASK | \ #define COLOR_AREA_EVENT_MASK (GDK_EXPOSURE_MASK | \
GDK_BUTTON_PRESS_MASK | \ GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK | \ GDK_BUTTON_RELEASE_MASK | \
GDK_BUTTON_MOTION_MASK | \ GDK_BUTTON_MOTION_MASK | \
GDK_ENTER_NOTIFY_MASK) GDK_ENTER_NOTIFY_MASK)
@ -226,14 +225,14 @@ gimp_color_select_get_type (void)
static const GTypeInfo select_info = static const GTypeInfo select_info =
{ {
sizeof (GimpColorSelectClass), sizeof (GimpColorSelectClass),
(GBaseInitFunc) NULL, (GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL, (GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_color_select_class_init, (GClassInitFunc) gimp_color_select_class_init,
NULL, /* class_finalize */ NULL, /* class_finalize */
NULL, /* class_data */ NULL, /* class_data */
sizeof (GimpColorSelect), sizeof (GimpColorSelect),
0, /* n_preallocs */ 0, /* n_preallocs */
(GInstanceInitFunc) gimp_color_select_init, (GInstanceInitFunc) gimp_color_select_init,
}; };
select_type = g_type_register_static (GIMP_TYPE_COLOR_SELECTOR, select_type = g_type_register_static (GIMP_TYPE_COLOR_SELECTOR,
@ -292,14 +291,14 @@ gimp_color_select_init (GimpColorSelect *select)
gtk_widget_show (select->xy_color); gtk_widget_show (select->xy_color);
g_signal_connect (select->xy_color, "size_allocate", g_signal_connect (select->xy_color, "size_allocate",
G_CALLBACK (gimp_color_select_xy_size_allocate), G_CALLBACK (gimp_color_select_xy_size_allocate),
select); select);
g_signal_connect_after (select->xy_color, "expose_event", g_signal_connect_after (select->xy_color, "expose_event",
G_CALLBACK (gimp_color_select_xy_expose), G_CALLBACK (gimp_color_select_xy_expose),
select); select);
g_signal_connect (select->xy_color, "event", g_signal_connect (select->xy_color, "event",
G_CALLBACK (gimp_color_select_xy_events), G_CALLBACK (gimp_color_select_xy_events),
select); select);
#if 0 #if 0
gimp_dnd_color_dest_add (select->xy_color, gimp_color_select_drop_color, gimp_dnd_color_dest_add (select->xy_color, gimp_color_select_drop_color,
@ -321,14 +320,14 @@ gimp_color_select_init (GimpColorSelect *select)
gtk_widget_show (select->z_color); gtk_widget_show (select->z_color);
g_signal_connect (select->z_color, "size_allocate", g_signal_connect (select->z_color, "size_allocate",
G_CALLBACK (gimp_color_select_z_size_allocate), G_CALLBACK (gimp_color_select_z_size_allocate),
select); select);
g_signal_connect_after (select->z_color, "expose_event", g_signal_connect_after (select->z_color, "expose_event",
G_CALLBACK (gimp_color_select_z_expose), G_CALLBACK (gimp_color_select_z_expose),
select); select);
g_signal_connect (select->z_color, "event", g_signal_connect (select->z_color, "event",
G_CALLBACK (gimp_color_select_z_events), G_CALLBACK (gimp_color_select_z_events),
select); select);
select->toggle_box = gtk_vbox_new (FALSE, 2); select->toggle_box = gtk_vbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (hbox), select->toggle_box, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), select->toggle_box, FALSE, FALSE, 0);
@ -687,10 +686,10 @@ gimp_color_select_xy_events (GtkWidget *widget,
y = bevent->y; y = bevent->y;
gdk_pointer_grab (select->xy_color->window, FALSE, gdk_pointer_grab (select->xy_color->window, FALSE,
GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_MOTION_MASK | GDK_BUTTON_MOTION_MASK |
GDK_BUTTON_RELEASE_MASK, GDK_BUTTON_RELEASE_MASK,
NULL, NULL, bevent->time); NULL, NULL, bevent->time);
break; break;
case GDK_BUTTON_RELEASE: case GDK_BUTTON_RELEASE:
@ -705,9 +704,9 @@ gimp_color_select_xy_events (GtkWidget *widget,
case GDK_MOTION_NOTIFY: case GDK_MOTION_NOTIFY:
mevent = (GdkEventMotion *) event; mevent = (GdkEventMotion *) event;
if (mevent->is_hint) if (mevent->is_hint)
{ {
gdk_window_get_pointer (widget->window, &x, &y, NULL); gdk_window_get_pointer (widget->window, &x, &y, NULL);
} }
else else
{ {
x = mevent->x; x = mevent->x;
@ -781,10 +780,10 @@ gimp_color_select_z_events (GtkWidget *widget,
z = bevent->y; z = bevent->y;
gdk_pointer_grab (select->z_color->window, FALSE, gdk_pointer_grab (select->z_color->window, FALSE,
GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_MOTION_MASK | GDK_BUTTON_MOTION_MASK |
GDK_BUTTON_RELEASE_MASK, GDK_BUTTON_RELEASE_MASK,
NULL, NULL, bevent->time); NULL, NULL, bevent->time);
break; break;
case GDK_BUTTON_RELEASE: case GDK_BUTTON_RELEASE:
@ -798,9 +797,9 @@ gimp_color_select_z_events (GtkWidget *widget,
case GDK_MOTION_NOTIFY: case GDK_MOTION_NOTIFY:
mevent = (GdkEventMotion *) event; mevent = (GdkEventMotion *) event;
if (mevent->is_hint) if (mevent->is_hint)
{ {
gdk_window_get_pointer (widget->window, NULL, &z, NULL); gdk_window_get_pointer (widget->window, NULL, &z, NULL);
} }
else else
{ {
z = mevent->y; z = mevent->y;
@ -1245,63 +1244,63 @@ color_select_update_hue_saturation (ColorSelectFill *csf)
{ {
case 0: case 0:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * 255; *p++ = v * 255;
*p++ = v * (255 - (s * (255 - f))); *p++ = v * (255 - (s * (255 - f)));
*p++ = v * 255 * (1 - s); *p++ = v * 255 * (1 - s);
s += ds; s += ds;
} }
break; break;
case 1: case 1:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * (255 - s * f); *p++ = v * (255 - s * f);
*p++ = v * 255; *p++ = v * 255;
*p++ = v * 255 * (1 - s); *p++ = v * 255 * (1 - s);
s += ds; s += ds;
} }
break; break;
case 2: case 2:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * 255 * (1 - s); *p++ = v * 255 * (1 - s);
*p++ = v *255; *p++ = v *255;
*p++ = v * (255 - (s * (255 - f))); *p++ = v * (255 - (s * (255 - f)));
s += ds; s += ds;
} }
break; break;
case 3: case 3:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * 255 * (1 - s); *p++ = v * 255 * (1 - s);
*p++ = v * (255 - s * f); *p++ = v * (255 - s * f);
*p++ = v * 255; *p++ = v * 255;
s += ds; s += ds;
} }
break; break;
case 4: case 4:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * (255 - (s * (255 - f))); *p++ = v * (255 - (s * (255 - f)));
*p++ = v * (255 * (1 - s)); *p++ = v * (255 * (1 - s));
*p++ = v * 255; *p++ = v * 255;
s += ds; s += ds;
} }
break; break;
case 5: case 5:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * 255; *p++ = v * 255;
*p++ = v * 255 * (1 - s); *p++ = v * 255 * (1 - s);
*p++ = v * (255 - s * f); *p++ = v * (255 - s * f);
s += ds; s += ds;
} }
break; break;
} }
} }
@ -1335,63 +1334,63 @@ color_select_update_hue_value (ColorSelectFill *csf)
{ {
case 0: case 0:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * 255; *p++ = v * 255;
*p++ = v * (255 - (s * (255 - f))); *p++ = v * (255 - (s * (255 - f)));
*p++ = v * 255 * (1 - s); *p++ = v * 255 * (1 - s);
v += dv; v += dv;
} }
break; break;
case 1: case 1:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * (255 - s * f); *p++ = v * (255 - s * f);
*p++ = v * 255; *p++ = v * 255;
*p++ = v * 255 * (1 - s); *p++ = v * 255 * (1 - s);
v += dv; v += dv;
} }
break; break;
case 2: case 2:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * 255 * (1 - s); *p++ = v * 255 * (1 - s);
*p++ = v *255; *p++ = v *255;
*p++ = v * (255 - (s * (255 - f))); *p++ = v * (255 - (s * (255 - f)));
v += dv; v += dv;
} }
break; break;
case 3: case 3:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * 255 * (1 - s); *p++ = v * 255 * (1 - s);
*p++ = v * (255 - s * f); *p++ = v * (255 - s * f);
*p++ = v * 255; *p++ = v * 255;
v += dv; v += dv;
} }
break; break;
case 4: case 4:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * (255 - (s * (255 - f))); *p++ = v * (255 - (s * (255 - f)));
*p++ = v * (255 * (1 - s)); *p++ = v * (255 * (1 - s));
*p++ = v * 255; *p++ = v * 255;
v += dv; v += dv;
} }
break; break;
case 5: case 5:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * 255; *p++ = v * 255;
*p++ = v * 255 * (1 - s); *p++ = v * 255 * (1 - s);
*p++ = v * (255 - s * f); *p++ = v * (255 - s * f);
v += dv; v += dv;
} }
break; break;
} }
} }
@ -1428,63 +1427,63 @@ color_select_update_saturation_value (ColorSelectFill *csf)
{ {
case 0: case 0:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * 255; *p++ = v * 255;
*p++ = v * (255 - (s * (255 - f))); *p++ = v * (255 - (s * (255 - f)));
*p++ = v * 255 * (1 - s); *p++ = v * 255 * (1 - s);
v += dv; v += dv;
} }
break; break;
case 1: case 1:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * (255 - s * f); *p++ = v * (255 - s * f);
*p++ = v * 255; *p++ = v * 255;
*p++ = v * 255 * (1 - s); *p++ = v * 255 * (1 - s);
v += dv; v += dv;
} }
break; break;
case 2: case 2:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * 255 * (1 - s); *p++ = v * 255 * (1 - s);
*p++ = v *255; *p++ = v *255;
*p++ = v * (255 - (s * (255 - f))); *p++ = v * (255 - (s * (255 - f)));
v += dv; v += dv;
} }
break; break;
case 3: case 3:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * 255 * (1 - s); *p++ = v * 255 * (1 - s);
*p++ = v * (255 - s * f); *p++ = v * (255 - s * f);
*p++ = v * 255; *p++ = v * 255;
v += dv; v += dv;
} }
break; break;
case 4: case 4:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * (255 - (s * (255 - f))); *p++ = v * (255 - (s * (255 - f)));
*p++ = v * (255 * (1 - s)); *p++ = v * (255 * (1 - s));
*p++ = v * 255; *p++ = v * 255;
v += dv; v += dv;
} }
break; break;
case 5: case 5:
for (i = 0; i < csf->width; i++) for (i = 0; i < csf->width; i++)
{ {
*p++ = v * 255; *p++ = v * 255;
*p++ = v * 255 * (1 - s); *p++ = v * 255 * (1 - s);
*p++ = v * (255 - s * f); *p++ = v * (255 - s * f);
v += dv; v += dv;
} }
break; break;
} }
} }