Download as
Browse Code »

Commit 6a07931c38f7fff964f9af0913ae21b5c53a4ac5

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

Revertendo argumentos das actions posto que causaram problemas com a GUI antiga

Showing 9 changed files with 68 additions and 68 deletions   Show diff stats
src/gtk2/action_calls.c
  Diff comments   View file @6a07931
... ... @@ -234,7 +234,7 @@
234 234 {
235 235 unselect();
236 236 if(PCONNECTED)
237   - lib3270_enter(hSession);
  237 + lib3270_enter();
238 238 else
239 239 action_connect(action);
240 240 }
... ... @@ -480,7 +480,7 @@
480 480 {
481 481 Trace("%s - KPAlternative is %s",__FUNCTION__,TOGGLED_KP_ALTERNATIVE ? "Enabled" : "Disabled");
482 482 if(TOGGLED_KP_ALTERNATIVE)
483   - lib3270_tab(hSession);
  483 + lib3270_tab();
484 484 else
485 485 ParseInput("+");
486 486  
... ... @@ -490,7 +490,7 @@
490 490 {
491 491 Trace("%s - KPAlternative is %s",__FUNCTION__,TOGGLED_KP_ALTERNATIVE ? "Enabled" : "Disabled");
492 492 if(TOGGLED_KP_ALTERNATIVE)
493   - lib3270_backtab(hSession);
  493 + lib3270_backtab();
494 494 else
495 495 ParseInput("-");
496 496 }
... ...
src/gtk2/actions1.c
  Diff comments   View file @6a07931
... ... @@ -301,7 +301,7 @@
301 301  
302 302 if(!TOGGLED_KEEP_SELECTED)
303 303 unselect();
304   - lib3270_pfkey(NULL,(int) id);
  304 + lib3270_pfkey((int) id);
305 305 }
306 306  
307 307 static void action_pakey(GtkAction *action, gpointer id)
... ... @@ -310,7 +310,7 @@
310 310  
311 311 if(!TOGGLED_KEEP_SELECTED)
312 312 unselect();
313   - lib3270_pakey(NULL,(int) id);
  313 + lib3270_pakey((int) id);
314 314 }
315 315  
316 316 gboolean check_key_action(GtkWidget *widget, GdkEventKey *event)
... ...
src/gtk2/mouse.c
  Diff comments   View file @6a07931
... ... @@ -197,7 +197,7 @@
197 197 if(length < 4 )
198 198 {
199 199 int function = CheckForFunction(start,length-1);
200   - if(!lib3270_pfkey(hSession,function))
  200 + if(!lib3270_pfkey(function))
201 201 return;
202 202 }
203 203 start++;
... ... @@ -232,7 +232,7 @@
232 232 if(length < 3)
233 233 {
234 234 int function = CheckForFunction(baddr,length);
235   - if(!lib3270_pfkey(hSession,function))
  235 + if(!lib3270_pfkey(function))
236 236 return;
237 237 }
238 238  
... ...
src/include/lib3270/actions.h
  Diff comments   View file @6a07931
... ... @@ -30,24 +30,24 @@
30 30 *
31 31 */
32 32  
33   - #define DECLARE_LIB3270_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (H3270 *hSession);
34   - #define LIB3270_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (H3270 *hSession)
  33 + #define DECLARE_LIB3270_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (void);
  34 + #define LIB3270_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (void)
35 35  
36 36 // Clear actions - When called the selected area is cleared
37   - #define DECLARE_LIB3270_CLEAR_SELECTION_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (H3270 *hSession);
38   - #define LIB3270_CLEAR_SELECTION_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (H3270 *hSession)
  37 + #define DECLARE_LIB3270_CLEAR_SELECTION_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (void);
  38 + #define LIB3270_CLEAR_SELECTION_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (void)
39 39  
40 40 // Single key actions
41   - #define DECLARE_LIB3270_KEY_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (H3270 *hSession);
42   - #define LIB3270_KEY_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (H3270 *hSession)
  41 + #define DECLARE_LIB3270_KEY_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (void);
  42 + #define LIB3270_KEY_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (void)
43 43  
44 44 // Cursor actions
45   - #define DECLARE_LIB3270_CURSOR_ACTION( name ) LIB3270_EXPORT int lib3270_cursor_ ## name (H3270 *hSession);
46   - #define LIB3270_CURSOR_ACTION( name ) LIB3270_EXPORT int lib3270_cursor_ ## name (H3270 *hSession)
  45 + #define DECLARE_LIB3270_CURSOR_ACTION( name ) LIB3270_EXPORT int lib3270_cursor_ ## name (void);
  46 + #define LIB3270_CURSOR_ACTION( name ) LIB3270_EXPORT int lib3270_cursor_ ## name (void)
