Download as
Browse Code »

Commit 99691e522ad52c57f2cea43af9e3d591e8973b6a

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

Limpando códigos antigos e não mais usados

Showing 12 changed files with 375 additions and 363 deletions   Show diff stats
@@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
9 <Option compiler="mingw_64_compiler" /> 9 <Option compiler="mingw_64_compiler" />
10 <Build> 10 <Build>
11 <Target title="Debug"> 11 <Target title="Debug">
12 - <Option output=".bin\Debug\pw3270" prefix_auto="1" extension_auto="1" />  
13 - <Option object_output=".obj\Debug\" /> 12 + <Option output=".bin/Debug/pw3270" prefix_auto="1" extension_auto="1" />
  13 + <Option object_output=".obj/Debug/" />
14 <Option type="1" /> 14 <Option type="1" />
15 <Option compiler="mingw_64_compiler" /> 15 <Option compiler="mingw_64_compiler" />
16 <Option use_console_runner="0" /> 16 <Option use_console_runner="0" />
@@ -20,8 +20,8 @@ @@ -20,8 +20,8 @@
20 </Compiler> 20 </Compiler>
21 </Target> 21 </Target>
22 <Target title="Release"> 22 <Target title="Release">
23 - <Option output=".bin\Release\pw3270" prefix_auto="1" extension_auto="1" />  
24 - <Option object_output=".obj\Release\" /> 23 + <Option output=".bin/Release/pw3270" prefix_auto="1" extension_auto="1" />
  24 + <Option object_output=".obj/Release/" />
25 <Option type="0" /> 25 <Option type="0" />
26 <Option compiler="mingw_64_compiler" /> 26 <Option compiler="mingw_64_compiler" />
27 <Compiler> 27 <Compiler>
@@ -35,308 +35,305 @@ @@ -35,308 +35,305 @@
35 <Compiler> 35 <Compiler>
36 <Add option="-Wall" /> 36 <Add option="-Wall" />
37 <Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" /> 37 <Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" />
38 - <Add directory="src\include" /> 38 + <Add directory="src/include" />
39 </Compiler> 39 </Compiler>
40 <Linker> 40 <Linker>
41 <Add option="`pkg-config gtk+-3.0 lib3270 --libs`" /> 41 <Add option="`pkg-config gtk+-3.0 lib3270 --libs`" />
42 </Linker> 42 </Linker>
43 <Unit filename="Makefile.in" /> 43 <Unit filename="Makefile.in" />
44 - <Unit filename="android\Makefile" />  
45 - <Unit filename="android\jni\Android.mk" />  
46 - <Unit filename="android\jni\globals.h" />  
47 - <Unit filename="android\jni\main.cpp" />  
48 - <Unit filename="android\jni\misc.cpp" />  
49 - <Unit filename="android\src\br\com\bb\pw3270\PW3270Activity.java" />  
50 - <Unit filename="android\src\br\com\bb\pw3270\lib3270.java" /> 44 + <Unit filename="android/Makefile" />
  45 + <Unit filename="android/jni/Android.mk" />
  46 + <Unit filename="android/jni/globals.h" />
  47 + <Unit filename="android/jni/main.cpp" />
  48 + <Unit filename="android/jni/misc.cpp" />
  49 + <Unit filename="android/src/br/com/bb/pw3270/PW3270Activity.java" />
  50 + <Unit filename="android/src/br/com/bb/pw3270/lib3270.java" />
51 <Unit filename="autogen.sh" /> 51 <Unit filename="autogen.sh" />
52 <Unit filename="colors.conf" /> 52 <Unit filename="colors.conf" />
53 <Unit filename="configure.ac" /> 53 <Unit filename="configure.ac" />
54 <Unit filename="pw3270.spec.in" /> 54 <Unit filename="pw3270.spec.in" />
55 - <Unit filename="src\include\lib3270.h" />  
56 - <Unit filename="src\include\lib3270\action_table.h" />  
57 - <Unit filename="src\include\lib3270\actions.h" />  
58 - <Unit filename="src\include\lib3270\config.h.in" />  
59 - <Unit filename="src\include\lib3270\filetransfer.h" />  
60 - <Unit filename="src\include\lib3270\html.h" />  
61 - <Unit filename="src\include\lib3270\log.h" />  
62 - <Unit filename="src\include\lib3270\popup.h" />  
63 - <Unit filename="src\include\lib3270\selection.h" />  
64 - <Unit filename="src\include\lib3270\session.h" />  
65 - <Unit filename="src\include\lib3270\trace.h" />  
66 - <Unit filename="src\include\pw3270.h" />  
67 - <Unit filename="src\include\rules.mak.in" />  
68 - <Unit filename="src\lib3270\3270ds.h" />  
69 - <Unit filename="src\lib3270\Makefile.in" />  
70 - <Unit filename="src\lib3270\X11keysym.h" />  
71 - <Unit filename="src\lib3270\XtGlue.c"> 55 + <Unit filename="src/include/lib3270.h" />
  56 + <Unit filename="src/include/lib3270/action_table.h" />
  57 + <Unit filename="src/include/lib3270/actions.h" />
  58 + <Unit filename="src/include/lib3270/config.h.in" />
  59 + <Unit filename="src/include/lib3270/filetransfer.h" />
  60 + <Unit filename="src/include/lib3270/html.h" />
  61 + <Unit filename="src/include/lib3270/log.h" />
  62 + <Unit filename="src/include/lib3270/popup.h" />
  63 + <Unit filename="src/include/lib3270/selection.h" />
  64 + <Unit filename="src/include/lib3270/session.h" />
  65 + <Unit filename="src/include/lib3270/trace.h" />
  66 + <Unit filename="src/include/pw3270.h" />
  67 + <Unit filename="src/include/rules.mak.in" />
  68 + <Unit filename="src/lib3270/3270ds.h" />
  69 + <Unit filename="src/lib3270/Makefile.in" />
  70 + <Unit filename="src/lib3270/X11keysym.h" />
  71 + <Unit filename="src/lib3270/XtGlue.c">
72 <Option compilerVar="CC" /> 72 <Option compilerVar="CC" />
73 </Unit> 73 </Unit>
74 - <Unit filename="src\lib3270\actions.c"> 74 + <Unit filename="src/lib3270/actionsc.h" />
  75 + <Unit filename="src/lib3270/ansi.c">
75 <Option compilerVar="CC" /> 76 <Option compilerVar="CC" />
76 </Unit> 77 </Unit>
77 - <Unit filename="src\lib3270\actionsc.h" />  
78 - <Unit filename="src\lib3270\ansi.c"> 78 + <Unit filename="src/lib3270/ansic.h" />
  79 + <Unit filename="src/lib3270/api.h" />
  80 + <Unit filename="src/lib3270/apl.c">
79 <Option compilerVar="CC" /> 81 <Option compilerVar="CC" />
80 </Unit> 82 </Unit>
81 - <Unit filename="src\lib3270\ansic.h" />  
82 - <Unit filename="src\lib3270\api.h" />  
83 - <Unit filename="src\lib3270\apl.c"> 83 + <Unit filename="src/lib3270/aplc.h" />
  84 + <Unit filename="src/lib3270/appres.h" />
  85 + <Unit filename="src/lib3270/arpa_telnet.h" />
  86 + <Unit filename="src/lib3270/bounds.c">
84 <Option compilerVar="CC" /> 87 <Option compilerVar="CC" />
85 </Unit> 88 </Unit>
86 - <Unit filename="src\lib3270\aplc.h" />  
87 - <Unit filename="src\lib3270\appres.h" />  
88 - <Unit filename="src\lib3270\arpa_telnet.h" />  
89 - <Unit filename="src\lib3270\bounds.c"> 89 + <Unit filename="src/lib3270/cg.h" />
  90 + <Unit filename="src/lib3270/charset.c">
90 <Option compilerVar="CC" /> 91 <Option compilerVar="CC" />
91 </Unit> 92 </Unit>
92 - <Unit filename="src\lib3270\cg.h" />  
93 - <Unit filename="src\lib3270\charset.c"> 93 + <Unit filename="src/lib3270/charsetc.h" />
  94 + <Unit filename="src/lib3270/childc.h" />
  95 + <Unit filename="src/lib3270/ctlr.c">
94 <Option compilerVar="CC" /> 96 <Option compilerVar="CC" />
95 </Unit> 97 </Unit>
96 - <Unit filename="src\lib3270\charsetc.h" />  
97 - <Unit filename="src\lib3270\childc.h" />  
98 - <Unit filename="src\lib3270\ctlr.c"> 98 + <Unit filename="src/lib3270/ctlrc.h" />
  99 + <Unit filename="src/lib3270/ft.c">
99 <Option compilerVar="CC" /> 100 <Option compilerVar="CC" />
100 </Unit> 101 </Unit>
101 - <Unit filename="src\lib3270\ctlrc.h" />  
102 - <Unit filename="src\lib3270\ft.c"> 102 + <Unit filename="src/lib3270/ft_cut.c">
103 <Option compilerVar="CC" /> 103 <Option compilerVar="CC" />
104 </Unit> 104 </Unit>
105 - <Unit filename="src\lib3270\ft_cut.c"> 105 + <Unit filename="src/lib3270/ft_cut_ds.h" />
  106 + <Unit filename="src/lib3270/ft_cutc.h" />
  107 + <Unit filename="src/lib3270/ft_dft.c">
106 <Option compilerVar="CC" /> 108 <Option compilerVar="CC" />
107 </Unit> 109 </Unit>
108 - <Unit filename="src\lib3270\ft_cut_ds.h" />  
109 - <Unit filename="src\lib3270\ft_cutc.h" />  
110 - <Unit filename="src\lib3270\ft_dft.c"> 110 + <Unit filename="src/lib3270/ft_dft_ds.h" />
  111 + <Unit filename="src/lib3270/ft_dftc.h" />
  112 + <Unit filename="src/lib3270/ftc.h" />
  113 + <Unit filename="src/lib3270/globals.h" />
  114 + <Unit filename="src/lib3270/glue.c">
111 <Option compilerVar="CC" /> 115 <Option compilerVar="CC" />
112 </Unit> 116 </Unit>
113 - <Unit filename="src\lib3270\ft_dft_ds.h" />  
114 - <Unit filename="src\lib3270\ft_dftc.h" />  
115 - <Unit filename="src\lib3270\ftc.h" />  
116 - <Unit filename="src\lib3270\globals.h" />  
117 - <Unit filename="src\lib3270\glue.c"> 117 + <Unit filename="src/lib3270/gluec.h" />
  118 + <Unit filename="src/lib3270/host.c">
118 <Option compilerVar="CC" /> 119 <Option compilerVar="CC" />
119 </Unit> 120 </Unit>
120 - <Unit filename="src\lib3270\gluec.h" />  
121 - <Unit filename="src\lib3270\host.c"> 121 + <Unit filename="src/lib3270/hostc.h" />
  122 + <Unit filename="src/lib3270/html.c">
122 <Option compilerVar="CC" /> 123 <Option compilerVar="CC" />
123 </Unit> 124 </Unit>
124 - <Unit filename="src\lib3270\hostc.h" />  
125 - <Unit filename="src\lib3270\html.c"> 125 + <Unit filename="src/lib3270/icmdc.h" />
  126 + <Unit filename="src/lib3270/iocalls.c">
