Download as
Browse Code »

Commit 8bee3b8b1a094e525befd7b6cf0923a1f48a1677

Authored by perry.werneck@gmail.com
1 parent 84a6f128
Exists in master and in 3 other branches develop, macos, network_module

Iniciando inclusao de suporte a acessibilidade

Showing 5 changed files with 40 additions and 40 deletions   Show diff stats
@@ -100,14 +100,16 @@ typedef struct { @@ -100,14 +100,16 @@ typedef struct {
100 #endif /*]*/ 100 #endif /*]*/
101 101
102 /* Named resources */ 102 /* Named resources */
103 -#if defined(X3270_KEYPAD) /*[*/ 103 +/*
  104 +#if defined(X3270_KEYPAD)
104 char *keypad; 105 char *keypad;
105 -#endif /*]*/  
106 -#if defined(X3270_DISPLAY) || defined(C3270) /*[*/ 106 +#endif
  107 +*/
  108 +#if defined(X3270_DISPLAY) || defined(C3270)
107 // char *key_map; 109 // char *key_map;
108 char *compose_map; 110 char *compose_map;
109 char *printer_lu; 111 char *printer_lu;
110 -#endif /*]*/ 112 +#endif
111 /* 113 /*
112 #if defined(X3270_DISPLAY) 114 #if defined(X3270_DISPLAY)
113 char *efontname; 115 char *efontname;
@@ -375,14 +375,14 @@ ft_aborting(void) @@ -375,14 +375,14 @@ ft_aborting(void)
375 static void ft_connected(H3270 *session, int ignored, void *dunno) 375 static void ft_connected(H3270 *session, int ignored, void *dunno)
376 { 376 {
377 if (!CONNECTED && ft_state != FT_NONE) 377 if (!CONNECTED && ft_state != FT_NONE)
378 - ft_complete(MSG_("ftDisconnected","Host disconnected, transfer cancelled")); 378 + ft_complete(_("Host disconnected, transfer cancelled"));
379 } 379 }
380 380
381 /* Process an abort from no longer being in 3270 mode. */ 381 /* Process an abort from no longer being in 3270 mode. */
382 static void ft_in3270(H3270 *session, int ignored, void *dunno) 382 static void ft_in3270(H3270 *session, int ignored, void *dunno)
383 { 383 {
384 if (!IN_3270 && ft_state != FT_NONE) 384 if (!IN_3270 && ft_state != FT_NONE)
385 - ft_complete(MSG_("ftNot3270","Not in 3270 mode, transfer cancelled")); 385 + ft_complete(_("Not in 3270 mode, transfer cancelled"));
386 } 386 }
387 387
388 #endif 388 #endif
@@ -160,8 +160,7 @@ upload_convert(unsigned char *buf, int len) @@ -160,8 +160,7 @@ upload_convert(unsigned char *buf, int len)
160 break; 160 break;
161 } 161 }
162 if (quadrant >= NQ) { 162 if (quadrant >= NQ) {
163 - cut_abort(MSG_("ftCutConversionError","Data conversion error"),  
164 - SC_ABORT_XMIT); 163 + cut_abort(_("Data conversion error"),SC_ABORT_XMIT);
165 return -1; 164 return -1;
166 } 165 }
167 continue; 166 continue;
@@ -169,8 +168,7 @@ upload_convert(unsigned char *buf, int len) @@ -169,8 +168,7 @@ upload_convert(unsigned char *buf, int len)
169 168
170 /* Make sure it's in a valid range. */ 169 /* Make sure it's in a valid range. */
171 if (c < 0x40 || c > 0xf9) { 170 if (c < 0x40 || c > 0xf9) {
172 - cut_abort(MSG_("ftCutConversionError","Data conversion error"),  
173 - SC_ABORT_XMIT); 171 + cut_abort(_("Data conversion error"),SC_ABORT_XMIT);
174 return -1; 172 return -1;
175 } 173 }
176 174
@@ -291,7 +289,7 @@ ft_cut_data(void) @@ -291,7 +289,7 @@ ft_cut_data(void)
291 break; 289 break;
292 default: 290 default:
293 trace_ds("< FT unknown 0x%02x\n", ea_buf[O_FRAME_TYPE].cc); 291 trace_ds("< FT unknown 0x%02x\n", ea_buf[O_FRAME_TYPE].cc);
294 - cut_abort(MSG_("ftCutUnknownFrame"," Unknown frame type from host"), SC_ABORT_XMIT); 292 + cut_abort(_(" Unknown frame type from host"), SC_ABORT_XMIT);
295 break; 293 break;
296 } 294 }
297 } 295 }
@@ -346,14 +344,14 @@ cut_control_code(void) @@ -346,14 +344,14 @@ cut_control_code(void)
346 while (bp >= buf && *bp == ' ') 344 while (bp >= buf && *bp == ' ')
347 *bp-- = '\0'; 345 *bp-- = '\0';
348 if (!*buf) 346 if (!*buf)
349 - strcpy(buf, MSG_("ftHostCancel","Transfer cancelled by host")); 347 + strcpy(buf, _("Transfer cancelled by host"));
350 } 348 }
351 ft_complete(buf); 349 ft_complete(buf);
352 Free(buf); 350 Free(buf);
353 break; 351 break;
354 default: 352 default:
355 trace_ds("unknown 0x%04x\n", code); 353 trace_ds("unknown 0x%04x\n", code);
356 - cut_abort(MSG_("ftCutUnknownControl","Unknown FT control code from host"), SC_ABORT_XMIT); 354 + cut_abort(_("Unknown FT control code from host"), SC_ABORT_XMIT);
357 break; 355 break;
358 } 356 }
359 } 357 }
@@ -373,7 +371,7 @@ cut_data_request(void) @@ -373,7 +371,7 @@ cut_data_request(void)
373 371
374 trace_ds("< FT DATA_REQUEST %u\n", from6(seq)); 372 trace_ds("< FT DATA_REQUEST %u\n", from6(seq));
375 if (ft_state == FT_ABORT_WAIT) { 373 if (ft_state == FT_ABORT_WAIT) {
376 - cut_abort(MSG_("ftUserCancel","Transfer cancelled by user"), SC_ABORT_FILE); 374 + cut_abort(_("Transfer cancelled by user"), SC_ABORT_FILE);
377 return; 375 return;
378 } 376 }
379 377
@@ -394,8 +392,7 @@ cut_data_request(void) @@ -394,8 +392,7 @@ cut_data_request(void)
394 ctlr_add(O_UP_DATA + j, 0, 0); 392 ctlr_add(O_UP_DATA + j, 0, 0);
395 393
396 /* Abort the transfer. */ 394 /* Abort the transfer. */
397 - msg = xs_buffer("read(%s): %s", ft_local_filename,  
398 - strerror(errno)); 395 + msg = xs_buffer("read(%s): %s", ft_local_filename,strerror(errno));
399 cut_abort(msg, SC_ABORT_FILE); 396 cut_abort(msg, SC_ABORT_FILE);
400 Free(msg); 397 Free(msg);
401 return; 398 return;
@@ -437,7 +434,7 @@ static void @@ -437,7 +434,7 @@ static void
437 cut_retransmit(void) 434 cut_retransmit(void)
438 { 435 {
439 trace_ds("< FT RETRANSMIT\n"); 436 trace_ds("< FT RETRANSMIT\n");
440 - cut_abort(MSG_("ftCutRetransmit","Transmission error"), SC_ABORT_XMIT); 437 + cut_abort(_("Transmission error"), SC_ABORT_XMIT);
441 } 438 }
442 439
443 /* 440 /*
@@ -468,7 +465,7 @@ cut_data(void) @@ -468,7 +465,7 @@ cut_data(void)
468 465
469 trace_ds("< FT DATA\n"); 466 trace_ds("< FT DATA\n");
470 if (ft_state == FT_ABORT_WAIT) { 467 if (ft_state == FT_ABORT_WAIT) {
471 - cut_abort(MSG_("ftUserCancel","Transfer cancelled by user"), SC_ABORT_FILE); 468 + cut_abort(_("Transfer cancelled by user"), SC_ABORT_FILE);
472 return; 469 return;
473 } 470 }
474 471
@@ -476,7 +473,7 @@ cut_data(void) @@ -476,7 +473,7 @@ cut_data(void)
476 raw_length = from6(h3270.ea_buf[O_DT_LEN].cc) << 6 | 473 raw_length = from6(h3270.ea_buf[O_DT_LEN].cc) << 6 |
477 from6(h3270.ea_buf[O_DT_LEN + 1].cc); 474 from6(h3270.ea_buf[O_DT_LEN + 1].cc);
478 if ((int)raw_length > O_RESPONSE - O_DT_DATA) { 475 if ((int)raw_length > O_RESPONSE - O_DT_DATA) {
479 - cut_abort(MSG_("ftCutOversize","Illegal frame length"), SC_ABORT_XMIT); 476 + cut_abort(_("Illegal frame length"), SC_ABORT_XMIT);
480 return; 477 return;
481 } 478 }
482 for (i = 0; i < (int)raw_length; i++) 479 for (i = 0; i < (int)raw_length; i++)
@@ -162,7 +162,7 @@ dft_open_request(unsigned short len, unsigned char *cp) @@ -162,7 +162,7 @@ dft_open_request(unsigned short len, unsigned char *cp)
162 GET16(recsz, recszp); 162 GET16(recsz, recszp);
163 name = (char *)cp + 31; 163 name = (char *)cp + 31;
164 } else { 164 } else {
165 - dft_abort(MSG_("ftDftUknownOpen","ftDftUknownOpen"), TR_OPEN_REQ); 165 + dft_abort( _("ftDftUknownOpen"), TR_OPEN_REQ);
166 return; 166 return;
167 } 167 }
168 168
@@ -215,7 +215,7 @@ dft_data_insert(struct data_buffer *data_bufr) @@ -215,7 +215,7 @@ dft_data_insert(struct data_buffer *data_bufr)
215 unsigned char *cp; 215 unsigned char *cp;
216 216
217 if (!message_flag && ft_state == FT_ABORT_WAIT) { 217 if (!message_flag && ft_state == FT_ABORT_WAIT) {
218 - dft_abort( MSG_("ftUserCancel","Transfer cancelled by user"), TR_DATA_INSERT); 218 + dft_abort( _("Transfer cancelled by user"), TR_DATA_INSERT);
219 return; 219 return;
220 } 220 }
221 221
@@ -352,7 +352,7 @@ dft_get_request(void) @@ -352,7 +352,7 @@ dft_get_request(void)
352 trace_ds(" Get\n"); 352 trace_ds(" Get\n");
353 353
354 if (!message_flag && ft_state == FT_ABORT_WAIT) { 354 if (!message_flag && ft_state == FT_ABORT_WAIT) {
355 - dft_abort(MSG_("ftUserCancel","Transfer cancelled by user"), TR_GET_REQ); 355 + dft_abort(_("Transfer cancelled by user"), TR_GET_REQ);
356 return; 356 return;
357 } 357 }
358 358
@@ -59,11 +59,9 @@ @@ -59,11 +59,9 @@
59 #include <libintl.h> 59 #include <libintl.h>
60 #define _( x ) gettext(x) 60 #define _( x ) gettext(x)
61 #define N_( x ) x 61 #define N_( x ) x
62 - #define MSG_( c, s ) gettext(s)  
63 #else 62 #else
64 #define _( x ) x 63 #define _( x ) x
65 #define N_( x ) x 64 #define N_( x ) x
66 - #define MSG_( c, s ) s  
67 #endif // HAVE_LIBINTL 65 #endif // HAVE_LIBINTL
68 66
69 67
@@ -120,23 +118,24 @@ @@ -120,23 +118,24 @@
120 #undef X3270_MENUS 118 #undef X3270_MENUS
121 #endif /*]*/ 119 #endif /*]*/
122 120
123 -/* Local process (-e) header files. */  
124 -#if defined(X3270_LOCAL_PROCESS) && defined(HAVE_LIBUTIL) /*[*/ 121 +/* Local process (-e) header files. */ /*
  122 +#if defined(X3270_LOCAL_PROCESS) && defined(HAVE_LIBUTIL)
