Download as
Browse Code »

Commit 1ec15611e2bd1f4569aad472152f13b8e6fd669e

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

wip

Showing 6 changed files with 49 additions and 69 deletions   Show diff stats
latest/pw3270.cbp
  Diff comments   View file @1ec1561
... ... @@ -489,7 +489,6 @@
489 489 <Unit filename="src/include/lib3270/config.h.in" />
490 490 <Unit filename="src/include/lib3270/macros.h" />
491 491 <Unit filename="src/include/lib3270/plugins.h.in" />
492   - <Unit filename="src/include/lib3270/statusc.h" />
493 492 <Unit filename="src/include/lib3270/toggle.h" />
494 493 <Unit filename="src/java/lib3270_jni.h" />
495 494 <Unit filename="src/java/terminal.java">
... ... @@ -618,6 +617,7 @@
618 617 </Unit>
619 618 <Unit filename="src/lib/sfc.h" />
620 619 <Unit filename="src/lib/shlobj_missing.h" />
  620 + <Unit filename="src/lib/statusc.h" />
621 621 <Unit filename="src/lib/tables.c">
622 622 <Option compilerVar="CC" />
623 623 </Unit>
... ...
latest/src/include/lib3270/api.h
  Diff comments   View file @1ec1561
... ... @@ -547,6 +547,8 @@
547 547 LIB3270_EXPORT const char * get_connected_lu(H3270 *h);
548 548 LIB3270_EXPORT const char * get_current_host(H3270 *h);
549 549  
  550 + LIB3270_EXPORT SCRIPT_STATE status_script(SCRIPT_STATE state);
  551 +
550 552 LIB3270_EXPORT int Toggled(int ix);
551 553  
552 554 LIB3270_EXPORT int CallAndWait(int(*callback)(void *), void *parm);
... ...
latest/src/include/lib3270/statusc.h
View file @c1636e3
... ... @@ -1,39 +0,0 @@
1   -/*
2   - * Copyright 1999, 2000, 2002 by Paul Mattes.
3   - * Permission to use, copy, modify, and distribute this software and its
4   - * documentation for any purpose and without fee is hereby granted,
5   - * provided that the above copyright notice appear in all copies and that
6   - * both that copyright notice and this permission notice appear in
7   - * supporting documentation.
8   - *
9   - * c3270 is distributed in the hope that it will be useful, but WITHOUT ANY
10   - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
11   - * FOR A PARTICULAR PURPOSE. See the file LICENSE for more details.
12   - */
13   -
14   -/* c3270 verson of statusc.h */
15   -
16   -#include <lib3270/api.h>
17   -
18   -LIB3270_EXPORT void status_compose(int on, unsigned char c, enum keytype keytype);
19   -LIB3270_EXPORT void status_ctlr_done(void);
20   -LIB3270_EXPORT SCRIPT_STATE status_script(SCRIPT_STATE state);
21   -
22   -LIB3270_EXPORT void status_timing(struct timeval *t0, struct timeval *t1);
23   -LIB3270_EXPORT void status_untiming(void);
24   -
25   -LIB3270_EXPORT void status_lu(const char *);
26   -LIB3270_EXPORT void status_oerr(int error_type);
27   -LIB3270_EXPORT void status_reset(void);
28   -LIB3270_EXPORT void status_reverse_mode(int on);
29   -LIB3270_EXPORT void status_twait(void);
30   -LIB3270_EXPORT void status_typeahead(int on);
31   -
32   -LIB3270_EXPORT void status_changed(STATUS_CODE id);
33   -
34   -#define status_kybdlock() status_changed(STATUS_CODE_KYBDLOCK)
35   -#define status_syswait() status_changed(STATUS_CODE_SYSWAIT)
36   -#define status_minus() status_changed(STATUS_CODE_MINUS)
37   -
38   -
39   -extern int lib3270_event_counter[COUNTER_ID_USER];
latest/src/lib/screen.c
  Diff comments   View file @1ec1561
... ... @@ -168,29 +168,6 @@ int screen_init(H3270 *session)
168 168 return 0;
169 169 }
170 170  
171   -/*
172   - * Parse a tri-state resource value.
173   - * Returns True for success, False for failure.
174   - */ /*
175   -static Boolean
176   -ts_value(const char *s, enum ts *tsp)
177   -{
178   - *tsp = TS_AUTO;
179   -
180   - if (s != CN && s[0]) {
181   - int sl = strlen(s);
182   -
183   - if (!strncasecmp(s, "true", sl))
184   - *tsp = TS_ON;
185   - else if (!strncasecmp(s, "false", sl))
186   - *tsp = TS_OFF;
187   - else if (strncasecmp(s, "auto", sl))
188   - return False;
189   - }
190   - return True;
191   -}
192   -*/
193   -
194 171 /* Map a field attribute to its default colors. */
195 172 static int
196 173 color_from_fa(unsigned char fa)
... ... @@ -574,7 +551,7 @@ status_reset(void)
574 551  
575 552 }
576 553  
577   -LIB3270_EXPORT void status_reverse_mode(int on)
  554 +void status_reverse_mode(int on)
