Commit b6cbd6d60a0b7e2509086672ec53b7e112899deb
1 parent
db83d6d4
Exists in
master
and in
4 other branches
Updating PF & PA key actions.
Showing
5 changed files
with
6 additions
and
15 deletions
Show diff stats
pw3270.cbp
| @@ -80,9 +80,6 @@ | @@ -80,9 +80,6 @@ | ||
| 80 | <Unit filename="src/objects/actions/lib3270/pfkey.c"> | 80 | <Unit filename="src/objects/actions/lib3270/pfkey.c"> |
| 81 | <Option compilerVar="CC" /> | 81 | <Option compilerVar="CC" /> |
| 82 | </Unit> | 82 | </Unit> |
| 83 | - <Unit filename="src/objects/actions/lib3270/toggle.c"> | ||
| 84 | - <Option compilerVar="CC" /> | ||
| 85 | - </Unit> | ||
| 86 | <Unit filename="src/objects/actions/print.c"> | 83 | <Unit filename="src/objects/actions/print.c"> |
| 87 | <Option compilerVar="CC" /> | 84 | <Option compilerVar="CC" /> |
| 88 | </Unit> | 85 | </Unit> |
src/include/pw3270/actions.h
| @@ -130,9 +130,6 @@ | @@ -130,9 +130,6 @@ | ||
| 130 | /// @brief Get lib3270 session handle. | 130 | /// @brief Get lib3270 session handle. |
| 131 | H3270 * pw3270_action_get_session(GAction *action); | 131 | H3270 * pw3270_action_get_session(GAction *action); |
| 132 | 132 | ||
| 133 | - /// @brief Add lib3270 actions to an application window. | ||
| 134 | - void pw3270_window_add_actions(GtkWidget * appwindow); | ||
| 135 | - | ||
| 136 | // | 133 | // |
| 137 | // "Simple" action | 134 | // "Simple" action |
| 138 | // | 135 | // |
src/objects/actions/lib3270/pfkey.c
src/objects/actions/window.c
| @@ -37,12 +37,12 @@ | @@ -37,12 +37,12 @@ | ||
| 37 | #include <v3270/actions.h> | 37 | #include <v3270/actions.h> |
| 38 | #include <pw3270/window.h> | 38 | #include <pw3270/window.h> |
| 39 | 39 | ||
| 40 | +/* | ||
| 40 | void pw3270_window_add_actions(GtkWidget * appwindow) { | 41 | void pw3270_window_add_actions(GtkWidget * appwindow) { |
| 41 | 42 | ||
| 42 | GActionMap * map = G_ACTION_MAP(appwindow); | 43 | GActionMap * map = G_ACTION_MAP(appwindow); |
| 43 | size_t ix; | 44 | size_t ix; |
| 44 | 45 | ||
| 45 | - /* | ||
| 46 | // Map lib3270 actions | 46 | // Map lib3270 actions |
| 47 | { | 47 | { |
| 48 | const LIB3270_ACTION * actions = lib3270_get_actions(); | 48 | const LIB3270_ACTION * actions = lib3270_get_actions(); |
| @@ -53,9 +53,7 @@ | @@ -53,9 +53,7 @@ | ||
| 53 | 53 | ||
| 54 | } | 54 | } |
| 55 | } | 55 | } |
| 56 | - */ | ||
| 57 | 56 | ||
| 58 | - /* | ||
| 59 | // Map toggles | 57 | // Map toggles |
| 60 | { | 58 | { |
| 61 | const LIB3270_TOGGLE * toggles = lib3270_get_toggles(); | 59 | const LIB3270_TOGGLE * toggles = lib3270_get_toggles(); |
| @@ -66,9 +64,7 @@ | @@ -66,9 +64,7 @@ | ||
| 66 | 64 | ||
| 67 | } | 65 | } |
| 68 | } | 66 | } |
| 69 | - */ | ||
| 70 | 67 | ||
| 71 | - /* | ||
| 72 | // Map V3270 actions | 68 | // Map V3270 actions |
| 73 | { | 69 | { |
| 74 | const V3270_ACTION * actions = v3270_get_actions(); | 70 | const V3270_ACTION * actions = v3270_get_actions(); |
| @@ -79,7 +75,6 @@ | @@ -79,7 +75,6 @@ | ||
| 79 | } | 75 | } |
| 80 | 76 | ||
| 81 | } | 77 | } |
| 82 | - */ | ||
| 83 | 78 | ||
| 84 | // Map special actions | 79 | // Map special actions |
| 85 | { | 80 | { |
| @@ -110,3 +105,4 @@ | @@ -110,3 +105,4 @@ | ||
| 110 | debug("%s ends",__FUNCTION__); | 105 | debug("%s ends",__FUNCTION__); |
| 111 | 106 | ||
| 112 | } | 107 | } |
| 108 | +*/ |
src/objects/window/window.c
| @@ -140,12 +140,13 @@ | @@ -140,12 +140,13 @@ | ||
| 140 | // | 140 | // |
| 141 | // Setup tn3270 actions. | 141 | // Setup tn3270 actions. |
| 142 | // | 142 | // |
| 143 | - pw3270_window_add_actions(GTK_WIDGET(widget)); | ||
| 144 | - | ||
| 145 | g_action_map_add_v3270_actions(G_ACTION_MAP(widget)); | 143 | g_action_map_add_v3270_actions(G_ACTION_MAP(widget)); |
| 146 | g_action_map_add_lib3270_actions(G_ACTION_MAP(widget)); | 144 | g_action_map_add_lib3270_actions(G_ACTION_MAP(widget)); |
| 147 | g_action_map_add_lib3270_toggles(G_ACTION_MAP(widget)); | 145 | g_action_map_add_lib3270_toggles(G_ACTION_MAP(widget)); |
| 148 | 146 | ||
| 147 | + g_action_map_add_action(G_ACTION_MAP(widget),v3270_pfkey_action_new()); | ||
| 148 | + g_action_map_add_action(G_ACTION_MAP(widget),v3270_pakey_action_new()); | ||
| 149 | + | ||
| 149 | // Map special actions | 150 | // Map special actions |
| 150 | { | 151 | { |
| 151 | size_t ix; | 152 | size_t ix; |