Commit 4ef004122e67481268745b090852240c9ca12725
1 parent
70c33ef2
Exists in
master
and in
3 other branches
Cleaning code.
Showing
2 changed files
with
7 additions
and
50 deletions
Show diff stats
src/include/api.h
| @@ -99,34 +99,16 @@ | @@ -99,34 +99,16 @@ | ||
| 99 | 99 | ||
| 100 | #include <lib3270/log.h> | 100 | #include <lib3270/log.h> |
| 101 | 101 | ||
| 102 | -// #define WriteLog(module,fmt, ...) lib3270_write_log(NULL,module,fmt,__VA_ARGS__) | ||
| 103 | -// #define WriteRCLog(module,rc,fmt, ...) lib3270_write_rc(NULL,module,fmt,__VA_ARGS__) | ||
| 104 | - | ||
| 105 | -/* | ||
| 106 | - #ifdef LIB3270_MODULE_NAME | ||
| 107 | - #define Log(fmt, ...) lib3270_write_log(NULL,LIB3270_MODULE_NAME,fmt,__VA_ARGS__) | ||
| 108 | - #else | ||
| 109 | - #define Log(fmt, ...) lib3270_write_log(NULL,"MSG",fmt,__VA_ARGS__) | ||
| 110 | - #endif | ||
| 111 | -*/ | ||
| 112 | - | ||
| 113 | #define OIA_FLAG_BOXSOLID LIB3270_FLAG_BOXSOLID | 102 | #define OIA_FLAG_BOXSOLID LIB3270_FLAG_BOXSOLID |
| 114 | #define OIA_FLAG_UNDERA LIB3270_FLAG_UNDERA | 103 | #define OIA_FLAG_UNDERA LIB3270_FLAG_UNDERA |
| 115 | #define OIA_FLAG_TYPEAHEAD LIB3270_FLAG_TYPEAHEAD | 104 | #define OIA_FLAG_TYPEAHEAD LIB3270_FLAG_TYPEAHEAD |
| 116 | #define OIA_FLAG_USER LIB3270_FLAG_COUNT | 105 | #define OIA_FLAG_USER LIB3270_FLAG_COUNT |
| 117 | #define OIA_FLAG LIB3270_FLAG | 106 | #define OIA_FLAG LIB3270_FLAG |
| 118 | 107 | ||
| 119 | - struct lib3270_state_callback; | 108 | +// struct lib3270_state_callback; |
| 120 | 109 | ||
| 121 | #include <lib3270/session.h> | 110 | #include <lib3270/session.h> |
| 122 | 111 | ||
| 123 | - struct lib3270_state_callback | ||
| 124 | - { | ||
| 125 | - struct lib3270_state_callback * next; /**< Next callback in chain */ | ||
| 126 | - void * data; /**< User data */ | ||
| 127 | - void (*func)(H3270 *, int, void *); /**< Function to call */ | ||
| 128 | - }; | ||
| 129 | - | ||
| 130 | 112 | ||
| 131 | /** Type of dialog boxes */ | 113 | /** Type of dialog boxes */ |
| 132 | #include <lib3270/popup.h> | 114 | #include <lib3270/popup.h> |
| @@ -178,30 +160,6 @@ | @@ -178,30 +160,6 @@ | ||
| 178 | #define IN_TN3270E lib3270_in_tn3270e(hSession) | 160 | #define IN_TN3270E lib3270_in_tn3270e(hSession) |
| 179 | #define IN_E lib3270_in_e(hSession) | 161 | #define IN_E lib3270_in_e(hSession) |
| 180 | 162 | ||
| 181 | - /* Screen processing */ | ||
| 182 | - | ||
| 183 | - typedef enum _SCRIPT_STATE | ||
| 184 | - { | ||
| 185 | - SCRIPT_STATE_NONE, | ||
| 186 | - SCRIPT_STATE_RUNNING, | ||
| 187 | - SCRIPT_STATE_HALTED, | ||
| 188 | - | ||
| 189 | - SCRIPT_STATE_USER | ||
| 190 | - | ||
| 191 | - } SCRIPT_STATE; | ||
| 192 | - | ||
| 193 | - typedef enum _COUNTER_ID | ||
| 194 | - { | ||
| 195 | - COUNTER_ID_CTLR_DONE, | ||
| 196 | - COUNTER_ID_RESET, | ||
| 197 | - | ||
| 198 | - COUNTER_ID_USER | ||
| 199 | - } COUNTER_ID; | ||
| 200 | - | ||
| 201 | - LOCAL_EXTERN int query_counter(COUNTER_ID id); | ||
| 202 | - | ||
| 203 | - #define query_screen_change_counter() query_counter(COUNTER_ID_CTLR_DONE) | ||
| 204 | - | ||
| 205 | #define COLOR_ATTR_NONE 0x0000 | 163 | #define COLOR_ATTR_NONE 0x0000 |
| 206 | #define COLOR_ATTR_FIELD LIB3270_ATTR_FIELD | 164 | #define COLOR_ATTR_FIELD LIB3270_ATTR_FIELD |
| 207 | #define COLOR_ATTR_BLINK LIB3270_ATTR_BLINK | 165 | #define COLOR_ATTR_BLINK LIB3270_ATTR_BLINK |
| @@ -225,13 +183,6 @@ | @@ -225,13 +183,6 @@ | ||
| 225 | 183 | ||
| 226 | /* Misc calls */ | 184 | /* Misc calls */ |
| 227 | 185 | ||
| 228 | - #define query_3270_terminal_status(void) lib3270_get_program_message(NULL) | ||
| 229 | - | ||
| 230 | - /* Get connection info */ | ||
| 231 | - #define get_connected_lu(h) lib3270_get_luname(h) | ||
| 232 | - | ||
| 233 | - LOCAL_EXTERN SCRIPT_STATE status_script(SCRIPT_STATE state); | ||
| 234 | - | ||
| 235 | #include <lib3270/actions.h> | 186 | #include <lib3270/actions.h> |
| 236 | 187 | ||
| 237 | #ifdef __cplusplus | 188 | #ifdef __cplusplus |
src/lib3270/private.h
| @@ -299,6 +299,12 @@ typedef struct _input_t | @@ -299,6 +299,12 @@ typedef struct _input_t | ||
| 299 | 299 | ||
| 300 | } input_t; | 300 | } input_t; |
| 301 | 301 | ||
| 302 | +struct lib3270_state_callback | ||
| 303 | +{ | ||
| 304 | + struct lib3270_state_callback * next; /**< Next callback in chain */ | ||
| 305 | + void * data; /**< User data */ | ||
| 306 | + void (*func)(H3270 *, int, void *); /**< Function to call */ | ||
| 307 | +}; | ||
| 302 | 308 | ||
| 303 | /** | 309 | /** |
| 304 | * | 310 | * |