126 <Option compilerVar="CC" /> 127 <Option compilerVar="CC" />
127 </Unit> 128 </Unit>
128 - <Unit filename="src\lib3270\icmdc.h" />  
129 - <Unit filename="src\lib3270\iocalls.c"> 129 + <Unit filename="src/lib3270/keypadc.h" />
  130 + <Unit filename="src/lib3270/kybd.c">
130 <Option compilerVar="CC" /> 131 <Option compilerVar="CC" />
131 </Unit> 132 </Unit>
132 - <Unit filename="src\lib3270\keypadc.h" />  
133 - <Unit filename="src\lib3270\kybd.c"> 133 + <Unit filename="src/lib3270/kybdc.h" />
  134 + <Unit filename="src/lib3270/localdefs.h" />
  135 + <Unit filename="src/lib3270/log.c">
134 <Option compilerVar="CC" /> 136 <Option compilerVar="CC" />
135 </Unit> 137 </Unit>
136 - <Unit filename="src\lib3270\kybdc.h" />  
137 - <Unit filename="src\lib3270\localdefs.h" />  
138 - <Unit filename="src\lib3270\log.c"> 138 + <Unit filename="src/lib3270/macros.c">
139 <Option compilerVar="CC" /> 139 <Option compilerVar="CC" />
140 </Unit> 140 </Unit>
141 - <Unit filename="src\lib3270\macros.c"> 141 + <Unit filename="src/lib3270/mkfb.c">
142 <Option compilerVar="CC" /> 142 <Option compilerVar="CC" />
143 </Unit> 143 </Unit>
144 - <Unit filename="src\lib3270\mkfb.c"> 144 + <Unit filename="src/lib3270/objects.h" />
  145 + <Unit filename="src/lib3270/paste.c">
145 <Option compilerVar="CC" /> 146 <Option compilerVar="CC" />
146 </Unit> 147 </Unit>
147 - <Unit filename="src\lib3270\objects.h" />  
148 - <Unit filename="src\lib3270\paste.c"> 148 + <Unit filename="src/lib3270/popupsc.h" />
  149 + <Unit filename="src/lib3270/printc.h" />
  150 + <Unit filename="src/lib3270/printerc.h" />
  151 + <Unit filename="src/lib3270/proxy.c">
149 <Option compilerVar="CC" /> 152 <Option compilerVar="CC" />
150 </Unit> 153 </Unit>
151 - <Unit filename="src\lib3270\popupsc.h" />  
152 - <Unit filename="src\lib3270\printc.h" />  
153 - <Unit filename="src\lib3270\printerc.h" />  
154 - <Unit filename="src\lib3270\proxy.c"> 154 + <Unit filename="src/lib3270/proxyc.h" />
  155 + <Unit filename="src/lib3270/resolver.c">
155 <Option compilerVar="CC" /> 156 <Option compilerVar="CC" />
156 </Unit> 157 </Unit>
157 - <Unit filename="src\lib3270\proxyc.h" />  
158 - <Unit filename="src\lib3270\resolver.c"> 158 + <Unit filename="src/lib3270/resolverc.h" />
  159 + <Unit filename="src/lib3270/resources.c">
159 <Option compilerVar="CC" /> 160 <Option compilerVar="CC" />
160 </Unit> 161 </Unit>
161 - <Unit filename="src\lib3270\resolverc.h" />  
162 - <Unit filename="src\lib3270\resources.c"> 162 + <Unit filename="src/lib3270/resources.h" />
  163 + <Unit filename="src/lib3270/rpq.c">
163 <Option compilerVar="CC" /> 164 <Option compilerVar="CC" />
164 </Unit> 165 </Unit>
165 - <Unit filename="src\lib3270\resources.h" />  
166 - <Unit filename="src\lib3270\rpq.c"> 166 + <Unit filename="src/lib3270/savec.h" />
  167 + <Unit filename="src/lib3270/screen.c">
167 <Option compilerVar="CC" /> 168 <Option compilerVar="CC" />
168 </Unit> 169 </Unit>
169 - <Unit filename="src\lib3270\savec.h" />  
170 - <Unit filename="src\lib3270\screen.c"> 170 + <Unit filename="src/lib3270/screen.h" />
  171 + <Unit filename="src/lib3270/screenc.h" />
  172 + <Unit filename="src/lib3270/scrollc.h" />
  173 + <Unit filename="src/lib3270/see.c">
171 <Option compilerVar="CC" /> 174 <Option compilerVar="CC" />
172 </Unit> 175 </Unit>
173 - <Unit filename="src\lib3270\screen.h" />  
174 - <Unit filename="src\lib3270\screenc.h" />  
175 - <Unit filename="src\lib3270\scrollc.h" />  
176 - <Unit filename="src\lib3270\see.c"> 176 + <Unit filename="src/lib3270/seec.h" />
  177 + <Unit filename="src/lib3270/selection.c">
177 <Option compilerVar="CC" /> 178 <Option compilerVar="CC" />
178 </Unit> 179 </Unit>
179 - <Unit filename="src\lib3270\seec.h" />  
180 - <Unit filename="src\lib3270\selection.c"> 180 + <Unit filename="src/lib3270/session.c">
181 <Option compilerVar="CC" /> 181 <Option compilerVar="CC" />
182 </Unit> 182 </Unit>
183 - <Unit filename="src\lib3270\session.c"> 183 + <Unit filename="src/lib3270/sf.c">
184 <Option compilerVar="CC" /> 184 <Option compilerVar="CC" />
185 </Unit> 185 </Unit>
186 - <Unit filename="src\lib3270\sf.c"> 186 + <Unit filename="src/lib3270/sf.h" />
  187 + <Unit filename="src/lib3270/shlobj_missing.h" />
  188 + <Unit filename="src/lib3270/sources.mak" />
  189 + <Unit filename="src/lib3270/state.c">
187 <Option compilerVar="CC" /> 190 <Option compilerVar="CC" />
188 </Unit> 191 </Unit>
189 - <Unit filename="src\lib3270\sf.h" />  
190 - <Unit filename="src\lib3270\shlobj_missing.h" />  
191 - <Unit filename="src\lib3270\sources.mak" />  
192 - <Unit filename="src\lib3270\state.c"> 192 + <Unit filename="src/lib3270/statusc.h" />
  193 + <Unit filename="src/lib3270/tables.c">
193 <Option compilerVar="CC" /> 194 <Option compilerVar="CC" />
194 </Unit> 195 </Unit>
195 - <Unit filename="src\lib3270\statusc.h" />  
196 - <Unit filename="src\lib3270\tables.c"> 196 + <Unit filename="src/lib3270/tablesc.h" />
  197 + <Unit filename="src/lib3270/telnet.c">
197 <Option compilerVar="CC" /> 198 <Option compilerVar="CC" />
198 </Unit> 199 </Unit>
199 - <Unit filename="src\lib3270\tablesc.h" />  
200 - <Unit filename="src\lib3270\telnet.c"> 200 + <Unit filename="src/lib3270/telnetc.h" />
  201 + <Unit filename="src/lib3270/testprogram.c">
201 <Option compilerVar="CC" /> 202 <Option compilerVar="CC" />
202 </Unit> 203 </Unit>
203 - <Unit filename="src\lib3270\telnetc.h" />  
204 - <Unit filename="src\lib3270\testprogram.c"> 204 + <Unit filename="src/lib3270/tn3270e.h" />
  205 + <Unit filename="src/lib3270/toggle.h" />
  206 + <Unit filename="src/lib3270/toggles.c">
205 <Option compilerVar="CC" /> 207 <Option compilerVar="CC" />
206 </Unit> 208 </Unit>
207 - <Unit filename="src\lib3270\tn3270e.h" />  
208 - <Unit filename="src\lib3270\toggle.h" />  
209 - <Unit filename="src\lib3270\toggles.c"> 209 + <Unit filename="src/lib3270/togglesc.h" />
  210 + <Unit filename="src/lib3270/trace_ds.c">
210 <Option compilerVar="CC" /> 211 <Option compilerVar="CC" />
211 </Unit> 212 </Unit>
212 - <Unit filename="src\lib3270\togglesc.h" />  
213 - <Unit filename="src\lib3270\trace_ds.c"> 213 + <Unit filename="src/lib3270/trace_dsc.h" />
  214 + <Unit filename="src/lib3270/utf8.c">
214 <Option compilerVar="CC" /> 215 <Option compilerVar="CC" />
215 </Unit> 216 </Unit>
216 - <Unit filename="src\lib3270\trace_dsc.h" />  
217 - <Unit filename="src\lib3270\utf8.c"> 217 + <Unit filename="src/lib3270/utf8c.h" />
  218 + <Unit filename="src/lib3270/util.c">
218 <Option compilerVar="CC" /> 219 <Option compilerVar="CC" />
219 </Unit> 220 </Unit>
220 - <Unit filename="src\lib3270\utf8c.h" />  
221 - <Unit filename="src\lib3270\util.c"> 221 + <Unit filename="src/lib3270/utilc.h" />
  222 + <Unit filename="src/lib3270/w3misc.c">
222 <Option compilerVar="CC" /> 223 <Option compilerVar="CC" />
223 </Unit> 224 </Unit>
224 - <Unit filename="src\lib3270\utilc.h" />  
225 - <Unit filename="src\lib3270\w3misc.c"> 225 + <Unit filename="src/lib3270/w3miscc.h" />
  226 + <Unit filename="src/lib3270/widec.h" />
  227 + <Unit filename="src/lib3270/winvers.c">
226 <Option compilerVar="CC" /> 228 <Option compilerVar="CC" />
227 </Unit> 229 </Unit>
228 - <Unit filename="src\lib3270\w3miscc.h" />  
229 - <Unit filename="src\lib3270\widec.h" />  
230 - <Unit filename="src\lib3270\winvers.c"> 230 + <Unit filename="src/lib3270/winversc.h" />
  231 + <Unit filename="src/lib3270/xioc.h" />
  232 + <Unit filename="src/lib3270/xl.h" />
  233 + <Unit filename="src/pw3270/Makefile.in" />
  234 + <Unit filename="src/pw3270/actions.c">
231 <Option compilerVar="CC" /> 235 <Option compilerVar="CC" />
232 </Unit> 236 </Unit>
233 - <Unit filename="src\lib3270\winversc.h" />  
234 - <Unit filename="src\lib3270\xioc.h" />  
235 - <Unit filename="src\lib3270\xl.h" />  
236 - <Unit filename="src\pw3270\Makefile.in" />  
237 - <Unit filename="src\pw3270\actions.c"> 237 + <Unit filename="src/pw3270/colors.c">
238 <Option compilerVar="CC" /> 238 <Option compilerVar="CC" />
239 </Unit> 239 </Unit>
240 - <Unit filename="src\pw3270\colors.c"> 240 + <Unit filename="src/pw3270/common/common.h.in" />
  241 + <Unit filename="src/pw3270/common/config.c">
241 <Option compilerVar="CC" /> 242 <Option compilerVar="CC" />
242 </Unit> 243 </Unit>
243 - <Unit filename="src\pw3270\common\common.h.in" />  
244 - <Unit filename="src\pw3270\common\config.c"> 244 + <Unit filename="src/pw3270/common/sources.mak" />
  245 + <Unit filename="src/pw3270/dialog.c">
