Download as
Browse Code »

Commit 3c70bc72d1dcb3433979e51fc1a9219fb407cf2d

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

Removendo warnings em windows, incluindo suporte a sessoes em net_connect()

Showing 5 changed files with 262 additions and 314 deletions   Show diff stats
pw3270.cbp
  Diff comments   View file @3c70bc7
... ... @@ -9,8 +9,8 @@
9 9 <Option compiler="gcc" />
10 10 <Build>
11 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 14 <Option type="1" />
15 15 <Option compiler="gcc" />
16 16 <Option use_console_runner="0" />
... ... @@ -20,8 +20,8 @@
20 20 </Compiler>
21 21 </Target>
22 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 25 <Option type="0" />
26 26 <Option compiler="gcc" />
27 27 <Compiler>
... ... @@ -35,7 +35,7 @@
35 35 <Compiler>
36 36 <Add option="-Wall" />
37 37 <Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" />
38   - <Add directory="src/include" />
  38 + <Add directory="src\include" />
39 39 </Compiler>
40 40 <Linker>
41 41 <Add option="`pkg-config gtk+-3.0 lib3270 --libs`" />
... ... @@ -45,283 +45,277 @@
45 45 <Unit filename="colors.conf" />
46 46 <Unit filename="configure.ac" />
47 47 <Unit filename="pw3270.spec.in" />
48   - <Unit filename="src/gtk/Makefile.in" />
49   - <Unit filename="src/gtk/actions.c">
  48 + <Unit filename="src\gtk\Makefile.in" />
  49 + <Unit filename="src\gtk\actions.c">
50 50 <Option compilerVar="CC" />
51 51 </Unit>
52   - <Unit filename="src/gtk/colors.c">
  52 + <Unit filename="src\gtk\colors.c">
53 53 <Option compilerVar="CC" />
54 54 </Unit>
55   - <Unit filename="src/gtk/common/common.h" />
56   - <Unit filename="src/gtk/common/config.c">
  55 + <Unit filename="src\gtk\common\common.h" />
  56 + <Unit filename="src\gtk\common\config.c">
57 57 <Option compilerVar="CC" />
58 58 </Unit>
59   - <Unit filename="src/gtk/dialog.c">
  59 + <Unit filename="src\gtk\dialog.c">
60 60 <Option compilerVar="CC" />
61 61 </Unit>
62   - <Unit filename="src/gtk/fonts.c">
  62 + <Unit filename="src\gtk\fonts.c">
63 63 <Option compilerVar="CC" />
64 64 </Unit>
65   - <Unit filename="src/gtk/globals.h" />
66   - <Unit filename="src/gtk/main.c">
  65 + <Unit filename="src\gtk\globals.h" />
  66 + <Unit filename="src\gtk\main.c">
67 67 <Option compilerVar="CC" />
68 68 </Unit>
69   - <Unit filename="src/gtk/mainwindow.c">
  69 + <Unit filename="src\gtk\mainwindow.c">
70 70 <Option compilerVar="CC" />
71 71 </Unit>
72   - <Unit filename="src/gtk/print.c">
  72 + <Unit filename="src\gtk\print.c">
73 73 <Option compilerVar="CC" />
74 74 </Unit>
75   - <Unit filename="src/gtk/uiparser/Makefile.in" />
76   - <Unit filename="src/gtk/uiparser/accelerator.c">
  75 + <Unit filename="src\gtk\uiparser\Makefile.in" />
  76 + <Unit filename="src\gtk\uiparser\accelerator.c">
77 77 <Option compilerVar="CC" />
78 78 </Unit>
79   - <Unit filename="src/gtk/uiparser/action.c">
  79 + <Unit filename="src\gtk\uiparser\action.c">
80 80 <Option compilerVar="CC" />
81 81 </Unit>
82   - <Unit filename="src/gtk/uiparser/menu.c">
  82 + <Unit filename="src\gtk\uiparser\menu.c">
83 83 <Option compilerVar="CC" />
84 84 </Unit>
85   - <Unit filename="src/gtk/uiparser/menubar.c">
  85 + <Unit filename="src\gtk\uiparser\menubar.c">
86 86 <Option compilerVar="CC" />
87 87 </Unit>
88   - <Unit filename="src/gtk/uiparser/menuitem.c">
  88 + <Unit filename="src\gtk\uiparser\menuitem.c">
89 89 <Option compilerVar="CC" />
90 90 </Unit>
91   - <Unit filename="src/gtk/uiparser/parsefile.c">
  91 + <Unit filename="src\gtk\uiparser\parsefile.c">
92 92 <Option compilerVar="CC" />
93 93 </Unit>
94   - <Unit filename="src/gtk/uiparser/parser.c">
  94 + <Unit filename="src\gtk\uiparser\parser.c">
95 95 <Option compilerVar="CC" />
96 96 </Unit>
97   - <Unit filename="src/gtk/uiparser/parser.h" />
98   - <Unit filename="src/gtk/uiparser/popup.c">
  97 + <Unit filename="src\gtk\uiparser\parser.h" />
  98 + <Unit filename="src\gtk\uiparser\popup.c">
99 99 <Option compilerVar="CC" />
100 100 </Unit>
101   - <Unit filename="src/gtk/uiparser/private.h" />
102   - <Unit filename="src/gtk/uiparser/script.c">
  101 + <Unit filename="src\gtk\uiparser\private.h" />
  102 + <Unit filename="src\gtk\uiparser\script.c">