47 47  
48 48 // PF & PA key actions
49   - #define DECLARE_LIB3270_FKEY_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (H3270 *hSession, int key);
50   - #define LIB3270_FKEY_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (H3270 *hSession, int key)
  49 + #define DECLARE_LIB3270_FKEY_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (int key);
  50 + #define LIB3270_FKEY_ACTION( name ) LIB3270_EXPORT int lib3270_ ## name (int key)
51 51  
52 52  
53 53 // Load action table entries
... ...
src/jni/pw3270_jni.c
  Diff comments   View file @6a07931
... ... @@ -271,7 +271,7 @@ JNIEXPORT jboolean JNICALL Java_pw3270_terminal_queryStringAt(JNIEnv *env, jobje
271 271 JNIEXPORT jint JNICALL Java_pw3270_terminal_sendEnterKey(JNIEnv *env, jobject obj)
272 272 {
273 273 CHECK_FOR_TERMINAL_STATUS
274   - return lib3270_enter(NULL);
  274 + return lib3270_enter();
275 275 }
276 276  
277 277 JNIEXPORT jint JNICALL Java_pw3270_terminal_setStringAt(JNIEnv *env, jobject obj, jint row, jint col, jstring j_str)
... ... @@ -299,7 +299,7 @@ JNIEXPORT jint JNICALL Java_pw3270_terminal_sendPFKey(JNIEnv *env, jobject obj,
299 299 {
300 300 CHECK_FOR_TERMINAL_STATUS
301 301  
302   - return lib3270_pfkey(NULL,key);
  302 + return lib3270_pfkey(key);
303 303 }
304 304  
305 305 JNIEXPORT jint JNICALL Java_pw3270_terminal_waitForTerminalReady(JNIEnv *env, jobject obj, jint timeout)
... ...
src/lib/ft_cut.c
  Diff comments   View file @6a07931
... ... @@ -428,7 +428,7 @@ cut_data_request(void)
428 428 ft_update_length();
429 429 expanded_length += count;
430 430  
431   - lib3270_enter(&h3270);
  431 + lib3270_enter();
432 432 }
433 433  
434 434 /*
... ... @@ -513,7 +513,7 @@ cut_data(void)
513 513 static void cut_ack(void)
514 514 {
515 515 trace_ds("> FT ACK\n");
516   - lib3270_enter(&h3270);
  516 + lib3270_enter();
517 517 }
518 518  
519 519 /*
... ... @@ -532,7 +532,7 @@ cut_abort(const char *s, unsigned short reason)
532 532 ctlr_add(RO_REASON_CODE+1, LOW8(reason), 0);
533 533 trace_ds("> FT CONTROL_CODE ABORT\n");
534 534  
535   - lib3270_pfkey(&h3270,2);
  535 + lib3270_pfkey(2);
536 536  
537 537 /* Update the in-progress pop-up. */
538 538 ft_aborting();
... ...
src/lib/kybd.c
  Diff comments   View file @6a07931
... ... @@ -1771,13 +1771,13 @@ LIB3270_ACTION( delete )
1771 1771 if (!do_delete())
1772 1772 return 0;
1773 1773 if (reverse) {
1774   - int baddr = hSession->cursor_addr;
  1774 + int baddr = h3270.cursor_addr;
1775 1775  
1776 1776 DEC_BA(baddr);
1777 1777 if (!ea_buf[baddr].fa)
1778 1778 cursor_move(baddr);
1779 1779 }
1780   - screen_disp(hSession);
  1780 + screen_disp(&h3270);
1781 1781 return 0;
1782 1782 }
1783 1783  
... ... @@ -2628,18 +2628,18 @@ LIB3270_ACTION( eraseeof )
2628 2628 if (IN_ANSI)
2629 2629 return 0;
2630 2630 #endif /*]*/
2631   - baddr = hSession->cursor_addr;
2632   - fa = get_field_attribute(hSession,baddr);
  2631 + baddr = h3270.cursor_addr;
  2632 + fa = get_field_attribute(&h3270,baddr);