245 <Option compilerVar="CC" /> 246 <Option compilerVar="CC" />
246 </Unit> 247 </Unit>
247 - <Unit filename="src\pw3270\common\sources.mak" />  
248 - <Unit filename="src\pw3270\dialog.c"> 248 + <Unit filename="src/pw3270/filetransfer.c">
249 <Option compilerVar="CC" /> 249 <Option compilerVar="CC" />
250 </Unit> 250 </Unit>
251 - <Unit filename="src\pw3270\filetransfer.c"> 251 + <Unit filename="src/pw3270/filetransfer.h" />
  252 + <Unit filename="src/pw3270/fonts.c">
252 <Option compilerVar="CC" /> 253 <Option compilerVar="CC" />
253 </Unit> 254 </Unit>
254 - <Unit filename="src\pw3270\filetransfer.h" />  
255 - <Unit filename="src\pw3270\fonts.c"> 255 + <Unit filename="src/pw3270/globals.h" />
  256 + <Unit filename="src/pw3270/main.c">
256 <Option compilerVar="CC" /> 257 <Option compilerVar="CC" />
257 </Unit> 258 </Unit>
258 - <Unit filename="src\pw3270\globals.h" />  
259 - <Unit filename="src\pw3270\main.c"> 259 + <Unit filename="src/pw3270/print.c">
260 <Option compilerVar="CC" /> 260 <Option compilerVar="CC" />
261 </Unit> 261 </Unit>
262 - <Unit filename="src\pw3270\print.c"> 262 + <Unit filename="src/pw3270/uiparser/Makefile.in" />
  263 + <Unit filename="src/pw3270/uiparser/accelerator.c">
263 <Option compilerVar="CC" /> 264 <Option compilerVar="CC" />
264 </Unit> 265 </Unit>
265 - <Unit filename="src\pw3270\uiparser\Makefile.in" />  
266 - <Unit filename="src\pw3270\uiparser\accelerator.c"> 266 + <Unit filename="src/pw3270/uiparser/action.c">
267 <Option compilerVar="CC" /> 267 <Option compilerVar="CC" />
268 </Unit> 268 </Unit>
269 - <Unit filename="src\pw3270\uiparser\action.c"> 269 + <Unit filename="src/pw3270/uiparser/menu.c">
270 <Option compilerVar="CC" /> 270 <Option compilerVar="CC" />
271 </Unit> 271 </Unit>
272 - <Unit filename="src\pw3270\uiparser\menu.c"> 272 + <Unit filename="src/pw3270/uiparser/menubar.c">
273 <Option compilerVar="CC" /> 273 <Option compilerVar="CC" />
274 </Unit> 274 </Unit>
275 - <Unit filename="src\pw3270\uiparser\menubar.c"> 275 + <Unit filename="src/pw3270/uiparser/menuitem.c">
276 <Option compilerVar="CC" /> 276 <Option compilerVar="CC" />
277 </Unit> 277 </Unit>
278 - <Unit filename="src\pw3270\uiparser\menuitem.c"> 278 + <Unit filename="src/pw3270/uiparser/parsefile.c">
279 <Option compilerVar="CC" /> 279 <Option compilerVar="CC" />
280 </Unit> 280 </Unit>
281 - <Unit filename="src\pw3270\uiparser\parsefile.c"> 281 + <Unit filename="src/pw3270/uiparser/parser.c">
282 <Option compilerVar="CC" /> 282 <Option compilerVar="CC" />
283 </Unit> 283 </Unit>
284 - <Unit filename="src\pw3270\uiparser\parser.c"> 284 + <Unit filename="src/pw3270/uiparser/parser.h" />
  285 + <Unit filename="src/pw3270/uiparser/popup.c">
285 <Option compilerVar="CC" /> 286 <Option compilerVar="CC" />
286 </Unit> 287 </Unit>
287 - <Unit filename="src\pw3270\uiparser\parser.h" />  
288 - <Unit filename="src\pw3270\uiparser\popup.c"> 288 + <Unit filename="src/pw3270/uiparser/private.h" />
  289 + <Unit filename="src/pw3270/uiparser/script.c">
289 <Option compilerVar="CC" /> 290 <Option compilerVar="CC" />
290 </Unit> 291 </Unit>
291 - <Unit filename="src\pw3270\uiparser\private.h" />  
292 - <Unit filename="src\pw3270\uiparser\script.c"> 292 + <Unit filename="src/pw3270/uiparser/separator.c">
293 <Option compilerVar="CC" /> 293 <Option compilerVar="CC" />
294 </Unit> 294 </Unit>
295 - <Unit filename="src\pw3270\uiparser\separator.c"> 295 + <Unit filename="src/pw3270/uiparser/sources.mak" />
  296 + <Unit filename="src/pw3270/uiparser/toolbar.c">
296 <Option compilerVar="CC" /> 297 <Option compilerVar="CC" />
297 </Unit> 298 </Unit>
298 - <Unit filename="src\pw3270\uiparser\sources.mak" />  
299 - <Unit filename="src\pw3270\uiparser\toolbar.c"> 299 + <Unit filename="src/pw3270/uiparser/toolitem.c">
300 <Option compilerVar="CC" /> 300 <Option compilerVar="CC" />
301 </Unit> 301 </Unit>
302 - <Unit filename="src\pw3270\uiparser\toolitem.c"> 302 + <Unit filename="src/pw3270/v3270/accessible.c">
303 <Option compilerVar="CC" /> 303 <Option compilerVar="CC" />
304 </Unit> 304 </Unit>
305 - <Unit filename="src\pw3270\v3270\accessible.c"> 305 + <Unit filename="src/pw3270/v3270/accessible.h" />
  306 + <Unit filename="src/pw3270/v3270/draw.c">
306 <Option compilerVar="CC" /> 307 <Option compilerVar="CC" />
307 </Unit> 308 </Unit>
308 - <Unit filename="src\pw3270\v3270\accessible.h" />  
309 - <Unit filename="src\pw3270\v3270\draw.c"> 309 + <Unit filename="src/pw3270/v3270/genmarshal" />
  310 + <Unit filename="src/pw3270/v3270/iocallback.c">
310 <Option compilerVar="CC" /> 311 <Option compilerVar="CC" />
311 </Unit> 312 </Unit>
312 - <Unit filename="src\pw3270\v3270\genmarshal" />  
313 - <Unit filename="src\pw3270\v3270\iocallback.c"> 313 + <Unit filename="src/pw3270/v3270/keyboard.c">
314 <Option compilerVar="CC" /> 314 <Option compilerVar="CC" />
315 </Unit> 315 </Unit>
316 - <Unit filename="src\pw3270\v3270\keyboard.c"> 316 + <Unit filename="src/pw3270/v3270/mouse.c">
317 <Option compilerVar="CC" /> 317 <Option compilerVar="CC" />
318 </Unit> 318 </Unit>
319 - <Unit filename="src\pw3270\v3270\mouse.c"> 319 + <Unit filename="src/pw3270/v3270/oia.c">
320 <Option compilerVar="CC" /> 320 <Option compilerVar="CC" />
321 </Unit> 321 </Unit>
322 - <Unit filename="src\pw3270\v3270\oia.c"> 322 + <Unit filename="src/pw3270/v3270/private.h" />
  323 + <Unit filename="src/pw3270/v3270/selection.c">
323 <Option compilerVar="CC" /> 324 <Option compilerVar="CC" />
324 </Unit> 325 </Unit>
325 - <Unit filename="src\pw3270\v3270\private.h" />  
326 - <Unit filename="src\pw3270\v3270\selection.c"> 326 + <Unit filename="src/pw3270/v3270/sources.mak" />
  327 + <Unit filename="src/pw3270/v3270/v3270.h" />
  328 + <Unit filename="src/pw3270/v3270/widget.c">
327 <Option compilerVar="CC" /> 329 <Option compilerVar="CC" />
328 </Unit> 330 </Unit>
329 - <Unit filename="src\pw3270\v3270\sources.mak" />  
330 - <Unit filename="src\pw3270\v3270\v3270.h" />  
331 - <Unit filename="src\pw3270\v3270\widget.c"> 331 + <Unit filename="src/pw3270/window.c">
332 <Option compilerVar="CC" /> 332 <Option compilerVar="CC" />
333 </Unit> 333 </Unit>
334 - <Unit filename="src\pw3270\window.c">  
335 - <Option compilerVar="CC" />  
336 - </Unit>  
337 - <Unit filename="src\tools\Makefile.in" />  
338 - <Unit filename="ui\00default.xml" />  
339 - <Unit filename="ui\99debug.xml" /> 334 + <Unit filename="src/tools/Makefile.in" />
  335 + <Unit filename="ui/00default.xml" />
  336 + <Unit filename="ui/99debug.xml" />
340 <Extensions> 337 <Extensions>
341 <code_completion /> 338 <code_completion />
342 <debugger /> 339 <debugger />
src/include/lib3270/filetransfer.h
  Diff comments   View file @99691e5
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
34 34
35 #define LIB3270_FILETRANSFER_INCLUDED 1 35 #define LIB3270_FILETRANSFER_INCLUDED 1
36 #include <stdio.h> 36 #include <stdio.h>
  37 + #include <sys/time.h>
37 38
38 #define LIB3270_FT_OPTION_SEND 0x0000 39 #define LIB3270_FT_OPTION_SEND 0x0000
39 40
@@ -85,6 +86,8 @@ @@ -85,6 +86,8 @@
85 int secspace; 86 int secspace;
86 int dft; 87 int dft;
87 88
  89 + struct timeval starting_time; /**< Starting time */
  90 +
88 const char * local; /**< Local filename */ 91 const char * local; /**< Local filename */
89 const char * remote; /**< Remote filename */ 92 const char * remote; /**< Remote filename */
90 93
src/lib3270/actions.c
  Diff comments   View file @99691e5
@@ -59,6 +59,8 @@ @@ -59,6 +59,8 @@
59 #include "screenc.h" 59 #include "screenc.h"
60 #endif /*]*/ 60 #endif /*]*/
61 61
  62 +#error Deprecated
  63 +
62 /* 64 /*
63 65
64 #if defined(X3270_DISPLAY) 66 #if defined(X3270_DISPLAY)
src/lib3270/appres.h
  Diff comments   View file @99691e5
@@ -107,7 +107,7 @@ typedef struct { @@ -107,7 +107,7 @@ typedef struct {
107 */ 107 */
108 #if defined(X3270_DISPLAY) || defined(C3270) 108 #if defined(X3270_DISPLAY) || defined(C3270)
109 // char *key_map; 109 // char *key_map;
110 - char *compose_map; 110 +// char *compose_map;
111 // char *printer_lu; 111 // char *printer_lu;
112 #endif 112 #endif
113 /* 113 /*
@@ -136,30 +136,31 @@ typedef struct { @@ -136,30 +136,31 @@ typedef struct {
136 #endif 136 #endif
137 #endif 137 #endif
138 */ 138 */
139 -#if defined(X3270_DBCS) /*[*/  
140 - char *local_encoding;  
141 -#endif /*]*/ 139 +//#if defined(X3270_DBCS)
  140 +// char *local_encoding;
  141 +//#endif
  142 +
142 #if defined(C3270) /*[*/ 143 #if defined(C3270) /*[*/
143 - char *meta_escape;  
144 - char *all_bold; 144 +// char *meta_escape;
  145 +// char *all_bold;