103 103 <Option compilerVar="CC" />
104 104 </Unit>
105   - <Unit filename="src/gtk/uiparser/separator.c">
  105 + <Unit filename="src\gtk\uiparser\separator.c">
106 106 <Option compilerVar="CC" />
107 107 </Unit>
108   - <Unit filename="src/gtk/uiparser/sources.mak" />
109   - <Unit filename="src/gtk/uiparser/toolbar.c">
  108 + <Unit filename="src\gtk\uiparser\sources.mak" />
  109 + <Unit filename="src\gtk\uiparser\toolbar.c">
110 110 <Option compilerVar="CC" />
111 111 </Unit>
112   - <Unit filename="src/gtk/uiparser/toolitem.c">
  112 + <Unit filename="src\gtk\uiparser\toolitem.c">
113 113 <Option compilerVar="CC" />
114 114 </Unit>
115   - <Unit filename="src/gtk/v3270/clipboard.c">
  115 + <Unit filename="src\gtk\v3270\clipboard.c">
116 116 <Option compilerVar="CC" />
117 117 </Unit>
118   - <Unit filename="src/gtk/v3270/draw.c">
  118 + <Unit filename="src\gtk\v3270\draw.c">
119 119 <Option compilerVar="CC" />
120 120 </Unit>
121   - <Unit filename="src/gtk/v3270/genmarshal" />
122   - <Unit filename="src/gtk/v3270/iocallback.c">
  121 + <Unit filename="src\gtk\v3270\genmarshal" />
  122 + <Unit filename="src\gtk\v3270\iocallback.c">
123 123 <Option compilerVar="CC" />
124 124 </Unit>
125   - <Unit filename="src/gtk/v3270/keyboard.c">
  125 + <Unit filename="src\gtk\v3270\keyboard.c">
126 126 <Option compilerVar="CC" />
127 127 </Unit>
128   - <Unit filename="src/gtk/v3270/mouse.c">
  128 + <Unit filename="src\gtk\v3270\mouse.c">
129 129 <Option compilerVar="CC" />
130 130 </Unit>
131   - <Unit filename="src/gtk/v3270/oia.c">
  131 + <Unit filename="src\gtk\v3270\oia.c">
132 132 <Option compilerVar="CC" />
133 133 </Unit>
134   - <Unit filename="src/gtk/v3270/private.h" />
135   - <Unit filename="src/gtk/v3270/sources.mak" />
136   - <Unit filename="src/gtk/v3270/v3270.h" />
137   - <Unit filename="src/gtk/v3270/widget.c">
  134 + <Unit filename="src\gtk\v3270\private.h" />
  135 + <Unit filename="src\gtk\v3270\sources.mak" />
  136 + <Unit filename="src\gtk\v3270\v3270.h" />
  137 + <Unit filename="src\gtk\v3270\widget.c">
138 138 <Option compilerVar="CC" />
139 139 </Unit>
140   - <Unit filename="src/gtk/valgrind.suppression" />
141   - <Unit filename="src/include/lib3270.h" />
142   - <Unit filename="src/include/lib3270/action_table.h" />
143   - <Unit filename="src/include/lib3270/actions.h" />
144   - <Unit filename="src/include/lib3270/config.h.in" />
145   - <Unit filename="src/include/lib3270/log.h" />
146   - <Unit filename="src/include/lib3270/popup.h" />
147   - <Unit filename="src/include/lib3270/selection.h" />
148   - <Unit filename="src/include/lib3270/session.h" />
149   - <Unit filename="src/include/pw3270.h" />
150   - <Unit filename="src/include/rules.mak.in" />
151   - <Unit filename="src/lib3270/3270ds.h" />
152   - <Unit filename="src/lib3270/Makefile.in" />
153   - <Unit filename="src/lib3270/X11keysym.h" />
154   - <Unit filename="src/lib3270/XtGlue.c">
  140 + <Unit filename="src\gtk\valgrind.suppression" />
  141 + <Unit filename="src\include\lib3270.h" />
  142 + <Unit filename="src\include\lib3270\action_table.h" />
  143 + <Unit filename="src\include\lib3270\actions.h" />
  144 + <Unit filename="src\include\lib3270\config.h.in" />
  145 + <Unit filename="src\include\lib3270\log.h" />
  146 + <Unit filename="src\include\lib3270\popup.h" />
  147 + <Unit filename="src\include\lib3270\selection.h" />
  148 + <Unit filename="src\include\lib3270\session.h" />
  149 + <Unit filename="src\include\pw3270.h" />
  150 + <Unit filename="src\include\rules.mak.in" />
  151 + <Unit filename="src\lib3270\3270ds.h" />
  152 + <Unit filename="src\lib3270\Makefile.in" />
  153 + <Unit filename="src\lib3270\X11keysym.h" />
  154 + <Unit filename="src\lib3270\XtGlue.c">
155 155 <Option compilerVar="CC" />
156 156 </Unit>
157   - <Unit filename="src/lib3270/actions.c">
  157 + <Unit filename="src\lib3270\actions.c">
158 158 <Option compilerVar="CC" />
159 159 </Unit>
160   - <Unit filename="src/lib3270/actionsc.h" />
161   - <Unit filename="src/lib3270/ansi.c">
  160 + <Unit filename="src\lib3270\actionsc.h" />
  161 + <Unit filename="src\lib3270\ansi.c">