125 #define LOCAL_PROCESS 1 123 #define LOCAL_PROCESS 1
126 #include <termios.h> 124 #include <termios.h>
127 125
128 - #if defined(HAVE_PTY_H) /*[*/ 126 + #if defined(HAVE_PTY_H)
129 #include <pty.h> 127 #include <pty.h>
130 - #endif /*]*/ 128 + #endif
131 129
132 - #if defined(HAVE_LIBUTIL_H) /*[*/ 130 + #if defined(HAVE_LIBUTIL_H)
133 #include <libutil.h> 131 #include <libutil.h>
134 - #endif /*]*/ 132 + #endif
135 133
136 - #if defined(HAVE_UTIL_H) /*[*/ 134 + #if defined(HAVE_UTIL_H)
137 #include <util.h> 135 #include <util.h>
138 - #endif /*]*/  
139 -#endif /*]*/ 136 + #endif
  137 +#endif
  138 +*/
140 139
141 /* Functions we may need to supply. */ 140 /* Functions we may need to supply. */
142 #if defined(NEED_STRTOK_R) /*[*/ 141 #if defined(NEED_STRTOK_R) /*[*/
@@ -182,26 +181,28 @@ LIB3270_INTERNAL int children; @@ -182,26 +181,28 @@ LIB3270_INTERNAL int children;
182 LIB3270_INTERNAL int dft_buffersize; 181 LIB3270_INTERNAL int dft_buffersize;
183 #endif /*]*/ 182 #endif /*]*/
184 183
185 -LIB3270_INTERNAL char *efontname; 184 +// LIB3270_INTERNAL char *efontname;
186 LIB3270_INTERNAL Boolean ever_3270; 185 LIB3270_INTERNAL Boolean ever_3270;
187 LIB3270_INTERNAL Boolean exiting; 186 LIB3270_INTERNAL Boolean exiting;
188 187
189 -#if defined(X3270_DISPLAY) /*[*/ 188 +/*
  189 +#if defined(X3270_DISPLAY)