145 // char *altscreen; 146 // char *altscreen;
146 // char *defscreen; 147 // char *defscreen;
147 #endif /*]*/ 148 #endif /*]*/
148 - char *conf_dir; 149 +// char *conf_dir;
149 char *model; 150 char *model;
150 // char *hostsfile; 151 // char *hostsfile;
151 // char *port; 152 // char *port;
152 // char *charset; 153 // char *charset;
153 // char *termname; 154 // char *termname;
154 // char *login_macro; 155 // char *login_macro;
155 - char *macros; 156 +// char *macros;
156 #if defined(X3270_TRACE) /*[*/ 157 #if defined(X3270_TRACE) /*[*/
157 -#if !defined(_WIN32) /*[*/  
158 - char *trace_dir;  
159 -#endif /*]*/  
160 - char *trace_file;  
161 - char *screentrace_file;  
162 - char *trace_file_size; 158 +//#if !defined(_WIN32)
  159 +// char *trace_dir;
  160 +//#endif
  161 +// char *trace_file;
  162 +// char *screentrace_file;
  163 +// char *trace_file_size;
163 /* 164 /*
164 #if defined(X3270_DISPLAY) || defined(WC3270) 165 #if defined(X3270_DISPLAY) || defined(WC3270)
165 char trace_monitor; 166 char trace_monitor;
@@ -169,13 +170,13 @@ typedef struct { @@ -169,13 +170,13 @@ typedef struct {
169 #endif /*]*/ 170 #endif /*]*/
170 // char *oversize; 171 // char *oversize;
171 #if defined(X3270_FT) /*[*/ 172 #if defined(X3270_FT) /*[*/
172 - char *ft_command; 173 +// char *ft_command;
173 int dft_buffer_size; 174 int dft_buffer_size;
174 #endif /*]*/ 175 #endif /*]*/
175 - char *connectfile_name;  
176 - char *idle_command;  
177 - char idle_command_enabled;  
178 - char *idle_timeout; 176 +// char *connectfile_name;
  177 +// char *idle_command;
  178 +// char idle_command_enabled;
  179 +// char *idle_timeout;
179 180
180 /* 181 /*
181 #if defined(X3270_SCRIPT) 182 #if defined(X3270_SCRIPT)
src/lib3270/ft.c
  Diff comments   View file @99691e5
@@ -86,7 +86,7 @@ Boolean remap_flag = True; // Remap ASCII&lt;-&gt;EBCDIC @@ -86,7 +86,7 @@ Boolean remap_flag = True; // Remap ASCII&lt;-&gt;EBCDIC
86 unsigned long ft_length = 0; // Length of transfer 86 unsigned long ft_length = 0; // Length of transfer
87 static Boolean ft_is_cut; // File transfer is CUT-style 87 static Boolean ft_is_cut; // File transfer is CUT-style
88 88
89 -static struct timeval starting_time; // Starting time 89 +// static struct timeval starting_time; // Starting time
90 90
91 // static const struct filetransfer_callbacks *callbacks = NULL; // Callbacks to main application 91 // static const struct filetransfer_callbacks *callbacks = NULL; // Callbacks to main application
92 92
@@ -193,7 +193,7 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state); @@ -193,7 +193,7 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state);
193 { 193 {
194 H3270FT * ftHandle = NULL; 194 H3270FT * ftHandle = NULL;
195 FILE * ft_local_file = NULL; 195 FILE * ft_local_file = NULL;
196 - unsigned long ft_length = 0L; 196 +// unsigned long length = 0L;
197 197
198 // trace("%s(%s)",__FUNCTION__,local); 198 // trace("%s(%s)",__FUNCTION__,local);
199 if(!lib3270_connected(session)) 199 if(!lib3270_connected(session))
@@ -248,7 +248,6 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state); @@ -248,7 +248,6 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state);
248 ftHandle->host = session; 248 ftHandle->host = session;
249 ftHandle->flags = flags; 249 ftHandle->flags = flags;
250 ftHandle->local_file = ft_local_file; 250 ftHandle->local_file = ft_local_file;
251 - ftHandle->length = ft_length;  
252 ftHandle->state = LIB3270_FT_STATE_AWAIT_ACK; 251 ftHandle->state = LIB3270_FT_STATE_AWAIT_ACK;
253 ftHandle->complete = def_complete; 252 ftHandle->complete = def_complete;
254 ftHandle->message = def_message; 253 ftHandle->message = def_message;
@@ -306,9 +305,10 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state); @@ -306,9 +305,10 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state);
306 return errno ? errno : -1; 305 return errno ? errno : -1;
307 } 306 }
308 307
309 - ft_length = ftell(ft->local_file); 308 + ft->length = ftell(ft->local_file);
310 309
311 - lib3270_write_log(ft->host,"ft","Sending file %s (%ld bytes)",ft->local,ft_length); 310 +
  311 + lib3270_write_log(ft->host,"ft","Sending file %s (%ld bytes)",ft->local,ft->length);
312 rewind(ft->local_file); 312 rewind(ft->local_file);
313 } 313 }
314 314
@@ -414,8 +414,8 @@ void ft_complete(H3270FT *session, const char *errmsg) @@ -414,8 +414,8 @@ void ft_complete(H3270FT *session, const char *errmsg)
414 414
415 (void) gettimeofday(&t1, (struct timezone *)NULL); 415 (void) gettimeofday(&t1, (struct timezone *)NULL);
416 kbytes_sec = (double)ft_length / 1024.0 / 416 kbytes_sec = (double)ft_length / 1024.0 /
417 - ((double)(t1.tv_sec - starting_time.tv_sec) +  
418 - (double)(t1.tv_usec - starting_time.tv_usec) / 1.0e6); 417 + ((double)(t1.tv_sec - session->starting_time.tv_sec) +
  418 + (double)(t1.tv_usec - session->starting_time.tv_usec) / 1.0e6);
419 419
420 // Close the local file. 420 // Close the local file.
421 if(session->local_file) 421 if(session->local_file)
@@ -470,8 +470,8 @@ void ft_update_length(H3270FT *session) @@ -470,8 +470,8 @@ void ft_update_length(H3270FT *session)
470 470
471 (void) gettimeofday(&t1, (struct timezone *)NULL); 471 (void) gettimeofday(&t1, (struct timezone *)NULL);
472 kbytes_sec = (double)ft_length / 1024.0 / 472 kbytes_sec = (double)ft_length / 1024.0 /
473 - ((double)(t1.tv_sec - starting_time.tv_sec) +  
474 - (double)(t1.tv_usec - starting_time.tv_usec) / 1.0e6); 473 + ((double)(t1.tv_sec - session->starting_time.tv_sec) +
  474 + (double)(t1.tv_usec - session->starting_time.tv_usec) / 1.0e6);
475 } 475 }
476 476
477 session->update(session,ft_length,session->length,kbytes_sec); 477 session->update(session,ft_length,session->length,kbytes_sec);
@@ -486,7 +486,7 @@ void ft_running(H3270FT *h, Boolean is_cut) @@ -486,7 +486,7 @@ void ft_running(H3270FT *h, Boolean is_cut)
486 ft_is_cut = is_cut; 486 ft_is_cut = is_cut;
487 ft_length = 0; 487 ft_length = 0;
488 488
489 - (void) gettimeofday(&starting_time, (struct timezone *)NULL); 489 + gettimeofday(&h->starting_time, (struct timezone *)NULL);
490 490
491 if (h->state == FT_AWAIT_ACK) 491 if (h->state == FT_AWAIT_ACK)
492 set_ft_state(h,FT_RUNNING); 492 set_ft_state(h,FT_RUNNING);
src/lib3270/globals.h
  Diff comments   View file @99691e5
@@ -158,7 +158,7 @@ LIB3270_INTERNAL const char * build_rpq_timestamp; @@ -158,7 +158,7 @@ LIB3270_INTERNAL const char * build_rpq_timestamp;
158 LIB3270_INTERNAL const char * build_rpq_version; 158 LIB3270_INTERNAL const char * build_rpq_version;
159 LIB3270_INTERNAL const char * build_rpq_revision; 159 LIB3270_INTERNAL const char * build_rpq_revision;
160 160
161 -LIB3270_INTERNAL int children; 161 +// LIB3270_INTERNAL int children;
162 162
163 #if defined(X3270_DBCS) /*[*/ 163 #if defined(X3270_DBCS) /*[*/
164 LIB3270_INTERNAL Boolean dbcs; 164 LIB3270_INTERNAL Boolean dbcs;
@@ -170,7 +170,7 @@ LIB3270_INTERNAL int children; @@ -170,7 +170,7 @@ LIB3270_INTERNAL int children;
170 170
171 // LIB3270_INTERNAL char *efontname; 171 // LIB3270_INTERNAL char *efontname;
172 LIB3270_INTERNAL Boolean ever_3270; 172 LIB3270_INTERNAL Boolean ever_3270;
173 -LIB3270_INTERNAL Boolean exiting; 173 +// LIB3270_INTERNAL Boolean exiting;
174 174
175 /* 175 /*
176 #if defined(X3270_DISPLAY) 176 #if defined(X3270_DISPLAY)
@@ -192,7 +192,7 @@ LIB3270_INTERNAL Boolean exiting; @@ -192,7 +192,7 @@ LIB3270_INTERNAL Boolean exiting;
192 //LIB3270_INTERNAL char *hostname; 192 //LIB3270_INTERNAL char *hostname;
193 193
194 #if defined(X3270_DBCS) /*[*/ 194 #if defined(X3270_DBCS) /*[*/
195 - LIB3270_INTERNAL char *local_encoding; 195 +// LIB3270_INTERNAL char *local_encoding;
196 196
197 #if defined(X3270_DISPLAY) /*[*/ 197 #if defined(X3270_DISPLAY) /*[*/
198 LIB3270_INTERNAL char *locale_name; 198 LIB3270_INTERNAL char *locale_name;
src/lib3270/glue.c
  Diff comments   View file @99691e5
@@ -49,6 +49,7 @@ @@ -49,6 +49,7 @@
49 49
50 #include <signal.h> 50 #include <signal.h>
51 #include <errno.h> 51 #include <errno.h>
  52 +#include <stdarg.h>
52 53
53 #include "appres.h" 54 #include "appres.h"
54 #include "3270ds.h" 55 #include "3270ds.h"
@@ -100,15 +101,15 @@ @@ -100,15 +101,15 @@
100 #define LAST_ARG "--" 101 #define LAST_ARG "--"
101 102
102 /*---[ Globals ]--------------------------------------------------------------------------------------------------------------*/ 103 /*---[ Globals ]--------------------------------------------------------------------------------------------------------------*/
103 - const char * programname; 104 +// const char * programname;
104 AppRes appres; 105 AppRes appres;
105 - int children = 0;  
106 - Boolean exiting = False; 106 +// int children = 0;
  107 +// Boolean exiting = False;
107 // char * command_string = CN; 108 // char * command_string = CN;
108 109
109 -#if defined(WC3270) || defined(LIB3270)/*[*/  
110 -char *profile_name = CN;  
111 -#endif /*]*/ 110 +// #if defined(WC3270) || defined(LIB3270)
  111 +// char *profile_name = CN;
  112 +// #endif
