custom color chooser; misc patches

[xournal.git] / src / xo-misc.h

diff --git a/src/xo-misc.h b/src/xo-misc.h
index fe490ec63f1988b5438e81540eaf693e2bd7fd0c..3a6e029dd98f4fcca83d05a92264f06502a5e342 100644 (file)
--- a/src/xo-misc.h
+++ b/src/xo-misc.h
@@ -34,6 +34,7 @@ gboolean have_intersect(struct BBox *a, struct BBox *b);
 void lower_canvas_item_to(GnomeCanvasGroup *g, GnomeCanvasItem *item, GnomeCanvasItem *after);
 
 void rgb_to_gdkcolor(guint rgba, GdkColor *color);
+guint32 gdkcolor_to_rgba(GdkColor gdkcolor, guint16 alpha);
 
 // interface misc functions
 
@@ -60,9 +61,9 @@ void update_font_button(void);
 
 void update_mapping_linkings(int toolno);
 void do_switch_page(int pg, gboolean rescroll, gboolean refresh_all);
-void set_cur_color(int color);
+void set_cur_color(int color_no, guint color_rgba);
 void recolor_temp_text(int color_no, guint color_rgba);
-void process_color_activate(GtkMenuItem *menuitem, int color);
+void process_color_activate(GtkMenuItem *menuitem, int color_no, guint color_rgba);
 void process_thickness_activate(GtkMenuItem *menuitem, int tool, int val);
 void process_papercolor_activate(GtkMenuItem *menuitem, int color);
 void process_paperstyle_activate(GtkMenuItem *menuitem, int style);
@@ -101,6 +102,8 @@ gboolean filter_extended_events(GtkWidget *widget, GdkEvent *event, gpointer use
 // gboolean fix_extended_events(GtkWidget *widget, GdkEvent *event, gpointer user_data);
 gboolean combobox_popup_disable_xinput(GtkWidget *widget, GdkEvent *event, gpointer user_data);
 
+
+
 // defines for paper rulings
 
 #define RULING_MARGIN_COLOR 0xff0080ff