Download as
Browse Code »

Commit 184468d64d63f1a7e0a28b138939367c5218ddad

Authored by Perry Werneck
1 parent df8fdf4c
Exists in master and in 3 other branches develop, macos, network_module

Adding action types.

Showing 2 changed files with 92 additions and 2 deletions   Show diff stats
src/core/actions/table.c
  Diff comments   View file @184468d
... ... @@ -78,6 +78,8 @@
78 78 //
79 79 {
80 80 .name = "reconnect",
  81 + .type = LIB3270_ACTION_TYPE_NETWORK,
  82 +
81 83 .key = NULL,
82 84 .icon = "gtk-connect",
83 85 .label = N_( "_Connect" ) ,
... ... @@ -90,6 +92,8 @@
90 92  
91 93 {
92 94 .name = "disconnect",
  95 + .type = LIB3270_ACTION_TYPE_NETWORK,
  96 +
93 97 .key = NULL,
94 98 .icon = "gtk-disconnect",
95 99 .label = N_( "_Disconnect" ),
... ... @@ -105,6 +109,8 @@
105 109 //
106 110 {
107 111 .name = "up",
  112 + .type = LIB3270_ACTION_TYPE_NAVIGATION,
  113 +
108 114 .key = "Up",
109 115 .icon = NULL,
110 116 .label = NULL,
... ... @@ -117,6 +123,8 @@
117 123  
118 124 {
119 125 .name = "down",
  126 + .type = LIB3270_ACTION_TYPE_NAVIGATION,
  127 +
120 128 .key = "Down",
121 129 .icon = NULL,
122 130 .label = NULL,
... ... @@ -129,6 +137,8 @@
129 137  
130 138 {
131 139 .name = "left",
  140 + .type = LIB3270_ACTION_TYPE_NAVIGATION,
  141 +
132 142 .key = "Left",
133 143 .icon = NULL,
134 144 .label = NULL,
... ... @@ -141,6 +151,8 @@
141 151  
142 152 {
143 153 .name = "right",
  154 + .type = LIB3270_ACTION_TYPE_NAVIGATION,
  155 +
144 156 .key = "Right",
145 157 .icon = NULL,
146 158 .label = NULL,
... ... @@ -153,6 +165,8 @@
153 165  
154 166 {
155 167 .name = "newline",
  168 + .type = LIB3270_ACTION_TYPE_NAVIGATION,
  169 +
156 170 .key = "Control_R",
157 171 .icon = NULL,
158 172 .label = NULL,
... ... @@ -165,6 +179,8 @@
165 179  
166 180 {
167 181 .name = "previousword",
  182 + .type = LIB3270_ACTION_TYPE_NAVIGATION,
  183 +
168 184 .key = NULL,
169 185 .icon = NULL,
170 186 .label = NULL,
... ... @@ -177,6 +193,8 @@
177 193  
178 194 {
179 195 .name = "nextword",
  196 + .type = LIB3270_ACTION_TYPE_NAVIGATION,
  197 +
180 198 .key = NULL,
181 199 .icon = NULL,
182 200 .label = NULL,
... ... @@ -192,6 +210,8 @@
192 210 //
193 211 {
194 212 .name = "saveall",
  213 + .type = LIB3270_ACTION_TYPE_FILE,
  214 +
195 215 .key = NULL,
196 216 .icon = "document-save",
197 217 .label = NULL,
... ... @@ -204,6 +224,8 @@
204 224  
205 225 {
206 226 .name = "saveselected",
  227 + .type = LIB3270_ACTION_TYPE_FILE,
  228 +
207 229 .key = NULL,
208 230 .icon = NULL,
209 231 .label = NULL,
... ... @@ -216,6 +238,8 @@
216 238  
217 239 {
218 240 .name = "savecopy",
  241 + .type = LIB3270_ACTION_TYPE_FILE,
  242 +
219 243 .key = NULL,
220 244 .icon = NULL,
221 245 .label = NULL,
... ... @@ -228,6 +252,8 @@
228 252  
229 253 {
230 254 .name = "loadfile",
  255 + .type = LIB3270_ACTION_TYPE_FILE,
  256 +
231 257 .key = NULL,
232 258 .icon = "document-load",
233 259 .label = NULL,
... ... @@ -243,6 +269,8 @@
243 269 //
244 270 {
245 271 .name = "select_all",
  272 + .type = LIB3270_ACTION_TYPE_SELECTION,
  273 +
246 274 .key = "<ctrl>a",
247 275 .icon = "edit-select-all",
248 276 .label = N_( "Select all" ),
... ... @@ -255,6 +283,8 @@
255 283  
256 284 {
257 285 .name = "unselect",
  286 + .type = LIB3270_ACTION_TYPE_SELECTION,
  287 +
258 288 .key = NULL,
259 289 .icon = NULL,
260 290 .label = N_( "Remove selection" ),
... ... @@ -267,6 +297,8 @@
267 297  
268 298 {
269 299 .name = "reselect",
  300 + .type = LIB3270_ACTION_TYPE_SELECTION,
  301 +
270 302 .key = "<Ctrl>r",
271 303 .icon = NULL,
272 304 .label = N_( "Reselect" ),
... ... @@ -282,6 +314,8 @@
282 314 //
283 315 {
284 316 .name = "select_field",
  317 + .type = LIB3270_ACTION_TYPE_SELECTION,
  318 +
285 319 .key = "<Ctrl>f",
286 320 .icon = NULL,
287 321 .label = N_( "Select field" ),
... ... @@ -295,6 +329,8 @@
295 329  
296 330 {
297 331 .name = "fieldend",
  332 + .type = LIB3270_ACTION_TYPE_NAVIGATION,
  333 +
298 334 .key = NULL,
299 335 .icon = NULL,
300 336 .label = NULL,
... ... @@ -307,6 +343,8 @@
307 343  
308 344 {
309 345 .name = "firstfield",
  346 + .type = LIB3270_ACTION_TYPE_NAVIGATION,
  347 +
310 348 .key = "Home",
311 349 .icon = "go-first",
312 350 .label = NULL,
... ... @@ -319,6 +357,8 @@
319 357  
320 358 {
321 359 .name = "nextfield",
  360 + .type = LIB3270_ACTION_TYPE_NAVIGATION,
  361 +
322 362 .key = "Tab",
323 363 .icon = "go-next",
324 364 .label = NULL,
... ... @@ -331,6 +371,8 @@
331 371  
332 372 {
333 373 .name = "previousfield",
  374 + .type = LIB3270_ACTION_TYPE_NAVIGATION,
  375 +
334 376 .key = "ISO_Left_Tab",
335 377 .icon = "go-previous",
336 378 .label = NULL,
... ... @@ -347,6 +389,8 @@
347 389 //
348 390 {
349 391 .name = "deleteword",
  392 + .type = LIB3270_ACTION_TYPE_NAVIGATION,
  393 +
350 394 .key = "<Ctrl>w",
351 395 .icon = NULL,
352 396 .label = NULL,
... ... @@ -359,6 +403,8 @@
359 403  
360 404 {
361 405 .name = "deletefield",
  406 + .type = LIB3270_ACTION_TYPE_NAVIGATION,
  407 +
362 408 .key = "<Ctrl>u",
363 409 .icon = NULL,
364 410 .label = NULL,
... ... @@ -372,6 +418,8 @@
372 418  
373 419 {
374 420 .name = "eraseinput",
  421 + .type = LIB3270_ACTION_TYPE_GENERIC,
  422 +
375 423 .key = NULL,
376 424 .icon = NULL,
377 425 .label = NULL,
... ... @@ -384,6 +432,8 @@
384 432  
385 433 {
386 434 .name = "eraseeof",
  435 + .type = LIB3270_ACTION_TYPE_GENERIC,
  436 +
387 437 .key = "End",
388 438 .icon = NULL,
389 439 .label = NULL,
... ... @@ -396,6 +446,8 @@
396 446  
397 447 {
398 448 .name = "eraseeol",
  449 + .type = LIB3270_ACTION_TYPE_GENERIC,
  450 +
399 451 .key = NULL,
400 452 .icon = NULL,
401 453 .label = NULL,
... ... @@ -408,6 +460,8 @@
408 460  
409 461 {
410 462 .name = "erase",
  463 + .type = LIB3270_ACTION_TYPE_GENERIC,
  464 +
411 465 .key = "BackSpace",
412 466 .icon = NULL,
413 467 .label = NULL,
... ... @@ -423,6 +477,8 @@
423 477 //
424 478 {
425 479 .name = "enter",
  480 + .type = LIB3270_ACTION_TYPE_GENERIC,
  481 +
426 482 .key = NULL,
427 483 .icon = NULL,
428 484 .label = NULL,
... ... @@ -436,6 +492,8 @@
436 492  
437 493 {
438 494 .name = "kybdreset",
  495 + .type = LIB3270_ACTION_TYPE_GENERIC,
  496 +
439 497 .key = "Escape",
440 498 .icon = NULL,
441 499 .label = NULL,
... ... @@ -448,6 +506,8 @@
448 506  
449 507 {
450 508 .name = "clear",
  509 + .type = LIB3270_ACTION_TYPE_GENERIC,
  510 +
451 511 .key = NULL,
452 512 .icon = NULL,
453 513 .label = NULL,
... ... @@ -461,6 +521,8 @@
461 521  
462 522 {
463 523 .name = "delete",
  524 + .type = LIB3270_ACTION_TYPE_GENERIC,
  525 +
464 526 .key = "Delete",
465 527 .icon = NULL,
466 528 .label = NULL,
... ... @@ -473,6 +535,8 @@
473 535  
474 536 {
475 537 .name = "dup",
  538 + .type = LIB3270_ACTION_TYPE_GENERIC,
  539 +
476 540 .key = "<Shift>KP_Multiply",
477 541 .icon = NULL,
478 542 .label = NULL,
... ... @@ -485,6 +549,8 @@
485 549  
486 550 {
487 551 .name = "fieldmark",
  552 + .type = LIB3270_ACTION_TYPE_GENERIC,
  553 +
488 554 .key = NULL,
489 555 .icon = NULL,
490 556 .label = NULL,
... ... @@ -497,6 +563,8 @@
497 563  
498 564 {
499 565 .name = "backspace",
  566 + .type = LIB3270_ACTION_TYPE_NAVIGATION,
  567 +
500 568 .key = NULL,
501 569 .icon = NULL,
502 570 .label = NULL,
... ... @@ -509,6 +577,8 @@
509 577  
510 578 {
511 579 .name = "attn",
  580 + .type = LIB3270_ACTION_TYPE_GENERIC,
  581 +
512 582 .key = "<shift>Escape",
513 583 .icon = NULL,
514 584 .label = NULL,
... ... @@ -521,6 +591,8 @@
521 591  
522 592 {
523 593 .name = "break",
  594 + .type = LIB3270_ACTION_TYPE_GENERIC,
  595 +
524 596 .key = NULL,
525 597 .icon = NULL,
526 598 .label = NULL,
... ... @@ -533,6 +605,8 @@
533 605  
534 606 {
535 607 .name = "pastenext",
  608 + .type = LIB3270_ACTION_TYPE_SELECTION,
  609 +
536 610 .key = "<shift><ctrl>v",
537 611 .icon = NULL,
538 612 .label = NULL,
... ... @@ -545,6 +619,8 @@
545 619  
546 620 {
547 621 .name = "sysreq",
  622 + .type = LIB3270_ACTION_TYPE_GENERIC,
  623 +
548 624 .key = "<shift>Print",
549 625 .icon = NULL,
550 626 .label = NULL,
... ... @@ -560,6 +636,8 @@
560 636 //
561 637 {
562 638 .name = "print",
  639 + .type = LIB3270_ACTION_TYPE_PRINTER,
  640 +
563 641 .key = "Print",
564 642 .icon = "document-print",
565 643 .label = NULL,
... ... @@ -573,6 +651,8 @@
573 651  
574 652 {
575 653 .name = "printall",
  654 + .type = LIB3270_ACTION_TYPE_PRINTER,
  655 +
576 656 .key = NULL,
577 657 .icon = NULL,
578 658 .label = NULL,
... ... @@ -585,6 +665,8 @@
585 665  
586 666 {
587 667 .name = "printselected",
  668 + .type = LIB3270_ACTION_TYPE_PRINTER,
  669 +
588 670 .key = NULL,
589 671 .icon = NULL,
590 672 .label = NULL,
... ... @@ -597,6 +679,8 @@
597 679  
598 680 {
599 681 .name = "printcopy",
  682 + .type = LIB3270_ACTION_TYPE_PRINTER,
  683 +
600 684 .key = NULL,
601 685 .icon = NULL,
602 686 .label = NULL,
... ... @@ -613,6 +697,8 @@
613 697  
614 698 {
615 699 .name = "testpattern",
  700 + .type = LIB3270_ACTION_TYPE_GENERIC,
  701 +
616 702 .key = NULL,
617 703 .icon = NULL,
618 704 .label = NULL,
... ... @@ -625,6 +711,8 @@
625 711  
626 712 {
627 713 .name = "charsettable",
  714 + .type = LIB3270_ACTION_TYPE_GENERIC,
  715 +
628 716 .key = NULL,
629 717 .icon = NULL,
630 718 .label = NULL,
... ...
src/include/lib3270/actions.h
  Diff comments   View file @184468d
... ... @@ -48,8 +48,10 @@
48 48 {
49 49 LIB3270_ACTION_TYPE_GENERIC, ///< @brief Generic action.
50 50 LIB3270_ACTION_TYPE_NAVIGATION, ///< @brief Cursor and field navigation.
51   - LIB3270_ACTION_CONNECTION, ///< @brief Connection action.
52   - LIB3270_ACTION_CLIPBOARD, ///< @brief Clipboard action.
  51 + LIB3270_ACTION_TYPE_NETWORK, ///< @brief Connection action.
  52 + LIB3270_ACTION_TYPE_SELECTION, ///< @brief Clipboard action.
  53 + LIB3270_ACTION_TYPE_FILE, ///< @brief File load/save.
  54 + LIB3270_ACTION_TYPE_PRINTER, ///< @brief Printer actions.
53 55  
54 56 LIB3270_ACTION_CUSTOM ///< @brief Custom action/Number of actions.
55 57 } LIB3270_ACTION_TYPE;
... ...