112 113
113 /* 114 /*
114 * Set default options 115 * Set default options
@@ -163,9 +164,9 @@ static void initialize(void) @@ -163,9 +164,9 @@ static void initialize(void)
163 // appres.typeahead = True; 164 // appres.typeahead = True;
164 appres.debug_tracing = True; 165 appres.debug_tracing = True;
165 166
166 -#if defined(C3270) /*[*/  
167 - appres.compose_map = "latin1";  
168 -#endif /*]*/ 167 +//#if defined(C3270)
  168 +// appres.compose_map = "latin1";
  169 +//#endif
169 170
170 appres.model = ""; 171 appres.model = "";
171 // appres.hostsfile = CN; 172 // appres.hostsfile = CN;
@@ -182,13 +183,15 @@ static void initialize(void) @@ -182,13 +183,15 @@ static void initialize(void)
182 //#endif /*]*/ 183 //#endif /*]*/
183 184
184 // appres.termname = CN; 185 // appres.termname = CN;
185 - appres.macros = CN; 186 +// appres.macros = CN;
186 187
187 #if defined(X3270_TRACE) /*[*/ 188 #if defined(X3270_TRACE) /*[*/
188 189
189 -#if !defined(_WIN32) /*[*/ 190 +/*
  191 +#if !defined(_WIN32)
190 appres.trace_dir = "/tmp"; 192 appres.trace_dir = "/tmp";
191 -#endif /*]*/ 193 +#endif
  194 +*/
192 195
193 /* 196 /*
194 #if defined(X3270_DISPLAY) || defined(WC3270) 197 #if defined(X3270_DISPLAY) || defined(WC3270)
@@ -201,7 +204,7 @@ static void initialize(void) @@ -201,7 +204,7 @@ static void initialize(void)
201 // appres.oversize = CN; 204 // appres.oversize = CN;
202 205
203 #if defined(C3270) /*[*/ 206 #if defined(C3270) /*[*/
204 - appres.meta_escape = "auto"; 207 +// appres.meta_escape = "auto";
205 // appres.curses_keypad = True; 208 // appres.curses_keypad = True;
206 // appres.cbreak_mode = False; 209 // appres.cbreak_mode = False;
207 #endif /*]*/ 210 #endif /*]*/
@@ -291,79 +294,84 @@ int lib3270_unloaded(void) @@ -291,79 +294,84 @@ int lib3270_unloaded(void)
291 #define offset(n) (void *) &appres.n 294 #define offset(n) (void *) &appres.n
292 #define toggle_offset(index) offset(toggle[index].value) 295 #define toggle_offset(index) offset(toggle[index].value)
293 296
  297 +/*
  298 +
294 static const struct lib3270_option options[] = 299 static const struct lib3270_option options[] =
295 { 300 {
296 // TODO (perry#5#): Add option descriptions. 301 // TODO (perry#5#): Add option descriptions.
297 -//#if defined(C3270) /*[*/ 302 +//#if defined(C3270)
298 // { OptAllBold, OPT_BOOLEAN, True, ResAllBold, offset(all_bold_on), NULL }, 303 // { OptAllBold, OPT_BOOLEAN, True, ResAllBold, offset(all_bold_on), NULL },
299 // { OptAltScreen,OPT_STRING, False, ResAltScreen, offset(altscreen), NULL }, 304 // { OptAltScreen,OPT_STRING, False, ResAltScreen, offset(altscreen), NULL },
300 -//#endif /*]*/ 305 +//#endif
301 // { OptAplMode, OPT_BOOLEAN, True, ResAplMode, offset(apl_mode), NULL }, 306 // { OptAplMode, OPT_BOOLEAN, True, ResAplMode, offset(apl_mode), NULL },
302 -#if defined(C3270) /*[*/ 307 +#if defined(C3270)
303 // { OptCbreak, OPT_BOOLEAN, True, ResCbreak, offset(cbreak_mode), NULL }, 308 // { OptCbreak, OPT_BOOLEAN, True, ResCbreak, offset(cbreak_mode), NULL },
304 -#endif /*]*/  
305 -#if defined(HAVE_LIBSSL) /*[*/ 309 +#endif
  310 +#if defined(HAVE_LIBSSL)
306 { OptCertFile, OPT_STRING, False, ResCertFile, offset(cert_file), NULL }, 311 { OptCertFile, OPT_STRING, False, ResCertFile, offset(cert_file), NULL },
307 -#endif /*]*/ 312 +#endif
308 // { OptCharset, OPT_STRING, False, ResCharset, offset(charset), NULL }, 313 // { OptCharset, OPT_STRING, False, ResCharset, offset(charset), NULL },
309 { OptClear, OPT_SKIP2, False, NULL, NULL, NULL }, 314 { OptClear, OPT_SKIP2, False, NULL, NULL, NULL },
310 // { OptDefScreen,OPT_STRING, False, ResDefScreen, offset(defscreen), NULL }, 315 // { OptDefScreen,OPT_STRING, False, ResDefScreen, offset(defscreen), NULL },
311 //#if defined(X3270_TRACE) 316 //#if defined(X3270_TRACE)
312 // { OptDsTrace, OPT_BOOLEAN, True, ResDsTrace, toggle_offset(DS_TRACE), NULL }, 317 // { OptDsTrace, OPT_BOOLEAN, True, ResDsTrace, toggle_offset(DS_TRACE), NULL },
313 -//#endif /*]*/ 318 +//#endif
314 // { OptHostsFile,OPT_STRING, False, ResHostsFile, offset(hostsfile), NULL }, 319 // { OptHostsFile,OPT_STRING, False, ResHostsFile, offset(hostsfile), NULL },
315 //#if defined(C3270) 320 //#if defined(C3270)
316 // { OptKeymap, OPT_STRING, False, ResKeymap, offset(key_map), N_( "Specifies a keymap name and optional modifiers." ) }, 321 // { OptKeymap, OPT_STRING, False, ResKeymap, offset(key_map), N_( "Specifies a keymap name and optional modifiers." ) },
317 // #endif 322 // #endif
318 323
319 -// #if defined(X3270_DBCS) /*[*/ 324 +// #if defined(X3270_DBCS)
320 // { OptLocalEncoding,OPT_STRING,False,ResLocalEncoding,offset(local_encoding), NULL }, 325 // { OptLocalEncoding,OPT_STRING,False,ResLocalEncoding,offset(local_encoding), NULL },
321 -//#endif /*]*/  
322 - { OptModel, OPT_STRING, False, ResKeymap, offset(model), N_( "Set terminal model (screen size)" ) },  
323 -// #if !defined(_WIN32) /*[*/ 326 +//#endif
  327 +// { OptModel, OPT_STRING, False, ResKeymap, offset(model), N_( "Set terminal model (screen size)" ) },
  328 +// #if !defined(_WIN32)
324 // { OptMono, OPT_BOOLEAN, True, ResMono, offset(mono), N_( "Forces monochrome display" ) }, 329 // { OptMono, OPT_BOOLEAN, True, ResMono, offset(mono), N_( "Forces monochrome display" ) },
325 -// #endif /*]*/ 330 +// #endif
326 // { OptOnce, OPT_BOOLEAN, True, ResOnce, offset(once), NULL }, 331 // { OptOnce, OPT_BOOLEAN, True, ResOnce, offset(once), NULL },
327 // { OptOversize, OPT_STRING, False, ResOversize, offset(oversize), N_( "Sets the screen dimensions to be larger than the default for the chosen model (COLSxROWS)." ) }, 332 // { OptOversize, OPT_STRING, False, ResOversize, offset(oversize), N_( "Sets the screen dimensions to be larger than the default for the chosen model (COLSxROWS)." ) },
328 // { OptPort, OPT_STRING, False, ResPort, offset(port), N_( "The name of the default TCP port to connect" ) }, 333 // { OptPort, OPT_STRING, False, ResPort, offset(port), N_( "The name of the default TCP port to connect" ) },
329 -#if defined(C3270) && !defined(LIB3270) /*[*/ 334 +#if defined(C3270) && !defined(LIB3270)
330 // { OptPrinterLu,OPT_STRING, False, ResPrinterLu, offset(printer_lu), NULL }, 335 // { OptPrinterLu,OPT_STRING, False, ResPrinterLu, offset(printer_lu), NULL },
331 -#endif /*]*/ 336 +#endif
332 // { OptProxy, OPT_STRING, False, ResProxy, offset(proxy), N_( "Proxy server (type:host[:port])" ) }, 337 // { OptProxy, OPT_STRING, False, ResProxy, offset(proxy), N_( "Proxy server (type:host[:port])" ) },
333 -#if defined(S3270) /*[*/ 338 +#if defined(S3270)
334 { OptScripted, OPT_NOP, False, ResScripted, NULL, NULL }, 339 { OptScripted, OPT_NOP, False, ResScripted, NULL, NULL },
335 -#endif /*]*/  
336 -//#if defined(C3270) /*[*/ 340 +#endif
  341 +//#if defined(C3270)
337 // { OptSecure, OPT_BOOLEAN, True, ResSecure, offset(secure), NULL }, 342 // { OptSecure, OPT_BOOLEAN, True, ResSecure, offset(secure), NULL },
338 -//#endif /*]*/  
339 - { OptSet, OPT_SKIP2, False, NULL, NULL, NULL },  
340 -#if defined(X3270_SCRIPT) /*[*/  
341 - { OptSocket, OPT_BOOLEAN, True, ResSocket, offset(socket), NULL },  
342 -#endif /*]*/ 343 +//#endif
  344 +// { OptSet, OPT_SKIP2, False, NULL, NULL, NULL },
  345 +#if defined(X3270_SCRIPT)
  346 +// { OptSocket, OPT_BOOLEAN, True, ResSocket, offset(socket), NULL },
  347 +#endif
343 348
344 // { OptTermName, OPT_STRING, False, ResTermName, offset(termname), N_( "Specifies the terminal name to be transmitted over the telnet connection." ) }, 349 // { OptTermName, OPT_STRING, False, ResTermName, offset(termname), N_( "Specifies the terminal name to be transmitted over the telnet connection." ) },
345 350
346 -#if defined(WC3270) /*[*/  
347 - { OptTitle, OPT_STRING, False, ResTitle, offset(title), NULL },  
348 -#endif /*]*/  
349 -#if defined(X3270_TRACE) /*[*/  
350 - { OptTraceFile,OPT_STRING, False, ResTraceFile, offset(trace_file), NULL },  
351 - { OptTraceFileSize,OPT_STRING,False,ResTraceFileSize,offset(trace_file_size), NULL },  
352 -#endif /*]*/ 351 +#if defined(WC3270)
  352 +// { OptTitle, OPT_STRING, False, ResTitle, offset(title), NULL },
  353 +#endif
  354 +#if defined(X3270_TRACE)
  355 +// { OptTraceFile,OPT_STRING, False, ResTraceFile, offset(trace_file), NULL },
  356 +// { OptTraceFileSize,OPT_STRING,False,ResTraceFileSize,offset(trace_file_size), NULL },
  357 +#endif
353 { "-xrm", OPT_XRM, False, NULL, NULL, NULL }, 358 { "-xrm", OPT_XRM, False, NULL, NULL, NULL },
354 { LAST_ARG, OPT_DONE, False, NULL, NULL, NULL }, 359 { LAST_ARG, OPT_DONE, False, NULL, NULL, NULL },
355 { CN, OPT_SKIP2, False, NULL, NULL, NULL } 360 { CN, OPT_SKIP2, False, NULL, NULL, NULL }
356 }; 361 };
  362 +*/