162 162 <Option compilerVar="CC" />
163 163 </Unit>
164   - <Unit filename="src/lib3270/ansic.h" />
165   - <Unit filename="src/lib3270/api.h" />
166   - <Unit filename="src/lib3270/apl.c">
  164 + <Unit filename="src\lib3270\ansic.h" />
  165 + <Unit filename="src\lib3270\api.h" />
  166 + <Unit filename="src\lib3270\apl.c">
167 167 <Option compilerVar="CC" />
168 168 </Unit>
169   - <Unit filename="src/lib3270/aplc.h" />
170   - <Unit filename="src/lib3270/appres.h" />
171   - <Unit filename="src/lib3270/arpa_telnet.h" />
172   - <Unit filename="src/lib3270/cg.h" />
173   - <Unit filename="src/lib3270/charset.c">
  169 + <Unit filename="src\lib3270\aplc.h" />
  170 + <Unit filename="src\lib3270\appres.h" />
  171 + <Unit filename="src\lib3270\arpa_telnet.h" />
  172 + <Unit filename="src\lib3270\cg.h" />
  173 + <Unit filename="src\lib3270\charset.c">
174 174 <Option compilerVar="CC" />
175 175 </Unit>
176   - <Unit filename="src/lib3270/charsetc.h" />
177   - <Unit filename="src/lib3270/childc.h" />
178   - <Unit filename="src/lib3270/ctlr.c">
  176 + <Unit filename="src\lib3270\charsetc.h" />
  177 + <Unit filename="src\lib3270\childc.h" />
  178 + <Unit filename="src\lib3270\ctlr.c">
179 179 <Option compilerVar="CC" />
180 180 </Unit>
181   - <Unit filename="src/lib3270/ctlr.h" />
182   - <Unit filename="src/lib3270/ctlrc.h" />
183   - <Unit filename="src/lib3270/dialogc.h" />
184   - <Unit filename="src/lib3270/fallbacks.c">
  181 + <Unit filename="src\lib3270\ctlr.h" />
  182 + <Unit filename="src\lib3270\ctlrc.h" />
  183 + <Unit filename="src\lib3270\dialogc.h" />
  184 + <Unit filename="src\lib3270\ft.c">
185 185 <Option compilerVar="CC" />
186 186 </Unit>
187   - <Unit filename="src/lib3270/ft.c">
  187 + <Unit filename="src\lib3270\ft_cut.c">
188 188 <Option compilerVar="CC" />
189 189 </Unit>
190   - <Unit filename="src/lib3270/ft_cut.c">
  190 + <Unit filename="src\lib3270\ft_cut_ds.h" />
  191 + <Unit filename="src\lib3270\ft_cutc.h" />
  192 + <Unit filename="src\lib3270\ft_dft.c">
191 193 <Option compilerVar="CC" />
192 194 </Unit>
193   - <Unit filename="src/lib3270/ft_cut_ds.h" />
194   - <Unit filename="src/lib3270/ft_cutc.h" />
195   - <Unit filename="src/lib3270/ft_dft.c">
  195 + <Unit filename="src\lib3270\ft_dft_ds.h" />
  196 + <Unit filename="src\lib3270\ft_dftc.h" />
  197 + <Unit filename="src\lib3270\ftc.h" />
  198 + <Unit filename="src\lib3270\globals.h" />
  199 + <Unit filename="src\lib3270\glue.c">
196 200 <Option compilerVar="CC" />
197 201 </Unit>
198   - <Unit filename="src/lib3270/ft_dft_ds.h" />
199   - <Unit filename="src/lib3270/ft_dftc.h" />
200   - <Unit filename="src/lib3270/ftc.h" />
201   - <Unit filename="src/lib3270/globals.h" />
202   - <Unit filename="src/lib3270/glue.c">
  202 + <Unit filename="src\lib3270\gluec.h" />
  203 + <Unit filename="src\lib3270\host.c">
203 204 <Option compilerVar="CC" />
204 205 </Unit>
205   - <Unit filename="src/lib3270/gluec.h" />
206   - <Unit filename="src/lib3270/host.c">
  206 + <Unit filename="src\lib3270\hostc.h" />
  207 + <Unit filename="src\lib3270\icmdc.h" />
  208 + <Unit filename="src\lib3270\init.c">
207 209 <Option compilerVar="CC" />
208 210 </Unit>
209   - <Unit filename="src/lib3270/hostc.h" />
210   - <Unit filename="src/lib3270/icmdc.h" />
211   - <Unit filename="src/lib3270/init.c">
  211 + <Unit filename="src\lib3270\keypadc.h" />
  212 + <Unit filename="src\lib3270\kybd.c">
212 213 <Option compilerVar="CC" />
213 214 </Unit>
214   - <Unit filename="src/lib3270/keypadc.h" />
215   - <Unit filename="src/lib3270/kybd.c">
  215 + <Unit filename="src\lib3270\kybdc.h" />
  216 + <Unit filename="src\lib3270\localdefs.h" />
  217 + <Unit filename="src\lib3270\log.c">
216 218 <Option compilerVar="CC" />
217 219 </Unit>
218   - <Unit filename="src/lib3270/kybdc.h" />
219   - <Unit filename="src/lib3270/localdefs.h" />
220   - <Unit filename="src/lib3270/log.c">
  220 + <Unit filename="src\lib3270\macros.c">
221 221 <Option compilerVar="CC" />
222 222 </Unit>
223   - <Unit filename="src/lib3270/macros.c">
  223 + <Unit filename="src\lib3270\mkfb.c">
