Download as
Browse Code »

Commit 009c88fdc72a1d6b3e06b25ee40a362f2eaf775e

Authored by perry.werneck@gmail.com
1 parent a2547761
Exists in master

Incluindo prefixo nos nomes de toogle, atualizando protótipo da função de obtenç… 

…ão de toogles para o formato multi-sessão
Showing 3 changed files with 31 additions and 32 deletions   Show diff stats
latest/src/include/lib3270/api.h
  Diff comments   View file @009c88f
... ... @@ -31,13 +31,13 @@
31 31 */
32 32  
33 33  
34   -#ifndef LIB3270_H_INCLUDED
  34 +#ifndef LIB3270_API_INCLUDED
35 35  
36 36 #ifdef __cplusplus
37 37 extern "C" {
38 38 #endif
39 39  
40   - #define LIB3270_H_INCLUDED "4.2"
  40 + #define LIB3270_API_INCLUDED "4.2"
41 41  
42 42 #include <errno.h>
43 43  
... ... @@ -580,7 +580,7 @@
580 580  
581 581 LIB3270_EXPORT SCRIPT_STATE status_script(SCRIPT_STATE state);
582 582  
583   - LIB3270_EXPORT int Toggled(int ix);
  583 + #define Toggled(ix) lib3270_get_toogle(NULL,ix)
584 584  
585 585 LIB3270_EXPORT int CallAndWait(int(*callback)(void *), void *parm);
586 586 LIB3270_EXPORT void RunPendingEvents(int wait);
... ... @@ -625,4 +625,4 @@
625 625 }
626 626 #endif
627 627  
628   -#endif // LIB3270_H_INCLUDED
  628 +#endif // LIB3270_API_INCLUDED
... ...
latest/src/include/lib3270/toggle.h
  Diff comments   View file @009c88f
... ... @@ -34,36 +34,35 @@
34 34  
35 35 #define TOGGLE3270_H_INCLUDED 1
36 36  
37   - #include <lib3270/api.h>
  37 + #include <lib3270.h>
38 38  
39 39 enum toggle_type { TT_INITIAL, TT_INTERACTIVE, TT_ACTION, TT_FINAL, TT_UPDATE };
40 40  
41   - typedef enum _lib3270_toggle_id
42   - {
43   - MONOCASE,
44   - ALT_CURSOR,
45   - CURSOR_BLINK,
46   - SHOW_TIMING,
47   - CURSOR_POS,
48   - DS_TRACE,
49   - SCROLL_BAR,
50   - LINE_WRAP,
51   - BLANK_FILL,
52   - SCREEN_TRACE,
53   - EVENT_TRACE,
54   - MARGINED_PASTE,
55   - RECTANGLE_SELECT,
56   - CROSSHAIR,
57   - VISIBLE_CONTROL,
58   - AID_WAIT,
59   - FULL_SCREEN,
60   - RECONNECT,
61   - INSERT,
62   - KEYPAD,
63   - SMART_PASTE,
  41 + #define MONOCASE LIB3270_TOGGLE_MONOCASE
  42 + #define ALT_CURSOR LIB3270_TOGGLE_ALT_CURSOR
  43 + #define CURSOR_BLINK LIB3270_TOGGLE_CURSOR_BLINK
  44 + #define SHOW_TIMING LIB3270_TOGGLE_SHOW_TIMING
  45 + #define CURSOR_POS LIB3270_TOGGLE_CURSOR_POS
  46 + #define DS_TRACE LIB3270_TOGGLE_DS_TRACE
  47 + #define SCROLL_BAR LIB3270_TOGGLE_SCROLL_BAR
  48 + #define LINE_WRAP LIB3270_TOGGLE_LINE_WRAP
  49 + #define BLANK_FILL LIB3270_TOGGLE_BLANK_FILL
  50 + #define SCREEN_TRACE LIB3270_TOGGLE_SCREEN_TRACE
  51 + #define EVENT_TRACE LIB3270_TOGGLE_EVENT_TRACE
  52 + #define MARGINED_PASTE LIB3270_TOGGLE_MARGINED_PASTE
  53 + #define RECTANGLE_SELECT LIB3270_TOGGLE_RECTANGLE_SELECT
  54 + #define CROSSHAIR LIB3270_TOGGLE_CROSSHAIR
  55 + #define VISIBLE_CONTROL LIB3270_TOGGLE_VISIBLE_CONTROL
  56 + #define AID_WAIT LIB3270_TOGGLE_AID_WAIT
  57 + #define FULL_SCREEN LIB3270_TOGGLE_FULL_SCREEN
  58 + #define RECONNECT LIB3270_TOGGLE_RECONNECT
  59 + #define INSERT LIB3270_TOGGLE_INSERT
  60 + #define KEYPAD LIB3270_TOGGLE_KEYPAD
  61 + #define SMART_PASTE LIB3270_TOGGLE_SMART_PASTE
  62 + #define N_TOGGLES LIB3270_TOGGLE_COUNT
  63 +
  64 + #define LIB3270_TOGGLE_ID LIB3270_TOGGLE
64 65  
65   - N_TOGGLES
66   - } LIB3270_TOGGLE_ID;
67 66  
68 67 LIB3270_EXPORT void register_3270_toggle_monitor(LIB3270_TOGGLE_ID ix, void (*callback)(int value, enum toggle_type reason));
69 68 LIB3270_EXPORT int do_3270_toggle(LIB3270_TOGGLE_ID ix);
... ...
latest/src/lib/toggles.c
  Diff comments   View file @009c88f
... ... @@ -92,11 +92,11 @@ LIB3270_EXPORT void register_3270_toggle_monitor(LIB3270_TOGGLE_ID ix, void (*ca
92 92 }
93 93 }
94 94  
95   -int Toggled(int ix)
  95 +LIB3270_EXPORT unsigned char lib3270_get_toogle(H3270 *session, LIB3270_TOGGLE ix)
96 96 {
97 97 if(ix < 0 || ix >= N_TOGGLES)
98 98 return 0;
99   - return (int) appres.toggle[ix].value;
  99 + return (unsigned char) appres.toggle[ix].value != 0;
100 100 }
101 101 #endif
102 102 /*
... ...