357 363
358 /* 364 /*
359 * Get library option table 365 * Get library option table
360 */ 366 */
  367 + /*
361 const struct lib3270_option * get_3270_option_table(int sz) 368 const struct lib3270_option * get_3270_option_table(int sz)
362 { 369 {
363 if(sz == sizeof(struct lib3270_option)) 370 if(sz == sizeof(struct lib3270_option))
364 return options; 371 return options;
365 return NULL; 372 return NULL;
366 } 373 }
  374 +*/
367 375
368 /* 376 /*
369 * Parse '-xrm' options. 377 * Parse '-xrm' options.
@@ -371,110 +379,111 @@ const struct lib3270_option * get_3270_option_table(int sz) @@ -371,110 +379,111 @@ const struct lib3270_option * get_3270_option_table(int sz)
371 * {c,s,tcl}3270.<resourcename>: value 379 * {c,s,tcl}3270.<resourcename>: value
372 * Asterisks and class names need not apply. 380 * Asterisks and class names need not apply.
373 */ 381 */
374 - 382 +/*
375 static struct { 383 static struct {
376 const char *name; 384 const char *name;
377 void *address; 385 void *address;
378 enum resource_type { XRM_STRING, XRM_BOOLEAN, XRM_INT } type; 386 enum resource_type { XRM_STRING, XRM_BOOLEAN, XRM_INT } type;
379 } resources[] = { 387 } resources[] = {
380 - { ResAllBold, offset(all_bold), XRM_STRING }, 388 +// { ResAllBold, offset(all_bold), XRM_STRING },
381 // { ResAltScreen, offset(altscreen), XRM_STRING }, 389 // { ResAltScreen, offset(altscreen), XRM_STRING },
382 // { ResBsdTm, offset(bsd_tm), XRM_BOOLEAN }, 390 // { ResBsdTm, offset(bsd_tm), XRM_BOOLEAN },
383 -#if defined(HAVE_LIBSSL) /*[*/ 391 +#if defined(HAVE_LIBSSL)
384 { ResCertFile, offset(cert_file), XRM_STRING }, 392 { ResCertFile, offset(cert_file), XRM_STRING },
385 -#endif /*]*/ 393 +#endif
386 // { ResCharset, offset(charset), XRM_STRING }, 394 // { ResCharset, offset(charset), XRM_STRING },
387 // { ResColor8, offset(color8), XRM_BOOLEAN }, 395 // { ResColor8, offset(color8), XRM_BOOLEAN },
388 - { ResConfDir, offset(conf_dir), XRM_STRING }, 396 +// { ResConfDir, offset(conf_dir), XRM_STRING },
389 // { ResDefScreen, offset(defscreen), XRM_STRING }, 397 // { ResDefScreen, offset(defscreen), XRM_STRING },
390 -#if defined(X3270_ANSI) /*[*/ 398 +#if defined(X3270_ANSI)
391 // { ResEof, offset(eof), XRM_STRING }, 399 // { ResEof, offset(eof), XRM_STRING },
392 // { ResErase, offset(erase), XRM_STRING }, 400 // { ResErase, offset(erase), XRM_STRING },
393 -#endif /*]*/ 401 +#endif
394 // { ResExtended, offset(extended), XRM_BOOLEAN }, 402 // { ResExtended, offset(extended), XRM_BOOLEAN },
395 -#if defined(X3270_FT) /*[*/  
396 - { ResFtCommand, offset(ft_command), XRM_STRING }, 403 +#if defined(X3270_FT)
  404 +// { ResFtCommand, offset(ft_command), XRM_STRING },
397 { ResDftBufferSize,offset(dft_buffer_size),XRM_INT }, 405 { ResDftBufferSize,offset(dft_buffer_size),XRM_INT },
398 -#endif /*]*/  
399 -#if defined(WC3270) /*[*/  
400 - { "hostname", offset(hostname), XRM_STRING },  
401 -#endif /*]*/ 406 +#endif
  407 +//#if defined(WC3270)
  408 +// { "hostname", offset(hostname), XRM_STRING },
  409 +//#endif
402 // { ResHostsFile, offset(hostsfile), XRM_STRING }, 410 // { ResHostsFile, offset(hostsfile), XRM_STRING },
403 -#if defined(X3270_ANSI) /*[*/ 411 +#if defined(X3270_ANSI)
404 // { ResIcrnl, offset(icrnl), XRM_BOOLEAN }, 412 // { ResIcrnl, offset(icrnl), XRM_BOOLEAN },
405 // { ResInlcr, offset(inlcr), XRM_BOOLEAN }, 413 // { ResInlcr, offset(inlcr), XRM_BOOLEAN },
406 // { ResOnlcr, offset(onlcr), XRM_BOOLEAN }, 414 // { ResOnlcr, offset(onlcr), XRM_BOOLEAN },
407 // { ResIntr, offset(intr), XRM_STRING }, 415 // { ResIntr, offset(intr), XRM_STRING },
408 -#endif /*]*/  
409 -#if defined(X3270_SCRIPT) /*[*/  
410 - { ResPluginCommand, offset(plugin_command), XRM_STRING },  
411 -#endif /*]*/ 416 +#endif
  417 +//#if defined(X3270_SCRIPT)
  418 +// { ResPluginCommand, offset(plugin_command), XRM_STRING },
  419 +//#endif
412 //#if defined(C3270) && defined(_WIN32) 420 //#if defined(C3270) && defined(_WIN32)
413 // { ResHighlightUnderline, offset(highlight_underline), XRM_BOOLEAN }, 421 // { ResHighlightUnderline, offset(highlight_underline), XRM_BOOLEAN },
414 //#endif 422 //#endif
415 -#if defined(C3270) && defined(X3270_SCRIPT) /*[*/ 423 +#if defined(C3270) && defined(X3270_SCRIPT)
416 { ResIdleCommand,offset(idle_command), XRM_STRING }, 424 { ResIdleCommand,offset(idle_command), XRM_STRING },
417 { ResIdleCommandEnabled,offset(idle_command_enabled), XRM_BOOLEAN }, 425 { ResIdleCommandEnabled,offset(idle_command_enabled), XRM_BOOLEAN },
418 { ResIdleTimeout,offset(idle_timeout), XRM_STRING }, 426 { ResIdleTimeout,offset(idle_timeout), XRM_STRING },
419 -#endif /*]*/  
420 -#if defined(C3270) /*[*/ 427 +#endif
  428 +#if defined(C3270)
421 // { ResKeymap, offset(key_map), XRM_STRING }, 429 // { ResKeymap, offset(key_map), XRM_STRING },
422 - { ResMetaEscape,offset(meta_escape), XRM_STRING }, 430 +// { ResMetaEscape,offset(meta_escape), XRM_STRING },
423 // { ResCursesKeypad,offset(curses_keypad),XRM_BOOLEAN }, 431 // { ResCursesKeypad,offset(curses_keypad),XRM_BOOLEAN },
424 // { ResCbreak, offset(cbreak_mode), XRM_BOOLEAN }, 432 // { ResCbreak, offset(cbreak_mode), XRM_BOOLEAN },
425 -#endif /*]*/  
426 -#if defined(X3270_ANSI) /*[*/ 433 +#endif
  434 +#if defined(X3270_ANSI)
427 // { ResKill, offset(kill), XRM_STRING }, 435 // { ResKill, offset(kill), XRM_STRING },
428 // { ResLnext, offset(lnext), XRM_STRING }, 436 // { ResLnext, offset(lnext), XRM_STRING },
429 -#endif /*]*/ 437 +#endif
430 // { ResLoginMacro,offset(login_macro), XRM_STRING }, 438 // { ResLoginMacro,offset(login_macro), XRM_STRING },
431 // { ResM3279, offset(m3279), XRM_BOOLEAN }, 439 // { ResM3279, offset(m3279), XRM_BOOLEAN },
432 // { ResModel, offset(model), XRM_STRING }, 440 // { ResModel, offset(model), XRM_STRING },
433 // { ResModifiedSel, offset(modified_sel), XRM_BOOLEAN }, 441 // { ResModifiedSel, offset(modified_sel), XRM_BOOLEAN },
434 -//#if defined(C3270) && !defined(_WIN32) /*[*/ 442 +//#if defined(C3270) && !defined(_WIN32)
435 // { ResMono, offset(mono), XRM_BOOLEAN }, 443 // { ResMono, offset(mono), XRM_BOOLEAN },
436 -//#endif /*]*/ 444 +//#endif
437 // { ResNumericLock, offset(numeric_lock), XRM_BOOLEAN }, 445 // { ResNumericLock, offset(numeric_lock), XRM_BOOLEAN },
438 // { ResOerrLock, offset(oerr_lock), XRM_BOOLEAN }, 446 // { ResOerrLock, offset(oerr_lock), XRM_BOOLEAN },
439 // { ResOversize, offset(oversize), XRM_STRING }, 447 // { ResOversize, offset(oversize), XRM_STRING },
440 // { ResPort, offset(port), XRM_STRING }, 448 // { ResPort, offset(port), XRM_STRING },
441 -#if defined(C3270) /*[*/ 449 +#if defined(C3270)
442 // { ResPrinterLu, offset(printer_lu), XRM_STRING }, 450 // { ResPrinterLu, offset(printer_lu), XRM_STRING },
443 { ResPrintTextCommand, NULL, XRM_STRING }, 451 { ResPrintTextCommand, NULL, XRM_STRING },
444 -#endif /*]*/ 452 +#endif
445 // { ResProxy, offset(proxy), XRM_STRING }, 453 // { ResProxy, offset(proxy), XRM_STRING },
446 -#if defined(X3270_ANSI) /*[*/ 454 +#if defined(X3270_ANSI)
447 // { ResQuit, offset(quit), XRM_STRING }, 455 // { ResQuit, offset(quit), XRM_STRING },
448 // { ResRprnt, offset(rprnt), XRM_STRING }, 456 // { ResRprnt, offset(rprnt), XRM_STRING },
449 -#endif /*]*/ 457 +#endif
450 // { ResSecure, offset(secure), XRM_BOOLEAN }, 458 // { ResSecure, offset(secure), XRM_BOOLEAN },
451 // { ResTermName, offset(termname), XRM_STRING }, 459 // { ResTermName, offset(termname), XRM_STRING },
452 -#if defined(WC3270) /*[*/ 460 +#if defined(WC3270)
453 { ResTitle, offset(title), XRM_STRING }, 461 { ResTitle, offset(title), XRM_STRING },
454 -#endif /*]*/  
455 -#if defined(X3270_TRACE) /*[*/  
456 -#if !defined(_WIN32) /*[*/  
457 - { ResTraceDir, offset(trace_dir), XRM_STRING },  
458 -#endif /*]*/  
459 - { ResTraceFile, offset(trace_file), XRM_STRING },  
460 - { ResTraceFileSize,offset(trace_file_size),XRM_STRING },  
461 -#if defined(WC3270) /*[*/ 462 +#endif
  463 +#if defined(X3270_TRACE)
  464 +//#if !defined(_WIN32)
  465 +// { ResTraceDir, offset(trace_dir), XRM_STRING },
  466 +//#endif
  467 +// { ResTraceFile, offset(trace_file), XRM_STRING },
  468 +// { ResTraceFileSize,offset(trace_file_size),XRM_STRING },
  469 +#if defined(WC3270)
