From 3b5d2c0c61a75e09b5e47c5dc5a1a3908f2a8a98 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 26 Dec 2019 13:52:26 -0300 Subject: [PATCH] Implementing GActions for v3270 terminal. --- src/include/v3270/actions.h | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/terminal/actions/action.c | 477 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/terminal/actions/table.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- v3270.cbp | 3 +++ 4 files changed, 614 insertions(+), 8 deletions(-) create mode 100644 src/terminal/actions/action.c diff --git a/src/include/v3270/actions.h b/src/include/v3270/actions.h index 6fa3b17..2094f83 100644 --- a/src/include/v3270/actions.h +++ b/src/include/v3270/actions.h @@ -101,6 +101,72 @@ LIB3270_EXPORT V3270Accelerator * v3270_accelerator_clone(const V3270Accelerator *accel); LIB3270_EXPORT const V3270Accelerator * v3270_accelerator_map_lookup_entry(GtkWidget *widget, guint keyval, GdkModifierType state); + // + // GAction wrapper for V3270 terminal widget. + // + #define V3270_TYPE_ACTION (V3270Action_get_type()) + #define V3270_ACTION(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), V3270_TYPE_ACTION, V3270Action)) + #define V3270_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), V3270_TYPE_ACTION, V3270ActionClass)) + #define V3270_IS_ACTION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), V3270_TYPE_ACTION)) + #define V3270_IS_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), V3270_TYPE_ACTION)) + #define V3270_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), V3270_TYPE_ACTION, V3270ActionClass)) + + typedef struct _V3270Action { + + GObject parent; + + GtkWidget * terminal; ///> @brief The active terminal widget. + const LIB3270_PROPERTY * info; ///> @brief Action info. + const void * listener; ///> @brief Signal listener for the action group. + + struct { + const GVariantType * state; ///> @brief State type type. + const GVariantType * parameter; ///> @brief Parameter type. + } types; + + /// @brief Activation method. + void (*activate)(GAction *action, GVariant *parameter, GtkWidget *terminal); + + /// @brief Get State method. + GVariant * (*get_state_property)(GAction *action, GtkWidget *terminal); + + /// @brief Get state hint. + GVariant * (*get_state_hint)(GAction *action, GtkWidget *terminal); + + } V3270Action; + + typedef struct _V3270ActionClass { + + GObjectClass parent_class; + + struct { + GParamSpec * state; + GParamSpec * enabled; + } properties; + + void (*change_widget)(GAction *action, GtkWidget *from, GtkWidget *to); + gboolean (*get_enabled)(GAction *action, GtkWidget *terminal); + + } V3270ActionClass; + + LIB3270_EXPORT GType V3270Action_get_type(void) G_GNUC_CONST; + LIB3270_EXPORT GAction * v3270_action_new(); + + LIB3270_EXPORT void v3270_action_set_terminal_widget(GAction *object, GtkWidget *widget); + LIB3270_EXPORT GtkWidget * v3270_action_get_terminal_widget(GAction *object); + + LIB3270_EXPORT void v3270_action_notify_state(GAction *action); + LIB3270_EXPORT void v3270_action_notify_enabled(GAction *action); + + LIB3270_EXPORT H3270 * v3270_action_get_session(GAction *action); + LIB3270_EXPORT const gchar * v3270_action_get_icon_name(GAction *action); + LIB3270_EXPORT const gchar * v3270_action_get_label(GAction *action); + LIB3270_EXPORT const gchar * v3270_action_get_tooltip(GAction *action); + LIB3270_EXPORT GdkPixbuf * v3270_action_get_pixbuf(GAction *action, GtkIconSize icon_size, GtkIconLookupFlags flags); + + LIB3270_EXPORT void g_action_map_add_v3270_actions(GActionMap *action_map); + LIB3270_EXPORT void g_action_map_add_lib3270_actions(GActionMap *action_map); + G_END_DECLS #endif // V3270_ACTIONS_H_INCLUDED diff --git a/src/terminal/actions/action.c b/src/terminal/actions/action.c new file mode 100644 index 0000000..f5c7881 --- /dev/null +++ b/src/terminal/actions/action.c @@ -0,0 +1,477 @@ +/* + * "Software v3270, desenvolvido com base nos códigos fontes do WC3270 e X3270 + * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a + * aplicativos mainframe. Registro no INPI sob o nome G3270. + * + * Copyright (C) <2008> + * + * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob + * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela + * Free Software Foundation. + * + * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER + * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO + * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para + * obter mais detalhes. + * + * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este + * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin + * St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Este programa está nomeado como - e possui - linhas de código. + * + * Contatos: + * + * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) + * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça) + * + */ + + #include + #include + #include + #include + #include + #include + + #define V3270_ACTION_GET_DESCRIPTOR(obj) ((V3270Action *) obj)->info + + static void V3270_action_iface_init(GActionInterface *iface); + static void V3270Action_class_init(V3270ActionClass *klass); + static void V3270Action_init(V3270Action *action); + + static void get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); + static void set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); + + static gboolean get_enabled(GAction *action); + static void activate(GAction *action, GVariant *parameter); + + static void change_widget(GAction *action, GtkWidget *from, GtkWidget *to); + + static void finalize(GObject *object); + + static const GVariantType * get_state_type(GAction *action); + static GVariant * get_state_property(GAction *action); + + static GVariant * internal_get_state_property(GAction *action, GtkWidget *terminal); + static gboolean internal_get_enabled(GAction *action, GtkWidget *terminal); + static void internal_activate(GAction *action, GVariant *parameter, GtkWidget *terminal); + static GVariant * internal_get_state_hint(GAction *action, GtkWidget *terminal); + + static const GVariantType * get_parameter_type(GAction *action); + static GVariant * get_state_hint(GAction *action); + static const gchar * get_name(GAction *action); + + static void change_state(GAction *action, GVariant *value); + + enum { + PROP_NONE, + PROP_NAME, + PROP_PARAMETER_TYPE, + PROP_ENABLED, + PROP_STATE_TYPE, + PROP_STATE, + PROP_ICON_NAME, + PROP_LABEL, + PROP_TOOLTIP + }; + + G_DEFINE_TYPE_WITH_CODE(V3270Action, V3270Action, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE(G_TYPE_ACTION, V3270_action_iface_init)) + + void V3270_action_iface_init(GActionInterface *iface) { + iface->get_name = get_name; + iface->get_parameter_type = get_parameter_type; + iface->get_state_type = get_state_type; + iface->get_state_hint = get_state_hint; + iface->get_enabled = get_enabled; + iface->get_state = get_state_property; + iface->change_state = change_state; + iface->activate = activate; + } + + void V3270Action_class_init(V3270ActionClass *klass) { + + GObjectClass *object_class = G_OBJECT_CLASS(klass); + + debug("%s",__FUNCTION__); + + klass->change_widget = change_widget; + klass->get_enabled = internal_get_enabled; + + object_class->finalize = finalize; + object_class->get_property = get_property; + object_class->set_property = set_property; + + // Install properties + g_object_class_install_property(object_class, PROP_NAME, + g_param_spec_string ( + "name", + N_("Action Name"), + N_("The name used to invoke the action"), + NULL, + G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property(object_class, PROP_ICON_NAME, + g_param_spec_string ( + "icon-name", + N_("Icon Name"), + N_("The name of the icon associated with the action"), + NULL, + G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property(object_class, PROP_LABEL, + g_param_spec_string ( + "label", + N_("The action label"), + N_("The label for the action"), + NULL, + G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property(object_class, PROP_TOOLTIP, + g_param_spec_string ( + "tooltip", + N_("The action tooltip"), + N_("The tooltip for the action"), + NULL, + G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (object_class, PROP_PARAMETER_TYPE, + g_param_spec_boxed ("parameter-type", + N_("Parameter Type"), + N_("The type of GVariant passed to activate()"), + G_TYPE_VARIANT_TYPE, + G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (object_class, PROP_STATE_TYPE, + g_param_spec_boxed ("state-type", + N_("State Type"), + N_("The type of the state kept by the action"), + G_TYPE_VARIANT_TYPE, + G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + + // Enabled property + klass->properties.enabled = + g_param_spec_boolean( + "enabled", + N_("Enabled"), + N_("If the action can be activated"), + TRUE, + G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS + ); + + g_object_class_install_property(object_class, PROP_ENABLED, klass->properties.enabled); + + // State property + klass->properties.state = + g_param_spec_variant( + "state", + N_("State"), + N_("The state the action is in"), + G_VARIANT_TYPE_ANY, + NULL, + G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS + ); + + g_object_class_install_property (object_class, PROP_STATE, klass->properties.state); + + } + + void V3270Action_init(V3270Action *action) { + + static const LIB3270_PROPERTY default_info = { + .name = "unnamed" + }; + + action->terminal = NULL; + action->info = &default_info; + action->types.parameter = NULL; + + action->activate = internal_activate; + action->get_state_property = internal_get_state_property; + action->get_state_hint = internal_get_state_hint; + + } + + void finalize(GObject *object) { + + V3270Action * action = V3270_ACTION(object); + + if(action->terminal) { + v3270_action_set_terminal_widget(G_ACTION(object),NULL); + action->terminal = NULL; + } + + G_OBJECT_CLASS(V3270Action_parent_class)->finalize(object); + + } + + void get_property(GObject *object, guint prop_id, GValue *value, GParamSpec G_GNUC_UNUSED(*pspec)) { + + GAction *action = G_ACTION(object); + +// debug("%s(%d)",__FUNCTION__,prop_id); + + switch (prop_id) { + case PROP_NAME: + g_value_set_string(value, get_name(action)); + break; + + case PROP_ICON_NAME: + g_value_set_string(value, v3270_action_get_icon_name(action)); + break; + + case PROP_LABEL: + g_value_set_string(value, v3270_action_get_label(action)); + break; + + case PROP_TOOLTIP: + g_value_set_string(value, v3270_action_get_tooltip(action)); + break; + + case PROP_PARAMETER_TYPE: + g_value_set_boxed(value, get_parameter_type(action)); + break; + + case PROP_ENABLED: + g_value_set_boolean(value, get_enabled(action)); + break; + + case PROP_STATE_TYPE: + g_value_set_boxed(value, get_state_type(action)); + break; + + case PROP_STATE: + g_value_take_variant(value, get_state_property(action)); + break; + + default: + g_assert_not_reached (); + } + + } + + void set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { + g_message("Action property \"%s\" is read-only",pspec->name); + } + + const gchar * get_name(GAction *action) { + return V3270_ACTION_GET_DESCRIPTOR(action)->name; + } + + GVariant * internal_get_state_hint(GAction G_GNUC_UNUSED(*action), GtkWidget G_GNUC_UNUSED(*terminal)) { + return NULL; + } + + GVariant * internal_get_state_property(GAction *object, GtkWidget G_GNUC_UNUSED(*terminal)) { + + V3270Action * action = V3270_ACTION(object); + + if(action->types.state == G_VARIANT_TYPE_BOOLEAN) + return g_variant_new_boolean(FALSE); + + return NULL; + } + + GVariant * get_state_property(GAction *object) { + + V3270Action * action = V3270_ACTION(object); + GVariant * state; + + if(action->terminal) + state = action->get_state_property(object,action->terminal); + else + state = internal_get_state_property(object,NULL); + + if(state) + g_variant_ref(state); + + return state; + } + + const GVariantType * get_parameter_type(GAction *action) { + return V3270_ACTION(action)->types.parameter; + } + + const GVariantType * get_state_type(GAction *object) { + return V3270_ACTION(object)->types.state; + } + + GVariant * get_state_hint(GAction *object) { + V3270Action *action = V3270_ACTION(object); + return action->get_state_hint(object,action->terminal); + } + + void change_state(GAction G_GNUC_UNUSED(*object), GVariant G_GNUC_UNUSED(*value)) { + debug("%s",__FUNCTION__); + } + + static gboolean bg_notify_enabled(GObject *action) { + debug("%s(%s,%s)",__FUNCTION__,g_action_get_name(G_ACTION(action)),(g_action_get_enabled(G_ACTION(action)) ? "enabled" : "disabled")); + g_object_notify(action, "enabled"); + return FALSE; + } + + static gboolean bg_notify_state(GObject *action) { + g_object_notify(action, "state"); + return FALSE; + } + + void v3270_action_notify_enabled(GAction *action) { + g_idle_add((GSourceFunc) bg_notify_enabled, G_OBJECT(action)); + } + + void v3270_action_notify_state(GAction *action) { + g_idle_add((GSourceFunc) bg_notify_state, G_OBJECT(action)); + } + + static void event_listener(H3270 G_GNUC_UNUSED(*hSession), void *object) { + g_idle_add((GSourceFunc) bg_notify_enabled, G_ACTION(object)); + } + + static void change_widget(GAction *object, GtkWidget *from, GtkWidget *to) { + + if(from != to) { + + V3270Action *action = V3270_ACTION(object); + + if(action->listener) { + lib3270_unregister_action_group_listener(v3270_action_get_session(object),action->info->group,action->listener); + action->listener = NULL; + } + + action->terminal = to; + + if(action->info->group != LIB3270_ACTION_GROUP_NONE && to) { + action->listener = lib3270_register_action_group_listener(v3270_action_get_session(object),action->info->group,event_listener,object); + } + + g_idle_add((GSourceFunc) bg_notify_enabled, G_OBJECT(action)); + + if(action->types.state) + g_idle_add((GSourceFunc) bg_notify_state, G_OBJECT(action)); + + } + + } + + void v3270_action_set_terminal_widget(GAction *object, GtkWidget *widget) { + + g_return_if_fail(V3270_IS_ACTION(object)); + + if(widget) { + g_return_if_fail(GTK_IS_V3270(widget)); + } + + V3270Action * action = V3270_ACTION(object); + + if(action->terminal != widget) { + V3270_ACTION_GET_CLASS(object)->change_widget(object,action->terminal,widget); + action->terminal = widget; + } + + } + + GtkWidget * v3270_action_get_terminal_widget(GAction *object) { + g_return_val_if_fail(V3270_IS_ACTION(object),NULL); + return V3270_ACTION(object)->terminal; + } + + gboolean get_enabled(GAction *object) { + + V3270Action * action = V3270_ACTION(object); + + if(action && action->terminal) { + + if(action->info->group != LIB3270_ACTION_GROUP_NONE) { + + if(!lib3270_action_group_get_activatable(v3270_get_session(action->terminal),action->info->group)) + return FALSE; + + } + + return V3270_ACTION_GET_CLASS(object)->get_enabled(object,action->terminal); + } + + return FALSE; + + } + + void activate(GAction *object, GVariant *parameter) { + + V3270Action * action = V3270_ACTION(object); + + debug("%s: terminal=%p",__FUNCTION__,action->terminal); + + if(action && action->terminal) { + action->activate(object,parameter,action->terminal); + } + + } + + gboolean internal_get_enabled(GAction G_GNUC_UNUSED(*object), GtkWidget *terminal) { + return terminal != NULL; + } + + void internal_activate(GAction *action, GVariant G_GNUC_UNUSED(*parameter), GtkWidget G_GNUC_UNUSED(*terminal)) { + g_message("Action %s can't be activated",g_action_get_name(action)); + } + + const gchar * v3270_action_get_icon_name(GAction *action) { + return V3270_ACTION_GET_DESCRIPTOR(action)->icon; + } + + const gchar * v3270_action_get_label(GAction *action) { + const gchar * label = V3270_ACTION_GET_DESCRIPTOR(action)->label; + + if(label) + return gettext(label); + + return NULL; + } + + const gchar * v3270_action_get_tooltip(GAction *action) { + const gchar * tooltip = V3270_ACTION_GET_DESCRIPTOR(action)->description; + + if(tooltip) + return gettext(tooltip); + + return NULL; + } + + H3270 * v3270_action_get_session(GAction *action) { + g_return_val_if_fail(V3270_IS_ACTION(action),NULL); + return v3270_get_session(V3270_ACTION(action)->terminal); + } + + GAction * v3270_action_new() { + return G_ACTION(g_object_new(V3270_TYPE_ACTION, NULL)); + } + + /* + static GdkPixbuf * pixbuf_from_icon_name(GValue *value, GtkIconSize icon_size) { + + const gchar * icon_name = g_value_get_string(value); + + if(!icon_name) + return NULL; + + } + */ + + GdkPixbuf * v3270_action_get_pixbuf(GAction *action, GtkIconSize icon_size, GtkIconLookupFlags flags) { + + const gchar * icon_name = v3270_action_get_icon_name(action); + + if(!icon_name) + return NULL; + + return gtk_icon_theme_load_icon( + gtk_icon_theme_get_default(), + icon_name, + icon_size, + flags, + NULL + ); + + } + diff --git a/src/terminal/actions/table.c b/src/terminal/actions/table.c index 953b6e6..16917cf 100644 --- a/src/terminal/actions/table.c +++ b/src/terminal/actions/table.c @@ -48,12 +48,14 @@ { { .name = "keypad-add", + .group = LIB3270_ACTION_GROUP_ONLINE, .key = GDK_KP_Add, .mods = GDK_NUMLOCK_MASK, .activate = fire_keypad_action }, { .name = "keypad-subtract", + .group = LIB3270_ACTION_GROUP_ONLINE, .key = GDK_KP_Subtract, .mods = GDK_NUMLOCK_MASK, .activate = fire_keypad_action @@ -63,8 +65,9 @@ { .flags = 0, .name = "copy", + .group = LIB3270_ACTION_GROUP_SELECTION, .icon = "edit-copy", - .summary = N_( "Copy" ), + .label = N_( "Copy" ), .key = 'c', .mods = GDK_CONTROL_MASK, .activate = fire_copy_accelerator @@ -72,8 +75,9 @@ { .flags = V3270_COPY_APPEND, + .group = LIB3270_ACTION_GROUP_SELECTION, .name = "copy-append", - .summary = N_( "Add to copy" ), + .label = N_( "Add to copy" ), .key = 'c', .mods = GDK_ALT_MASK, .activate = fire_copy_accelerator @@ -81,8 +85,10 @@ { .flags = V3270_COPY_TEXT, + .group = LIB3270_ACTION_GROUP_SELECTION, .name = "copy-text", .icon = "edit-copy", + .label = N_( "Copy" ), .summary = N_( "Copy as plain text" ), .key = 'c', .mods = GDK_SHIFT_MASK|GDK_CONTROL_MASK, @@ -91,9 +97,10 @@ { .flags = V3270_ACTION_FLAG_CUT|V3270_COPY_DEFAULT, + .group = LIB3270_ACTION_GROUP_SELECTION, .name = "cut", .icon = "edit-cut", - .summary = N_( "Cut" ), + .label = N_( "Cut" ), .key = 'x', .mods = GDK_CONTROL_MASK, .activate = fire_copy_accelerator @@ -101,7 +108,9 @@ { .flags = V3270_ACTION_FLAG_CUT|V3270_COPY_APPEND, + .group = LIB3270_ACTION_GROUP_SELECTION, .name = "cut-append", + .label = N_( "Cut" ), .summary = N_( "Cut and append to copy" ), .key = 'x', .mods = GDK_ALT_MASK, @@ -110,8 +119,10 @@ { .flags = V3270_ACTION_FLAG_CUT|V3270_COPY_TEXT, + .group = LIB3270_ACTION_GROUP_SELECTION, .name = "cut-text", .icon = "edit-cut", + .label = N_( "Cut" ), .summary = N_( "Cut as plain text" ), .key = 'x', .mods = GDK_SHIFT_MASK|GDK_CONTROL_MASK, @@ -120,9 +131,10 @@ { .flags = 0, + .group = LIB3270_ACTION_GROUP_ONLINE, .name = "paste", .icon = "edit-paste", - .summary = N_("Paste"), + .label = N_("Paste"), .key = 'v', .mods = GDK_CONTROL_MASK, .activate = fire_paste_accelerator @@ -130,8 +142,10 @@ { .flags = 1, + .group = LIB3270_ACTION_GROUP_ONLINE, .name = "paste-text", .icon = "edit-paste", + .label = N_("Paste"), .summary = N_("Paste as plain text"), .key = 'v', .mods = GDK_SHIFT_MASK|GDK_CONTROL_MASK, @@ -140,7 +154,9 @@ { .flags = 2, + .group = LIB3270_ACTION_GROUP_ONLINE, .name = "paste-file", + .label = N_("Paste file"), .summary = N_("Paste from text file"), .key = 'v', .mods = GDK_ALT_MASK, @@ -149,9 +165,10 @@ { .flags = 0, + .group = LIB3270_ACTION_GROUP_ONLINE, .name = "zoom-in", .icon = "zoom-in", - .summary = N_("Zoom in"), + .label = N_("Zoom in"), .key = GDK_KP_Add, .mods = GDK_CONTROL_MASK, .activate = fire_zoom_action @@ -159,8 +176,9 @@ { .flags = 1, + .group = LIB3270_ACTION_GROUP_ONLINE, .name = "zoom-out", - .summary = N_("Zoom out"), + .label = N_("Zoom out"), .icon = "zoom-out", .key = GDK_KP_Subtract, .mods = GDK_CONTROL_MASK, @@ -169,7 +187,9 @@ { .flags = 2, + .group = LIB3270_ACTION_GROUP_ONLINE, .name = "zoom-fit-best", + .label = N_("Fit best"), .summary = N_("Zoom to best size"), .icon = "zoom-fit-best", .key = '0', @@ -182,8 +202,10 @@ // { .flags = -1, + .group = LIB3270_ACTION_GROUP_ONLINE, .name = "save", .icon = "document-save-as", + .label = N_("Save"), .summary = N_("Save screen or selection"), .activate = fire_save_action @@ -191,7 +213,9 @@ { .flags = LIB3270_CONTENT_ALL, + .group = LIB3270_ACTION_GROUP_ONLINE, .name = "save-all", + .label = N_("Save all"), .icon = "document-save-as", .summary = N_("Save screen"), .activate = fire_save_action @@ -200,7 +224,9 @@ { .flags = LIB3270_CONTENT_SELECTED, + .group = LIB3270_ACTION_GROUP_SELECTION, .name = "save-selected", + .label = N_("Save selected"), .icon = "document-save-as", .summary = N_("Save selected area"), .activate = fire_save_action @@ -209,7 +235,9 @@ { .flags = LIB3270_CONTENT_COPY, + .group = LIB3270_ACTION_GROUP_ONLINE, .name = "save-copy", + .label = N_("Save copy"), .icon = "document-save-as", .summary = N_("Save Copy"), .activate = fire_save_action @@ -221,8 +249,10 @@ // { .flags = -1, + .group = LIB3270_ACTION_GROUP_ONLINE, .name = "print", .icon = "document-print", + .label = N_("Print"), .summary = N_("Print screen or selection"), .activate = fire_print_action @@ -230,17 +260,20 @@ { .flags = LIB3270_CONTENT_ALL, + .group = LIB3270_ACTION_GROUP_ONLINE, .name = "print-all", .icon = "document-print", - .summary = N_("Print screen"), + .label = N_("Print screen"), .activate = fire_print_action }, { .flags = LIB3270_CONTENT_SELECTED, + .group = LIB3270_ACTION_GROUP_SELECTION, .name = "print-selected", .icon = "document-print", + .label = N_("Print selected"), .summary = N_("Print selected area"), .activate = fire_print_action @@ -248,9 +281,10 @@ { .flags = LIB3270_CONTENT_COPY, + .group = LIB3270_ACTION_GROUP_ONLINE, .name = "print-copy", .icon = "document-print", - .summary = N_("Print Copy"), + .label = N_("Print Copy"), .activate = fire_print_action }, @@ -265,4 +299,30 @@ return actions; } + static void activate_v3270(GAction *action, GVariant G_GNUC_UNUSED(*parameter), GtkWidget *terminal) + { + debug("Activating action \"%s\"",g_action_get_name(action)); + + V3270_ACTION * descriptor = (V3270_ACTION *) ((V3270Action *) action)->info; + descriptor->activate(terminal,descriptor); + + } + + void g_action_map_add_v3270_actions(GActionMap *action_map) + { + + const V3270_ACTION * actions = v3270_get_actions(); + size_t ix; + + for(ix = 0; actions[ix].name; ix++) { + + V3270Action * action = V3270_ACTION(g_object_new(V3270_TYPE_ACTION, NULL)); + + action->info = (const LIB3270_PROPERTY *) &actions[ix]; + action->activate = activate_v3270; + g_action_map_add_action(action_map,G_ACTION(action)); + + } + + } diff --git a/v3270.cbp b/v3270.cbp index 71e4387..7048ba2 100644 --- a/v3270.cbp +++ b/v3270.cbp @@ -228,6 +228,9 @@ + + -- libgit2 0.21.2