190 LIB3270_INTERNAL Boolean *extended_3270font; 190 LIB3270_INTERNAL Boolean *extended_3270font;
191 LIB3270_INTERNAL Font *fid; 191 LIB3270_INTERNAL Font *fid;
192 LIB3270_INTERNAL Boolean *font_8bit; 192 LIB3270_INTERNAL Boolean *font_8bit;
193 -#endif /*]*/ 193 +#endif
  194 +*/
194 195
195 // LIB3270_INTERNAL Boolean flipped; 196 // LIB3270_INTERNAL Boolean flipped;
196 -LIB3270_INTERNAL char *full_current_host;  
197 -LIB3270_INTERNAL char *full_efontname; 197 +// LIB3270_INTERNAL char *full_current_host;
  198 +// LIB3270_INTERNAL char *full_efontname;
198 199
199 #if defined(X3270_DBCS) /*[*/ 200 #if defined(X3270_DBCS) /*[*/
200 LIB3270_INTERNAL char *full_efontname_dbcs; 201 LIB3270_INTERNAL char *full_efontname_dbcs;
201 #endif /*]*/ 202 #endif /*]*/
202 203
203 -LIB3270_INTERNAL char *funky_font;  
204 -LIB3270_INTERNAL char *hostname; 204 +//LIB3270_INTERNAL char *funky_font;
  205 +//LIB3270_INTERNAL char *hostname;
205 206
206 #if defined(X3270_DBCS) /*[*/ 207 #if defined(X3270_DBCS) /*[*/
207 LIB3270_INTERNAL char *local_encoding; 208 LIB3270_INTERNAL char *local_encoding;