578 555 {
579 556 set(OIA_FLAG_REVERSE,on);
580 557 }
... ... @@ -593,7 +570,7 @@ LIB3270_EXPORT STATUS_CODE query_3270_terminal_status(void)
593 570 return current_status_code;
594 571 }
595 572  
596   -LIB3270_EXPORT void status_changed(STATUS_CODE id)
  573 +void status_changed(STATUS_CODE id)
597 574 {
598 575 if(id == current_status_code)
599 576 return;
... ... @@ -604,13 +581,13 @@ LIB3270_EXPORT void status_changed(STATUS_CODE id)
604 581 callbacks->status(id);
605 582 }
606 583  
607   -LIB3270_EXPORT void status_twait(void)
  584 +void status_twait(void)
608 585 {
609 586 set(OIA_FLAG_UNDERA,False);
610 587 status_changed(STATUS_CODE_TWAIT);
611 588 }
612 589  
613   -LIB3270_EXPORT void status_typeahead(int on)
  590 +void status_typeahead(int on)
614 591 {
615 592 set(OIA_FLAG_TYPEAHEAD,on);
616 593 }
... ... @@ -648,7 +625,7 @@ static void status_connect(H3270 *session, int connected, void *dunno)
648 625 id = STATUS_CODE_CONNECTED;
649 626  
650 627 #if defined(HAVE_LIBSSL) /*[*/
651   - set(OIA_FLAG_SECURE,h3270.secure_connection);
  628 + set(OIA_FLAG_SECURE,session->secure_connection);
652 629 #endif /*]*/
653 630  
654 631 } else {
... ... @@ -697,6 +674,7 @@ void status_untiming(void)
697 674 callbacks->show_timer(-1);
698 675 }
699 676  
  677 +/*
700 678 void Redraw_action(Widget w unused, XEvent *event unused, String *params unused, Cardinal *num_params unused)
701 679 {
702 680 if(callbacks && callbacks->redraw)
... ... @@ -704,6 +682,7 @@ void Redraw_action(Widget w unused, XEvent *event unused, String *params unused,
704 682 else
705 683 screen_disp(&h3270);
706 684 }
  685 +*/
707 686  
708 687 void ring_bell(void)
709 688 {
... ...
latest/src/lib/statusc.h 0 → 100644
  Diff comments   View file @1ec1561
... ... @@ -0,0 +1,38 @@
  1 +/*
  2 + * Copyright 1999, 2000, 2002 by Paul Mattes.
  3 + * Permission to use, copy, modify, and distribute this software and its
  4 + * documentation for any purpose and without fee is hereby granted,
  5 + * provided that the above copyright notice appear in all copies and that
  6 + * both that copyright notice and this permission notice appear in
  7 + * supporting documentation.
  8 + *
  9 + * c3270 is distributed in the hope that it will be useful, but WITHOUT ANY
  10 + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  11 + * FOR A PARTICULAR PURPOSE. See the file LICENSE for more details.
  12 + */
  13 +
  14 +/* c3270 verson of statusc.h */
  15 +
  16 +#include <lib3270/api.h>
  17 +
  18 +LIB3270_INTERNAL void status_compose(int on, unsigned char c, enum keytype keytype);
  19 +LIB3270_INTERNAL void status_ctlr_done(void);
  20 +
  21 +LIB3270_INTERNAL void status_timing(struct timeval *t0, struct timeval *t1);
  22 +LIB3270_INTERNAL void status_untiming(void);
  23 +
  24 +LIB3270_INTERNAL void status_lu(const char *);
  25 +LIB3270_INTERNAL void status_oerr(int error_type);
  26 +LIB3270_INTERNAL void status_reset(void);
  27 +LIB3270_INTERNAL void status_reverse_mode(int on);
  28 +LIB3270_INTERNAL void status_twait(void);
  29 +LIB3270_INTERNAL void status_typeahead(int on);
  30 +
  31 +LIB3270_INTERNAL void status_changed(STATUS_CODE id);
  32 +
  33 +#define status_kybdlock() status_changed(STATUS_CODE_KYBDLOCK)
  34 +#define status_syswait() status_changed(STATUS_CODE_SYSWAIT)
  35 +#define status_minus() status_changed(STATUS_CODE_MINUS)
  36 +
  37 +
  38 +extern int lib3270_event_counter[COUNTER_ID_USER];
... ...
latest/src/plugins/rexx/rx3270.h
  Diff comments   View file @1ec1561
... ... @@ -106,7 +106,7 @@
106 106 #define LIB3270_MODULE_NAME "rexx"
107 107 #include <lib3270/api.h>
108 108 #include <lib3270/plugins.h>
109   - #include <lib3270/statusc.h>
  109 +// #include <lib3270/statusc.h>
110 110 #include <lib3270/toggle.h>
111 111  
112 112 #define CONFIG_GROUP "Rexx"
... ...