224 224 <Option compilerVar="CC" />
225 225 </Unit>
226   - <Unit filename="src/lib3270/mkfb.c">
  226 + <Unit filename="src\lib3270\objects.h" />
  227 + <Unit filename="src\lib3270\paste.c">
227 228 <Option compilerVar="CC" />
228 229 </Unit>
229   - <Unit filename="src/lib3270/objects.h" />
230   - <Unit filename="src/lib3270/paste.c">
  230 + <Unit filename="src\lib3270\popupsc.h" />
  231 + <Unit filename="src\lib3270\print.c">
231 232 <Option compilerVar="CC" />
232 233 </Unit>
233   - <Unit filename="src/lib3270/popupsc.h" />
234   - <Unit filename="src/lib3270/print.c">
  234 + <Unit filename="src\lib3270\printc.h" />
  235 + <Unit filename="src\lib3270\printer.c">
235 236 <Option compilerVar="CC" />
236 237 </Unit>
237   - <Unit filename="src/lib3270/printc.h" />
238   - <Unit filename="src/lib3270/printer.c">
  238 + <Unit filename="src\lib3270\printerc.h" />
  239 + <Unit filename="src\lib3270\proxy.c">
239 240 <Option compilerVar="CC" />
240 241 </Unit>
241   - <Unit filename="src/lib3270/printerc.h" />
242   - <Unit filename="src/lib3270/proxy.c">
  242 + <Unit filename="src\lib3270\proxyc.h" />
  243 + <Unit filename="src\lib3270\resolver.c">
243 244 <Option compilerVar="CC" />
244 245 </Unit>
245   - <Unit filename="src/lib3270/proxyc.h" />
246   - <Unit filename="src/lib3270/resolver.c">
  246 + <Unit filename="src\lib3270\resolverc.h" />
  247 + <Unit filename="src\lib3270\resources.c">
247 248 <Option compilerVar="CC" />
248 249 </Unit>
249   - <Unit filename="src/lib3270/resolverc.h" />
250   - <Unit filename="src/lib3270/resources.c">
  250 + <Unit filename="src\lib3270\resources.h" />
  251 + <Unit filename="src\lib3270\rpq.c">
251 252 <Option compilerVar="CC" />
252 253 </Unit>
253   - <Unit filename="src/lib3270/resources.h" />
254   - <Unit filename="src/lib3270/rpq.c">
  254 + <Unit filename="src\lib3270\savec.h" />
  255 + <Unit filename="src\lib3270\screen.c">
255 256 <Option compilerVar="CC" />
256 257 </Unit>
257   - <Unit filename="src/lib3270/savec.h" />
258   - <Unit filename="src/lib3270/screen.c">
  258 + <Unit filename="src\lib3270\screen.h" />
  259 + <Unit filename="src\lib3270\screenc.h" />
  260 + <Unit filename="src\lib3270\scrollc.h" />
  261 + <Unit filename="src\lib3270\see.c">
259 262 <Option compilerVar="CC" />
260 263 </Unit>
261   - <Unit filename="src/lib3270/screen.h" />
262   - <Unit filename="src/lib3270/screenc.h" />
263   - <Unit filename="src/lib3270/scrollc.h" />
264   - <Unit filename="src/lib3270/see.c">
  264 + <Unit filename="src\lib3270\seec.h" />
  265 + <Unit filename="src\lib3270\selection.c">
265 266 <Option compilerVar="CC" />
266 267 </Unit>
267   - <Unit filename="src/lib3270/seec.h" />
268   - <Unit filename="src/lib3270/selection.c">
  268 + <Unit filename="src\lib3270\sf.c">
269 269 <Option compilerVar="CC" />
270 270 </Unit>
271   - <Unit filename="src/lib3270/sf.c">
  271 + <Unit filename="src\lib3270\sfc.h" />
  272 + <Unit filename="src\lib3270\shlobj_missing.h" />
  273 + <Unit filename="src\lib3270\statusc.h" />
  274 + <Unit filename="src\lib3270\tables.c">
272 275 <Option compilerVar="CC" />
273 276 </Unit>
274   - <Unit filename="src/lib3270/sfc.h" />
275   - <Unit filename="src/lib3270/shlobj_missing.h" />
276   - <Unit filename="src/lib3270/statusc.h" />
277   - <Unit filename="src/lib3270/tables.c">
  277 + <Unit filename="src\lib3270\tablesc.h" />
  278 + <Unit filename="src\lib3270\telnet.c">
278 279 <Option compilerVar="CC" />
279 280 </Unit>
280   - <Unit filename="src/lib3270/tablesc.h" />
281   - <Unit filename="src/lib3270/telnet.c">
  281 + <Unit filename="src\lib3270\telnetc.h" />
  282 + <Unit filename="src\lib3270\testprogram.c">
282 283 <Option compilerVar="CC" />
283 284 </Unit>
284   - <Unit filename="src/lib3270/telnetc.h" />
285   - <Unit filename="src/lib3270/testprogram.c">
  285 + <Unit filename="src\lib3270\tn3270e.h" />
  286 + <Unit filename="src\lib3270\toggle.h" />
  287 + <Unit filename="src\lib3270\toggles.c">
286 288 <Option compilerVar="CC" />
287 289 </Unit>
288   - <Unit filename="src/lib3270/tn3270e.h" />
289   - <Unit filename="src/lib3270/toggle.h" />
290   - <Unit filename="src/lib3270/toggles.c">
  290 + <Unit filename="src\lib3270\togglesc.h" />
  291 + <Unit filename="src\lib3270\trace_ds.c">
