Download as
Browse Code »

Commit f9c12c3590661d17d14cd958cc067f6250707b13

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

Trabalhando na leitura da configuracao de impressora direto do registry

Showing 4 changed files with 206 additions and 160 deletions   Show diff stats
@@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
9 <Option compiler="gcc" /> 9 <Option compiler="gcc" />
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="gcc" /> 15 <Option compiler="gcc" />
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="gcc" /> 26 <Option compiler="gcc" />
27 <Compiler> 27 <Compiler>
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
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`" />
@@ -45,281 +45,282 @@ @@ -45,281 +45,282 @@
45 <Unit filename="colors.conf" /> 45 <Unit filename="colors.conf" />
46 <Unit filename="configure.ac" /> 46 <Unit filename="configure.ac" />
47 <Unit filename="pw3270.spec.in" /> 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 <Option compilerVar="CC" /> 50 <Option compilerVar="CC" />
51 </Unit> 51 </Unit>
52 - <Unit filename="src/gtk/colors.c"> 52 + <Unit filename="src\gtk\colors.c">
53 <Option compilerVar="CC" /> 53 <Option compilerVar="CC" />
54 </Unit> 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\common.h.in" />
  57 + <Unit filename="src\gtk\common\config.c">
57 <Option compilerVar="CC" /> 58 <Option compilerVar="CC" />
58 </Unit> 59 </Unit>
59 - <Unit filename="src/gtk/dialog.c"> 60 + <Unit filename="src\gtk\dialog.c">
60 <Option compilerVar="CC" /> 61 <Option compilerVar="CC" />
61 </Unit> 62 </Unit>
62 - <Unit filename="src/gtk/fonts.c"> 63 + <Unit filename="src\gtk\fonts.c">
63 <Option compilerVar="CC" /> 64 <Option compilerVar="CC" />
64 </Unit> 65 </Unit>
65 - <Unit filename="src/gtk/globals.h" />  
66 - <Unit filename="src/gtk/main.c"> 66 + <Unit filename="src\gtk\globals.h" />
  67 + <Unit filename="src\gtk\main.c">
67 <Option compilerVar="CC" /> 68 <Option compilerVar="CC" />
68 </Unit> 69 </Unit>
69 - <Unit filename="src/gtk/mainwindow.c"> 70 + <Unit filename="src\gtk\mainwindow.c">
70 <Option compilerVar="CC" /> 71 <Option compilerVar="CC" />
71 </Unit> 72 </Unit>
72 - <Unit filename="src/gtk/print.c"> 73 + <Unit filename="src\gtk\print.c">
73 <Option compilerVar="CC" /> 74 <Option compilerVar="CC" />
74 </Unit> 75 </Unit>
75 - <Unit filename="src/gtk/uiparser/Makefile.in" />  
76 - <Unit filename="src/gtk/uiparser/accelerator.c"> 76 + <Unit filename="src\gtk\uiparser\Makefile.in" />
  77 + <Unit filename="src\gtk\uiparser\accelerator.c">
77 <Option compilerVar="CC" /> 78 <Option compilerVar="CC" />
78 </Unit> 79 </Unit>
79 - <Unit filename="src/gtk/uiparser/action.c"> 80 + <Unit filename="src\gtk\uiparser\action.c">
80 <Option compilerVar="CC" /> 81 <Option compilerVar="CC" />
81 </Unit> 82 </Unit>
82 - <Unit filename="src/gtk/uiparser/menu.c"> 83 + <Unit filename="src\gtk\uiparser\menu.c">
83 <Option compilerVar="CC" /> 84 <Option compilerVar="CC" />
84 </Unit> 85 </Unit>
85 - <Unit filename="src/gtk/uiparser/menubar.c"> 86 + <Unit filename="src\gtk\uiparser\menubar.c">
86 <Option compilerVar="CC" /> 87 <Option compilerVar="CC" />
87 </Unit> 88 </Unit>
88 - <Unit filename="src/gtk/uiparser/menuitem.c"> 89 + <Unit filename="src\gtk\uiparser\menuitem.c">
89 <Option compilerVar="CC" /> 90 <Option compilerVar="CC" />
90 </Unit> 91 </Unit>
91 - <Unit filename="src/gtk/uiparser/parsefile.c"> 92 + <Unit filename="src\gtk\uiparser\parsefile.c">
92 <Option compilerVar="CC" /> 93 <Option compilerVar="CC" />
93 </Unit> 94 </Unit>
94 - <Unit filename="src/gtk/uiparser/parser.c"> 95 + <Unit filename="src\gtk\uiparser\parser.c">
95 <Option compilerVar="CC" /> 96 <Option compilerVar="CC" />
96 </Unit> 97 </Unit>
97 - <Unit filename="src/gtk/uiparser/parser.h" />  
98 - <Unit filename="src/gtk/uiparser/popup.c"> 98 + <Unit filename="src\gtk\uiparser\parser.h" />
  99 + <Unit filename="src\gtk\uiparser\popup.c">
99 <Option compilerVar="CC" /> 100 <Option compilerVar="CC" />
100 </Unit> 101 </Unit>
101 - <Unit filename="src/gtk/uiparser/private.h" />  
102 - <Unit filename="src/gtk/uiparser/script.c"> 102 + <Unit filename="src\gtk\uiparser\private.h" />
  103 + <Unit filename="src\gtk\uiparser\script.c">
103 <Option compilerVar="CC" /> 104 <Option compilerVar="CC" />
104 </Unit> 105 </Unit>
105 - <Unit filename="src/gtk/uiparser/separator.c"> 106 + <Unit filename="src\gtk\uiparser\separator.c">
106 <Option compilerVar="CC" /> 107 <Option compilerVar="CC" />
107 </Unit> 108 </Unit>
108 - <Unit filename="src/gtk/uiparser/sources.mak" />  
109 - <Unit filename="src/gtk/uiparser/toolbar.c"> 109 + <Unit filename="src\gtk\uiparser\sources.mak" />
  110 + <Unit filename="src\gtk\uiparser\toolbar.c">
110 <Option compilerVar="CC" /> 111 <Option compilerVar="CC" />
111 </Unit> 112 </Unit>
112 - <Unit filename="src/gtk/uiparser/toolitem.c"> 113 + <Unit filename="src\gtk\uiparser\toolitem.c">
113 <Option compilerVar="CC" /> 114 <Option compilerVar="CC" />
114 </Unit> 115 </Unit>
115 - <Unit filename="src/gtk/v3270/accessible.c"> 116 + <Unit filename="src\gtk\v3270\accessible.c">
116 <Option compilerVar="CC" /> 117 <Option compilerVar="CC" />
117 </Unit> 118 </Unit>
118 - <Unit filename="src/gtk/v3270/accessible.h" />  
119 - <Unit filename="src/gtk/v3270/clipboard.c"> 119 + <Unit filename="src\gtk\v3270\accessible.h" />
  120 + <Unit filename="src\gtk\v3270\clipboard.c">
120 <Option compilerVar="CC" /> 121 <Option compilerVar="CC" />
121 </Unit> 122 </Unit>
122 - <Unit filename="src/gtk/v3270/draw.c"> 123 + <Unit filename="src\gtk\v3270\draw.c">
123 <Option compilerVar="CC" /> 124 <Option compilerVar="CC" />
124 </Unit> 125 </Unit>
125 - <Unit filename="src/gtk/v3270/genmarshal" />  
126 - <Unit filename="src/gtk/v3270/iocallback.c"> 126 + <Unit filename="src\gtk\v3270\genmarshal" />
  127 + <Unit filename="src\gtk\v3270\iocallback.c">
127 <Option compilerVar="CC" /> 128 <Option compilerVar="CC" />
128 </Unit> 129 </Unit>
129 - <Unit filename="src/gtk/v3270/keyboard.c"> 130 + <Unit filename="src\gtk\v3270\keyboard.c">
130 <Option compilerVar="CC" /> 131 <Option compilerVar="CC" />
131 </Unit> 132 </Unit>
132 - <Unit filename="src/gtk/v3270/mouse.c"> 133 + <Unit filename="src\gtk\v3270\mouse.c">
133 <Option compilerVar="CC" /> 134 <Option compilerVar="CC" />
134 </Unit> 135 </Unit>
135 - <Unit filename="src/gtk/v3270/oia.c"> 136 + <Unit filename="src\gtk\v3270\oia.c">
136 <Option compilerVar="CC" /> 137 <Option compilerVar="CC" />
137 </Unit> 138 </Unit>
138 - <Unit filename="src/gtk/v3270/private.h" />  
139 - <Unit filename="src/gtk/v3270/sources.mak" />  
140 - <Unit filename="src/gtk/v3270/v3270.h" />  
141 - <Unit filename="src/gtk/v3270/widget.c"> 139 + <Unit filename="src\gtk\v3270\private.h" />
  140 + <Unit filename="src\gtk\v3270\sources.mak" />
  141 + <Unit filename="src\gtk\v3270\v3270.h" />
  142 + <Unit filename="src\gtk\v3270\widget.c">
142 <Option compilerVar="CC" /> 143 <Option compilerVar="CC" />
143 </Unit> 144 </Unit>
144 - <Unit filename="src/gtk/valgrind.suppression" />  
145 - <Unit filename="src/include/lib3270.h" />  
146 - <Unit filename="src/include/lib3270/action_table.h" />  
147 - <Unit filename="src/include/lib3270/actions.h" />  
148 - <Unit filename="src/include/lib3270/config.h.in" />  
149 - <Unit filename="src/include/lib3270/log.h" />  
150 - <Unit filename="src/include/lib3270/popup.h" />  
151 - <Unit filename="src/include/lib3270/selection.h" />  
152 - <Unit filename="src/include/lib3270/session.h" />  
153 - <Unit filename="src/include/pw3270.h" />  
154 - <Unit filename="src/include/rules.mak.in" />  
155 - <Unit filename="src/lib3270/3270ds.h" />  
156 - <Unit filename="src/lib3270/Makefile.in" />  
157 - <Unit filename="src/lib3270/X11keysym.h" />  
158 - <Unit filename="src/lib3270/XtGlue.c"> 145 + <Unit filename="src\gtk\valgrind.suppression" />
  146 + <Unit filename="src\include\lib3270.h" />
  147 + <Unit filename="src\include\lib3270\action_table.h" />
  148 + <Unit filename="src\include\lib3270\actions.h" />
  149 + <Unit filename="src\include\lib3270\config.h.in" />
  150 + <Unit filename="src\include\lib3270\log.h" />
  151 + <Unit filename="src\include\lib3270\popup.h" />
  152 + <Unit filename="src\include\lib3270\selection.h" />
  153 + <Unit filename="src\include\lib3270\session.h" />
  154 + <Unit filename="src\include\pw3270.h" />
  155 + <Unit filename="src\include\rules.mak.in" />
  156 + <Unit filename="src\lib3270\3270ds.h" />
  157 + <Unit filename="src\lib3270\Makefile.in" />
  158 + <Unit filename="src\lib3270\X11keysym.h" />
  159 + <Unit filename="src\lib3270\XtGlue.c">
159 <Option compilerVar="CC" /> 160 <Option compilerVar="CC" />
160 </Unit> 161 </Unit>
161 - <Unit filename="src/lib3270/actions.c"> 162 + <Unit filename="src\lib3270\actions.c">
162 <Option compilerVar="CC" /> 163 <Option compilerVar="CC" />
163 </Unit> 164 </Unit>
164 - <Unit filename="src/lib3270/actionsc.h" />  
165 - <Unit filename="src/lib3270/ansi.c"> 165 + <Unit filename="src\lib3270\actionsc.h" />
  166 + <Unit filename="src\lib3270\ansi.c">
166 <Option compilerVar="CC" /> 167 <Option compilerVar="CC" />
167 </Unit> 168 </Unit>
168 - <Unit filename="src/lib3270/ansic.h" />  
169 - <Unit filename="src/lib3270/api.h" />  
170 - <Unit filename="src/lib3270/apl.c"> 169 + <Unit filename="src\lib3270\ansic.h" />
  170 + <Unit filename="src\lib3270\api.h" />
  171 + <Unit filename="src\lib3270\apl.c">
171 <Option compilerVar="CC" /> 172 <Option compilerVar="CC" />
172 </Unit> 173 </Unit>
173 - <Unit filename="src/lib3270/aplc.h" />  
174 - <Unit filename="src/lib3270/appres.h" />  
175 - <Unit filename="src/lib3270/arpa_telnet.h" />  
176 - <Unit filename="src/lib3270/cg.h" />  
177 - <Unit filename="src/lib3270/charset.c"> 174 + <Unit filename="src\lib3270\aplc.h" />
  175 + <Unit filename="src\lib3270\appres.h" />
  176 + <Unit filename="src\lib3270\arpa_telnet.h" />
  177 + <Unit filename="src\lib3270\cg.h" />
  178 + <Unit filename="src\lib3270\charset.c">
178 <Option compilerVar="CC" /> 179 <Option compilerVar="CC" />
179 </Unit> 180 </Unit>
180 - <Unit filename="src/lib3270/charsetc.h" />  
181 - <Unit filename="src/lib3270/childc.h" />  
182 - <Unit filename="src/lib3270/ctlr.c"> 181 + <Unit filename="src\lib3270\charsetc.h" />
  182 + <Unit filename="src\lib3270\childc.h" />
  183 + <Unit filename="src\lib3270\ctlr.c">
183 <Option compilerVar="CC" /> 184 <Option compilerVar="CC" />
184 </Unit> 185 </Unit>
185 - <Unit filename="src/lib3270/ctlr.h" />  
186 - <Unit filename="src/lib3270/ctlrc.h" />  
187 - <Unit filename="src/lib3270/dialogc.h" />  
188 - <Unit filename="src/lib3270/ft.c"> 186 + <Unit filename="src\lib3270\ctlr.h" />
  187 + <Unit filename="src\lib3270\ctlrc.h" />
  188 + <Unit filename="src\lib3270\dialogc.h" />
  189 + <Unit filename="src\lib3270\ft.c">
189 <Option compilerVar="CC" /> 190 <Option compilerVar="CC" />
190 </Unit> 191 </Unit>
191 - <Unit filename="src/lib3270/ft_cut.c"> 192 + <Unit filename="src\lib3270\ft_cut.c">
192 <Option compilerVar="CC" /> 193 <Option compilerVar="CC" />
193 </Unit> 194 </Unit>
194 - <Unit filename="src/lib3270/ft_cut_ds.h" />  
195 - <Unit filename="src/lib3270/ft_cutc.h" />  
196 - <Unit filename="src/lib3270/ft_dft.c"> 195 + <Unit filename="src\lib3270\ft_cut_ds.h" />
  196 + <Unit filename="src\lib3270\ft_cutc.h" />
  197 + <Unit filename="src\lib3270\ft_dft.c">
197 <Option compilerVar="CC" /> 198 <Option compilerVar="CC" />
198 </Unit> 199 </Unit>
199 - <Unit filename="src/lib3270/ft_dft_ds.h" />  
200 - <Unit filename="src/lib3270/ft_dftc.h" />  
201 - <Unit filename="src/lib3270/ftc.h" />  
202 - <Unit filename="src/lib3270/globals.h" />  
203 - <Unit filename="src/lib3270/glue.c"> 200 + <Unit filename="src\lib3270\ft_dft_ds.h" />
  201 + <Unit filename="src\lib3270\ft_dftc.h" />
  202 + <Unit filename="src\lib3270\ftc.h" />
  203 + <Unit filename="src\lib3270\globals.h" />
  204 + <Unit filename="src\lib3270\glue.c">
204 <Option compilerVar="CC" /> 205 <Option compilerVar="CC" />
205 </Unit> 206 </Unit>
206 - <Unit filename="src/lib3270/gluec.h" />  
207 - <Unit filename="src/lib3270/host.c"> 207 + <Unit filename="src\lib3270\gluec.h" />
  208 + <Unit filename="src\lib3270\host.c">
208 <Option compilerVar="CC" /> 209 <Option compilerVar="CC" />
209 </Unit> 210 </Unit>
210 - <Unit filename="src/lib3270/hostc.h" />  
211 - <Unit filename="src/lib3270/icmdc.h" />  
212 - <Unit filename="src/lib3270/init.c"> 211 + <Unit filename="src\lib3270\hostc.h" />
  212 + <Unit filename="src\lib3270\icmdc.h" />
  213 + <Unit filename="src\lib3270\init.c">
213 <Option compilerVar="CC" /> 214 <Option compilerVar="CC" />
214 </Unit> 215 </Unit>
215 - <Unit filename="src/lib3270/keypadc.h" />  
216 - <Unit filename="src/lib3270/kybd.c"> 216 + <Unit filename="src\lib3270\keypadc.h" />
  217 + <Unit filename="src\lib3270\kybd.c">
217 <Option compilerVar="CC" /> 218 <Option compilerVar="CC" />
218 </Unit> 219 </Unit>
219 - <Unit filename="src/lib3270/kybdc.h" />  
220 - <Unit filename="src/lib3270/localdefs.h" />  
221 - <Unit filename="src/lib3270/log.c"> 220 + <Unit filename="src\lib3270\kybdc.h" />
  221 + <Unit filename="src\lib3270\localdefs.h" />
  222 + <Unit filename="src\lib3270\log.c">
222 <Option compilerVar="CC" /> 223 <Option compilerVar="CC" />
223 </Unit> 224 </Unit>
224 - <Unit filename="src/lib3270/macros.c"> 225 + <Unit filename="src\lib3270\macros.c">
225 <Option compilerVar="CC" /> 226 <Option compilerVar="CC" />
226 </Unit> 227 </Unit>
227 - <Unit filename="src/lib3270/mkfb.c"> 228 + <Unit filename="src\lib3270\mkfb.c">
228 <Option compilerVar="CC" /> 229 <Option compilerVar="CC" />
229 </Unit> 230 </Unit>
230 - <Unit filename="src/lib3270/objects.h" />  
231 - <Unit filename="src/lib3270/paste.c"> 231 + <Unit filename="src\lib3270\objects.h" />
  232 + <Unit filename="src\lib3270\paste.c">
232 <Option compilerVar="CC" /> 233 <Option compilerVar="CC" />
233 </Unit> 234 </Unit>
234 - <Unit filename="src/lib3270/popupsc.h" />  
235 - <Unit filename="src/lib3270/print.c"> 235 + <Unit filename="src\lib3270\popupsc.h" />
  236 + <Unit filename="src\lib3270\print.c">
236 <Option compilerVar="CC" /> 237 <Option compilerVar="CC" />
237 </Unit> 238 </Unit>
238 - <Unit filename="src/lib3270/printc.h" />  
239 - <Unit filename="src/lib3270/printer.c"> 239 + <Unit filename="src\lib3270\printc.h" />
  240 + <Unit filename="src\lib3270\printer.c">
240 <Option compilerVar="CC" /> 241 <Option compilerVar="CC" />
241 </Unit> 242 </Unit>
242 - <Unit filename="src/lib3270/printerc.h" />  
243 - <Unit filename="src/lib3270/proxy.c"> 243 + <Unit filename="src\lib3270\printerc.h" />
  244 + <Unit filename="src\lib3270\proxy.c">
244 <Option compilerVar="CC" /> 245 <Option compilerVar="CC" />
245 </Unit> 246 </Unit>
246 - <Unit filename="src/lib3270/proxyc.h" />  
247 - <Unit filename="src/lib3270/resolver.c"> 247 + <Unit filename="src\lib3270\proxyc.h" />
  248 + <Unit filename="src\lib3270\resolver.c">
248 <Option compilerVar="CC" /> 249 <Option compilerVar="CC" />
249 </Unit> 250 </Unit>
250 - <Unit filename="src/lib3270/resolverc.h" />  
251 - <Unit filename="src/lib3270/resources.c"> 251 + <Unit filename="src\lib3270\resolverc.h" />
  252 + <Unit filename="src\lib3270\resources.c">
252 <Option compilerVar="CC" /> 253 <Option compilerVar="CC" />
253 </Unit> 254 </Unit>
254 - <Unit filename="src/lib3270/resources.h" />  
255 - <Unit filename="src/lib3270/rpq.c"> 255 + <Unit filename="src\lib3270\resources.h" />
  256 + <Unit filename="src\lib3270\rpq.c">
256 <Option compilerVar="CC" /> 257 <Option compilerVar="CC" />
257 </Unit> 258 </Unit>
258 - <Unit filename="src/lib3270/savec.h" />  
259 - <Unit filename="src/lib3270/screen.c"> 259 + <Unit filename="src\lib3270\savec.h" />
  260 + <Unit filename="src\lib3270\screen.c">
260 <Option compilerVar="CC" /> 261 <Option compilerVar="CC" />
261 </Unit> 262 </Unit>
262 - <Unit filename="src/lib3270/screen.h" />  
263 - <Unit filename="src/lib3270/screenc.h" />  
264 - <Unit filename="src/lib3270/scrollc.h" />  
265 - <Unit filename="src/lib3270/see.c"> 263 + <Unit filename="src\lib3270\screen.h" />
  264 + <Unit filename="src\lib3270\screenc.h" />
  265 + <Unit filename="src\lib3270\scrollc.h" />
  266 + <Unit filename="src\lib3270\see.c">
266 <Option compilerVar="CC" /> 267 <Option compilerVar="CC" />
267 </Unit> 268 </Unit>
268 - <Unit filename="src/lib3270/seec.h" />  
269 - <Unit filename="src/lib3270/selection.c"> 269 + <Unit filename="src\lib3270\seec.h" />
  270 + <Unit filename="src\lib3270\selection.c">
270 <Option compilerVar="CC" /> 271 <Option compilerVar="CC" />
271 </Unit> 272 </Unit>
272 - <Unit filename="src/lib3270/sf.c"> 273 + <Unit filename="src\lib3270\sf.c">
273 <Option compilerVar="CC" /> 274 <Option compilerVar="CC" />
274 </Unit> 275 </Unit>
275 - <Unit filename="src/lib3270/sfc.h" />  
276 - <Unit filename="src/lib3270/shlobj_missing.h" />  
277 - <Unit filename="src/lib3270/statusc.h" />  
278 - <Unit filename="src/lib3270/tables.c"> 276 + <Unit filename="src\lib3270\sfc.h" />
  277 + <Unit filename="src\lib3270\shlobj_missing.h" />
  278 + <Unit filename="src\lib3270\statusc.h" />
  279 + <Unit filename="src\lib3270\tables.c">
279 <Option compilerVar="CC" /> 280 <Option compilerVar="CC" />
280 </Unit> 281 </Unit>
281 - <Unit filename="src/lib3270/tablesc.h" />  
282 - <Unit filename="src/lib3270/telnet.c"> 282 + <Unit filename="src\lib3270\tablesc.h" />
  283 + <Unit filename="src\lib3270\telnet.c">
283 <Option compilerVar="CC" /> 284 <Option compilerVar="CC" />
284 </Unit> 285 </Unit>
285 - <Unit filename="src/lib3270/telnetc.h" />  
286 - <Unit filename="src/lib3270/testprogram.c"> 286 + <Unit filename="src\lib3270\telnetc.h" />
  287 + <Unit filename="src\lib3270\testprogram.c">
287 <Option compilerVar="CC" /> 288 <Option compilerVar="CC" />
288 </Unit> 289 </Unit>
289 - <Unit filename="src/lib3270/tn3270e.h" />  
290 - <Unit filename="src/lib3270/toggle.h" />  
291 - <Unit filename="src/lib3270/toggles.c"> 290 + <Unit filename="src\lib3270\tn3270e.h" />
  291 + <Unit filename="src\lib3270\toggle.h" />
  292 + <Unit filename="src\lib3270\toggles.c">
292 <Option compilerVar="CC" /> 293 <Option compilerVar="CC" />
293 </Unit> 294 </Unit>
294 - <Unit filename="src/lib3270/togglesc.h" />  
295 - <Unit filename="src/lib3270/trace_ds.c"> 295 + <Unit filename="src\lib3270\togglesc.h" />
  296 + <Unit filename="src\lib3270\trace_ds.c">
296 <Option compilerVar="CC" /> 297 <Option compilerVar="CC" />
297 </Unit> 298 </Unit>
298 - <Unit filename="src/lib3270/trace_dsc.h" />  
299 - <Unit filename="src/lib3270/utf8.c"> 299 + <Unit filename="src\lib3270\trace_dsc.h" />
  300 + <Unit filename="src\lib3270\utf8.c">
300 <Option compilerVar="CC" /> 301 <Option compilerVar="CC" />
301 </Unit> 302 </Unit>
302 - <Unit filename="src/lib3270/utf8c.h" />  
303 - <Unit filename="src/lib3270/util.c"> 303 + <Unit filename="src\lib3270\utf8c.h" />
  304 + <Unit filename="src\lib3270\util.c">
304 <Option compilerVar="CC" /> 305 <Option compilerVar="CC" />
305 </Unit> 306 </Unit>
306 - <Unit filename="src/lib3270/utilc.h" />  
307 - <Unit filename="src/lib3270/w3misc.c"> 307 + <Unit filename="src\lib3270\utilc.h" />
  308 + <Unit filename="src\lib3270\w3misc.c">
308 <Option compilerVar="CC" /> 309 <Option compilerVar="CC" />
309 </Unit> 310 </Unit>
310 - <Unit filename="src/lib3270/w3miscc.h" />  
311 - <Unit filename="src/lib3270/widec.h" />  
312 - <Unit filename="src/lib3270/winvers.c"> 311 + <Unit filename="src\lib3270\w3miscc.h" />
  312 + <Unit filename="src\lib3270\widec.h" />
  313 + <Unit filename="src\lib3270\winvers.c">
313 <Option compilerVar="CC" /> 314 <Option compilerVar="CC" />
314 </Unit> 315 </Unit>
315 - <Unit filename="src/lib3270/winversc.h" />  
316 - <Unit filename="src/lib3270/xio.c"> 316 + <Unit filename="src\lib3270\winversc.h" />
  317 + <Unit filename="src\lib3270\xio.c">
317 <Option compilerVar="CC" /> 318 <Option compilerVar="CC" />
318 </Unit> 319 </Unit>
319 - <Unit filename="src/lib3270/xioc.h" />  
320 - <Unit filename="src/lib3270/xl.h" />  
321 - <Unit filename="ui/00default.xml" />  
322 - <Unit filename="ui/99debug.xml" /> 320 + <Unit filename="src\lib3270\xioc.h" />
  321 + <Unit filename="src\lib3270\xl.h" />
  322 + <Unit filename="ui\00default.xml" />
  323 + <Unit filename="ui\99debug.xml" />
323 <Extensions> 324 <Extensions>
324 <code_completion /> 325 <code_completion />
325 <debugger /> 326 <debugger />
src/gtk/common/common.h.in
  Diff comments   View file @f9c12c3
@@ -85,6 +85,9 @@ @@ -85,6 +85,9 @@
85 85
86 #ifdef WIN_REGISTRY_ENABLED 86 #ifdef WIN_REGISTRY_ENABLED
87 HKEY get_registry_handle(const gchar *first_element,REGSAM samDesired); 87 HKEY get_registry_handle(const gchar *first_element,REGSAM samDesired);
  88 + void registry_foreach(HKEY parent, const gchar *name,void (*cbk)(const gchar *key, const gchar *val, gpointer *user_data), gpointer *user_data);
  89 + void registry_set_double(HKEY hKey, const gchar *key, gdouble value);
  90 + gboolean registry_get_double(HKEY hKey, const gchar *key, gdouble *value);
88 #else 91 #else
89 GKeyFile * get_application_keyfile(void); 92 GKeyFile * get_application_keyfile(void);
90 #endif // WIN_REGISTRY_ENABLED 93 #endif // WIN_REGISTRY_ENABLED
src/gtk/common/config.c
  Diff comments   View file @f9c12c3
@@ -93,6 +93,7 @@ gchar * get_last_error_msg(void) @@ -93,6 +93,7 @@ gchar * get_last_error_msg(void)
93 #endif // WIN32 93 #endif // WIN32
94 94
95 #ifdef WIN_REGISTRY_ENABLED 95 #ifdef WIN_REGISTRY_ENABLED
  96 +
96 static BOOL registry_open_key(const gchar *group, REGSAM samDesired, HKEY *hKey) 97 static BOOL registry_open_key(const gchar *group, REGSAM samDesired, HKEY *hKey)
97 { 98 {
98 static HKEY predefined[] = { HKEY_CURRENT_USER, HKEY_USERS, HKEY_LOCAL_MACHINE }; 99 static HKEY predefined[] = { HKEY_CURRENT_USER, HKEY_USERS, HKEY_LOCAL_MACHINE };
@@ -144,6 +145,40 @@ gchar * get_last_error_msg(void) @@ -144,6 +145,40 @@ gchar * get_last_error_msg(void)
144 } 145 }
145 } 146 }
146 147
  148 + void registry_set_double(HKEY hKey, const gchar *key, gdouble value)
  149 + {
  150 + // Reference: http://git.gnome.org/browse/glib/tree/glib/gkeyfile.c
  151 + gchar result[G_ASCII_DTOSTR_BUF_SIZE];
  152 + g_ascii_dtostr (result, sizeof (result), value);
  153 +
  154 + RegSetValueEx(hKey,key,0,REG_SZ,(const BYTE *) result,strlen(result)+1);
  155 + }
  156 +
  157 + gboolean registry_get_double(HKEY hKey, const gchar *key, gdouble *value)
  158 + {
  159 + GError * error = NULL;
  160 + BYTE data[4096];
  161 + unsigned long datatype;
  162 + unsigned long datalen = sizeof(data);
  163 + gchar * end_of_valid_d;
  164 +
  165 + if(RegQueryValueExA(hKey,key,NULL,&datatype,data,&datalen) != ERROR_SUCCESS)
  166 + return FALSE;
  167 +
  168 + data[datalen] = 0;
  169 +
  170 + * value = g_ascii_strtod(data, &end_of_valid_d);
  171 +
  172 + if(*end_of_valid_d != '\0' || end_of_valid_d == ((gchar *) data))
  173 + {
  174 + g_warning("Key %s on registry isnt a valid double value",key);
  175 + return FALSE;
  176 + }
  177 +
  178 + return TRUE;
  179 + }
  180 +
  181 +
147 182
148 #else 183 #else
149 static gchar * search_for_ini(void) 184 static gchar * search_for_ini(void)
@@ -307,7 +342,7 @@ gchar * get_last_error_msg(void) @@ -307,7 +342,7 @@ gchar * get_last_error_msg(void)
307 342
308 memcpy(ret,data,datalen); 343 memcpy(ret,data,datalen);
309 ret[datalen+1] = 0; 344 ret[datalen+1] = 0;
310 - trace("%s\%s=\"%s\"",group,key,ret); 345 +// trace("%s\%s=\"%s\"",group,key,ret);
311 } 346 }
312 else if(def) 347 else if(def)
313 { 348 {
src/gtk/print.c
  Diff comments   View file @f9c12c3
@@ -134,21 +134,13 @@ @@ -134,21 +134,13 @@
134 #ifdef WIN32 134 #ifdef WIN32
135 135
136 #define save_string(h,k,v) save_settings(k,v,h) 136 #define save_string(h,k,v) save_settings(k,v,h)
  137 +#define save_double(h,k,v) registry_set_double(h,k,v)
137 138
138 static void save_settings(const gchar *key, const gchar *value, HKEY hKey) 139 static void save_settings(const gchar *key, const gchar *value, HKEY hKey)
139 { 140 {
140 RegSetValueEx(hKey,key,0,REG_SZ,(const BYTE *) value,strlen(value)+1); 141 RegSetValueEx(hKey,key,0,REG_SZ,(const BYTE *) value,strlen(value)+1);
141 } 142 }
142 143
143 -static void save_double(HKEY hKey, const gchar *key, gdouble value)  
144 -{  
145 - // Reference: http://git.gnome.org/browse/glib/tree/glib/gkeyfile.c  
146 - gchar result[G_ASCII_DTOSTR_BUF_SIZE];  
147 - g_ascii_dtostr (result, sizeof (result), value);  
148 - save_settings(key,result,hKey);  
149 -}  
150 -  
151 -  
152 /* 144 /*
153 * From: http://git.gnome.org/browse/gtk+/tree/gtk/gtkpagesetup.c 145 * From: http://git.gnome.org/browse/gtk+/tree/gtk/gtkpagesetup.c
154 * something like this should really be in gobject! 146 * something like this should really be in gobject!
@@ -429,9 +421,24 @@ static gchar * enum_to_string(GType type, guint enum_value) @@ -429,9 +421,24 @@ static gchar * enum_to_string(GType type, guint enum_value)
429 421
430 if(get_registry_handle("print",&registry,KEY_READ)) 422 if(get_registry_handle("print",&registry,KEY_READ))
431 { 423 {
  424 + HKEY hKey;
  425 + DWORD disp;
  426 +
432 registry_foreach(registry,"settings",update_settings,(gpointer) settings); 427 registry_foreach(registry,"settings",update_settings,(gpointer) settings);
433 428
  429 + if(RegCreateKeyEx(registry,"pagesetup",0,NULL,REG_OPTION_NON_VOLATILE,KEY_READ,NULL,&hKey,&disp) == ERROR_SUCCESS)
  430 + {
  431 + gdouble val;
  432 +
  433 + #define load_double(h,k,s) if(registry_get_double(h,k,&val)) s(setup, val,GTK_UNIT_MM);
434 434
  435 + load_double(hKey, "MarginTop", gtk_page_setup_set_top_margin );
  436 + load_double(hKey, "MarginBottom", gtk_page_setup_set_bottom_margin );
  437 + load_double(hKey, "MarginLeft", gtk_page_setup_set_left_margin );
  438 + load_double(hKey, "MarginRight", gtk_page_setup_set_right_margin );
  439 +
  440 + RegCloseKey(hKey);
  441 + }
435 442
436 443
437 #warning Work in progress 444 #warning Work in progress