X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fxournal.h;h=8e2aff618342384bc35698e46f34a6ecf87d0379;hb=e648cece76b671b5b0e165acc6d14178e8de1000;hp=644fbd800a8737bc3ded719d0f809ea25b698682;hpb=59df9eb838b273295a6b86ce9f522dc4ad71dc4d;p=xournal.git diff --git a/src/xournal.h b/src/xournal.h index 644fbd8..8e2aff6 100644 --- a/src/xournal.h +++ b/src/xournal.h @@ -1,11 +1,23 @@ #include #include +#include + +// #define INPUT_DEBUG +/* uncomment this line if you experience event-processing problems + and want to list the input events received by xournal. Caution, lots + of output (redirect to a file). */ + +#define ENABLE_XINPUT_BUGFIX +/* comment out this line if you are experiencing calibration problems with + XInput and want to try things differently. This will probably break + on-the-fly display rotation after application startup, though. */ // PREF FILES INFO #define CONFIG_DIR ".xournal" #define MRU_FILE "recent-files" #define MRU_SIZE 8 +#define CONFIG_FILE "config" // DATA STRUCTURES AND CONSTANTS @@ -13,8 +25,12 @@ #define MAX_AXES 12 #define EPSILON 1E-7 #define MAX_ZOOM 20.0 -#define DEFAULT_ZOOM 1.3333333333 +#define DISPLAY_DPI_DEFAULT 96.0 #define MIN_ZOOM 0.2 +#define RESIZE_MARGIN 6.0 +#define MAX_SAFE_RENDER_DPI 720 // max dpi at which PDF bg's get rendered + +#define VBOX_MAIN_NITEMS 5 // number of interface items in vboxMain /* a string (+ aux data) that maintains a refcount */ @@ -39,9 +55,9 @@ typedef struct Background { Refstring *filename; int file_domain; int file_page_seq; - int pixbuf_dpi; // for PDF only - the *current* dpi value double pixbuf_scale; // for PIXMAP, this is the *current* zoom value // for PDF, this is the *requested* zoom value + int pixel_height, pixel_width; // PDF only: pixel size of current pixbuf } Background; #define BG_SOLID 0 @@ -64,6 +80,7 @@ typedef struct Brush { int thickness_no; double thickness; int tool_options; + gboolean ruler, recognizer, variable_width; } Brush; #define COLOR_BLACK 0 @@ -97,15 +114,15 @@ extern guint predef_bgcolors_rgba[COLOR_MAX]; #define TOOL_SELECTREGION 4 #define TOOL_SELECTRECT 5 #define TOOL_VERTSPACE 6 +#define TOOL_HAND 7 #define NUM_STROKE_TOOLS 3 +#define NUM_TOOLS 8 #define NUM_BUTTONS 3 #define TOOLOPT_ERASER_STANDARD 0 #define TOOLOPT_ERASER_WHITEOUT 1 #define TOOLOPT_ERASER_STROKES 2 -#define HILITER_ALPHA_MASK 0xffffff80 - extern double predef_thickness[NUM_STROKE_TOOLS][THICKNESS_MAX]; typedef struct BBox { @@ -117,10 +134,17 @@ 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 GnomeCanvasPoints *path; + gdouble *widths; GnomeCanvasItem *canvas_item; // the corresponding canvas item, or NULL struct BBox bbox; struct UndoErasureData *erasure; // for temporary use during erasures + // the following fields for ITEM_TEXT: + gchar *text; + gchar *font_name; + gdouble font_size; + GtkWidget *widget; // the widget while text is being edited (ITEM_TEMP_TEXT) } Item; // item type values for Item.type, UndoItem.type, ui.cur_item_type ... @@ -142,6 +166,13 @@ typedef struct Item { #define ITEM_DELETE_PAGE 14 #define ITEM_REPAINTSEL 15 #define ITEM_MOVESEL_VERT 16 +#define ITEM_HAND 17 +#define ITEM_TEXT 18 +#define ITEM_TEMP_TEXT 19 +#define ITEM_TEXT_EDIT 20 +#define ITEM_TEXT_ATTRIB 21 +#define ITEM_RESIZESEL 22 +#define ITEM_RECOGNIZER 23 typedef struct Layer { GList *items; // the items on the layer, from bottom to top @@ -169,6 +200,8 @@ typedef struct Selection { BBox bbox; // the rectangle bbox of the selection struct Layer *layer; // the layer on which the selection lives double anchor_x, anchor_y, last_x, last_y; // for selection motion + gboolean resizing_top, resizing_bottom, resizing_left, resizing_right; // for selection resizing + double new_x1, new_x2, new_y1, new_y2; // for selection resizing GnomeCanvasItem *canvas_item; // if the selection box is on screen GList *items; // the selected items (a list of struct Item) int move_pageno, orig_pageno; // if selection moves to a different page @@ -185,7 +218,6 @@ typedef struct UIData { int toolno[NUM_BUTTONS+1]; // the number of the currently selected tool struct Brush brushes[NUM_BUTTONS+1][NUM_STROKE_TOOLS]; // the current pen, eraser, hiliter struct Brush default_brushes[NUM_STROKE_TOOLS]; // the default ones - gboolean ruler[NUM_BUTTONS+1]; // whether each button is in ruler mode int linked_brush[NUM_BUTTONS+1]; // whether brushes are linked across buttons int cur_mapping; // the current button number for mappings gboolean use_erasertip; @@ -195,22 +227,53 @@ typedef struct UIData { struct Item *cur_item; // the item being drawn, or NULL int cur_item_type; GnomeCanvasPoints cur_path; // the path being drawn + gdouble *cur_widths; // width array for the path being drawn int cur_path_storage_alloc; + int cur_widths_storage_alloc; double zoom; // zoom factor, in pixels per pt gboolean use_xinput; // use input devices instead of core pointer gboolean allow_xinput; // allow use of xinput ? + gboolean discard_corepointer; // discard core pointer events in XInput mode + gboolean pressure_sensitivity; // use pen pressure to control stroke width? + double width_minimum_multiplier, width_maximum_multiplier; // calibration for pressure sensitivity + gboolean is_corestroke; // this stroke is painted with core pointer int screen_width, screen_height; // initial screen size, for XInput events + double hand_refpt[2]; + int hand_scrollto_cx, hand_scrollto_cy; + gboolean hand_scrollto_pending; char *filename; - gboolean view_continuous, fullscreen; + gchar *default_path; // default path for new notes + gboolean view_continuous, fullscreen, maximize_at_start; 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 - char *mrufile; // file for the MRU + char *mrufile, *configfile; // file names for MRU & config char *mru[MRU_SIZE]; // MRU data GtkWidget *mrumenu[MRU_SIZE]; gboolean bg_apply_all_pages; + int window_default_width, window_default_height, scrollbar_step_increment; + gboolean print_ruling; // print the paper ruling ? + int default_unit; // the default unit for paper sizes + int startuptool; // the default tool at startup + int zoom_step_increment; // the increment in the zoom dialog box + double zoom_step_factor; // the multiplicative factor in zoom in/out + double startup_zoom; +#if GLIB_CHECK_VERSION(2,6,0) + GKeyFile *config_data; +#endif + int vertical_order[2][VBOX_MAIN_NITEMS]; // the order of interface components + gchar *default_font_name, *font_name; + gdouble default_font_size, font_size; + gulong resize_signal_handler; + gdouble hiliter_opacity; + guint hiliter_alpha_mask; + gboolean left_handed; // left-handed mode? + gboolean auto_save_prefs; // auto-save preferences ? + gboolean shorten_menus; // shorten menus ? + gchar *shorten_menu_items; // which items to hide + gboolean is_sel_cursor; // displaying a selection-related cursor } UIData; #define BRUSH_LINKED 0 @@ -226,16 +289,19 @@ typedef struct UndoErasureData { typedef struct UndoItem { int type; - struct Item *item; // for ITEM_STROKE - struct Layer *layer; // for ITEM_STROKE, ITEM_ERASURE, ITEM_PASTE, ITEM_NEW_LAYER, ITEM_DELETE_LAYER, ITEM_MOVESEL + struct Item *item; // for ITEM_STROKE, ITEM_TEXT, ITEM_TEXT_EDIT, ITEM_TEXT_ATTRIB + struct Layer *layer; // for ITEM_STROKE, ITEM_ERASURE, ITEM_PASTE, ITEM_NEW_LAYER, ITEM_DELETE_LAYER, ITEM_MOVESEL, ITEM_TEXT, ITEM_TEXT_EDIT, ITEM_RECOGNIZER struct Layer *layer2; // for ITEM_DELETE_LAYER with val=-1, ITEM_MOVESEL struct Page *page; // for ITEM_NEW_BG_ONE/RESIZE, ITEM_NEW_PAGE, ITEM_NEW_LAYER, ITEM_DELETE_LAYER, ITEM_DELETE_PAGE - GList *erasurelist; // for ITEM_ERASURE - GList *itemlist; // for ITEM_MOVESEL, ITEM_PASTE, ITEM_REPAINTSEL + GList *erasurelist; // for ITEM_ERASURE, ITEM_RECOGNIZER + GList *itemlist; // for ITEM_MOVESEL, ITEM_PASTE, ITEM_REPAINTSEL, ITEM_RESIZESEL GList *auxlist; // for ITEM_REPAINTSEL (brushes), ITEM_MOVESEL (depths) struct Background *bg; // for ITEM_NEW_BG_ONE/RESIZE, ITEM_NEW_DEFAULT_BG int val; // for ITEM_NEW_PAGE, ITEM_NEW_LAYER, ITEM_DELETE_LAYER, ITEM_DELETE_PAGE - double val_x, val_y; // for ITEM_MOVESEL, ITEM_NEW_BG_RESIZE, ITEM_PAPER_RESIZE, ITEM_NEW_DEFAULT_BG + double val_x, val_y; // for ITEM_MOVESEL, ITEM_NEW_BG_RESIZE, ITEM_PAPER_RESIZE, ITEM_NEW_DEFAULT_BG, ITEM_TEXT_ATTRIB, ITEM_RESIZESEL + double scaling_x, scaling_y; // for ITEM_RESIZESEL + gchar *str; // for ITEM_TEXT_EDIT, ITEM_TEXT_ATTRIB + struct Brush *brush; // for ITEM_TEXT_ATTRIB struct UndoItem *next; int multiop; } UndoItem; @@ -246,35 +312,32 @@ typedef struct UndoItem { typedef struct BgPdfRequest { int pageno; - int dpi; - gboolean initial_request; // if so, loop over page numbers - gboolean is_printing; // this is for printing, not for display + double dpi; } BgPdfRequest; typedef struct BgPdfPage { - int dpi; + double dpi; GdkPixbuf *pixbuf; + int pixel_height, pixel_width; // pixel size of pixbuf } BgPdfPage; typedef struct BgPdf { int status; // the rest only makes sense if this is not STATUS_NOT_INIT - int pid; // PID of the converter process + guint pid; // the identifier of the idle callback Refstring *filename; int file_domain; - gchar *tmpfile_copy; // the temporary work copy of the file (in tmpdir) + gchar *file_contents; // buffer containing a copy of file data + gsize file_length; // size of above buffer int npages; GList *pages; // a list of BgPdfPage structures GList *requests; // a list of BgPdfRequest structures - gchar *tmpdir; // where to look for pages coming from pdf converter - gboolean create_pages; // create journal pages as we find stuff in PDF gboolean has_failed; // has failed in the past... + PopplerDocument *document; // the poppler document } BgPdf; #define STATUS_NOT_INIT 0 -#define STATUS_IDLE 1 -#define STATUS_RUNNING 2 // currently running child process on head(requests) -#define STATUS_ABORTED 3 // child process running, but head(requests) aborted -#define STATUS_SHUTDOWN 4 // waiting for child process to shut down +#define STATUS_READY 1 // things are initialized and can work +// there used to be more possible values, things got streamlined... // UTILITY MACROS @@ -298,3 +361,10 @@ extern struct Journal journal; extern struct UIData ui; extern struct BgPdf bgpdf; extern struct UndoItem *undo, *redo; + +extern double DEFAULT_ZOOM; + +#define UNIT_CM 0 +#define UNIT_IN 1 +#define UNIT_PX 2 +#define UNIT_PT 3