Download as
Browse Code »

Commit 4b78d97d941ad31cff11cc467bdffa7d9f7fc8a5

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

Reativando opção de cores no diálogo de impressao

Showing 9 changed files with 228 additions and 245 deletions   Show diff stats
colors.conf
  Diff comments   View file @4b78d97
... ... @@ -24,6 +24,16 @@
24 24 # erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
25 25 #
26 26  
  27 +[default]
  28 +label=PW3270 default
  29 +
  30 +base=#000000,#7890F0,#FF0000,#FF00FF,#00FF00,#00FFFF,#FFFF00,#FFFFFF,#000000,#000080,#FFA200,#800080,#008000,#008080,#A0A000,#C0C0C0
  31 +field=#00FF00,#FF0000,#00FFFF,#FFFFFF
  32 +selection=#404040,#ffffff
  33 +OIA=#000000,#00FF00,#7890F0,#FFFFFF,#FF0000
  34 +
  35 +cross-hair=#00FF00
  36 +
27 37 [X3270]
28 38 label=X3270
29 39  
... ...
memchk.sh 0 → 100755
  Diff comments   View file @4b78d97
... ... @@ -0,0 +1,3 @@
  1 +#!/bin/bash
  2 +G_DEBUG=gc-friendly G_SLICE=always-malloc valgrind --leak-check=full --suppressions=src/gtk/valgrind.suppression --gen-suppressions=all .bin/Debug/pw3270
  3 +
... ...
pw3270.cbp
  Diff comments   View file @4b78d97
... ... @@ -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,283 @@
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/fallbacks.c">
185 185 <Option compilerVar="CC" />
186 186 </Unit>
187   - <Unit filename="src\lib3270\ft.c">
  187 + <Unit filename="src/lib3270/ft.c">
188 188 <Option compilerVar="CC" />
189 189 </Unit>
190   - <Unit filename="src\lib3270\ft_cut.c">
  190 + <Unit filename="src/lib3270/ft_cut.c">
191 191 <Option compilerVar="CC" />
192 192 </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">
  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">
196 196 <Option compilerVar="CC" />
197 197 </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">
  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">
203 203 <Option compilerVar="CC" />
204 204 </Unit>
205   - <Unit filename="src\lib3270\gluec.h" />
206   - <Unit filename="src\lib3270\host.c">
  205 + <Unit filename="src/lib3270/gluec.h" />
  206 + <Unit filename="src/lib3270/host.c">
207 207 <Option compilerVar="CC" />
208 208 </Unit>
209   - <Unit filename="src\lib3270\hostc.h" />
210   - <Unit filename="src\lib3270\icmdc.h" />
211   - <Unit filename="src\lib3270\init.c">
  209 + <Unit filename="src/lib3270/hostc.h" />
  210 + <Unit filename="src/lib3270/icmdc.h" />
  211 + <Unit filename="src/lib3270/init.c">
212 212 <Option compilerVar="CC" />
213 213 </Unit>
214   - <Unit filename="src\lib3270\keypadc.h" />
215   - <Unit filename="src\lib3270\kybd.c">
  214 + <Unit filename="src/lib3270/keypadc.h" />
  215 + <Unit filename="src/lib3270/kybd.c">
216 216 <Option compilerVar="CC" />
217 217 </Unit>
218   - <Unit filename="src\lib3270\kybdc.h" />
219   - <Unit filename="src\lib3270\localdefs.h" />
220   - <Unit filename="src\lib3270\log.c">
  218 + <Unit filename="src/lib3270/kybdc.h" />
  219 + <Unit filename="src/lib3270/localdefs.h" />
  220 + <Unit filename="src/lib3270/log.c">
221 221 <Option compilerVar="CC" />
222 222 </Unit>
223   - <Unit filename="src\lib3270\macros.c">
  223 + <Unit filename="src/lib3270/macros.c">
224 224 <Option compilerVar="CC" />
225 225 </Unit>
226   - <Unit filename="src\lib3270\mkfb.c">
  226 + <Unit filename="src/lib3270/mkfb.c">
