X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/20c7a3a095bc527ba1f97ff85fe193ce11177773..4e53f3dcd47d9208cff59bdacefdacf554b37962:/src/viklayer.h?ds=sidebyside diff --git a/src/viklayer.h b/src/viklayer.h index 543da016..0225fe5e 100644 --- a/src/viklayer.h +++ b/src/viklayer.h @@ -25,8 +25,9 @@ #include #include #include -#include "vikwindow.h" +#include "uibuilder.h" +#include "vikwindow.h" #include "viktreeview.h" #include "vikviewport.h" @@ -53,7 +54,7 @@ struct _VikLayer { gboolean visible; gboolean realized; - VikTreeview *vt; /* simply a refernce */ + VikTreeview *vt; /* simply a reference */ GtkTreeIter iter; /* for explicit "polymorphism" (function type switching) */ @@ -69,22 +70,34 @@ enum { VIK_LAYER_GEOREF, VIK_LAYER_GPS, VIK_LAYER_MAPS, + VIK_LAYER_DEM, VIK_LAYER_NUM_TYPES }; +/* I think most of these are ignored, + * returning GRAB_FOCUS grabs the focus for mouse move, + * mouse click, release always grabs focus. Focus allows key presses + * to be handled. + * It used to be that, if ignored, Viking could look for other layers. + * this was useful for clicking a way/trackpoint in any layer, + * if no layer was selected (find way/trackpoint) + */ typedef enum { VIK_LAYER_TOOL_IGNORED=0, VIK_LAYER_TOOL_ACK, VIK_LAYER_TOOL_ACK_REDRAW_ABOVE, VIK_LAYER_TOOL_ACK_REDRAW_ALL, - VIK_LAYER_TOOL_ACK_REDRAW_IF_VISIBLE + VIK_LAYER_TOOL_ACK_REDRAW_IF_VISIBLE, + VIK_LAYER_TOOL_ACK_GRAB_FOCUS, /* only for move */ } VikLayerToolFuncStatus; /* gpointer is tool-specific state created in the constructor */ typedef gpointer (*VikToolConstructorFunc) (VikWindow *, VikViewport *); typedef void (*VikToolDestructorFunc) (gpointer); typedef VikLayerToolFuncStatus (*VikToolMouseFunc) (VikLayer *, GdkEventButton *, gpointer); +typedef VikLayerToolFuncStatus (*VikToolMouseMoveFunc) (VikLayer *, GdkEventMotion *, gpointer); typedef void (*VikToolActivationFunc) (VikLayer *, gpointer); +typedef gboolean (*VikToolKeyFunc) (VikLayer *, GdkEventKey *, gpointer); typedef struct _VikToolInterface VikToolInterface; struct _VikToolInterface { @@ -94,63 +107,17 @@ struct _VikToolInterface { VikToolActivationFunc activate; VikToolActivationFunc deactivate; VikToolMouseFunc click; - VikToolMouseFunc move; + VikToolMouseMoveFunc move; VikToolMouseFunc release; + VikToolKeyFunc key_press; /* return FALSE if we don't use the key press -- should return AFLSE most of the time if we want any shortcuts / UI keybindings to work! use sparingly. */ + GdkCursorType cursor_type; + const GdkPixdata *cursor_data; + const GdkCursor *cursor; }; /* Parameters (for I/O and Properties) */ +/* --> moved to uibuilder.h */ -typedef union { - gdouble d; - guint32 u; - gint32 i; - gboolean b; - const gchar *s; - GdkColor c; -} VikLayerParamData; - -typedef struct { - const gchar *name; - guint8 type; - gint16 group; - const gchar *title; - guint8 widget_type; - const gpointer widget_data; - const gpointer extra_widget_data; -} VikLayerParam; - -enum { -VIK_LAYER_NOT_IN_PROPERTIES=-2, -VIK_LAYER_GROUP_NONE=-1 -}; - -enum { -VIK_LAYER_WIDGET_CHECKBUTTON=0, -VIK_LAYER_WIDGET_RADIOGROUP, -VIK_LAYER_WIDGET_SPINBUTTON, -VIK_LAYER_WIDGET_ENTRY, -VIK_LAYER_WIDGET_FILEENTRY, -VIK_LAYER_WIDGET_HSCALE, -VIK_LAYER_WIDGET_COLOR, -VIK_LAYER_WIDGET_COMBOBOX, -}; - -typedef struct { - gdouble min; - gdouble max; - gdouble step; - guint8 digits; -} VikLayerParamScale; - -/* id is index */ -enum { -VIK_LAYER_PARAM_DOUBLE=1, -VIK_LAYER_PARAM_UINT, -VIK_LAYER_PARAM_INT, -VIK_LAYER_PARAM_STRING, -VIK_LAYER_PARAM_BOOLEAN, -VIK_LAYER_PARAM_COLOR, -}; /* layer interface functions */ @@ -164,13 +131,13 @@ typedef void (*VikLayerFuncRealize) (VikLayer *,VikTreevi /* rarely used, this is called after a read operation or properties box is run. * usually used to create GC's that depend on params, * but GC's can also be created from create() or set_param() */ -typedef void (*VikLayerFuncPostRead) (VikLayer *,gpointer vp); +typedef void (*VikLayerFuncPostRead) (VikLayer *,VikViewport *vp,gboolean from_file); typedef void (*VikLayerFuncFree) (VikLayer *); /* do _not_ use this unless absolutely neccesary. Use the dynamic properties (see coordlayer for example) * returns TRUE if OK was pressed */ -typedef gboolean (*VikLayerFuncProperties) (VikLayer *,VikViewport *); /* gpointer is a VikViewport */ +typedef gboolean (*VikLayerFuncProperties) (VikLayer *,VikViewport *); typedef void (*VikLayerFuncDraw) (VikLayer *,VikViewport *); typedef void (*VikLayerFuncChangeCoordMode) (VikLayer *,VikCoordMode); @@ -184,7 +151,6 @@ typedef const gchar * (*VikLayerFuncSublayerRenameRequest) (VikLayer *,const gch gint,VikViewport *,GtkTreeIter *); /* first gpointer is a VikLayersPanel */ typedef gboolean (*VikLayerFuncSublayerToggleVisible) (VikLayer *,gint,gpointer); -typedef VikLayer * (*VikLayerFuncCopy) (VikLayer *,VikViewport *); typedef void (*VikLayerFuncMarshall) (VikLayer *, guint8 **, gint *); typedef VikLayer * (*VikLayerFuncUnmarshall) (guint8 *, gint, VikViewport *); @@ -255,7 +221,6 @@ struct _VikLayerInterface { VikLayerFuncSublayerRenameRequest sublayer_rename_request; VikLayerFuncSublayerToggleVisible sublayer_toggle_visible; - VikLayerFuncCopy copy; VikLayerFuncMarshall marshall; VikLayerFuncUnmarshall unmarshall; @@ -283,6 +248,7 @@ void vik_layer_draw ( VikLayer *l, gpointer data ); void vik_layer_change_coord_mode ( VikLayer *l, VikCoordMode mode ); void vik_layer_rename ( VikLayer *l, const gchar *new_name ); void vik_layer_rename_no_copy ( VikLayer *l, gchar *new_name ); +const gchar *vik_layer_get_name ( VikLayer *l ); gboolean vik_layer_set_param (VikLayer *layer, guint16 id, VikLayerParamData data, gpointer vp); @@ -296,7 +262,7 @@ VikLayer *vik_layer_create ( gint type, gpointer vp, GtkWindow *w, gboolean inte gboolean vik_layer_properties ( VikLayer *layer, gpointer vp ); void vik_layer_realize ( VikLayer *l, VikTreeview *vt, GtkTreeIter * layer_iter ); -void vik_layer_post_read ( VikLayer *layer, gpointer vp ); +void vik_layer_post_read ( VikLayer *layer, VikViewport *vp, gboolean from_file ); gboolean vik_layer_sublayer_add_menu_items ( VikLayer *l, GtkMenu *menu, gpointer vlp, gint subtype, gpointer sublayer, GtkTreeIter *iter ); @@ -313,4 +279,8 @@ gboolean vik_layer_sublayer_toggle_visible ( VikLayer *l, gint subtype, gpointer /* TODO: put in layerspanel */ GdkPixbuf *vik_layer_load_icon ( gint type ); +VikLayer *vik_layer_get_and_reset_trigger(); +void vik_layer_emit_update_secondary ( VikLayer *vl ); /* to be called by aggregate layer only. doesn't set the trigger */ +void vik_layer_emit_update_although_invisible ( VikLayer *vl ); + #endif