291 292 <Option compilerVar="CC" />
292 293 </Unit>
293   - <Unit filename="src/lib3270/togglesc.h" />
294   - <Unit filename="src/lib3270/trace_ds.c">
  294 + <Unit filename="src\lib3270\trace_dsc.h" />
  295 + <Unit filename="src\lib3270\utf8.c">
295 296 <Option compilerVar="CC" />
296 297 </Unit>
297   - <Unit filename="src/lib3270/trace_dsc.h" />
298   - <Unit filename="src/lib3270/utf8.c">
  298 + <Unit filename="src\lib3270\utf8c.h" />
  299 + <Unit filename="src\lib3270\util.c">
299 300 <Option compilerVar="CC" />
300 301 </Unit>
301   - <Unit filename="src/lib3270/utf8c.h" />
302   - <Unit filename="src/lib3270/util.c">
  302 + <Unit filename="src\lib3270\utilc.h" />
  303 + <Unit filename="src\lib3270\w3misc.c">
303 304 <Option compilerVar="CC" />
304 305 </Unit>
305   - <Unit filename="src/lib3270/utilc.h" />
306   - <Unit filename="src/lib3270/version.c">
  306 + <Unit filename="src\lib3270\w3miscc.h" />
  307 + <Unit filename="src\lib3270\widec.h" />
  308 + <Unit filename="src\lib3270\winvers.c">
307 309 <Option compilerVar="CC" />
308 310 </Unit>
309   - <Unit filename="src/lib3270/w3misc.c">
  311 + <Unit filename="src\lib3270\winversc.h" />
  312 + <Unit filename="src\lib3270\xio.c">
310 313 <Option compilerVar="CC" />
311 314 </Unit>
312   - <Unit filename="src/lib3270/w3miscc.h" />
313   - <Unit filename="src/lib3270/widec.h" />
314   - <Unit filename="src/lib3270/winvers.c">
315   - <Option compilerVar="CC" />
316   - </Unit>
317   - <Unit filename="src/lib3270/winversc.h" />
318   - <Unit filename="src/lib3270/xio.c">
319   - <Option compilerVar="CC" />
320   - </Unit>
321   - <Unit filename="src/lib3270/xioc.h" />
322   - <Unit filename="src/lib3270/xl.h" />
323   - <Unit filename="ui/00default.xml" />
324   - <Unit filename="ui/99debug.xml" />
  315 + <Unit filename="src\lib3270\xioc.h" />
  316 + <Unit filename="src\lib3270\xl.h" />
  317 + <Unit filename="ui\00default.xml" />
  318 + <Unit filename="ui\99debug.xml" />
325 319 <Extensions>
326 320 <code_completion />
327 321 <debugger />
... ...
src/gtk/colors.c
  Diff comments   View file @3c70bc7