462 { ResTraceMonitor,offset(trace_monitor),XRM_BOOLEAN }, 470 { ResTraceMonitor,offset(trace_monitor),XRM_BOOLEAN },
463 -#endif /*]*/  
464 -#endif /*]*/ 471 +#endif
  472 +#endif
465 // { ResTypeahead, offset(typeahead), XRM_BOOLEAN }, 473 // { ResTypeahead, offset(typeahead), XRM_BOOLEAN },
466 // { ResUnlockDelay,offset(unlock_delay), XRM_BOOLEAN }, 474 // { ResUnlockDelay,offset(unlock_delay), XRM_BOOLEAN },
467 -#if defined(X3270_ANSI) /*[*/ 475 +#if defined(X3270_ANSI)
468 // { ResWerase, offset(werase), XRM_STRING }, 476 // { ResWerase, offset(werase), XRM_STRING },
469 -#endif /*]*/ 477 +#endif
470 478
471 { CN, 0, XRM_STRING } 479 { CN, 0, XRM_STRING }
472 }; 480 };
  481 +*/
473 482
474 /* 483 /*
475 * Compare two strings, allowing the second to differ by uppercasing the 484 * Compare two strings, allowing the second to differ by uppercasing the
476 * first character of the second. 485 * first character of the second.
477 - */ 486 + */ /*
478 static int 487 static int
479 strncapcmp(const char *known, const char *unknown, unsigned unk_len) 488 strncapcmp(const char *known, const char *unknown, unsigned unk_len)
480 { 489 {
@@ -488,7 +497,7 @@ strncapcmp(const char *known, const char *unknown, unsigned unk_len) @@ -488,7 +497,7 @@ strncapcmp(const char *known, const char *unknown, unsigned unk_len)
488 return 0; 497 return 0;
489 return -1; 498 return -1;
490 } 499 }
491 - 500 +*/
492 501
493 #if !defined(ME) /*[*/ 502 #if !defined(ME) /*[*/
494 #if defined(C3270) /*[*/ 503 #if defined(C3270) /*[*/
@@ -504,6 +513,7 @@ strncapcmp(const char *known, const char *unknown, unsigned unk_len) @@ -504,6 +513,7 @@ strncapcmp(const char *known, const char *unknown, unsigned unk_len)
504 #endif /*]*/ 513 #endif /*]*/
505 #endif /*]*/ 514 #endif /*]*/
506 515
  516 +/*
507 void 517 void
508 parse_xrm(const char *arg, const char *where) 518 parse_xrm(const char *arg, const char *where)
509 { 519 {
@@ -516,13 +526,13 @@ parse_xrm(const char *arg, const char *where) @@ -516,13 +526,13 @@ parse_xrm(const char *arg, const char *where)
516 char *t; 526 char *t;
517 void *address = NULL; 527 void *address = NULL;
518 enum resource_type type = XRM_STRING; 528 enum resource_type type = XRM_STRING;
519 -#if defined(C3270) /*[*/ 529 +#if defined(C3270)
520 char *add_buf = CN; 530 char *add_buf = CN;
521 char *hide; 531 char *hide;
522 Boolean arbitrary = False; 532 Boolean arbitrary = False;
523 -#endif /*]*/ 533 +#endif
524 534
525 - /* Enforce "-3270." or "-3270*" or "*". */ 535 + // Enforce "-3270." or "-3270*" or "*".
526 if (!strncmp(arg, me_dot, sizeof(me_dot)-1)) 536 if (!strncmp(arg, me_dot, sizeof(me_dot)-1))
527 match_len = sizeof(me_dot)-1; 537 match_len = sizeof(me_dot)-1;
528 else if (!strncmp(arg, me_star, sizeof(me_star)-1)) 538 else if (!strncmp(arg, me_star, sizeof(me_star)-1))
@@ -536,7 +546,7 @@ parse_xrm(const char *arg, const char *where) @@ -536,7 +546,7 @@ parse_xrm(const char *arg, const char *where)
536 return; 546 return;
537 } 547 }
538 548
539 - /* Separate the parts. */ 549 + // Separate the parts.
540 s = arg + match_len; 550 s = arg + match_len;
541 while (*s && *s != ':' && !isspace(*s)) 551 while (*s && *s != ':' && !isspace(*s))
542 s++; 552 s++;
@@ -556,22 +566,22 @@ parse_xrm(const char *arg, const char *where) @@ -556,22 +566,22 @@ parse_xrm(const char *arg, const char *where)
556 while (isspace(*s)) 566 while (isspace(*s))
557 s++; 567 s++;
558 568
559 - /* Look up the name. */ 569 + // Look up the name.
560 for (i = 0; resources[i].name != CN; i++) { 570 for (i = 0; resources[i].name != CN; i++) {
561 if (!strncapcmp(resources[i].name, arg + match_len, rnlen)) { 571 if (!strncapcmp(resources[i].name, arg + match_len, rnlen)) {
562 address = resources[i].address; 572 address = resources[i].address;
563 type = resources[i].type; 573 type = resources[i].type;
564 -#if defined(C3270) /*[*/ 574 +#if defined(C3270)
565 if (address == NULL) { 575 if (address == NULL) {
566 add_buf = lib3270_malloc(strlen(s) + 1); 576 add_buf = lib3270_malloc(strlen(s) + 1);
567 address = add_buf; 577 address = add_buf;
568 } 578 }
569 -#endif /*]*/ 579 +#endif
570 break; 580 break;
571 } 581 }
572 } 582 }
573 583
574 -#if defined(C3270) /*[*/ 584 +#if defined(C3270)
575 if (address == NULL) { 585 if (address == NULL) {
576 if (!strncasecmp(ResKeymap ".", arg + match_len, 586 if (!strncasecmp(ResKeymap ".", arg + match_len,
577 strlen(ResKeymap ".")) || 587 strlen(ResKeymap ".")) ||
@@ -583,22 +593,22 @@ parse_xrm(const char *arg, const char *where) @@ -583,22 +593,22 @@ parse_xrm(const char *arg, const char *where)
583 strlen(ResCodepage ".")) || 593 strlen(ResCodepage ".")) ||
584 !strncasecmp("host.", arg + match_len, 5) || 594 !strncasecmp("host.", arg + match_len, 5) ||
585 !strncasecmp("printer.", arg + match_len, 8) || 595 !strncasecmp("printer.", arg + match_len, 8) ||
586 -#if defined(_WIN32) /*[*/ 596 +#if defined(_WIN32)
587 !strncasecmp(ResHostColorFor, arg + match_len, 597 !strncasecmp(ResHostColorFor, arg + match_len,
588 strlen(ResHostColorFor)) || 598 strlen(ResHostColorFor)) ||
589 !strncasecmp(ResConsoleColorForHostColor, arg + match_len, 599 !strncasecmp(ResConsoleColorForHostColor, arg + match_len,
590 strlen(ResConsoleColorForHostColor)) 600 strlen(ResConsoleColorForHostColor))
591 -#else /*][*/ 601 +#else
592 !strncasecmp(ResCursesColorFor, arg + match_len, 602 !strncasecmp(ResCursesColorFor, arg + match_len,
593 strlen(ResCursesColorFor)) 603 strlen(ResCursesColorFor))
594 -#endif /*]*/ 604 +#endif
595 ) { 605 ) {
596 address = &hide; 606 address = &hide;
597 type = XRM_STRING; 607 type = XRM_STRING;
598 arbitrary = True; 608 arbitrary = True;
599 } 609 }
600 } 610 }
601 -#endif /*]*/ 611 +#endif
602 if (address == NULL) { 612 if (address == NULL) {
603 xs_warning("%s: Unknown resource name: %.*s", 613 xs_warning("%s: Unknown resource name: %.*s",
604 where, (int)rnlen, arg + match_len); 614 where, (int)rnlen, arg + match_len);
@@ -670,8 +680,8 @@ parse_xrm(const char *arg, const char *where) @@ -670,8 +680,8 @@ parse_xrm(const char *arg, const char *where)
670 } 680 }
671 } 681 }
672 682
673 -#if defined(C3270) /*[*/  
674 - /* Add a new, arbitrarily-named resource. */ 683 +#if defined(C3270)
  684 + // Add a new, arbitrarily-named resource.
675 if (arbitrary) { 685 if (arbitrary) {
676 char *rsname; 686 char *rsname;
677 687
@@ -680,10 +690,11 @@ parse_xrm(const char *arg, const char *where) @@ -680,10 +690,11 @@ parse_xrm(const char *arg, const char *where)
680 rsname[rnlen] = '\0'; 690 rsname[rnlen] = '\0';
681 add_resource(rsname, hide); 691 add_resource(rsname, hide);
682 } 692 }
683 -#endif /*]*/ 693 +#endif
684 } 694 }
  695 +*/
685 696
686 -/* Read resources from a file. */ 697 +/* Read resources from a file. */ /*
687 int 698 int
688 read_resource_file(const char *filename, Boolean fatal) 699 read_resource_file(const char *filename, Boolean fatal)
689 { 700 {
@@ -701,7 +712,7 @@ read_resource_file(const char *filename, Boolean fatal) @@ -701,7 +712,7 @@ read_resource_file(const char *filename, Boolean fatal)
701 return -1; 712 return -1;
702 } 713 }
703 714
704 - /* Merge in what's in the file into the resource database. */ 715 + // Merge in what's in the file into the resource database.
705 where = lib3270_malloc(strlen(filename) + 64); 716 where = lib3270_malloc(strlen(filename) + 64);
706 717
707 ilen = 0; 718 ilen = 0;
@@ -712,15 +723,15 @@ read_resource_file(const char *filename, Boolean fatal) @@ -712,15 +723,15 @@ read_resource_file(const char *filename, Boolean fatal)
712 723
713 lno++; 724 lno++;
714 725
715 - /* Stip any trailing newline. */ 726 + // Stip any trailing newline.
716 sl = strlen(buf + ilen); 727 sl = strlen(buf + ilen);
717 if (sl && (buf + ilen)[sl-1] == '\n') 728 if (sl && (buf + ilen)[sl-1] == '\n')
718 (buf + ilen)[--sl] = '\0'; 729 (buf + ilen)[--sl] = '\0';
719 730
720 - /*  
721 - * Translate backslash-n to real newline characters, and  
722 - * remember if the last character is a backslash.  
723 - */ 731 + //
  732 + //Translate backslash-n to real newline characters, and
  733 + // remember if the last character is a backslash.
  734 + //
