Download as
Browse Code »

Commit aba7601f25ad0f56fc7730bb38d0f0ab974abe13

Authored by perry.werneck@gmail.com
1 parent 3d52cd0c
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Removendo modulos sem uso

Showing 4 changed files with 27 additions and 16 deletions   Show diff stats
src/gtk/v3270/oia.c
  Diff comments   View file @aba7601
... ... @@ -478,12 +478,14 @@ void v3270_draw_oia(cairo_t *cr, H3270 *host, int row, int cols, struct v3270_me
478 478 { V3270_OIA_TIMER, setup_timer_position },
479 479 { V3270_OIA_SPINNER, setup_spinner_position },
480 480 { V3270_OIA_LUNAME, setup_luname_position },
  481 +#ifdef X3270_PRINTER
481 482 { V3270_OIA_PRINTER, setup_single_char_right },
  483 +#endif // X3270_PRINTER
482 484 { V3270_OIA_SCRIPT, setup_single_char_right },
483 485 { V3270_OIA_INSERT, setup_insert_position },
484 486 { V3270_OIA_TYPEAHEAD, setup_single_char_right },
485 487 { V3270_OIA_SHIFT, setup_double_char_position },
486   - { V3270_OIA_CAPS, setup_single_char_right },
  488 +// { V3270_OIA_CAPS, setup_single_char_right },
487 489 { V3270_OIA_ALT, setup_single_char_right },
488 490 { V3270_OIA_SSL, setup_double_char_position },
489 491 };
... ... @@ -1011,7 +1013,7 @@ void v3270_update_oia(H3270 *session, LIB3270_FLAG id, unsigned char on)
1011 1013 update_text_field(terminal,on,V3270_OIA_TYPEAHEAD,"T");
1012 1014 break;
1013 1015  
1014   -#ifdef LIB3270_FLAG_PRINTER
  1016 +#if defined(LIB3270_FLAG_PRINTER) && defined(X3270_PRINTER)
1015 1017 case LIB3270_FLAG_PRINTER:
1016 1018 update_text_field(terminal,on,V3270_OIA_PRINTER,"P");
1017 1019 break;
... ...
src/gtk/v3270/v3270.h
  Diff comments   View file @aba7601
... ... @@ -31,6 +31,7 @@
31 31  
32 32 #ifndef V3270_H_INCLUDED
33 33  
  34 + #include <lib3270/config.h>
34 35 #include <lib3270.h>
35 36  
36 37 #define V3270_H_INCLUDED 1
... ... @@ -101,17 +102,21 @@
101 102 V3270_OIA_ALT, /**< Alt indication ("A" or blank) */
102 103 /**< Compose indication ("C" or blank) */
103 104 /**< Compose first character */
104   - V3270_OIA_CAPS, /**< Caps indication ("A" or blank) */
105 105 V3270_OIA_SHIFT, /**< Shift Status */
106 106 V3270_OIA_TYPEAHEAD, /**< Typeahead indication ("T" or blank) */
107 107 V3270_OIA_INSERT, /**< Insert mode indication (Special symbol/"I" or blank) */
108 108 V3270_OIA_SCRIPT, /**< Script indication ("S" or blank) */
109   - V3270_OIA_PRINTER, /**< Printer indication ("P" or blank) */
110 109 V3270_OIA_LUNAME, /**< LU Name */
111 110 V3270_OIA_SPINNER, /**< command timing spinner */
112 111 V3270_OIA_TIMER, /**< command timing (mmm:ss, or blank) */
113 112 V3270_OIA_CURSOR_POSITION, /**< cursor position (rrr/ccc or blank) */
114 113  
  114 +// V3270_OIA_CAPS, /**< Caps indication ("A" or blank) */
  115 +
  116 +#ifdef X3270_PRINTER
  117 + V3270_OIA_PRINTER, /**< Printer indication ("P" or blank) */
  118 +#endif // X3270_PRINTER
  119 +
115 120 V3270_OIA_FIELD_COUNT
116 121  
117 122 } V3270_OIA_FIELD;
... ...
src/include/lib3270/config.h.in
  Diff comments   View file @aba7601
... ... @@ -26,7 +26,6 @@
26 26 * erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
27 27 * licinio@bb.com.br (Licínio Luis Branco)
28 28 * kraucer@bb.com.br (Kraucer Fernandes Mazuco)
29   - * macmiranda@bb.com.br (Marco Aurélio Caldas Miranda)
30 29 *
31 30 */
32 31  
... ... @@ -52,9 +51,8 @@
52 51 #define X3270_ANSI
53 52 #define X3270_APL
54 53 #define X3270_FT
55   - #define X3270_PRINTER
  54 + /* #define X3270_PRINTER */
56 55  
57   - #undef HAVE_ALTSCREEN
58 56 #undef HAVE_IGEMAC
59 57 #undef HAVE_MACUI
60 58 #undef HAVE_MALLOC_H
... ...
src/lib3270/printer.c
  Diff comments   View file @aba7601
... ... @@ -39,13 +39,18 @@
39 39 #include "globals.h"
40 40  
41 41 #if (defined(C3270) || defined(X3270_DISPLAY)) && defined(X3270_PRINTER) /*[*/
42   -#if defined(X3270_DISPLAY) /*[*/
  42 +
  43 +/*
  44 +#if defined(X3270_DISPLAY)
43 45 #include <X11/StringDefs.h>
44 46 #include <X11/Xaw/Dialog.h>
45   -#endif /*]*/
46   -#if defined(_WIN32) /*[*/
47   -#include "windows.h"
48   -#endif /*]*/
  47 +#endif
  48 +*/
  49 +
  50 +#if defined(_WIN32)
  51 + #include "windows.h"
  52 +#endif
  53 +
49 54 #include <errno.h>
50 55 #include <signal.h>
51 56 #include <stdarg.h>
... ... @@ -54,7 +59,6 @@
54 59 #include "appres.h"
55 60 #include "objects.h"
56 61 #include "resources.h"
57   -// #include "ctlr.h"
58 62  
59 63 #include "charsetc.h"
60 64 #include "ctlrc.h"
... ... @@ -63,9 +67,11 @@
63 67 #include "printerc.h"
64 68 #include "printc.h"
65 69 #include "savec.h"
66   -#if defined(C3270) /*[*/
67   -#include "screenc.h"
68   -#endif /*]*/
  70 +
  71 +#if defined(C3270)
  72 + #include "screenc.h"
  73 +#endif
  74 +
69 75 #include "tablesc.h"
70 76 #include "telnetc.h"
71 77 #include "trace_dsc.h"
... ...