Commit 4d9fb27c5a39bdf112ca88c61c342730732b1720
1 parent
537f5dd0
Exists in
master
and in
5 other branches
Reativando acao "fieldmark"
Showing
3 changed files
with
11 additions
and
17 deletions
Show diff stats
src/include/lib3270/action_table.h
@@ -70,6 +70,7 @@ | @@ -70,6 +70,7 @@ | ||
70 | DECLARE_LIB3270_ACTION( erase ) | 70 | DECLARE_LIB3270_ACTION( erase ) |
71 | DECLARE_LIB3270_ACTION( delete ) | 71 | DECLARE_LIB3270_ACTION( delete ) |
72 | DECLARE_LIB3270_ACTION( dup ) | 72 | DECLARE_LIB3270_ACTION( dup ) |
73 | + DECLARE_LIB3270_ACTION( fieldmark ) | ||
73 | 74 | ||
74 | DECLARE_LIB3270_ACTION( backspace ) | 75 | DECLARE_LIB3270_ACTION( backspace ) |
75 | DECLARE_LIB3270_ACTION( previousword ) | 76 | DECLARE_LIB3270_ACTION( previousword ) |
src/lib3270/ctlr.c
@@ -2376,8 +2376,7 @@ ctlr_blanks(void) | @@ -2376,8 +2376,7 @@ ctlr_blanks(void) | ||
2376 | * Change a character in the 3270 buffer. | 2376 | * Change a character in the 3270 buffer. |
2377 | * Removes any field attribute defined at that location. | 2377 | * Removes any field attribute defined at that location. |
2378 | */ | 2378 | */ |
2379 | -void | ||
2380 | -ctlr_add(int baddr, unsigned char c, unsigned char cs) | 2379 | +void ctlr_add(int baddr, unsigned char c, unsigned char cs) |
2381 | { | 2380 | { |
2382 | unsigned char oc = 0; | 2381 | unsigned char oc = 0; |
2383 | 2382 | ||
@@ -2389,13 +2388,9 @@ ctlr_add(int baddr, unsigned char c, unsigned char cs) | @@ -2389,13 +2388,9 @@ ctlr_add(int baddr, unsigned char c, unsigned char cs) | ||
2389 | if (toggled(SCREEN_TRACE)) | 2388 | if (toggled(SCREEN_TRACE)) |
2390 | trace_screen(); | 2389 | trace_screen(); |
2391 | #endif /*]*/ | 2390 | #endif /*]*/ |
2392 | -// scroll_save(session->maxROWS, False); | ||
2393 | trace_primed = False; | 2391 | trace_primed = False; |
2394 | } | 2392 | } |
2395 | - /* | ||
2396 | - if (SELECTED(baddr)) | ||
2397 | - unselect(baddr, 1); | ||
2398 | - */ | 2393 | + |
2399 | h3270.ea_buf[baddr].cc = c; | 2394 | h3270.ea_buf[baddr].cc = c; |
2400 | h3270.ea_buf[baddr].cs = cs; | 2395 | h3270.ea_buf[baddr].cs = cs; |
2401 | h3270.ea_buf[baddr].fa = 0; | 2396 | h3270.ea_buf[baddr].fa = 0; |
src/lib3270/kybd.c
@@ -910,8 +910,7 @@ static Boolean key_Character(int code, Boolean with_ge, Boolean pasting, Boolean | @@ -910,8 +910,7 @@ static Boolean key_Character(int code, Boolean with_ge, Boolean pasting, Boolean | ||
910 | return False; | 910 | return False; |
911 | break; | 911 | break; |
912 | } | 912 | } |
913 | - ctlr_add(baddr, (unsigned char)code, | ||
914 | - (unsigned char)(with_ge ? CS_GE : 0)); | 913 | + ctlr_add(baddr, (unsigned char)code,(unsigned char)(with_ge ? CS_GE : 0)); |
915 | ctlr_add_fg(baddr, 0); | 914 | ctlr_add_fg(baddr, 0); |
916 | ctlr_add_gr(baddr, 0); | 915 | ctlr_add_gr(baddr, 0); |
917 | INC_BA(baddr); | 916 | INC_BA(baddr); |
@@ -2273,7 +2272,7 @@ LIB3270_ACTION( dup ) | @@ -2273,7 +2272,7 @@ LIB3270_ACTION( dup ) | ||
2273 | { | 2272 | { |
2274 | if (kybdlock) | 2273 | if (kybdlock) |
2275 | { | 2274 | { |
2276 | - ENQUEUE_ACTION(lib3270_enter); | 2275 | + ENQUEUE_ACTION(lib3270_dup); |
2277 | return 0; | 2276 | return 0; |
2278 | } | 2277 | } |
2279 | #if defined(X3270_ANSI) | 2278 | #if defined(X3270_ANSI) |
@@ -2286,13 +2285,12 @@ LIB3270_ACTION( dup ) | @@ -2286,13 +2285,12 @@ LIB3270_ACTION( dup ) | ||
2286 | 2285 | ||
2287 | /* | 2286 | /* |
2288 | * FM key | 2287 | * FM key |
2289 | - */ /* | ||
2290 | -void | ||
2291 | -FieldMark_action(Widget w unused, XEvent *event, String *params, Cardinal *num_params) | 2288 | + */ |
2289 | +LIB3270_ACTION( fieldmark ) | ||
2292 | { | 2290 | { |
2293 | -// reset_idle_timer(); | ||
2294 | - if (kybdlock) { | ||
2295 | - enq_ta(FieldMark_action, CN, CN); | 2291 | + if (kybdlock) |
2292 | + { | ||
2293 | + ENQUEUE_ACTION(lib3270_fieldmark); | ||
2296 | return; | 2294 | return; |
2297 | } | 2295 | } |
2298 | #if defined(X3270_ANSI) | 2296 | #if defined(X3270_ANSI) |
@@ -2300,7 +2298,7 @@ FieldMark_action(Widget w unused, XEvent *event, String *params, Cardinal *num_p | @@ -2300,7 +2298,7 @@ FieldMark_action(Widget w unused, XEvent *event, String *params, Cardinal *num_p | ||
2300 | return; | 2298 | return; |
2301 | #endif | 2299 | #endif |
2302 | (void) key_Character(EBC_fm, False, False, NULL); | 2300 | (void) key_Character(EBC_fm, False, False, NULL); |
2303 | -} */ | 2301 | +} |
2304 | 2302 | ||
2305 | /** | 2303 | /** |
2306 | * Send an "Enter" action. | 2304 | * Send an "Enter" action. |