X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/08f14055b729c70c631eef2113853a8d160c7f33..d61ec067563735c651f81e6ad0f31be01a8c202b:/src/viklayer.h diff --git a/src/viklayer.h b/src/viklayer.h index 4400d64f..8abb37ea 100644 --- a/src/viklayer.h +++ b/src/viklayer.h @@ -31,6 +31,8 @@ #include "viktreeview.h" #include "vikviewport.h" +G_BEGIN_DECLS + #define VIK_LAYER_TYPE (vik_layer_get_type ()) #define VIK_LAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VIK_LAYER_TYPE, VikLayer)) #define VIK_LAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VIK_LAYER_TYPE, VikLayerClass)) @@ -54,24 +56,12 @@ struct _VikLayer { gboolean visible; gboolean realized; + VikViewport *vvp;/* simply a reference */ VikTreeview *vt; /* simply a reference */ GtkTreeIter iter; /* for explicit "polymorphism" (function type switching) */ - guint16 type; -}; - - - -enum { - VIK_LAYER_AGGREGATE = 0, - VIK_LAYER_TRW, - VIK_LAYER_COORD, - VIK_LAYER_GEOREF, - VIK_LAYER_GPS, - VIK_LAYER_MAPS, - VIK_LAYER_DEM, - VIK_LAYER_NUM_TYPES + VikLayerTypeEnum type; }; /* I think most of these are ignored, @@ -101,7 +91,7 @@ typedef gboolean (*VikToolKeyFunc) (VikLayer *, GdkEventKey *, gpointer); typedef struct _VikToolInterface VikToolInterface; struct _VikToolInterface { - gchar *name; + GtkRadioActionEntry radioActionEntry; VikToolConstructorFunc create; VikToolDestructorFunc destroy; VikToolActivationFunc activate; @@ -109,7 +99,8 @@ struct _VikToolInterface { VikToolMouseFunc click; 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. */ + VikToolKeyFunc key_press; /* return FALSE if we don't use the key press -- should return FALSE most of the time if we want any shortcuts / UI keybindings to work! use sparingly. */ + gboolean pan_handler; // Call click & release funtions even when 'Pan Mode' is on GdkCursorType cursor_type; const GdkPixdata *cursor_data; const GdkCursor *cursor; @@ -166,7 +157,9 @@ typedef gboolean (*VikLayerFuncSetParam) (VikLayer *, guint16, typedef VikLayerParamData (*VikLayerFuncGetParam) (VikLayer *, guint16, gboolean); -typedef void (*VikLayerFuncReadFileData) (VikLayer *, FILE *); +typedef void (*VikLayerFuncChangeParam) (GtkWidget *, ui_change_values ); + +typedef gboolean (*VikLayerFuncReadFileData) (VikLayer *, FILE *, const gchar *); // gchar* is the directory path. Function should report success or failure typedef void (*VikLayerFuncWriteFileData) (VikLayer *, FILE *); /* item manipulation */ @@ -184,10 +177,12 @@ typedef void (*VikLayerFuncFreeCopiedItem) (gint, gpointer); typedef void (*VikLayerFuncDragDropRequest) (VikLayer *, VikLayer *, GtkTreeIter *, GtkTreePath *); typedef gboolean (*VikLayerFuncSelectClick) (VikLayer *, GdkEventButton *, VikViewport *, tool_ed_t*); -typedef gboolean (*VikLayerFuncSelectMove) (VikLayer *, GdkEventButton *, VikViewport *, tool_ed_t*); +typedef gboolean (*VikLayerFuncSelectMove) (VikLayer *, GdkEventMotion *, VikViewport *, tool_ed_t*); typedef gboolean (*VikLayerFuncSelectRelease) (VikLayer *, GdkEventButton *, VikViewport *, tool_ed_t*); typedef gboolean (*VikLayerFuncSelectedViewportMenu) (VikLayer *, GdkEventButton *, VikViewport *); +typedef time_t (*VikLayerFuncGetTimestamp) (VikLayer *); + typedef enum { VIK_MENU_ITEM_PROPERTY=1, VIK_MENU_ITEM_CUT=2, @@ -201,7 +196,9 @@ typedef struct _VikLayerInterface VikLayerInterface; /* See vik_layer_* for function parameter names */ struct _VikLayerInterface { - const gchar * name; + const gchar * fixed_layer_name; // Used in .vik files - this should never change to maintain file compatibility + const gchar * name; // Translate-able name used for display purposes + const gchar * accelerator; const GdkPixdata * icon; VikToolInterface * tools; @@ -225,6 +222,8 @@ struct _VikLayerInterface { VikLayerFuncDraw draw; VikLayerFuncChangeCoordMode change_coord_mode; + VikLayerFuncGetTimestamp get_timestamp; + VikLayerFuncSetMenuItemsSelection set_menu_selection; VikLayerFuncGetMenuItemsSelection get_menu_selection; @@ -242,6 +241,7 @@ struct _VikLayerInterface { /* for I/O */ VikLayerFuncSetParam set_param; VikLayerFuncGetParam get_param; + VikLayerFuncChangeParam change_param; /* for I/O -- extra non-param data like TrwLayer data */ VikLayerFuncReadFileData read_file_data; @@ -261,26 +261,30 @@ struct _VikLayerInterface { VikLayerFuncSelectedViewportMenu show_viewport_menu; }; -VikLayerInterface *vik_layer_get_interface ( gint type ); +VikLayerInterface *vik_layer_get_interface ( VikLayerTypeEnum type ); -void vik_layer_init ( VikLayer *vl, gint type ); -void vik_layer_draw ( VikLayer *l, gpointer data ); +void vik_layer_set_type ( VikLayer *vl, VikLayerTypeEnum type ); +void vik_layer_draw ( VikLayer *l, VikViewport *vp ); 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 ); +time_t vik_layer_get_timestamp ( VikLayer *vl ); + gboolean vik_layer_set_param (VikLayer *layer, guint16 id, VikLayerParamData data, gpointer vp, gboolean is_file_operation); +void vik_layer_set_defaults ( VikLayer *vl, VikViewport *vvp ); + void vik_layer_emit_update ( VikLayer *vl ); /* GUI */ void vik_layer_set_menu_items_selection(VikLayer *l, guint16 selection); guint16 vik_layer_get_menu_items_selection(VikLayer *l); void vik_layer_add_menu_items ( VikLayer *l, GtkMenu *menu, gpointer vlp ); -VikLayer *vik_layer_create ( gint type, gpointer vp, GtkWindow *w, gboolean interactive ); -gboolean vik_layer_properties ( VikLayer *layer, gpointer vp ); +VikLayer *vik_layer_create ( VikLayerTypeEnum type, VikViewport *vp, gboolean interactive ); +gboolean vik_layer_properties ( VikLayer *layer, VikViewport *vp ); void vik_layer_realize ( VikLayer *l, VikTreeview *vt, GtkTreeIter * layer_iter ); void vik_layer_post_read ( VikLayer *layer, VikViewport *vp, gboolean from_file ); @@ -304,10 +308,23 @@ const gchar* vik_layer_layer_tooltip ( VikLayer *l ); gboolean vik_layer_selected ( VikLayer *l, gint subtype, gpointer sublayer, gint type, gpointer vlp ); /* TODO: put in layerspanel */ -GdkPixbuf *vik_layer_load_icon ( gint type ); +GdkPixbuf *vik_layer_load_icon ( VikLayerTypeEnum 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 ); +VikLayerTypeEnum vik_layer_type_from_string ( const gchar *str ); + +typedef struct { + VikLayerParamData data; + VikLayerParamType type; +} VikLayerTypedParamData; + +void vik_layer_typed_param_data_free ( gpointer gp ); +VikLayerTypedParamData *vik_layer_typed_param_data_copy_from_data ( VikLayerParamType type, VikLayerParamData val ); +VikLayerTypedParamData *vik_layer_data_typed_param_copy_from_string ( VikLayerParamType type, const gchar *str ); + +G_END_DECLS + #endif