227 227 <Option compilerVar="CC" />
228 228 </Unit>
229   - <Unit filename="src\lib3270\objects.h" />
230   - <Unit filename="src\lib3270\paste.c">
  229 + <Unit filename="src/lib3270/objects.h" />
  230 + <Unit filename="src/lib3270/paste.c">
231 231 <Option compilerVar="CC" />
232 232 </Unit>
233   - <Unit filename="src\lib3270\popupsc.h" />
234   - <Unit filename="src\lib3270\print.c">
  233 + <Unit filename="src/lib3270/popupsc.h" />
  234 + <Unit filename="src/lib3270/print.c">
235 235 <Option compilerVar="CC" />
236 236 </Unit>
237   - <Unit filename="src\lib3270\printc.h" />
238   - <Unit filename="src\lib3270\printer.c">
  237 + <Unit filename="src/lib3270/printc.h" />
  238 + <Unit filename="src/lib3270/printer.c">
239 239 <Option compilerVar="CC" />
240 240 </Unit>
241   - <Unit filename="src\lib3270\printerc.h" />
242   - <Unit filename="src\lib3270\proxy.c">
  241 + <Unit filename="src/lib3270/printerc.h" />
  242 + <Unit filename="src/lib3270/proxy.c">
243 243 <Option compilerVar="CC" />
244 244 </Unit>
245   - <Unit filename="src\lib3270\proxyc.h" />
246   - <Unit filename="src\lib3270\resolver.c">
  245 + <Unit filename="src/lib3270/proxyc.h" />
  246 + <Unit filename="src/lib3270/resolver.c">
247 247 <Option compilerVar="CC" />
248 248 </Unit>
249   - <Unit filename="src\lib3270\resolverc.h" />
250   - <Unit filename="src\lib3270\resources.c">
  249 + <Unit filename="src/lib3270/resolverc.h" />
  250 + <Unit filename="src/lib3270/resources.c">
251 251 <Option compilerVar="CC" />
252 252 </Unit>
253   - <Unit filename="src\lib3270\resources.h" />
254   - <Unit filename="src\lib3270\rpq.c">
  253 + <Unit filename="src/lib3270/resources.h" />
  254 + <Unit filename="src/lib3270/rpq.c">
255 255 <Option compilerVar="CC" />
256 256 </Unit>
257   - <Unit filename="src\lib3270\savec.h" />
258   - <Unit filename="src\lib3270\screen.c">
  257 + <Unit filename="src/lib3270/savec.h" />
  258 + <Unit filename="src/lib3270/screen.c">
259 259 <Option compilerVar="CC" />
260 260 </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">
  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">
265 265 <Option compilerVar="CC" />
266 266 </Unit>
267   - <Unit filename="src\lib3270\seec.h" />
268   - <Unit filename="src\lib3270\selection.c">
  267 + <Unit filename="src/lib3270/seec.h" />
  268 + <Unit filename="src/lib3270/selection.c">
269 269 <Option compilerVar="CC" />
270 270 </Unit>
271   - <Unit filename="src\lib3270\sf.c">
  271 + <Unit filename="src/lib3270/sf.c">
272 272 <Option compilerVar="CC" />
273 273 </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">
  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">
278 278 <Option compilerVar="CC" />
279 279 </Unit>
280   - <Unit filename="src\lib3270\tablesc.h" />
281   - <Unit filename="src\lib3270\telnet.c">
  280 + <Unit filename="src/lib3270/tablesc.h" />
  281 + <Unit filename="src/lib3270/telnet.c">
282 282 <Option compilerVar="CC" />
283 283 </Unit>
284   - <Unit filename="src\lib3270\telnetc.h" />
285   - <Unit filename="src\lib3270\testprogram.c">
  284 + <Unit filename="src/lib3270/telnetc.h" />
  285 + <Unit filename="src/lib3270/testprogram.c">
