From 8bee3b8b1a094e525befd7b6cf0923a1f48a1677 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Tue, 3 Apr 2012 11:40:29 +0000 Subject: [PATCH] Iniciando inclusao de suporte a acessibilidade --- appres.h | 10 ++++++---- ft.c | 4 ++-- ft_cut.c | 23 ++++++++++------------- ft_dft.c | 6 +++--- globals.h | 37 +++++++++++++++++++------------------ 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/appres.h b/appres.h index d4f5c36..722ecb8 100644 --- a/appres.h +++ b/appres.h @@ -100,14 +100,16 @@ typedef struct { #endif /*]*/ /* Named resources */ -#if defined(X3270_KEYPAD) /*[*/ +/* +#if defined(X3270_KEYPAD) char *keypad; -#endif /*]*/ -#if defined(X3270_DISPLAY) || defined(C3270) /*[*/ +#endif +*/ +#if defined(X3270_DISPLAY) || defined(C3270) // char *key_map; char *compose_map; char *printer_lu; -#endif /*]*/ +#endif /* #if defined(X3270_DISPLAY) char *efontname; diff --git a/ft.c b/ft.c index eae9493..ebf0717 100644 --- a/ft.c +++ b/ft.c @@ -375,14 +375,14 @@ ft_aborting(void) static void ft_connected(H3270 *session, int ignored, void *dunno) { if (!CONNECTED && ft_state != FT_NONE) - ft_complete(MSG_("ftDisconnected","Host disconnected, transfer cancelled")); + ft_complete(_("Host disconnected, transfer cancelled")); } /* Process an abort from no longer being in 3270 mode. */ static void ft_in3270(H3270 *session, int ignored, void *dunno) { if (!IN_3270 && ft_state != FT_NONE) - ft_complete(MSG_("ftNot3270","Not in 3270 mode, transfer cancelled")); + ft_complete(_("Not in 3270 mode, transfer cancelled")); } #endif diff --git a/ft_cut.c b/ft_cut.c index f37a219..4bd09e3 100644 --- a/ft_cut.c +++ b/ft_cut.c @@ -160,8 +160,7 @@ upload_convert(unsigned char *buf, int len) break; } if (quadrant >= NQ) { - cut_abort(MSG_("ftCutConversionError","Data conversion error"), - SC_ABORT_XMIT); + cut_abort(_("Data conversion error"),SC_ABORT_XMIT); return -1; } continue; @@ -169,8 +168,7 @@ upload_convert(unsigned char *buf, int len) /* Make sure it's in a valid range. */ if (c < 0x40 || c > 0xf9) { - cut_abort(MSG_("ftCutConversionError","Data conversion error"), - SC_ABORT_XMIT); + cut_abort(_("Data conversion error"),SC_ABORT_XMIT); return -1; } @@ -291,7 +289,7 @@ ft_cut_data(void) break; default: trace_ds("< FT unknown 0x%02x\n", ea_buf[O_FRAME_TYPE].cc); - cut_abort(MSG_("ftCutUnknownFrame"," Unknown frame type from host"), SC_ABORT_XMIT); + cut_abort(_(" Unknown frame type from host"), SC_ABORT_XMIT); break; } } @@ -346,14 +344,14 @@ cut_control_code(void) while (bp >= buf && *bp == ' ') *bp-- = '\0'; if (!*buf) - strcpy(buf, MSG_("ftHostCancel","Transfer cancelled by host")); + strcpy(buf, _("Transfer cancelled by host")); } ft_complete(buf); Free(buf); break; default: trace_ds("unknown 0x%04x\n", code); - cut_abort(MSG_("ftCutUnknownControl","Unknown FT control code from host"), SC_ABORT_XMIT); + cut_abort(_("Unknown FT control code from host"), SC_ABORT_XMIT); break; } } @@ -373,7 +371,7 @@ cut_data_request(void) trace_ds("< FT DATA_REQUEST %u\n", from6(seq)); if (ft_state == FT_ABORT_WAIT) { - cut_abort(MSG_("ftUserCancel","Transfer cancelled by user"), SC_ABORT_FILE); + cut_abort(_("Transfer cancelled by user"), SC_ABORT_FILE); return; } @@ -394,8 +392,7 @@ cut_data_request(void) ctlr_add(O_UP_DATA + j, 0, 0); /* Abort the transfer. */ - msg = xs_buffer("read(%s): %s", ft_local_filename, - strerror(errno)); + msg = xs_buffer("read(%s): %s", ft_local_filename,strerror(errno)); cut_abort(msg, SC_ABORT_FILE); Free(msg); return; @@ -437,7 +434,7 @@ static void cut_retransmit(void) { trace_ds("< FT RETRANSMIT\n"); - cut_abort(MSG_("ftCutRetransmit","Transmission error"), SC_ABORT_XMIT); + cut_abort(_("Transmission error"), SC_ABORT_XMIT); } /* @@ -468,7 +465,7 @@ cut_data(void) trace_ds("< FT DATA\n"); if (ft_state == FT_ABORT_WAIT) { - cut_abort(MSG_("ftUserCancel","Transfer cancelled by user"), SC_ABORT_FILE); + cut_abort(_("Transfer cancelled by user"), SC_ABORT_FILE); return; } @@ -476,7 +473,7 @@ cut_data(void) raw_length = from6(h3270.ea_buf[O_DT_LEN].cc) << 6 | from6(h3270.ea_buf[O_DT_LEN + 1].cc); if ((int)raw_length > O_RESPONSE - O_DT_DATA) { - cut_abort(MSG_("ftCutOversize","Illegal frame length"), SC_ABORT_XMIT); + cut_abort(_("Illegal frame length"), SC_ABORT_XMIT); return; } for (i = 0; i < (int)raw_length; i++) diff --git a/ft_dft.c b/ft_dft.c index 3b95ddc..98f61d8 100644 --- a/ft_dft.c +++ b/ft_dft.c @@ -162,7 +162,7 @@ dft_open_request(unsigned short len, unsigned char *cp) GET16(recsz, recszp); name = (char *)cp + 31; } else { - dft_abort(MSG_("ftDftUknownOpen","ftDftUknownOpen"), TR_OPEN_REQ); + dft_abort( _("ftDftUknownOpen"), TR_OPEN_REQ); return; } @@ -215,7 +215,7 @@ dft_data_insert(struct data_buffer *data_bufr) unsigned char *cp; if (!message_flag && ft_state == FT_ABORT_WAIT) { - dft_abort( MSG_("ftUserCancel","Transfer cancelled by user"), TR_DATA_INSERT); + dft_abort( _("Transfer cancelled by user"), TR_DATA_INSERT); return; } @@ -352,7 +352,7 @@ dft_get_request(void) trace_ds(" Get\n"); if (!message_flag && ft_state == FT_ABORT_WAIT) { - dft_abort(MSG_("ftUserCancel","Transfer cancelled by user"), TR_GET_REQ); + dft_abort(_("Transfer cancelled by user"), TR_GET_REQ); return; } diff --git a/globals.h b/globals.h index bddca25..06475f7 100644 --- a/globals.h +++ b/globals.h @@ -59,11 +59,9 @@ #include #define _( x ) gettext(x) #define N_( x ) x - #define MSG_( c, s ) gettext(s) #else #define _( x ) x #define N_( x ) x - #define MSG_( c, s ) s #endif // HAVE_LIBINTL @@ -120,23 +118,24 @@ #undef X3270_MENUS #endif /*]*/ -/* Local process (-e) header files. */ -#if defined(X3270_LOCAL_PROCESS) && defined(HAVE_LIBUTIL) /*[*/ +/* Local process (-e) header files. */ /* +#if defined(X3270_LOCAL_PROCESS) && defined(HAVE_LIBUTIL) #define LOCAL_PROCESS 1 #include - #if defined(HAVE_PTY_H) /*[*/ + #if defined(HAVE_PTY_H) #include - #endif /*]*/ + #endif - #if defined(HAVE_LIBUTIL_H) /*[*/ + #if defined(HAVE_LIBUTIL_H) #include - #endif /*]*/ + #endif - #if defined(HAVE_UTIL_H) /*[*/ + #if defined(HAVE_UTIL_H) #include - #endif /*]*/ -#endif /*]*/ + #endif +#endif +*/ /* Functions we may need to supply. */ #if defined(NEED_STRTOK_R) /*[*/ @@ -182,26 +181,28 @@ LIB3270_INTERNAL int children; LIB3270_INTERNAL int dft_buffersize; #endif /*]*/ -LIB3270_INTERNAL char *efontname; +// LIB3270_INTERNAL char *efontname; LIB3270_INTERNAL Boolean ever_3270; LIB3270_INTERNAL Boolean exiting; -#if defined(X3270_DISPLAY) /*[*/ +/* +#if defined(X3270_DISPLAY) LIB3270_INTERNAL Boolean *extended_3270font; LIB3270_INTERNAL Font *fid; LIB3270_INTERNAL Boolean *font_8bit; -#endif /*]*/ +#endif +*/ // LIB3270_INTERNAL Boolean flipped; -LIB3270_INTERNAL char *full_current_host; -LIB3270_INTERNAL char *full_efontname; +// LIB3270_INTERNAL char *full_current_host; +// LIB3270_INTERNAL char *full_efontname; #if defined(X3270_DBCS) /*[*/ LIB3270_INTERNAL char *full_efontname_dbcs; #endif /*]*/ -LIB3270_INTERNAL char *funky_font; -LIB3270_INTERNAL char *hostname; +//LIB3270_INTERNAL char *funky_font; +//LIB3270_INTERNAL char *hostname; #if defined(X3270_DBCS) /*[*/ LIB3270_INTERNAL char *local_encoding; -- libgit2 0.21.2