2633 2633 if (FA_IS_PROTECTED(fa) || ea_buf[baddr].fa) {
2634 2634 operator_error(KL_OERR_PROTECTED);
2635 2635 return -1;
2636 2636 }
2637   - if (hSession->formatted) { /* erase to next field attribute */
  2637 + if (h3270.formatted) { /* erase to next field attribute */
2638 2638 do {
2639 2639 ctlr_add(baddr, EBC_null, 0);
2640 2640 INC_BA(baddr);
2641 2641 } while (!ea_buf[baddr].fa);
2642   - mdt_set(hSession->cursor_addr);
  2642 + mdt_set(h3270.cursor_addr);
2643 2643 } else { /* erase to end of screen */
2644 2644 do {
2645 2645 ctlr_add(baddr, EBC_null, 0);
... ... @@ -2651,14 +2651,14 @@ LIB3270_ACTION( eraseeof )
2651 2651 d = ctlr_lookleft_state(cursor_addr, &why);
2652 2652 if (IS_DBCS(d) && why == DBCS_SUBFIELD) {
2653 2653 if (d == DBCS_RIGHT) {
2654   - baddr = hSession->cursor_addr;
  2654 + baddr = h3270.cursor_addr;
2655 2655 DEC_BA(baddr);
2656 2656 ea_buf[baddr].cc = EBC_si;
2657 2657 } else
2658   - ea_buf[hSession->cursor_addr].cc = EBC_si;
  2658 + ea_buf[h3270.cursor_addr].cc = EBC_si;
2659 2659 }
2660 2660 (void) ctlr_dbcs_postprocess();
2661   - screen_disp(hSession);
  2661 + screen_disp(&h3270);
2662 2662 return 0;
2663 2663 }
2664 2664  
... ... @@ -2677,7 +2677,7 @@ LIB3270_ACTION( eraseinput )
2677 2677 if (IN_ANSI)
2678 2678 return 0;
2679 2679 #endif /*]*/
2680   - if (hSession->formatted) {
  2680 + if (h3270.formatted) {
2681 2681 /* find first field attribute */
2682 2682 baddr = 0;
2683 2683 do {
... ... @@ -2710,10 +2710,10 @@ LIB3270_ACTION( eraseinput )
2710 2710 if (!f)
2711 2711 cursor_move(0);
2712 2712 } else {
2713   - ctlr_clear(hSession,True);
  2713 + ctlr_clear(&h3270,True);
2714 2714 cursor_move(0);
2715 2715 }
2716   - screen_disp(hSession);
  2716 + screen_disp(&h3270);
2717 2717 return 0;
2718 2718 }
2719 2719  
... ... @@ -2743,11 +2743,11 @@ LIB3270_ACTION( deleteword )
2743 2743 return 0;
2744 2744 }
2745 2745 #endif /*]*/
2746   - if (!hSession->formatted)
  2746 + if (!h3270.formatted)
2747 2747 return 0;
2748 2748  
2749   - baddr = hSession->cursor_addr;
2750   - fa = get_field_attribute(hSession,baddr);
  2749 + baddr = h3270.cursor_addr;
  2750 + fa = get_field_attribute(&h3270,baddr);
2751 2751  
2752 2752 /* Make sure we're on a modifiable field. */
2753 2753 if (FA_IS_PROTECTED(fa) || ea_buf[baddr].fa) {
... ... @@ -2757,7 +2757,7 @@ LIB3270_ACTION( deleteword )
2757 2757  
2758 2758 /* Backspace over any spaces to the left of the cursor. */
2759 2759 for (;;) {
2760   - baddr = hSession->cursor_addr;
  2760 + baddr = h3270.cursor_addr;
2761 2761 DEC_BA(baddr);
2762 2762 if (ea_buf[baddr].fa)
2763 2763 return 0;
... ... @@ -2770,7 +2770,7 @@ LIB3270_ACTION( deleteword )
2770 2770  
2771 2771 /* Backspace until the character to the left of the cursor is blank. */
2772 2772 for (;;) {
2773   - baddr = hSession->cursor_addr;
  2773 + baddr = h3270.cursor_addr;
2774 2774 DEC_BA(baddr);
2775 2775 if (ea_buf[baddr].fa)
2776 2776 return 0;
... ... @@ -2780,7 +2780,7 @@ LIB3270_ACTION( deleteword )
2780 2780 else
2781 2781 do_erase();
2782 2782 }
2783   - screen_disp(hSession);
  2783 + screen_disp(&h3270);
2784 2784 return 0;
2785 2785 }
2786 2786  
... ... @@ -2810,11 +2810,11 @@ LIB3270_ACTION( deletefield )
2810 2810 return 0;
2811 2811 }
2812 2812 #endif /*]*/
2813   - if (!hSession->formatted)
  2813 + if (!h3270.formatted)
2814 2814 return 0;
2815 2815  
2816   - baddr = hSession->cursor_addr;
2817   - fa = get_field_attribute(hSession,baddr);
  2816 + baddr = h3270.cursor_addr;
  2817 + fa = get_field_attribute(&h3270,baddr);
2818 2818 if (FA_IS_PROTECTED(fa) || ea_buf[baddr].fa) {
2819 2819 operator_error(KL_OERR_PROTECTED);
2820 2820 return -1;
... ... @@ -2822,13 +2822,13 @@ LIB3270_ACTION( deletefield )
2822 2822 while (!ea_buf[baddr].fa)
2823 2823 DEC_BA(baddr);
2824 2824 INC_BA(baddr);
2825   - mdt_set(hSession->cursor_addr);
  2825 + mdt_set(h3270.cursor_addr);
2826 2826 cursor_move(baddr);
2827 2827 while (!ea_buf[baddr].fa) {
2828 2828 ctlr_add(baddr, EBC_null, 0);
2829 2829 INC_BA(baddr);
2830 2830 }
2831   - screen_disp(hSession);
  2831 + screen_disp(&h3270);
2832 2832 return 0;
2833 2833 }
2834 2834  
... ... @@ -2914,10 +2914,10 @@ LIB3270_ACTION( fieldend )
2914 2914 if (IN_ANSI)
2915 2915 return 0;
2916 2916 #endif /*]*/
2917   - if (!hSession->formatted)
  2917 + if (!h3270.formatted)
2918 2918 return 0;
2919   - baddr = hSession->cursor_addr;
2920   - faddr = find_field_attribute(hSession,baddr);
  2919 + baddr = h3270.cursor_addr;
  2920 + faddr = find_field_attribute(&h3270,baddr);
2921 2921 fa = ea_buf[faddr].fa;
2922 2922 if (faddr == baddr || FA_IS_PROTECTED(fa))
2923 2923 return 0;
... ... @@ -3249,7 +3249,7 @@ do_pa(unsigned n)
3249 3249 return;
3250 3250 }
3251 3251  
3252   - lib3270_pakey(&h3270,n);
  3252 + lib3270_pakey(n);
3253 3253  
3254 3254 }
3255 3255  
... ... @@ -3261,7 +3261,7 @@ static void do_pf(unsigned n)
3261 3261 return;
3262 3262 }
3263 3263  
3264   - lib3270_pfkey(&h3270,n);
  3264 + lib3270_pfkey(n);