724 for (bsl = False, s = buf + ilen, t = s; *s; s++) { 735 for (bsl = False, s = buf + ilen, t = s; *s; s++) {
725 if (bsl) { 736 if (bsl) {
726 if (*s == 'n') 737 if (*s == 'n')
@@ -737,12 +748,12 @@ read_resource_file(const char *filename, Boolean fatal) @@ -737,12 +748,12 @@ read_resource_file(const char *filename, Boolean fatal)
737 } 748 }
738 *t = '\0'; 749 *t = '\0';
739 750
740 - /* Skip leading whitespace. */ 751 + // Skip leading whitespace.
741 s = buf; 752 s = buf;
742 while (isspace(*s)) 753 while (isspace(*s))
743 s++; 754 s++;
744 755
745 - /* Skip comments _before_ checking for line continuation. */ 756 + // Skip comments _before_ checking for line continuation.
746 if (*s == '!') { 757 if (*s == '!') {
747 ilen = 0; 758 ilen = 0;
748 continue; 759 continue;
@@ -755,7 +766,7 @@ read_resource_file(const char *filename, Boolean fatal) @@ -755,7 +766,7 @@ read_resource_file(const char *filename, Boolean fatal)
755 continue; 766 continue;
756 } 767 }
757 768
758 - /* If this line is a continuation, try again. */ 769 + // If this line is a continuation, try again.
759 if (bsl) { 770 if (bsl) {
760 ilen += strlen(buf + ilen); 771 ilen += strlen(buf + ilen);
761 if (ilen >= sizeof(buf) - 1) { 772 if (ilen >= sizeof(buf) - 1) {
@@ -767,7 +778,7 @@ read_resource_file(const char *filename, Boolean fatal) @@ -767,7 +778,7 @@ read_resource_file(const char *filename, Boolean fatal)
767 continue; 778 continue;
768 } 779 }
769 780
770 - /* Strip trailing whitespace and check for empty lines. */ 781 + // Strip trailing whitespace and check for empty lines.
771 sl = strlen(s); 782 sl = strlen(s);
772 while (sl && isspace(s[sl-1])) 783 while (sl && isspace(s[sl-1]))
773 s[--sl] = '\0'; 784 s[--sl] = '\0';
@@ -776,11 +787,11 @@ read_resource_file(const char *filename, Boolean fatal) @@ -776,11 +787,11 @@ read_resource_file(const char *filename, Boolean fatal)
776 continue; 787 continue;
777 } 788 }
778 789
779 - /* Digest it. */ 790 + // Digest it.
780 (void) sprintf(where, "%s:%d", filename, lno); 791 (void) sprintf(where, "%s:%d", filename, lno);
781 parse_xrm(s, where); 792 parse_xrm(s, where);
782 793
783 - /* Get ready for the next iteration. */ 794 + // Get ready for the next iteration.
784 ilen = 0; 795 ilen = 0;
785 } 796 }
786 lib3270_free(where); 797 lib3270_free(where);
@@ -788,29 +799,13 @@ read_resource_file(const char *filename, Boolean fatal) @@ -788,29 +799,13 @@ read_resource_file(const char *filename, Boolean fatal)
788 } 799 }
789 800
790 // Boolean flipped = False; 801 // Boolean flipped = False;
  802 +*/
791 803
792 /* Replacements for functions in popups.c. */ 804 /* Replacements for functions in popups.c. */
793 805
794 -#include <stdarg.h>  
795 -  
796 -Boolean error_popup_visible = False; 806 +// Boolean error_popup_visible = False;
797 807
798 808
799 -/* Pop up an error dialog, based on an error number. */  
800 -void popup_an_errno(H3270 *session, int errn, const char *fmt, ...)  
801 -{  
802 - char vmsgbuf[4096];  
803 - va_list args;  
804 -  
805 - va_start(args, fmt);  
806 - (void) vsprintf(vmsgbuf, fmt, args);  
807 - va_end(args);  
808 -  
809 - lib3270_write_log(session, "3270", "Error Popup:\n%s\nrc=%d (%s)",vmsgbuf,errn,strerror(errn));  
810 -  
811 - Error(NULL,vmsgbuf);  
812 -}  
813 -  
814 #ifdef DEBUG 809 #ifdef DEBUG
815 extern void lib3270_initialize(void) 810 extern void lib3270_initialize(void)
816 { 811 {
@@ -818,11 +813,12 @@ extern void lib3270_initialize(void) @@ -818,11 +813,12 @@ extern void lib3270_initialize(void)
818 } 813 }
819 #endif 814 #endif
820 815
  816 +
  817 +/*
821 void 818 void
822 action_output(const char *fmt, ...) 819 action_output(const char *fmt, ...)
823 { 820 {
824 // TODO (perry#1#): Implement a callback to browse the text string. 821 // TODO (perry#1#): Implement a callback to browse the text string.
825 -/*  
826 va_list args; 822 va_list args;
827 823
828 va_start(args, fmt); 824 va_start(args, fmt);
@@ -844,32 +840,6 @@ action_output(const char *fmt, ...) @@ -844,32 +840,6 @@ action_output(const char *fmt, ...)
844 (void) fprintf(aout, "%s\n", vmsgbuf); 840 (void) fprintf(aout, "%s\n", vmsgbuf);
845 macro_output = True; 841 macro_output = True;
846 } 842 }
847 -*/  
848 -}  
849 -  
850 -  
851 -#if defined(_WIN32) /*[*/  
852 -  
853 -/* Missing parts for wc3270. */  
854 -#include <windows.h>  
855 -#define SECS_BETWEEN_EPOCHS 11644473600ULL  
856 -#define SECS_TO_100NS 10000000ULL /* 10^7 */  
857 -  
858 -int  
859 -gettimeofday(struct timeval *tv, void *ignored)  
860 -{  
861 - FILETIME t;  
862 - ULARGE_INTEGER u;  
863 -  
864 - GetSystemTimeAsFileTime(&t);  
865 - memcpy(&u, &t, sizeof(ULARGE_INTEGER));  
866 -  
867 - /* Isolate seconds and move epochs. */  
868 - tv->tv_sec = (DWORD)((u.QuadPart / SECS_TO_100NS) -  
869 - SECS_BETWEEN_EPOCHS);  
870 - tv->tv_usec = (u.QuadPart % SECS_TO_100NS) / 10ULL;  
871 - return 0;  
872 } 843 }
873 -  
874 -#endif /*]*/ 844 +*/
875 845
src/lib3270/gluec.h
  Diff comments   View file @99691e5
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 /* glue.c */ 20 /* glue.c */
21 // extern int parse_command_line(int argc, const char **argv, const char **cl_hostname); 21 // extern int parse_command_line(int argc, const char **argv, const char **cl_hostname);
22 // extern int parse_program_parameters(int argc, const char **argv); 22 // extern int parse_program_parameters(int argc, const char **argv);
23 -LIB3270_INTERNAL void parse_xrm(const char *arg, const char *where); 23 +// LIB3270_INTERNAL void parse_xrm(const char *arg, const char *where);
24 LIB3270_INTERNAL void notify_ssl_error(H3270 *session, const char *title, const char *msg, const char *state, const char *alert); 24 LIB3270_INTERNAL void notify_ssl_error(H3270 *session, const char *title, const char *msg, const char *state, const char *alert);
25 25
26 /* XtGlue.c */ 26 /* XtGlue.c */
src/lib3270/popupsc.h
  Diff comments   View file @99691e5
@@ -15,4 +15,4 @@ @@ -15,4 +15,4 @@
15 /* Non-display version of popupsc.h */ 15 /* Non-display version of popupsc.h */
16 16
17 LIB3270_INTERNAL void popup_an_errno(H3270 *session, int errn, const char *fmt, ...); 17 LIB3270_INTERNAL void popup_an_errno(H3270 *session, int errn, const char *fmt, ...);
18 -LIB3270_INTERNAL void action_output(const char *fmt, ...); 18 +// LIB3270_INTERNAL void action_output(const char *fmt, ...);
src/lib3270/sources.mak
  Diff comments   View file @99691e5
@@ -33,6 +33,6 @@ TERMINAL_SOURCES = bounds.c XtGlue.c ctlr.c util.c toggles.c screen.c selection. @@ -33,6 +33,6 @@ TERMINAL_SOURCES = bounds.c XtGlue.c ctlr.c util.c toggles.c screen.c selection.
33 NETWORK_SOURCES = iocalls.c proxy.c 33 NETWORK_SOURCES = iocalls.c proxy.c
34 34
35 # Full library sources 35 # Full library sources
36 -SOURCES = $(TERMINAL_SOURCES) $(NETWORK_SOURCES) actions.c ft.c ft_cut.c ft_dft.c glue.c resources.c \ 36 +SOURCES = $(TERMINAL_SOURCES) $(NETWORK_SOURCES) ft.c ft_cut.c ft_dft.c glue.c resources.c \
37 rpq.c see.c trace_ds.c paste.c macros.c fallbacks.c log.c 37 rpq.c see.c trace_ds.c paste.c macros.c fallbacks.c log.c
38 38
src/lib3270/util.c
  Diff comments   View file @99691e5
@@ -992,3 +992,42 @@ LIB3270_EXPORT const char * lib3270_get_revision(void) @@ -992,3 +992,42 @@ LIB3270_EXPORT const char * lib3270_get_revision(void)
992 { 992 {
993 return build_rpq_revision; 993 return build_rpq_revision;
994 } 994 }
  995 +
  996 +/* Pop up an error dialog, based on an error number. */
  997 +void popup_an_errno(H3270 *session, int errn, const char *fmt, ...)
  998 +{
  999 + va_list args;
  1000 + char * text;
  1001 +
  1002 + va_start(args, fmt);
  1003 + text = lib3270_vsprintf(fmt, args);
  1004 + va_end(args);
  1005 +
  1006 + lib3270_write_log(session, "3270", "Error Popup:\n%s\nrc=%d (%s)",text,errn,strerror(errn));
  1007 +
  1008 + Error(session,text);
  1009 +
  1010 + lib3270_free(text);
  1011 +}
  1012 +
  1013 +#if defined(_WIN32)
  1014 +
  1015 +#define SECS_BETWEEN_EPOCHS 11644473600ULL
  1016 +#define SECS_TO_100NS 10000000ULL /* 10^7 */
  1017 +
  1018 +int gettimeofday(struct timeval *tv, void *ignored)
  1019 +{
  1020 + FILETIME t;
  1021 + ULARGE_INTEGER u;
  1022 +
  1023 + GetSystemTimeAsFileTime(&t);
  1024 + memcpy(&u, &t, sizeof(ULARGE_INTEGER));
  1025 +
  1026 + /* Isolate seconds and move epochs. */
  1027 + tv->tv_sec = (DWORD)((u.QuadPart / SECS_TO_100NS) - SECS_BETWEEN_EPOCHS);
  1028 + tv->tv_usec = (u.QuadPart % SECS_TO_100NS) / 10ULL;
  1029 + return 0;
  1030 +}
  1031 +
  1032 +#endif
  1033 +
src/lib3270/utilc.h
  Diff comments   View file @99691e5
@@ -46,7 +46,7 @@ LIB3270_INTERNAL void RemoveTimeOut(void *cookie); @@ -46,7 +46,7 @@ LIB3270_INTERNAL void RemoveTimeOut(void *cookie);
46 LIB3270_INTERNAL const char * KeysymToString(KeySym k); 46 LIB3270_INTERNAL const char * KeysymToString(KeySym k);
47 LIB3270_INTERNAL KeySym StringToKeysym(char *s); 47 LIB3270_INTERNAL KeySym StringToKeysym(char *s);
48 48
49 -LIB3270_INTERNAL int read_resource_file(const char *filename, Boolean fatal); 49 +// LIB3270_INTERNAL int read_resource_file(const char *filename, Boolean fatal);
50 LIB3270_INTERNAL Boolean split_hier(char *label, char **base, char ***parents); 50 LIB3270_INTERNAL Boolean split_hier(char *label, char **base, char ***parents);
51 51
52 typedef struct { 52 typedef struct {