286 286 <Option compilerVar="CC" />
287 287 </Unit>
288   - <Unit filename="src\lib3270\tn3270e.h" />
289   - <Unit filename="src\lib3270\toggle.h" />
290   - <Unit filename="src\lib3270\toggles.c">
  288 + <Unit filename="src/lib3270/tn3270e.h" />
  289 + <Unit filename="src/lib3270/toggle.h" />
  290 + <Unit filename="src/lib3270/toggles.c">
291 291 <Option compilerVar="CC" />
292 292 </Unit>
293   - <Unit filename="src\lib3270\togglesc.h" />
294   - <Unit filename="src\lib3270\trace_ds.c">
  293 + <Unit filename="src/lib3270/togglesc.h" />
  294 + <Unit filename="src/lib3270/trace_ds.c">
295 295 <Option compilerVar="CC" />
296 296 </Unit>
297   - <Unit filename="src\lib3270\trace_dsc.h" />
298   - <Unit filename="src\lib3270\utf8.c">
  297 + <Unit filename="src/lib3270/trace_dsc.h" />
  298 + <Unit filename="src/lib3270/utf8.c">
299 299 <Option compilerVar="CC" />
300 300 </Unit>
301   - <Unit filename="src\lib3270\utf8c.h" />
302   - <Unit filename="src\lib3270\util.c">
  301 + <Unit filename="src/lib3270/utf8c.h" />
  302 + <Unit filename="src/lib3270/util.c">
303 303 <Option compilerVar="CC" />
304 304 </Unit>
305   - <Unit filename="src\lib3270\utilc.h" />
306   - <Unit filename="src\lib3270\version.c">
  305 + <Unit filename="src/lib3270/utilc.h" />
  306 + <Unit filename="src/lib3270/version.c">
307 307 <Option compilerVar="CC" />
308 308 </Unit>
309   - <Unit filename="src\lib3270\w3misc.c">
  309 + <Unit filename="src/lib3270/w3misc.c">
310 310 <Option compilerVar="CC" />
311 311 </Unit>
312   - <Unit filename="src\lib3270\w3miscc.h" />
313   - <Unit filename="src\lib3270\widec.h" />
314   - <Unit filename="src\lib3270\winvers.c">
  312 + <Unit filename="src/lib3270/w3miscc.h" />
  313 + <Unit filename="src/lib3270/widec.h" />
  314 + <Unit filename="src/lib3270/winvers.c">
315 315 <Option compilerVar="CC" />
316 316 </Unit>
317   - <Unit filename="src\lib3270\winversc.h" />
318   - <Unit filename="src\lib3270\xio.c">
  317 + <Unit filename="src/lib3270/winversc.h" />
  318 + <Unit filename="src/lib3270/xio.c">
319 319 <Option compilerVar="CC" />
320 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" />
  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" />
325 325 <Extensions>
326 326 <code_completion />
327 327 <debugger />
... ...
src/gtk/colors.c
  Diff comments   View file @4b78d97