3265 3265 }
3266 3266  
3267 3267 /*
... ... @@ -3393,7 +3393,7 @@ LIB3270_EXPORT int lib3270_emulate_input(H3270 *session, char *s, int len, int p
3393 3393 case BASE:
3394 3394 switch (c) {
3395 3395 case '\b':
3396   - lib3270_cursor_left(session);
  3396 + lib3270_cursor_left();
3397 3397 skipped = False;
3398 3398 break;
3399 3399 case '\f':
... ... @@ -3401,7 +3401,7 @@ LIB3270_EXPORT int lib3270_emulate_input(H3270 *session, char *s, int len, int p
3401 3401 key_ACharacter((unsigned char) ' ',
3402 3402 KT_STD, ia, &skipped);
3403 3403 } else {
3404   - lib3270_clear(session);
  3404 + lib3270_clear();
3405 3405 skipped = False;
3406 3406 if (IN_3270)
3407 3407 return len-1;
... ... @@ -3410,11 +3410,11 @@ LIB3270_EXPORT int lib3270_emulate_input(H3270 *session, char *s, int len, int p
3410 3410 case '\n':
3411 3411 if (pasting) {
3412 3412 if (!skipped)
3413   - lib3270_cursor_newline(session);
  3413 + lib3270_cursor_newline();
3414 3414 // action_internal(Newline_action,ia, CN, CN);
3415 3415 skipped = False;
3416 3416 } else {
3417   - lib3270_enter(session);
  3417 + lib3270_enter();
3418 3418 skipped = False;
3419 3419 if (IN_3270)
3420 3420 return len-1;
... ... @@ -3423,7 +3423,7 @@ LIB3270_EXPORT int lib3270_emulate_input(H3270 *session, char *s, int len, int p
3423 3423 case '\r': /* ignored */
3424 3424 break;
3425 3425 case '\t':
3426   - lib3270_tab(session);
  3426 + lib3270_tab();
