From c03311d455f442d055afac02a26ae4e3d9de6834 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Thu, 2 Aug 2012 20:02:37 +0000 Subject: [PATCH] Acertando globais para multi-sessao --- src/lib3270/charset.c | 6 +++--- src/lib3270/charsetc.h | 12 ++++++++---- src/lib3270/kybd.c | 22 +++++++++------------- src/lib3270/session.c | 1 - 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/lib3270/charset.c b/src/lib3270/charset.c index d3afc58..8bebfa2 100644 --- a/src/lib3270/charset.c +++ b/src/lib3270/charset.c @@ -77,13 +77,13 @@ #define ES_SIZE (sizeof(EURO_SUFFIX) - 1) /* Globals. */ -Boolean charset_changed = False; +// static Boolean charset_changed = False; #define DEFAULT_CGEN 0x02b90000 #define DEFAULT_CSET 0x00000025 unsigned long cgcsgid = DEFAULT_CGEN | DEFAULT_CSET; unsigned long cgcsgid_dbcs = 0L; -char *default_display_charset = "3270cg-1a,3270cg-1,iso8859-1"; -char *converter_names; +const char *default_display_charset = "3270cg-1a,3270cg-1,iso8859-1"; +// char *converter_names; char *encoding; /* diff --git a/src/lib3270/charsetc.h b/src/lib3270/charsetc.h index b145390..ab2e612 100644 --- a/src/lib3270/charsetc.h +++ b/src/lib3270/charsetc.h @@ -24,14 +24,18 @@ * Global declarations for charset.c */ -LIB3270_INTERNAL Boolean charset_changed; +// LIB3270_INTERNAL Boolean charset_changed; LIB3270_INTERNAL unsigned long cgcsgid; -#if defined(X3270_DBCS) /*[*/ + +/* +#if defined(X3270_DBCS) LIB3270_INTERNAL unsigned long cgcsgid_dbcs; LIB3270_INTERNAL char *converter_names; LIB3270_INTERNAL char *encoding; -#endif /*]*/ -LIB3270_INTERNAL char *default_display_charset; +#endif +*/ + +// LIB3270_INTERNAL char *default_display_charset; enum cs_result { CS_OKAY, CS_NOTFOUND, CS_BAD, CS_PREREQ, CS_ILLEGAL }; diff --git a/src/lib3270/kybd.c b/src/lib3270/kybd.c index 4ef4614..05172d8 100644 --- a/src/lib3270/kybd.c +++ b/src/lib3270/kybd.c @@ -26,7 +26,6 @@ * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça) * licinio@bb.com.br (Licínio Luis Branco) * kraucer@bb.com.br (Kraucer Fernandes Mazuco) - * macmiranda@bb.com.br (Marco Aurélio Caldas Miranda) * */ @@ -101,27 +100,25 @@ static const char *ia_name[] = }; #endif // X3270_TRACE -static unsigned char pf_xlate[] = +static const unsigned char pf_xlate[] = { AID_PF1, AID_PF2, AID_PF3, AID_PF4, AID_PF5, AID_PF6, AID_PF7, AID_PF8, AID_PF9, AID_PF10, AID_PF11, AID_PF12, AID_PF13, AID_PF14, AID_PF15, AID_PF16, AID_PF17, AID_PF18, AID_PF19, AID_PF20, AID_PF21, AID_PF22, AID_PF23, AID_PF24 }; -static unsigned char pa_xlate[] = +static const unsigned char pa_xlate[] = { AID_PA1, AID_PA2, AID_PA3 }; -#define PF_SZ (sizeof(pf_xlate)/sizeof(pf_xlate[0])) -#define PA_SZ (sizeof(pa_xlate)/sizeof(pa_xlate[0])) -// static void * unlock_id; -// static time_t unlock_delay_time; +#define PF_SZ (sizeof(pf_xlate)/sizeof(pf_xlate[0])) +#define PA_SZ (sizeof(pa_xlate)/sizeof(pa_xlate[0])) #define UNLOCK_MS 350 /* 0.35s after last unlock */ -static Boolean key_Character(H3270 *hSession, int code, Boolean with_ge, Boolean pasting,Boolean *skipped); -static int flush_ta(H3270 *hSession); -static void key_AID(H3270 *session, unsigned char aid_code); -static void kybdlock_set(H3270 *session, unsigned int bits); -// static KeySym MyStringToKeysym(char *s, enum keytype *keytypep); + +static Boolean key_Character(H3270 *hSession, int code, Boolean with_ge, Boolean pasting,Boolean *skipped); +static int flush_ta(H3270 *hSession); +static void key_AID(H3270 *session, unsigned char aid_code); +static void kybdlock_set(H3270 *session, unsigned int bits); /* #if defined(X3270_DBCS) @@ -1112,7 +1109,6 @@ LIB3270_ACTION( previousfield ) return 0; } - /* * Deferred keyboard unlock. */ diff --git a/src/lib3270/session.c b/src/lib3270/session.c index 5f9193d..8d1b3db 100644 --- a/src/lib3270/session.c +++ b/src/lib3270/session.c @@ -26,7 +26,6 @@ * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça) * licinio@bb.com.br (Licínio Luis Branco) * kraucer@bb.com.br (Kraucer Fernandes Mazuco) - * macmiranda@bb.com.br (Marco Aurélio Caldas Miranda) * */ -- libgit2 0.21.2