X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/dc2c040e183a7ea9bcc704921dc124557f5eb21a..c9a5cbf917b6c208b30670bf85de2d4c4b14e3cc:/src/viklayer.h?ds=sidebyside diff --git a/src/viklayer.h b/src/viklayer.h index 0225fe5e..4400d64f 100644 --- a/src/viklayer.h +++ b/src/viklayer.h @@ -144,21 +144,27 @@ typedef void (*VikLayerFuncChangeCoordMode) (VikLayer *,VikCoordM typedef void (*VikLayerFuncSetMenuItemsSelection) (VikLayer *,guint16); typedef guint16 (*VikLayerFuncGetMenuItemsSelection) (VikLayer *); + typedef void (*VikLayerFuncAddMenuItems) (VikLayer *,GtkMenu *,gpointer); /* gpointer is a VikLayersPanel */ typedef gboolean (*VikLayerFuncSublayerAddMenuItems) (VikLayer *,GtkMenu *,gpointer, /* first gpointer is a VikLayersPanel */ - gint,gpointer,GtkTreeIter *); + gint,gpointer,GtkTreeIter *,VikViewport *); typedef const gchar * (*VikLayerFuncSublayerRenameRequest) (VikLayer *,const gchar *,gpointer, gint,VikViewport *,GtkTreeIter *); /* first gpointer is a VikLayersPanel */ typedef gboolean (*VikLayerFuncSublayerToggleVisible) (VikLayer *,gint,gpointer); +typedef const gchar * (*VikLayerFuncSublayerTooltip) (VikLayer *,gint,gpointer); +typedef const gchar * (*VikLayerFuncLayerTooltip) (VikLayer *); +typedef gboolean (*VikLayerFuncLayerSelected) (VikLayer *,gint,gpointer,gint,gpointer); /* 2nd gpointer is a VikLayersPanel */ typedef void (*VikLayerFuncMarshall) (VikLayer *, guint8 **, gint *); typedef VikLayer * (*VikLayerFuncUnmarshall) (guint8 *, gint, VikViewport *); /* returns TRUE if needs to redraw due to changed param */ -typedef gboolean (*VikLayerFuncSetParam) (VikLayer *, guint16, VikLayerParamData, VikViewport *); +/* in parameter gboolean denotes if for file I/O, as opposed to display/cut/copy etc... operations */ +typedef gboolean (*VikLayerFuncSetParam) (VikLayer *, guint16, VikLayerParamData, VikViewport *, gboolean); +/* in parameter gboolean denotes if for file I/O, as opposed to display/cut/copy etc... operations */ typedef VikLayerParamData - (*VikLayerFuncGetParam) (VikLayer *, guint16); + (*VikLayerFuncGetParam) (VikLayer *, guint16, gboolean); typedef void (*VikLayerFuncReadFileData) (VikLayer *, FILE *); typedef void (*VikLayerFuncWriteFileData) (VikLayer *, FILE *); @@ -166,6 +172,7 @@ typedef void (*VikLayerFuncWriteFileData) (VikLayer *, FILE *); /* item manipulation */ typedef void (*VikLayerFuncDeleteItem) (VikLayer *, gint, gpointer); /* layer, subtype, pointer to sub-item */ +typedef void (*VikLayerFuncCutItem) (VikLayer *, gint, gpointer); typedef void (*VikLayerFuncCopyItem) (VikLayer *, gint, gpointer, guint8 **, guint *); /* layer, subtype, pointer to sub-item, return pointer, return len */ typedef gboolean (*VikLayerFuncPasteItem) (VikLayer *, gint, guint8 *, guint); @@ -176,6 +183,11 @@ 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 (*VikLayerFuncSelectRelease) (VikLayer *, GdkEventButton *, VikViewport *, tool_ed_t*); +typedef gboolean (*VikLayerFuncSelectedViewportMenu) (VikLayer *, GdkEventButton *, VikViewport *); + typedef enum { VIK_MENU_ITEM_PROPERTY=1, VIK_MENU_ITEM_CUT=2, @@ -220,6 +232,9 @@ struct _VikLayerInterface { VikLayerFuncSublayerAddMenuItems sublayer_add_menu_items; VikLayerFuncSublayerRenameRequest sublayer_rename_request; VikLayerFuncSublayerToggleVisible sublayer_toggle_visible; + VikLayerFuncSublayerTooltip sublayer_tooltip; + VikLayerFuncLayerTooltip layer_tooltip; + VikLayerFuncLayerSelected layer_selected; VikLayerFuncMarshall marshall; VikLayerFuncUnmarshall unmarshall; @@ -233,11 +248,17 @@ struct _VikLayerInterface { VikLayerFuncWriteFileData write_file_data; VikLayerFuncDeleteItem delete_item; + VikLayerFuncCutItem cut_item; VikLayerFuncCopyItem copy_item; VikLayerFuncPasteItem paste_item; VikLayerFuncFreeCopiedItem free_copied_item; VikLayerFuncDragDropRequest drag_drop_request; + + VikLayerFuncSelectClick select_click; + VikLayerFuncSelectMove select_move; + VikLayerFuncSelectRelease select_release; + VikLayerFuncSelectedViewportMenu show_viewport_menu; }; VikLayerInterface *vik_layer_get_interface ( gint type ); @@ -250,7 +271,7 @@ 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); +gboolean vik_layer_set_param (VikLayer *layer, guint16 id, VikLayerParamData data, gpointer vp, gboolean is_file_operation); void vik_layer_emit_update ( VikLayer *vl ); @@ -264,7 +285,7 @@ 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, VikViewport *vp, gboolean from_file ); -gboolean vik_layer_sublayer_add_menu_items ( VikLayer *l, GtkMenu *menu, gpointer vlp, gint subtype, gpointer sublayer, GtkTreeIter *iter ); +gboolean vik_layer_sublayer_add_menu_items ( VikLayer *l, GtkMenu *menu, gpointer vlp, gint subtype, gpointer sublayer, GtkTreeIter *iter, VikViewport *vvp ); VikLayer *vik_layer_copy ( VikLayer *vl, gpointer vp ); void vik_layer_marshall ( VikLayer *vl, guint8 **data, gint *len ); @@ -276,6 +297,12 @@ const gchar *vik_layer_sublayer_rename_request ( VikLayer *l, const gchar *newna gboolean vik_layer_sublayer_toggle_visible ( VikLayer *l, gint subtype, gpointer sublayer ); +const gchar* vik_layer_sublayer_tooltip ( VikLayer *l, gint subtype, gpointer sublayer ); + +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 );