3427 3427 skipped = False;
3428 3428 break;
3429 3429 case '\\': /* backslashes are NOT special when
... ... @@ -3489,13 +3489,13 @@ LIB3270_EXPORT int lib3270_emulate_input(H3270 *session, char *s, int len, int p
3489 3489 state = BASE;
3490 3490 break;
3491 3491 case 'b':
3492   - lib3270_cursor_left(session);
  3492 + lib3270_cursor_left();
3493 3493 // action_internal(Left_action, ia, CN, CN);
3494 3494 skipped = False;
3495 3495 state = BASE;
3496 3496 break;
3497 3497 case 'f':
3498   - lib3270_clear(session);
  3498 + lib3270_clear();
3499 3499 skipped = False;
3500 3500 state = BASE;
3501 3501 if (IN_3270)
... ... @@ -3503,7 +3503,7 @@ LIB3270_EXPORT int lib3270_emulate_input(H3270 *session, char *s, int len, int p
3503 3503 else
3504 3504 break;
3505 3505 case 'n':
3506   - lib3270_enter(session);
  3506 + lib3270_enter();
3507 3507 skipped = False;
3508 3508 state = BASE;
3509 3509 if (IN_3270)
... ... @@ -3515,19 +3515,19 @@ LIB3270_EXPORT int lib3270_emulate_input(H3270 *session, char *s, int len, int p
3515 3515 break;
3516 3516  
3517 3517 case 'r':
3518   - lib3270_cursor_newline(session);
  3518 + lib3270_cursor_newline();
3519 3519 // action_internal(Newline_action, ia, CN, CN);
3520 3520 skipped = False;
3521 3521 state = BASE;
3522 3522 break;
3523 3523  
3524 3524 case 't':
3525   - lib3270_tab(session);
  3525 + lib3270_tab();
3526 3526 skipped = False;
3527 3527 state = BASE;
3528 3528 break;
3529 3529 case 'T':
3530   - lib3270_tab(session);
  3530 + lib3270_tab();
3531 3531 skipped = False;
3532 3532 state = BASE;
3533 3533 break;
... ...
src/lib/macros.c
  Diff comments   View file @6a07931
... ... @@ -191,7 +191,7 @@
191 191 switch(argc)
192 192 {
193 193 case 1:
194   - lib3270_enter(hSession);
  194 + lib3270_enter();
195 195 break;
196 196  
197 197 case 2:
... ... @@ -258,7 +258,7 @@
258 258 errno = EINVAL;
259 259 return NULL;
260 260 }
261   - snprintf(ret,9,"%d",lib3270_pfkey(hSession,atoi(argv[1])));
  261 + snprintf(ret,9,"%d",lib3270_pfkey(atoi(argv[1])));
262 262 return strdup(ret);
263 263 }
264 264  
... ... @@ -270,7 +270,7 @@
270 270 errno = EINVAL;
271 271 return NULL;
272 272 }
273   - snprintf(ret,9,"%d",lib3270_pakey(hSession,atoi(argv[1])));
  273 + snprintf(ret,9,"%d",lib3270_pakey(atoi(argv[1])));
274 274 return strdup(ret);
275 275 }
276 276  
... ... @@ -282,7 +282,7 @@
282 282 errno = EINVAL;
283 283 return NULL;
284 284 }
285   - snprintf(ret,9,"%d",lib3270_enter(hSession));
  285 + snprintf(ret,9,"%d",lib3270_enter());
286 286 return strdup(ret);
287 287 }
288 288  
... ...
src/plugins/rexx/screen.c
  Diff comments   View file @6a07931
... ... @@ -71,7 +71,7 @@
71 71 switch(Argc)
72 72 {
73 73 case 0:
74   - lib3270_enter(NULL);
  74 + lib3270_enter();
75 75 break;
76 76  
77 77 case 1:
... ... @@ -448,7 +448,7 @@ RexxReturnCode REXXENTRY rx3270GetCursorPosition(PSZ Name, LONG Argc, RXSTRING A
448 448 else if(query_3270_terminal_status() != LIB3270_STATUS_BLANK)
449 449 rc = EINVAL;
450 450 else
451   - rc = lib3270_enter(NULL);
  451 + rc = lib3270_enter();
452 452  
453 453 RunPendingEvents(1);
454 454  
... ... @@ -480,7 +480,7 @@ RexxReturnCode REXXENTRY rx3270GetCursorPosition(PSZ Name, LONG Argc, RXSTRING A
480 480 else if(query_3270_terminal_status() != LIB3270_STATUS_BLANK)
481 481 rc = EINVAL;
482 482 else
483   - rc = lib3270_pfkey(NULL,atoi(Argv[0].strptr));
  483 + rc = lib3270_pfkey(atoi(Argv[0].strptr));
484 484  
485 485 if(!rc)
486 486 {
... ...