From ea31de799a0d9ff5e1b461252577b8e2f20f2936 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 7 Nov 2000 23:34:19 +0000 Subject: [PATCH] plug-ins/fp/fp_gdk.c #include g* types, stuff. 2000-11-08 Michael Natterer * plug-ins/fp/fp_gdk.c * plug-ins/fp/fp_gtk.c: #include g* types, stuff. --- ChangeLog | 5 ++ plug-ins/fp/fp_gdk.c | 191 ++++++++++++++++++++++--------------------- plug-ins/fp/fp_gtk.c | 101 ++++++++++++----------- 3 files changed, 159 insertions(+), 138 deletions(-) diff --git a/ChangeLog b/ChangeLog index e28a2d8081..0c25a6ead8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-11-08 Michael Natterer + + * plug-ins/fp/fp_gdk.c + * plug-ins/fp/fp_gtk.c: #include g* types, stuff. + 2000-11-08 Michael Natterer * plug-ins/print/RELNOTES diff --git a/plug-ins/fp/fp_gdk.c b/plug-ins/fp/fp_gdk.c index 8485d62705..2594ff2b23 100644 --- a/plug-ins/fp/fp_gdk.c +++ b/plug-ins/fp/fp_gdk.c @@ -1,8 +1,10 @@ #include #include -#include -#include "gtk/gtk.h" + +#include + #include "libgimp/gimp.h" + #include "fp.h" extern AdvancedWindow AW; @@ -26,38 +28,39 @@ draw_slider(GdkWindow *window, GdkGC *fill_gc, int xpos) { - int i; + gint i; + for (i = 0; i < RANGE_HEIGHT; i++) - gdk_draw_line(window, fill_gc, MARGIN + xpos-i/2, i, MARGIN + xpos+i/2,i); + gdk_draw_line (window, fill_gc, MARGIN + xpos-i/2, i, MARGIN + xpos+i/2,i); - gdk_draw_line(window, border_gc, MARGIN + xpos, 0, - MARGIN + xpos - (RANGE_HEIGHT - 1) / 2, RANGE_HEIGHT - 1); + gdk_draw_line (window, border_gc, MARGIN + xpos, 0, + MARGIN + xpos - (RANGE_HEIGHT - 1) / 2, RANGE_HEIGHT - 1); - gdk_draw_line(window, border_gc, MARGIN + xpos, 0, - MARGIN + xpos + (RANGE_HEIGHT - 1) / 2, RANGE_HEIGHT - 1); + gdk_draw_line (window, border_gc, MARGIN + xpos, 0, + MARGIN + xpos + (RANGE_HEIGHT - 1) / 2, RANGE_HEIGHT - 1); - gdk_draw_line(window, border_gc, MARGIN + xpos-(RANGE_HEIGHT-1)/2,RANGE_HEIGHT-1, - MARGIN + xpos + (RANGE_HEIGHT-1)/2, RANGE_HEIGHT-1); + gdk_draw_line (window, border_gc, MARGIN + xpos-(RANGE_HEIGHT-1)/2,RANGE_HEIGHT-1, + MARGIN + xpos + (RANGE_HEIGHT-1)/2, RANGE_HEIGHT-1); } void -draw_it(GtkWidget *widget) +draw_it (GtkWidget *widget) { - draw_slider(AW.aliasingGraph->window, - AW.aliasingGraph->style->black_gc, - AW.aliasingGraph->style->dark_gc[GTK_STATE_NORMAL], - Current.Cutoffs[SHADOWS]); + draw_slider (AW.aliasingGraph->window, + AW.aliasingGraph->style->black_gc, + AW.aliasingGraph->style->dark_gc[GTK_STATE_NORMAL], + Current.Cutoffs[SHADOWS]); - draw_slider(AW.aliasingGraph->window, - AW.aliasingGraph->style->black_gc, - AW.aliasingGraph->style->dark_gc[GTK_STATE_NORMAL], - Current.Cutoffs[MIDTONES]); + draw_slider (AW.aliasingGraph->window, + AW.aliasingGraph->style->black_gc, + AW.aliasingGraph->style->dark_gc[GTK_STATE_NORMAL], + Current.Cutoffs[MIDTONES]); - draw_slider(AW.aliasingGraph->window, - AW.aliasingGraph->style->black_gc, - AW.aliasingGraph->style->dark_gc[GTK_STATE_SELECTED], - Current.Offset); + draw_slider (AW.aliasingGraph->window, + AW.aliasingGraph->style->black_gc, + AW.aliasingGraph->style->dark_gc[GTK_STATE_SELECTED], + Current.Offset); } gint @@ -71,91 +74,95 @@ FP_Range_Change_Events (GtkWidget *widget, static guchar *new; gint x; - switch(event->type) { - - case GDK_EXPOSE: - draw_it(NULL); - break; + switch (event->type) + { + case GDK_EXPOSE: + draw_it (NULL); + break; - case GDK_BUTTON_PRESS: - bevent=(GdkEventButton *) event; + case GDK_BUTTON_PRESS: + bevent= (GdkEventButton *) event; - shad = abs(bevent->x - Current.Cutoffs[SHADOWS]); - mid = abs(bevent->x - Current.Cutoffs[MIDTONES]); - offset = abs(bevent->x - Current.Offset); + shad = abs (bevent->x - Current.Cutoffs[SHADOWS]); + mid = abs (bevent->x - Current.Cutoffs[MIDTONES]); + offset = abs (bevent->x - Current.Offset); - min= MIN(MIN(shad,mid),offset); + min = MIN (MIN (shad, mid), offset); + + if (bevent->x >0 && bevent->x<256) + { + if (min == shad) + new = &Current.Cutoffs[SHADOWS]; + else if (min == mid) + new = &Current.Cutoffs[MIDTONES]; + else + new = &Current.Offset; - - if (bevent->x >0 && bevent->x<256) { - if (min==shad) - new = &Current.Cutoffs[SHADOWS]; - else if (min==mid) - new = &Current.Cutoffs[MIDTONES]; - else - new = &Current.Offset; + slider_erase (AW.aliasingGraph->window, *new); + *new=bevent->x; + } - slider_erase(AW.aliasingGraph->window,*new); - *new=bevent->x; - } - - draw_it(NULL); + draw_it (NULL); - if (Current.RealTime) { - fp_range_preview_spill(AW.rangePreview,Current.ValueBy); - update_range_labels(); - fp_create_smoothness_graph(AW.aliasingPreview); - refreshPreviews(Current.VisibleFrames); - } - break; + if (Current.RealTime) + { + fp_range_preview_spill (AW.rangePreview, Current.ValueBy); + update_range_labels (); + fp_create_smoothness_graph (AW.aliasingPreview); + refreshPreviews (Current.VisibleFrames); + } + break; - case GDK_BUTTON_RELEASE: - if (!Current.RealTime) { - fp_range_preview_spill(AW.rangePreview,Current.ValueBy); - update_range_labels(); - fp_create_smoothness_graph(AW.aliasingPreview); - refreshPreviews(Current.VisibleFrames); - } - break; + case GDK_BUTTON_RELEASE: + if (!Current.RealTime) + { + fp_range_preview_spill (AW.rangePreview, Current.ValueBy); + update_range_labels (); + fp_create_smoothness_graph (AW.aliasingPreview); + refreshPreviews (Current.VisibleFrames); + } + break; - case GDK_MOTION_NOTIFY: - mevent= (GdkEventMotion *) event; - gdk_window_get_pointer(widget->window, &x,NULL, NULL); - - if (x>=0 && x<256) { - slider_erase(AW.aliasingGraph->window,*new); - *new=x; - draw_it(NULL); - if (Current.RealTime) { - fp_range_preview_spill(AW.rangePreview,Current.ValueBy); - update_range_labels(); - fp_create_smoothness_graph(AW.aliasingPreview); - refreshPreviews(Current.VisibleFrames); - } - } - - break; + case GDK_MOTION_NOTIFY: + mevent = (GdkEventMotion *) event; + gdk_window_get_pointer (widget->window, &x, NULL, NULL); - default: - break; - } -return 0; + if (x >= 0 && x < 256) + { + slider_erase (AW.aliasingGraph->window, *new); + *new = x; + draw_it (NULL); + if (Current.RealTime) + { + fp_range_preview_spill (AW.rangePreview, Current.ValueBy); + update_range_labels (); + fp_create_smoothness_graph (AW.aliasingPreview); + refreshPreviews (Current.VisibleFrames); + } + } + break; + + default: + break; + } + + return FALSE; } void -update_range_labels() +update_range_labels (void) { guchar buffer[3]; gtk_label_set_text (GTK_LABEL(Current.rangeLabels[1]),"0"); - - sprintf(buffer,"%d",Current.Cutoffs[SHADOWS]); - gtk_label_set_text (GTK_LABEL(Current.rangeLabels[3]),buffer); - gtk_label_set_text (GTK_LABEL(Current.rangeLabels[5]),buffer); - sprintf(buffer,"%d",Current.Cutoffs[MIDTONES]); - gtk_label_set_text (GTK_LABEL(Current.rangeLabels[7]),buffer); - gtk_label_set_text (GTK_LABEL(Current.rangeLabels[9]),buffer); + g_snprintf (buffer, sizeof (buffer), "%d", Current.Cutoffs[SHADOWS]); + gtk_label_set_text (GTK_LABEL (Current.rangeLabels[3]), buffer); + gtk_label_set_text (GTK_LABEL (Current.rangeLabels[5]), buffer); - gtk_label_set_text (GTK_LABEL(Current.rangeLabels[11]),"255"); + g_snprintf (buffer, sizeof (buffer), "%d", Current.Cutoffs[MIDTONES]); + gtk_label_set_text (GTK_LABEL (Current.rangeLabels[7]), buffer); + gtk_label_set_text (GTK_LABEL (Current.rangeLabels[9]), buffer); + + gtk_label_set_text (GTK_LABEL(Current.rangeLabels[11]), "255"); } diff --git a/plug-ins/fp/fp_gtk.c b/plug-ins/fp/fp_gtk.c index 5fbfc25193..f5a37520d8 100644 --- a/plug-ins/fp/fp_gtk.c +++ b/plug-ins/fp/fp_gtk.c @@ -17,29 +17,30 @@ to figure out which button the user pushed, etc. Not my design, please don't blame me -- njl */ -static const char *hue_red= N_("Red:"); -static const char *hue_green= N_("Green:"); -static const char *hue_blue= N_("Blue:"); -static const char *hue_cyan= N_("Cyan:"); -static const char *hue_yellow= N_("Yellow:"); -static const char *hue_magenta= N_("Magenta:"); +static const gchar *hue_red = N_("Red:"); +static const gchar *hue_green = N_("Green:"); +static const gchar *hue_blue = N_("Blue:"); +static const gchar *hue_cyan = N_("Cyan:"); +static const gchar *hue_yellow = N_("Yellow:"); +static const gchar *hue_magenta = N_("Magenta:"); -static const char *val_darker= N_("Darker:"); -static const char *val_lighter= N_("Lighter:"); +static const gchar *val_darker = N_("Darker:"); +static const gchar *val_lighter = N_("Lighter:"); -static const char *sat_more= N_("More Sat:"); -static const char *sat_less= N_("Less Sat:"); +static const gchar *sat_more = N_("More Sat:"); +static const gchar *sat_less = N_("Less Sat:"); -static const char *current_val= N_("Current:"); +static const gchar *current_val = N_("Current:"); AdvancedWindow AW = { NULL, NULL, NULL, NULL, NULL, NULL, NULL }; extern FP_Params Current; -extern GimpDrawable *drawable, *mask; +extern GimpDrawable *drawable; +extern GimpDrawable *mask; FP_Intensity ShMidHi[] = { SHADOWS, MIDTONES, HIGHLIGHTS }; -int HueSatVal[] = { BY_HUE, BY_SAT, BY_VAL }; +gint HueSatVal[] = { BY_HUE, BY_SAT, BY_VAL }; gint nudgeArray[256]; @@ -51,23 +52,24 @@ GtkWidget *darkerPreview, *lighterPreview, *middlePreview; GtkWidget *allOrSell, *dlg; GtkWidget *plusSatPreview, *SatPreview, *minusSatPreview; -struct +struct { - GtkWidget *bna, - *palette, - *rough, - *range, - *show, - *lnd, - *pixelsBy, - *frameSelect, - *satur; + GtkWidget *bna; + GtkWidget *palette; + GtkWidget *rough; + GtkWidget *range; + GtkWidget *show; + GtkWidget *lnd; + GtkWidget *pixelsBy; + GtkWidget *frameSelect; + GtkWidget *satur; } fpFrames; fpInterface FPint = { FALSE /* run */ }; + ReducedImage *reduced; /***********************************************************/ @@ -256,9 +258,9 @@ fp_create_range (void) ShMidHi + MIDTONES, Current.Range == MIDTONES); group = Button_In_A_Box (vbox, group, _("Highlights"), - GTK_SIGNAL_FUNC (fp_change_current_range), - ShMidHi + HIGHLIGHTS, - Current.Range == HIGHLIGHTS); + GTK_SIGNAL_FUNC (fp_change_current_range), + ShMidHi + HIGHLIGHTS, + Current.Range == HIGHLIGHTS); return frame; } @@ -373,7 +375,7 @@ fp_create_msnls (void) table = gtk_table_new (1, 11, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 2); gtk_widget_show (table); - + gtk_table_attach (GTK_TABLE (table), moreVbox, 0, 3, 0, 1, GTK_EXPAND, GTK_EXPAND, 0, 0); gtk_table_attach (GTK_TABLE (table), middleVbox, 4, 7, 0, 1, @@ -564,9 +566,9 @@ Frames_Check_Button_In_A_Box (GtkWidget *vbox, } void -Create_A_Table_Entry (GtkWidget **box, - GtkWidget *SmallerFrame, - const gchar *description) +Create_A_Table_Entry (GtkWidget **box, + GtkWidget *SmallerFrame, + const gchar *description) { GtkWidget *label, *button, *table; @@ -575,7 +577,7 @@ Create_A_Table_Entry (GtkWidget **box, gtk_widget_show (*box); /* Delayed translation applied here */ - label = gtk_label_new (gettext(description)); + label = gtk_label_new (gettext (description)); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_widget_show (label); @@ -595,14 +597,16 @@ Create_A_Table_Entry (GtkWidget **box, GTK_SIGNAL_FUNC (selectionMade), (gchar *) description); - gtk_container_add (GTK_CONTAINER (button), SmallerFrame); - gtk_widget_show (button); - gtk_table_attach (GTK_TABLE (table), button, 0, 1, 1, 2, - 0, 0, 0, 4); + gtk_container_add (GTK_CONTAINER (button), SmallerFrame); + gtk_widget_show (button); + gtk_table_attach (GTK_TABLE (table), button, 0, 1, 1, 2, + 0, 0, 0, 4); } else - gtk_table_attach (GTK_TABLE (table), SmallerFrame, 0, 1, 1, 2, - 0, 0, 0, 4); + { + gtk_table_attach (GTK_TABLE (table), SmallerFrame, 0, 1, 1, 2, + 0, 0, 0, 4); + } } void @@ -642,7 +646,7 @@ void fp_selection_only (GtkWidget *button, gpointer data) { - static int notFirstTime = 0; + static gint notFirstTime = 0; if (!(notFirstTime++)) return; @@ -668,7 +672,7 @@ void fp_show_hide_frame (GtkWidget *button, GtkWidget *frame) { - int prev = Current.VisibleFrames; + gint prev = Current.VisibleFrames; if (frame == NULL) return; @@ -800,7 +804,7 @@ void fp_scale_update (GtkAdjustment *adjustment, float *scale_val) { - static float prevValue=.25; + static gfloat prevValue = 0.25; *scale_val = adjustment->value; @@ -836,12 +840,17 @@ void fp_change_current_pixels_by (GtkWidget *button, gint *valueBy) { - int prevValue=VALUE; - static int notFirstTime=0; + gint prevValue = VALUE; + static gint notFirstTime = 0; - if (!(notFirstTime++)) return; - if (!GTK_TOGGLE_BUTTON(button)->active) return; - if (*valueBy == prevValue) return; + if (!(notFirstTime++)) + return; + + if (!GTK_TOGGLE_BUTTON(button)->active) + return; + + if (*valueBy == prevValue) + return; Current.ValueBy = *valueBy; refreshPreviews (Current.VisibleFrames); @@ -865,7 +874,7 @@ fp_advanced_call (void) fp_advanced_dialog (); } -int +gint fp_dialog (void) { GtkWidget *bna;