... ... @@ -277,7 +277,6 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
277 277 gtk_widget_set_sensitive(widget,TRUE);
278 278 }
279 279  
280   -
281 280 g_key_file_free(conf);
282 281  
283 282 }
... ... @@ -387,11 +386,7 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
387 386  
388 387 const gchar * title = g_object_get_data(G_OBJECT(action),"title");
389 388 GtkWidget * dialog = gtk_dialog_new_with_buttons ( gettext(title ? title : N_( "Color setup") ),
390   -#if GTK_CHECK_VERSION(3,0,0)
391 389 NULL,
392   -#else
393   - GTK_WINDOW(gtk_widget_get_toplevel(widget)),
394   -#endif // GTK(3,0,0)
395 390 GTK_DIALOG_DESTROY_WITH_PARENT,
396 391 GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
397 392 GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
... ...
src/lib3270/host.c
  Diff comments   View file @3c70bc7
... ... @@ -569,7 +569,7 @@ static int do_connect(H3270 *hSession, const char *n)
569 569  
570 570 /* Attempt contact. */
571 571 hSession->ever_3270 = False;
572   - hSession->net_sock = net_connect(chost, port, localprocess_cmd != CN, &resolving,&pending);
  572 + hSession->net_sock = net_connect(hSession, chost, port, localprocess_cmd != CN, &resolving,&pending);
573 573  
574 574 if (hSession->net_sock < 0 && !resolving)
575 575 {
... ...
src/lib3270/telnet.c
  Diff comments   View file @3c70bc7
... ... @@ -353,8 +353,7 @@ static void output_possible(H3270 *session);
353 353  
354 354  
355 355 #if defined(_WIN32) /*[*/
356   -void
357   -sockstart(void)
  356 +void sockstart(H3270 *session)
358 357 {
359 358 static int initted = 0;
360 359 WORD wVersionRequested;
... ... @@ -367,15 +366,24 @@ sockstart(void)
367 366  
368 367 wVersionRequested = MAKEWORD(2, 2);
369 368  
370   - if (WSAStartup(wVersionRequested, &wsaData) != 0) {
371   - #warning Notify User
372   - fprintf(stderr, "WSAStartup failed: %s\n",win32_strerror(GetLastError()));
  369 + if (WSAStartup(wVersionRequested, &wsaData) != 0)
  370 + {
  371 + lib3270_popup_dialog( session,
  372 + LIB3270_NOTIFY_CRITICAL,
  373 + N_( "Network startup error" ),
  374 + N_( "WSAStartup failed" ),
  375 + "%s", win32_strerror(GetLastError()) );
  376 +
373 377 _exit(1);
374 378 }
375 379  
376   - if (LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) {
377   - #warning Notify User
378   - fprintf(stderr, "Bad winsock version: %d.%d\n",LOBYTE(wsaData.wVersion), HIBYTE(wsaData.wVersion));
  380 + if (LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2)
  381 + {
  382 + lib3270_popup_dialog( session,
  383 + LIB3270_NOTIFY_CRITICAL,
  384 + N_( "Network startup error" ),
  385 + N_( "Bad winsock version" ),
  386 + N_( "Can´t use winsock version %d.%d" ), LOBYTE(wsaData.wVersion), HIBYTE(wsaData.wVersion));
379 387 _exit(1);
380 388 }
381 389 }
... ... @@ -408,13 +416,18 @@ void popup_a_sockerr(H3270 *session, char *fmt, ...)
408 416  
409 417 }
410 418  
411   -/*
412   - * net_connect
413   - * Establish a telnet socket to the given host passed as an argument.
  419 +/**
  420 + * Establish a telnet socket to the given host passed as an argument.
  421 + *
414 422 * Called only once and is responsible for setting up the telnet
415   - * variables. Returns the file descriptor of the connected socket.
  423 + * variables.
  424 + *
  425 + * @param session Handle to the session descriptor.
  426 + *
  427 + *
  428 + * @return The file descriptor of the connected socket.
416 429 */
417   -int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving, Boolean *pending)
  430 +int net_connect(H3270 *session, const char *host, char *portname, Boolean ls, Boolean *resolving, Boolean *pending)
418 431 {
419 432 struct servent *sp;
420 433 struct hostent *hp;
... ... @@ -427,11 +440,11 @@ int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving
427 440 int mtu = OMTU;
428 441 #endif /*]*/
429 442  
430   -# define close_fail { (void) SOCK_CLOSE(h3270.sock); h3270.sock = -1; return -1; }
  443 +#define close_fail { (void) SOCK_CLOSE(session->sock); session->sock = -1; return -1; }
431 444  
432   -#if defined(_WIN32) /*[*/
433   - sockstart();
434   -#endif /*]*/
  445 +#if defined(_WIN32)
  446 + sockstart(session);
  447 +#endif
435 448  
436 449 if (netrbuf == (unsigned char *)NULL)
437 450 netrbuf = (unsigned char *)Malloc(BUFSZ);
... ... @@ -453,10 +466,10 @@ int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving
453 466 *resolving = False;
454 467 *pending = False;
455 468  
456   - Replace(h3270.hostname, NewString(host));
  469 + Replace(session->hostname, NewString(host));
457 470  
458 471 /* get the passthru host and port number */
459   - if (h3270.passthru_host) {
  472 + if (session->passthru_host) {
460 473 const char *hn;
461 474  
462 475 hn = getenv("INTERNET_HOST");
... ... @@ -491,9 +504,9 @@ int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving
491 504 "or service: %s", portname);
492 505 return -1;
493 506 }
494   - h3270.current_port = ntohs(sp->s_port);
  507 + session->current_port = ntohs(sp->s_port);
495 508 } else
496   - h3270.current_port = (unsigned short)lport;
  509 + session->current_port = (unsigned short)lport;
497 510 }
498 511 if (proxy_type < 0)
499 512 return -1;
... ... @@ -501,199 +514,142 @@ int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving
501 514  
502 515 /* fill in the socket address of the given host */
503 516 (void) memset((char *) &haddr, 0, sizeof(haddr));
504   - if (h3270.passthru_host) {
  517 + if (session->passthru_host) {
505 518 haddr.sin.sin_family = AF_INET;
506 519 (void) memmove(&haddr.sin.sin_addr, passthru_haddr,
507 520 passthru_len);
508 521 haddr.sin.sin_port = passthru_port;
509 522 ha_len = sizeof(struct sockaddr_in);
510 523 } else if (proxy_type > 0) {
511   - status_resolving(&h3270,1);
  524 + status_resolving(session,1);
512 525 if (resolve_host_and_port(proxy_host, proxy_portname,
513 526 &proxy_port, &haddr.sa, &ha_len, errmsg,
514 527 sizeof(errmsg)) < 0) {
515 528 popup_an_error(NULL,errmsg);
516   - status_resolving(&h3270,0);
  529 + status_resolving(session,0);
517 530 return -1;
518   - status_resolving(&h3270,0);
  531 + status_resolving(session,0);
519 532 }
520 533 } else {
521   -/*
522   -#if defined(LOCAL_PROCESS)
523   - if (ls) {
524   - local_process = True;
525   - } else {
526   -#endif
527   -#if defined(LOCAL_PROCESS)
528   - local_process = False;
529   -#endif
530   -*/
531   - status_resolving(&h3270,1);
  534 + status_resolving(session,1);
532 535 if (resolve_host_and_port(host, portname,
533   - &h3270.current_port, &haddr.sa, &ha_len,
  536 + &session->current_port, &haddr.sa, &ha_len,
534 537 errmsg, sizeof(errmsg)) < 0) {
535   - popup_an_error(NULL,errmsg);
  538 + popup_an_error(session,errmsg);
536 539 status_resolving(&h3270,0);
537 540 return -1;
538   - status_resolving(&h3270,0);
  541 + status_resolving(session,0);
539 542 }
540   -/*
541   -#if defined(LOCAL_PROCESS)
542   - }
543   -#endif
544   -*/
545 543 }
546 544  
547   -/*
548   -#if defined(LOCAL_PROCESS)
549   - if (local_process) {
550   - int amaster;
551   - struct winsize w;
552   -
553   - w.ws_row = XMIT_ROWS;
554   - w.ws_col = XMIT_COLS;
555   - w.ws_xpixel = 0;
556   - w.ws_ypixel = 0;
557   -
558   - switch (forkpty(&amaster, NULL, NULL, &w)) {
559   - case -1: // failed
560   - popup_an_errno(errno, "forkpty");
561   - close_fail;
562   - case 0: // child
563   - putenv("TERM=xterm");
564   - if (strchr(host, ' ') != CN) {
565   - (void) execlp("/bin/sh", "sh", "-c", host,
566   - NULL);
567   - } else {
568   - char *arg1;
569   -
570   - arg1 = strrchr(host, '/');
571   - (void) execlp(host,
572   - (arg1 == CN) ? host : arg1 + 1,
573   - NULL);
574   - }
575   - perror(host);
576   - #warning Notify User
577   - _exit(1);
578   - break;
579   - default: // parent
580   - sock = amaster;
581   -#if !defined(_WIN32)
582   - (void) fcntl(sock, F_SETFD, 1);
583   -#endif
584   - net_connected();
585   - host_in3270(CONNECTED_ANSI);
586   - break;
587   - }
588   - } else {
589   -#endif
590   -*/
591   - /* create the socket */
592   - if ((h3270.sock = socket(haddr.sa.sa_family, SOCK_STREAM, 0)) == -1) {
593   - popup_a_sockerr(NULL, N_( "socket" ) );
594   - return -1;
595   - }
  545 + /* create the socket */
  546 + if ((session->sock = socket(haddr.sa.sa_family, SOCK_STREAM, 0)) == -1) {
  547 + popup_a_sockerr(session, N_( "socket" ) );
  548 + return -1;
  549 + }
596 550  
597   - /* set options for inline out-of-band data and keepalives */
598   - if (setsockopt(h3270.sock, SOL_SOCKET, SO_OOBINLINE, (char *)&on,
599   - sizeof(on)) < 0) {
600   - popup_a_sockerr(NULL, N_( "setsockopt(%s)" ), "SO_OOBINLINE");
601   - close_fail;
602   - }
603   - if (setsockopt(h3270.sock, SOL_SOCKET, SO_KEEPALIVE, (char *)&on,
604   - sizeof(on)) < 0) {
605   - popup_a_sockerr(NULL, N_( "setsockopt(%s)" ), "SO_KEEPALIVE");
606   - close_fail;
607   - }
  551 + /* set options for inline out-of-band data and keepalives */
  552 + if (setsockopt(session->sock, SOL_SOCKET, SO_OOBINLINE, (char *)&on,
  553 + sizeof(on)) < 0) {
  554 + popup_a_sockerr(session, N_( "setsockopt(%s)" ), "SO_OOBINLINE");
  555 + close_fail;
  556 + }
  557 + if (setsockopt(session->sock, SOL_SOCKET, SO_KEEPALIVE, (char *)&on,
  558 + sizeof(on)) < 0) {
  559 + popup_a_sockerr(session, N_( "setsockopt(%s)" ), "SO_KEEPALIVE");
  560 + close_fail;
  561 + }
608 562 #if defined(OMTU) /*[*/
609   - if (setsockopt(h3270.sock, SOL_SOCKET, SO_SNDBUF, (char *)&mtu,
610   - sizeof(mtu)) < 0) {
611   - popup_a_sockerr( N_( "setsockopt(%s)" ), "SO_SNDBUF");
612   - close_fail;
613   - }
  563 + if (setsockopt(session->sock, SOL_SOCKET, SO_SNDBUF, (char *)&mtu,sizeof(mtu)) < 0)
  564 + {
  565 + popup_a_sockerr(session, N_( "setsockopt(%s)" ), "SO_SNDBUF");
  566 + close_fail;
  567 + }
614 568 #endif /*]*/
615 569  
616   - /* set the socket to be non-delaying */
  570 + /* set the socket to be non-delaying */
617 571 #if defined(_WIN32) /*[*/
618   - if (non_blocking(False) < 0)
  572 + if (non_blocking(False) < 0)
619 573 #else /*][*/
620   - if (non_blocking(True) < 0)
  574 + if (non_blocking(True) < 0)
621 575 #endif /*]*/
622   - close_fail;
  576 + close_fail;
623 577  
624 578 #if !defined(_WIN32) /*[*/
625   - /* don't share the socket with our children */
626   - (void) fcntl(h3270.sock, F_SETFD, 1);
  579 + /* don't share the socket with our children */
  580 + (void) fcntl(session->sock, F_SETFD, 1);
627 581 #endif /*]*/
628 582  
629   - /* init ssl */
  583 + /* init ssl */
630 584 #if defined(HAVE_LIBSSL) /*[*/
631   - last_ssl_error = 0;
632   - if (h3270.ssl_host)
633   - ssl_init();
  585 + last_ssl_error = 0;
  586 + if (session->ssl_host)
  587 + ssl_init();
634 588 #endif /*]*/
635 589  
636   - /* connect */
637   - status_connecting(&h3270,1);
638   - if (connect(h3270.sock, &haddr.sa, ha_len) == -1) {
639   - if (socket_errno() == SE_EWOULDBLOCK
  590 + /* connect */
  591 + status_connecting(session,1);
  592 + if (connect(session->sock, &haddr.sa, ha_len) == -1) {
  593 + if (socket_errno() == SE_EWOULDBLOCK
640 594 #if defined(SE_EINPROGRESS) /*[*/
641   - || socket_errno() == SE_EINPROGRESS
  595 + || socket_errno() == SE_EINPROGRESS
642 596 #endif /*]*/
643 597 ) {
644   - trace_dsn("Connection pending.\n");
645   - *pending = True;
  598 + trace_dsn("Connection pending.\n");
  599 + *pending = True;
646 600 #if !defined(_WIN32) /*[*/
647   - output_id = AddOutput(h3270.sock, &h3270, output_possible);
  601 + output_id = AddOutput(session->sock, session, output_possible);
648 602 #endif /*]*/
649   - } else {
650   - popup_a_sockerr(NULL, N_( "Can't connect to %s:%d" ),h3270.hostname, h3270.current_port);
651   - close_fail;
652   - }
653 603 } else {
654   - if (non_blocking(False) < 0)
655   - close_fail;
656   - net_connected(&h3270);
  604 + popup_a_sockerr(session, N_( "Can't connect to %s:%d" ),session->hostname, session->current_port);
  605 + close_fail;
657 606 }
658   -/*
659   -#if defined(LOCAL_PROCESS)
  607 + } else {
  608 + if (non_blocking(False) < 0)
  609 + close_fail;
  610 + net_connected(session);
660 611 }
661   -#endif
662   -*/
663 612  
664 613 /* set up temporary termtype */
665   - if (appres.termname == CN && h3270.std_ds_host) {
  614 + if (appres.termname == CN && session->std_ds_host) {
666 615 (void) sprintf(ttype_tmpval, "IBM-327%c-%d",
667   - appres.m3279 ? '9' : '8', h3270.model_num);
668   - h3270.termtype = ttype_tmpval;
  616 + appres.m3279 ? '9' : '8', session->model_num);
  617 + session->termtype = ttype_tmpval;
669 618 }
670 619  
671 620 /* all done */
672 621 #if defined(_WIN32) /*[*/
673   - if (h3270.sock_handle == NULL) {
  622 + if (session->sock_handle == NULL) {
674 623 char ename[256];
675 624  
676 625 sprintf(ename, "wc3270-%d", getpid());
677 626  
678   - h3270.sock_handle = CreateEvent(NULL, TRUE, FALSE, ename);
679   - if (h3270.sock_handle == NULL)
  627 + session->sock_handle = CreateEvent(NULL, TRUE, FALSE, ename);
  628 + if (session->sock_handle == NULL)
680 629 {
681   - #warning Notify User
682   - Log("Cannot create socket handle: %s\n",win32_strerror(GetLastError()));
  630 + lib3270_popup_dialog( session,
  631 + LIB3270_NOTIFY_CRITICAL,
  632 + N_( "Network startup error" ),
  633 + N_( "Cannot create socket handle" ),
  634 + "%s", win32_strerror(GetLastError()) );
  635 +
683 636 _exit(1);
684 637 }
685 638 }
686 639  
687   - if (WSAEventSelect(h3270.sock, h3270.sock_handle, FD_READ | FD_CONNECT | FD_CLOSE) != 0)
  640 + if (WSAEventSelect(session->sock, session->sock_handle, FD_READ | FD_CONNECT | FD_CLOSE) != 0)
688 641 {
689   - #warning Notify User
690   - Log("WSAEventSelect failed: %s\n",win32_strerror(GetLastError()));
  642 + lib3270_popup_dialog( session,
  643 + LIB3270_NOTIFY_CRITICAL,
  644 + N_( "Network startup error" ),
  645 + N_( "WSAEventSelect failed" ),
  646 + "%s", win32_strerror(GetLastError()) );
691 647 _exit(1);
692 648 }
693 649  
694   - return (int) h3270.sock_handle;
  650 + return (int) session->sock_handle;
695 651 #else /*][*/
696   - return h3270.sock;
  652 + return session->sock;
697 653 #endif /*]*/
698 654 }
699 655 #undef close_fail
... ... @@ -953,8 +909,11 @@ void net_input(H3270 *session)
953 909 case WSAEINVAL:
954 910 return;
955 911 default:
956   - #warning Notify User!
957   - Log("second connect() failed: %s\n",win32_strerror(err));
  912 + lib3270_popup_dialog( &h3270,
  913 + LIB3270_NOTIFY_CRITICAL,
  914 + N_( "Network startup error" ),
  915 + N_( "Second connect() failed" ),
  916 + "%s", win32_strerror(GetLastError()) );
958 917 _exit(1);
959 918 }
960 919 }
... ...
src/lib3270/telnetc.h
  Diff comments   View file @3c70bc7
... ... @@ -34,7 +34,7 @@ LIB3270_INTERNAL Boolean net_add_dummy_tn3270e(void);
34 34 LIB3270_INTERNAL void net_add_eor(unsigned char *buf, int len);
35 35 LIB3270_INTERNAL void net_break(void);
36 36 LIB3270_INTERNAL void net_charmode(void);
37   -LIB3270_INTERNAL int net_connect(const char *, char *, Boolean, Boolean *, Boolean *);
  37 +LIB3270_INTERNAL int net_connect(H3270 *session, const char *, char *, Boolean, Boolean *, Boolean *);
38 38 LIB3270_INTERNAL void net_disconnect(void);
39 39 LIB3270_INTERNAL void net_exception(H3270 *session);
40 40 LIB3270_INTERNAL void net_hexansi_out(unsigned char *buf, int len);
... ...