... ... @@ -32,7 +32,6 @@
32 32  
33 33 /*--[ Implement ]------------------------------------------------------------------------------------*/
34 34  
35   -
36 35 static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
37 36 {
38 37 #define V3270_COLOR_BASE V3270_COLOR_GRAY+1
... ... @@ -50,18 +49,10 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
50 49 switch(g_strv_length(str))
51 50 {
52 51 case 2: // Only 2 colors, create monocromatic table
53   - gdk_color_parse(str[0],clr);
54   - gdk_color_parse(str[1],clr+1);
55   -
56   - trace("%s color table is: monocromatic",group);
57   -
58   - for(f=2;f<V3270_COLOR_BASE;f++)
59   - clr[f] = clr[1];
60   - clr[V3270_COLOR_BLACK] = *clr;
  52 + v3270_set_mono_color_table(clr,str[1],str[0]);
61 53 break;
62 54  
63 55 case V3270_COLOR_BASE: // All colors, update it
64   - trace("%s color table is: complete",group);
65 56 for(f=0;f<V3270_COLOR_BASE;f++)
66 57 gdk_color_parse(str[f],clr+f);
67 58 break;
... ... @@ -156,7 +147,7 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
156 147  
157 148 }
158 149  
159   - static void color_scheme_changed(GtkComboBox *combo,gpointer dunno)
  150 + static void color_scheme_changed(GtkComboBox *combo)
160 151 {
161 152 GtkWidget * terminal = (GtkWidget *) g_object_get_data(G_OBJECT(combo),"terminal_widget");
162 153 GtkWidget * colorsel = (GtkWidget *) g_object_get_data(G_OBJECT(combo),"color_selection_widget");
... ... @@ -181,7 +172,6 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
181 172  
182 173 v3270_reload(terminal);
183 174 gtk_widget_queue_draw(terminal);
184   -
185 175 }
186 176  
187 177 if(colorsel)
... ... @@ -251,7 +241,7 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
251 241 int pos = 0;
252 242 int g;
253 243  
254   - g_signal_connect(G_OBJECT(widget),"changed",G_CALLBACK(color_scheme_changed),table);
  244 + g_signal_connect(G_OBJECT(widget),"changed",G_CALLBACK(color_scheme_changed),0);
255 245  
256 246 g_object_set_data_full(G_OBJECT(widget),"colortable",table,g_free);
257 247  
... ...
src/gtk/globals.h
  Diff comments   View file @4b78d97
... ... @@ -61,6 +61,7 @@
61 61 G_GNUC_INTERNAL GtkWidget * create_main_window(void);
62 62 G_GNUC_INTERNAL void setup_font_list(GtkWidget *widget, GtkWidget *obj);
63 63 G_GNUC_INTERNAL void load_color_schemes(GtkWidget *widget, gchar *active);
  64 + G_GNUC_INTERNAL GtkWidget * color_scheme_new(const GdkColor *current);
64 65  
65 66 // actions
66 67 G_GNUC_INTERNAL void paste_file_action(GtkAction *action, GtkWidget *widget);
... ...
src/gtk/print.c
  Diff comments   View file @4b78d97
... ... @@ -45,7 +45,6 @@
45 45 gchar * font;
46 46 guint fontsize;
47 47 cairo_font_weight_t fontweight;
48   - gchar * colorname;
49 48 int baddr;
50 49 int rows;
51 50 int cols;
... ... @@ -142,9 +141,6 @@
142 141 if(info->font)
143 142 g_free(info->font);
144 143  
145   - if(info->colorname)
146   - g_free(info->colorname);
147   -
148 144 g_free(info);
149 145 }
150 146  
... ... @@ -179,41 +175,6 @@
179 175 trace("Font set to \"%s\" with size %d",info->font,info->fontsize);
180 176 }
181 177  
182   -/*
183   - static void color_scheme_changed(GtkComboBox *widget,PRINT_INFO *info)
184   - {
185   - gchar *new_colors = NULL;
186   -
187   -#if GTK_CHECK_VERSION(3,0,0)
188   -
189   - new_colors = g_strdup(gtk_combo_box_get_active_id(GTK_COMBO_BOX(widget)));
190   -
191   -#else
192   -
193   - GValue value = { 0, };
194   - GtkTreeIter iter;
195   -
196   - if(!gtk_combo_box_get_active_iter(widget,&iter))
197   - return;
198   -
199   - gtk_tree_model_get_value(gtk_combo_box_get_model(widget),&iter,1,&value);
200   - new_colors = g_strdup(g_value_get_string(&value));
201   -
202   -#endif
203   -
204   - if(!info->colorname)
205   - return;
206   -
207   -// trace("%s: %s->%s",__FUNCTION__,info->colorname,new_colors);
208   -
209   - if(*info->colorname)
210   - g_free(info->colorname);
211   -
212   - info->colorname = new_colors;
213   -
214   - }
215   -*/
216   -
217 178 static void toggle_show_selection(GtkToggleButton *togglebutton,PRINT_INFO *info)
218 179 {
219 180 gboolean active = gtk_toggle_button_get_active(togglebutton);
... ... @@ -223,41 +184,11 @@
223 184  
224 185 static GObject * create_custom_widget(GtkPrintOperation *prt, PRINT_INFO *info)
225 186 {
226   - static const gchar *def_colors = "white," // V3270_COLOR_BACKGROUND
227   - "black," // V3270_COLOR_BLUE
228   - "black," // V3270_COLOR_RED
229   - "black," // V3270_COLOR_PINK
230   - "black," // V3270_COLOR_GREEN
231   - "black," // V3270_COLOR_TURQUOISE
232   - "black," // V3270_COLOR_YELLOW
233   - "black," // V3270_COLOR_WHITE
234   - "black," // V3270_COLOR_BLACK
235   - "black," // V3270_COLOR_DARK_BLUE
236   - "black," // V3270_COLOR_ORANGE
237   - "black," // V3270_COLOR_PURPLE
238   - "black," // V3270_COLOR_DARK_GREEN
239   - "black," // V3270_COLOR_DARK_TURQUOISE
240   - "black," // V3270_COLOR_MUSTARD
241   - "black," // V3270_COLOR_GRAY
242   - "black," // V3270_COLOR_FIELD_DEFAULT
243   - "black," // V3270_COLOR_FIELD_INTENSIFIED
244   - "black," // V3270_COLOR_FIELD_PROTECTED
245   - "black," // V3270_COLOR_FIELD_PROTECTED_INTENSIFIED
246   - "black," // V3270_COLOR_SELECTED_BG
247   - "white," // V3270_COLOR_SELECTED_FG
248   - "black," // V3270_COLOR_SELECTED_BORDER
249   - "black," // V3270_COLOR_CURSOR
250   - "black," // V3270_COLOR_CROSS_HAIR
251   - "white," // V3270_COLOR_OIA_BACKGROUND
252   - "black," // V3270_COLOR_OIA
253   - "black," // V3270_COLOR_OIA_SEPARATOR
254   - "black," // V3270_COLOR_OIA_STATUS_OK
255   - "black"; // V3270_COLOR_OIA_STATUS_INVALID
256   -
257 187 static const gchar * label[] = { N_( "Font:" ), N_( "Color scheme:" ) };
258 188 GtkWidget * container = gtk_table_new(3,2,FALSE);
259 189 GtkWidget * widget;
260 190 int f;
  191 + gchar * ptr;
261 192  
262 193 for(f=0;f<G_N_ELEMENTS(label);f++)
263 194 {
... ... @@ -280,17 +211,16 @@
280 211 g_signal_connect(G_OBJECT(widget),"font-set",G_CALLBACK(font_set),info);
281 212  
282 213 // Color scheme dropdown
283   -#if GTK_CHECK_VERSION(3,0,0)
284   - widget = gtk_combo_box_text_new();
285   -#else
286   - widget = gtk_combo_box_new();
287   -#endif // GTK(3,0,0)
  214 + ptr = get_string_from_config("print","colors","");
  215 + if(*ptr)
  216 + v3270_set_color_table(info->color,ptr);
  217 + else
  218 + v3270_set_mono_color_table(info->color,"black","white");
  219 + g_free(ptr);
288 220  
289   - gtk_widget_set_sensitive(widget,FALSE);
290   -// info->colorname = get_string_from_config("print","colors",def_colors);
291   -// load_color_schemes(widget,info->colorname);
292   -// g_signal_connect(G_OBJECT(widget),"changed",G_CALLBACK(color_scheme_changed),info);
  221 + widget = color_scheme_new(info->color);
293 222  
  223 + g_object_set_data(G_OBJECT(container),"combo",widget);
294 224 gtk_table_attach(GTK_TABLE(container),widget,1,2,1,2,GTK_EXPAND|GTK_FILL,GTK_FILL,5,0);
295 225  
296 226 // Selection checkbox
... ... @@ -316,9 +246,24 @@
316 246  
317 247 static void custom_widget_apply(GtkPrintOperation *prt, GtkWidget *widget, PRINT_INFO *info)
318 248 {
319   - trace("%s",__FUNCTION__);
320   - set_string_to_config("print","colors",info->colorname);
321   - v3270_set_color_table(info->color,info->colorname);
  249 + GtkWidget * combo = g_object_get_data(G_OBJECT(widget),"combo");
  250 + GdkColor * clr = g_object_get_data(G_OBJECT(combo),"selected");
  251 +
  252 + if(clr)
  253 + {
  254 + int f;
  255 + GString *str = g_string_new("");
  256 + for(f=0;f<V3270_COLOR_COUNT;f++)
  257 + {
  258 + info->color[f] = clr[f];
  259 + if(f)
  260 + g_string_append_c(str,',');
  261 + g_string_append_printf(str,"%s",gdk_color_to_string(clr+f));
  262 + }
  263 + set_string_to_config("print","colors","%s",str->str);
  264 + g_string_free(str,TRUE);
  265 + }
  266 + g_object_unref(combo);
322 267 }
323 268  
324 269 static GtkPrintOperation * begin_print_operation(GtkAction *action, GtkWidget *widget, PRINT_INFO **info)
... ...
src/gtk/v3270/v3270.h
  Diff comments   View file @4b78d97
... ... @@ -219,6 +219,7 @@
219 219 void v3270_set_colors(GtkWidget *widget, const gchar *);
220 220 void v3270_set_color_table(GdkColor *table, const gchar *colors);
221 221 const GdkColor * v3270_get_color_table(GtkWidget *widget);
  222 + void v3270_set_mono_color_table(GdkColor *table, const gchar *fg, const gchar *bg);
222 223 void v3270_draw_element(cairo_t *cr, unsigned char chr, unsigned short attr, H3270 *session, guint height, GdkRectangle *rect, GdkColor *color);
223 224 void v3270_set_color(GtkWidget *widget, enum V3270_COLOR id, GdkColor *color);
224 225 GdkColor * v3270_get_color(GtkWidget *widget, enum V3270_COLOR id);
... ...
src/gtk/v3270/widget.c
  Diff comments   View file @4b78d97
... ... @@ -874,6 +874,24 @@ const GdkColor * v3270_get_color_table(GtkWidget *widget)
874 874 return GTK_V3270(widget)->color;
875 875 }
876 876  
  877 +void v3270_set_mono_color_table(GdkColor *clr, const gchar *fg, const gchar *bg)
  878 +{
  879 + int f;
  880 +
  881 + gdk_color_parse(bg,clr);
  882 + gdk_color_parse(fg,clr+1);
  883 +
  884 + for(f=2;f<V3270_COLOR_COUNT;f++)
  885 + clr[f] = clr[1];
  886 +
  887 + clr[V3270_COLOR_BLACK] = *clr;
  888 + clr[V3270_COLOR_OIA_BACKGROUND] = *clr;
  889 + clr[V3270_COLOR_SELECTED_BG] = clr[V3270_COLOR_WHITE];
  890 + clr[V3270_COLOR_SELECTED_FG] = clr[V3270_COLOR_BLACK];
  891 +
  892 +
  893 +}
  894 +
877 895 void v3270_set_color_table(GdkColor *table, const gchar *colors)
878 896 {
879 897 gchar **clr;
... ...
src/gtk/valgrind.suppression
  Diff comments   View file @4b78d97
... ... @@ -101,3 +101,18 @@
101 101 ...
102 102 }
103 103  
  104 +{
  105 + g_cclosure_marshal_VOID__BOXED
  106 + Memcheck:Cond
  107 + ...
  108 + fun:g_cclosure_marshal_VOID__BOXED
  109 + ...
  110 +}
  111 +
  112 +{
  113 + gdk_window_destroy
  114 + Memcheck:Cond
  115 + ...
  116 + fun:gdk_window_destroy
  117 + ...
  118 +}
... ...