custom color chooser; misc patches

[xournal.git] / src / xournal.h

diff --git a/src/xournal.h b/src/xournal.h
index f6cc9675342dc538ccc093148a425bcbc95d8697..6233fe74482c605c59de78d0f431d5b113674958 100644 (file)
--- a/src/xournal.h
+++ b/src/xournal.h
@@ -134,7 +134,7 @@ struct UndoErasureData;
 typedef struct Item {
   int type;
   struct Brush brush; // the brush to use, if ITEM_STROKE
-  // 'brush" also contains color info for text items
+  // 'brush' also contains color info for text items
   GnomeCanvasPoints *path;
   gdouble *widths;
   GnomeCanvasItem *canvas_item; // the corresponding canvas item, or NULL
@@ -220,6 +220,7 @@ typedef struct UIData {
   struct Brush default_brushes[NUM_STROKE_TOOLS]; // the default ones
   int linked_brush[NUM_BUTTONS+1]; // whether brushes are linked across buttons
   int cur_mapping; // the current button number for mappings
+  gboolean button_switch_mapping; // button clicks switch button 1 mappings
   gboolean use_erasertip;
   int which_mouse_button; // the mouse button drawing the current path
   struct Page default_page;  // the model for the default page
@@ -247,8 +248,7 @@ typedef struct UIData {
   gboolean in_update_page_stuff; // semaphore to avoid scrollbar retroaction
   struct Selection *selection;
   GdkCursor *cursor;
-  gboolean antialias_bg; // bilinear interpolation on bg pixmaps
-  gboolean progressive_bg; // rescale bg's one at a time
+  gboolean progressive_bg; // update PDF bg's one at a time
   char *mrufile, *configfile; // file names for MRU & config
   char *mru[MRU_SIZE]; // MRU data
   GtkWidget *mrumenu[MRU_SIZE];
@@ -274,6 +274,10 @@ typedef struct UIData {
   gboolean shorten_menus; // shorten menus ?
   gchar *shorten_menu_items; // which items to hide
   gboolean is_sel_cursor; // displaying a selection-related cursor
+  gboolean need_emergency_disable_xinput; // need to disable xinput to avoid GTK+ 2.17 bug ?
+#if GTK_CHECK_VERSION(2,10,0)
+  GtkPrintSettings *print_settings;
+#endif
 } UIData;
 
 #define BRUSH_LINKED 0