Download as
Browse Code »

Commit 1f8ed5de6883aa20a8cfc7de828d0762fb486926

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

Iniciando implementacao de suporte ao atk

Showing 5 changed files with 220 additions and 176 deletions   Show diff stats
pw3270.cbp
  Diff comments   View file @1f8ed5d
... ... @@ -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,277 +45,281 @@
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/accessible.c">
116 116 <Option compilerVar="CC" />
117 117 </Unit>
118   - <Unit filename="src\gtk\v3270\draw.c">
  118 + <Unit filename="src/gtk/v3270/accessible.h" />
  119 + <Unit filename="src/gtk/v3270/clipboard.c">
119 120 <Option compilerVar="CC" />
120 121 </Unit>
121   - <Unit filename="src\gtk\v3270\genmarshal" />
122   - <Unit filename="src\gtk\v3270\iocallback.c">
  122 + <Unit filename="src/gtk/v3270/draw.c">
123 123 <Option compilerVar="CC" />
124 124 </Unit>
125   - <Unit filename="src\gtk\v3270\keyboard.c">
  125 + <Unit filename="src/gtk/v3270/genmarshal" />
  126 + <Unit filename="src/gtk/v3270/iocallback.c">
126 127 <Option compilerVar="CC" />
127 128 </Unit>
128   - <Unit filename="src\gtk\v3270\mouse.c">
  129 + <Unit filename="src/gtk/v3270/keyboard.c">
129 130 <Option compilerVar="CC" />
130 131 </Unit>
131   - <Unit filename="src\gtk\v3270\oia.c">
  132 + <Unit filename="src/gtk/v3270/mouse.c">
132 133 <Option compilerVar="CC" />
133 134 </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">
  135 + <Unit filename="src/gtk/v3270/oia.c">
138 136 <Option compilerVar="CC" />
139 137 </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">
  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">
155 142 <Option compilerVar="CC" />
156 143 </Unit>
157   - <Unit filename="src\lib3270\actions.c">
  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">
158 159 <Option compilerVar="CC" />
159 160 </Unit>
160   - <Unit filename="src\lib3270\actionsc.h" />
161   - <Unit filename="src\lib3270\ansi.c">
  161 + <Unit filename="src/lib3270/actions.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/actionsc.h" />
  165 + <Unit filename="src/lib3270/ansi.c">
167 166 <Option compilerVar="CC" />
168 167 </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">
  168 + <Unit filename="src/lib3270/ansic.h" />
  169 + <Unit filename="src/lib3270/api.h" />
  170 + <Unit filename="src/lib3270/apl.c">
174 171 <Option compilerVar="CC" />
175 172 </Unit>
176   - <Unit filename="src\lib3270\charsetc.h" />
177   - <Unit filename="src\lib3270\childc.h" />
178   - <Unit filename="src\lib3270\ctlr.c">
  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">
179 178 <Option compilerVar="CC" />
180 179 </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\ft.c">
  180 + <Unit filename="src/lib3270/charsetc.h" />
  181 + <Unit filename="src/lib3270/childc.h" />
  182 + <Unit filename="src/lib3270/ctlr.c">
185 183 <Option compilerVar="CC" />
186 184 </Unit>
187   - <Unit filename="src\lib3270\ft_cut.c">
  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">
188 189 <Option compilerVar="CC" />
189 190 </Unit>
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 + <Unit filename="src/lib3270/ft_cut.c">
193 192 <Option compilerVar="CC" />
194 193 </Unit>
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">
  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">
200 197 <Option compilerVar="CC" />
201 198 </Unit>
202   - <Unit filename="src\lib3270\gluec.h" />
203   - <Unit filename="src\lib3270\host.c">
  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">
204 204 <Option compilerVar="CC" />
205 205 </Unit>
206   - <Unit filename="src\lib3270\hostc.h" />
207   - <Unit filename="src\lib3270\icmdc.h" />
208   - <Unit filename="src\lib3270\init.c">
  206 + <Unit filename="src/lib3270/gluec.h" />
  207 + <Unit filename="src/lib3270/host.c">
209 208 <Option compilerVar="CC" />
210 209 </Unit>
211   - <Unit filename="src\lib3270\keypadc.h" />
212   - <Unit filename="src\lib3270\kybd.c">
  210 + <Unit filename="src/lib3270/hostc.h" />
  211 + <Unit filename="src/lib3270/icmdc.h" />
  212 + <Unit filename="src/lib3270/init.c">
213 213 <Option compilerVar="CC" />
214 214 </Unit>
215   - <Unit filename="src\lib3270\kybdc.h" />
216   - <Unit filename="src\lib3270\localdefs.h" />
217   - <Unit filename="src\lib3270\log.c">
  215 + <Unit filename="src/lib3270/keypadc.h" />
  216 + <Unit filename="src/lib3270/kybd.c">
218 217 <Option compilerVar="CC" />
219 218 </Unit>
220   - <Unit filename="src\lib3270\macros.c">
  219 + <Unit filename="src/lib3270/kybdc.h" />
  220 + <Unit filename="src/lib3270/localdefs.h" />
  221 + <Unit filename="src/lib3270/log.c">
221 222 <Option compilerVar="CC" />
222 223 </Unit>
223   - <Unit filename="src\lib3270\mkfb.c">
  224 + <Unit filename="src/lib3270/macros.c">
224 225 <Option compilerVar="CC" />
225 226 </Unit>
226   - <Unit filename="src\lib3270\objects.h" />
227   - <Unit filename="src\lib3270\paste.c">
  227 + <Unit filename="src/lib3270/mkfb.c">
228 228 <Option compilerVar="CC" />
229 229 </Unit>
230   - <Unit filename="src\lib3270\popupsc.h" />
231   - <Unit filename="src\lib3270\print.c">
  230 + <Unit filename="src/lib3270/objects.h" />
  231 + <Unit filename="src/lib3270/paste.c">
232 232 <Option compilerVar="CC" />
233 233 </Unit>
234   - <Unit filename="src\lib3270\printc.h" />
235   - <Unit filename="src\lib3270\printer.c">
  234 + <Unit filename="src/lib3270/popupsc.h" />
  235 + <Unit filename="src/lib3270/print.c">
236 236 <Option compilerVar="CC" />
237 237 </Unit>
238   - <Unit filename="src\lib3270\printerc.h" />
239   - <Unit filename="src\lib3270\proxy.c">
  238 + <Unit filename="src/lib3270/printc.h" />
  239 + <Unit filename="src/lib3270/printer.c">
240 240 <Option compilerVar="CC" />
241 241 </Unit>
242   - <Unit filename="src\lib3270\proxyc.h" />
243   - <Unit filename="src\lib3270\resolver.c">
  242 + <Unit filename="src/lib3270/printerc.h" />
  243 + <Unit filename="src/lib3270/proxy.c">
244 244 <Option compilerVar="CC" />
245 245 </Unit>
246   - <Unit filename="src\lib3270\resolverc.h" />
247   - <Unit filename="src\lib3270\resources.c">
  246 + <Unit filename="src/lib3270/proxyc.h" />
  247 + <Unit filename="src/lib3270/resolver.c">
248 248 <Option compilerVar="CC" />
249 249 </Unit>
250   - <Unit filename="src\lib3270\resources.h" />
251   - <Unit filename="src\lib3270\rpq.c">
  250 + <Unit filename="src/lib3270/resolverc.h" />
  251 + <Unit filename="src/lib3270/resources.c">
252 252 <Option compilerVar="CC" />
253 253 </Unit>
254   - <Unit filename="src\lib3270\savec.h" />
255   - <Unit filename="src\lib3270\screen.c">
  254 + <Unit filename="src/lib3270/resources.h" />
  255 + <Unit filename="src/lib3270/rpq.c">
256 256 <Option compilerVar="CC" />
257 257 </Unit>
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">
  258 + <Unit filename="src/lib3270/savec.h" />
  259 + <Unit filename="src/lib3270/screen.c">
262 260 <Option compilerVar="CC" />
263 261 </Unit>
264   - <Unit filename="src\lib3270\seec.h" />
265   - <Unit filename="src\lib3270\selection.c">
  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">
266 266 <Option compilerVar="CC" />
267 267 </Unit>
268   - <Unit filename="src\lib3270\sf.c">
  268 + <Unit filename="src/lib3270/seec.h" />
  269 + <Unit filename="src/lib3270/selection.c">
269 270 <Option compilerVar="CC" />
270 271 </Unit>
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 + <Unit filename="src/lib3270/sf.c">
275 273 <Option compilerVar="CC" />
276 274 </Unit>
277   - <Unit filename="src\lib3270\tablesc.h" />
278   - <Unit filename="src\lib3270\telnet.c">
  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">
279 279 <Option compilerVar="CC" />
280 280 </Unit>
281   - <Unit filename="src\lib3270\telnetc.h" />
282   - <Unit filename="src\lib3270\testprogram.c">
  281 + <Unit filename="src/lib3270/tablesc.h" />
  282 + <Unit filename="src/lib3270/telnet.c">
283 283 <Option compilerVar="CC" />
284 284 </Unit>
285   - <Unit filename="src\lib3270\tn3270e.h" />
286   - <Unit filename="src\lib3270\toggle.h" />
287   - <Unit filename="src\lib3270\toggles.c">
  285 + <Unit filename="src/lib3270/telnetc.h" />
  286 + <Unit filename="src/lib3270/testprogram.c">
288 287 <Option compilerVar="CC" />
289 288 </Unit>
290   - <Unit filename="src\lib3270\togglesc.h" />
291   - <Unit filename="src\lib3270\trace_ds.c">
  289 + <Unit filename="src/lib3270/tn3270e.h" />
  290 + <Unit filename="src/lib3270/toggle.h" />
  291 + <Unit filename="src/lib3270/toggles.c">
292 292 <Option compilerVar="CC" />
293 293 </Unit>
294   - <Unit filename="src\lib3270\trace_dsc.h" />
295   - <Unit filename="src\lib3270\utf8.c">
  294 + <Unit filename="src/lib3270/togglesc.h" />
  295 + <Unit filename="src/lib3270/trace_ds.c">
296 296 <Option compilerVar="CC" />
297 297 </Unit>
298   - <Unit filename="src\lib3270\utf8c.h" />
299   - <Unit filename="src\lib3270\util.c">
  298 + <Unit filename="src/lib3270/trace_dsc.h" />
  299 + <Unit filename="src/lib3270/utf8.c">
300 300 <Option compilerVar="CC" />
301 301 </Unit>
302   - <Unit filename="src\lib3270\utilc.h" />
303   - <Unit filename="src\lib3270\w3misc.c">
  302 + <Unit filename="src/lib3270/utf8c.h" />
  303 + <Unit filename="src/lib3270/util.c">
304 304 <Option compilerVar="CC" />
305 305 </Unit>
306   - <Unit filename="src\lib3270\w3miscc.h" />
307   - <Unit filename="src\lib3270\widec.h" />
308   - <Unit filename="src\lib3270\winvers.c">
  306 + <Unit filename="src/lib3270/utilc.h" />
  307 + <Unit filename="src/lib3270/w3misc.c">
309 308 <Option compilerVar="CC" />
310 309 </Unit>
311   - <Unit filename="src\lib3270\winversc.h" />
312   - <Unit filename="src\lib3270\xio.c">
  310 + <Unit filename="src/lib3270/w3miscc.h" />
  311 + <Unit filename="src/lib3270/widec.h" />
  312 + <Unit filename="src/lib3270/winvers.c">
313 313 <Option compilerVar="CC" />
314 314 </Unit>
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" />
  315 + <Unit filename="src/lib3270/winversc.h" />
  316 + <Unit filename="src/lib3270/xio.c">
  317 + <Option compilerVar="CC" />
  318 + </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" />
319 323 <Extensions>
320 324 <code_completion />
321 325 <debugger />
... ...
src/gtk/v3270/accessible.c
  Diff comments   View file @1f8ed5d
... ... @@ -28,6 +28,7 @@
28 28 */
29 29  
30 30 #include <gtk/gtk.h>
  31 + #include <pw3270.h>
31 32 #include "v3270.h"
32 33 #include "accessible.h"
33 34  
... ... @@ -40,42 +41,56 @@
40 41 /*--[ Prototipes ]-----------------------------------------------------------------------------------*/
41 42  
42 43 static void atk_editable_text_interface_init (AtkEditableTextIface *iface);
43   -static void atk_text_interface_init (AtkTextIface *iface);
44   -static void atk_action_interface_init (AtkActionIface *iface);
45 44 static void v3270_accessible_class_init (v3270AccessibleClass *klass);
46 45 static void v3270_accessible_init (v3270Accessible *widget);
47 46  
48 47 /*--[ Widget definition ]----------------------------------------------------------------------------*/
49 48  
50 49 G_DEFINE_TYPE_WITH_CODE (v3270Accessible, v3270_accessible, GTK_TYPE_V3270_ACCESSIBLE,
51   - G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, atk_editable_text_interface_init)
52   - G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init)
53   - G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init))
  50 + G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, atk_editable_text_interface_init) )
  51 +
  52 +// G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
  53 +// G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, atk_editable_text_interface_init)
  54 +// G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init)
54 55  
55 56 /*--[ Implement ]------------------------------------------------------------------------------------*/
56 57  
57 58 static void v3270_accessible_class_init(v3270AccessibleClass *klass)
58 59 {
59   -
  60 + trace("******************************* %s",__FUNCTION__);
  61 +/*
  62 + AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
  63 +
  64 + klass->notify_gtk = gtk_widget_accessible_notify_gtk;
  65 +
  66 + class->get_description = gtk_widget_accessible_get_description;
  67 + class->get_parent = gtk_widget_accessible_get_parent;
  68 + class->ref_relation_set = gtk_widget_accessible_ref_relation_set;
  69 + class->ref_state_set = gtk_widget_accessible_ref_state_set;
  70 + class->get_index_in_parent = gtk_widget_accessible_get_index_in_parent;
  71 + class->initialize = gtk_widget_accessible_initialize;
  72 + class->get_attributes = gtk_widget_accessible_get_attributes;
  73 + class->focus_event = gtk_widget_accessible_focus_event;
  74 +*/
60 75 }
61 76  
62 77 static void v3270_accessible_init(v3270Accessible *widget)
63 78 {
  79 + trace("*********************************** %s",__FUNCTION__);
64 80  
65 81 }
66 82  
67 83 static void atk_editable_text_interface_init(AtkEditableTextIface *iface)
68 84 {
69   -
70   -}
71   -
72   -static void atk_text_interface_init(AtkTextIface *iface)
73   -{
74   -
75   -}
76   -
77   -static void atk_action_interface_init(AtkActionIface *iface)
78   -{
79   -
  85 + trace("********************************** %s",__FUNCTION__);
  86 +/*
  87 + iface->set_text_contents = gtk_entry_accessible_set_text_contents;
  88 + iface->insert_text = gtk_entry_accessible_insert_text;
  89 + iface->copy_text = gtk_entry_accessible_copy_text;
  90 + iface->cut_text = gtk_entry_accessible_cut_text;
  91 + iface->delete_text = gtk_entry_accessible_delete_text;
  92 + iface->paste_text = gtk_entry_accessible_paste_text;
  93 + iface->set_run_attributes = NULL;
  94 +*/
80 95 }
81 96  
... ...
src/gtk/v3270/accessible.h
  Diff comments   View file @1f8ed5d
... ... @@ -55,4 +55,7 @@ struct _v3270AccessibleClass
55 55  
56 56 };
57 57  
  58 +GType v3270_accessible_get_type(void);
  59 +
  60 +
58 61 G_END_DECLS
... ...
src/gtk/v3270/v3270.h
  Diff comments   View file @1f8ed5d
... ... @@ -145,7 +145,7 @@
145 145 {
146 146 GtkWidget parent;
147 147  
148   - /* private */
  148 + // private
149 149 int selecting : 1; /**< Selecting region */
150 150 int moving : 1; /**< Moving selected region */
151 151 int resizing : 1; /**< Resizing selected region */
... ... @@ -166,7 +166,7 @@
166 166 unsigned char pointer; /** Mouse pointer ID */
167 167 int selection_addr; /** Selection addr */
168 168  
169   - /* Font info */
  169 + // Font info
170 170 gchar * font_family;
171 171 cairo_font_weight_t font_weight;
172 172 cairo_scaled_font_t * font_scaled;
... ... @@ -177,10 +177,10 @@
177 177 gint minimum_width;
178 178 gint minimum_height;
179 179  
180   - /* Colors */
  180 + // Colors
181 181 GdkColor color[V3270_COLOR_COUNT]; /**< Terminal widget colors */
182 182  
183   - /* Regions */
  183 + // Regions
184 184 GdkRectangle oia_rect[V3270_OIA_FIELD_COUNT];
185 185  
186 186 struct
... ... @@ -193,7 +193,10 @@
193 193 cairo_surface_t * surface; /**< Cursor image */
194 194 } cursor;
195 195  
196   - /* lib3270 stuff */
  196 + // Acessibility
  197 + GtkAccessible * accessible;
  198 +
  199 + // lib3270 stuff
197 200 H3270 * host; /**< Related 3270 session */
198 201  
199 202 };
... ...
src/gtk/v3270/widget.c
  Diff comments   View file @1f8ed5d
... ... @@ -50,17 +50,17 @@
50 50  
51 51 /*--[ Globals ]--------------------------------------------------------------------------------------*/
52 52  
53   - guint v3270_widget_signal[LAST_SIGNAL] = { 0 };
54   - GdkCursor * v3270_cursor[V3270_CURSOR_COUNT] = { 0 };
  53 + guint v3270_widget_signal[LAST_SIGNAL] = { 0 };
  54 + GdkCursor * v3270_cursor[V3270_CURSOR_COUNT] = { 0 };
55 55  
56 56 /*--[ Prototipes ]-----------------------------------------------------------------------------------*/
57 57  
58 58 // http://git.gnome.org/browse/gtk+/tree/gtk/gtkdrawingarea.c?h=gtk-3-0
59 59  
60   -static void v3270_realize (GtkWidget * widget);
61   -static void v3270_size_allocate (GtkWidget * widget,
62   - GtkAllocation * allocation);
63   -static void v3270_send_configure (v3270 * terminal);
  60 +static void v3270_realize ( GtkWidget * widget);
  61 +static void v3270_size_allocate ( GtkWidget * widget,
  62 + GtkAllocation * allocation);
  63 +static void v3270_send_configure ( v3270 * terminal);
64 64  
65 65 // Signals
66 66 static void v3270_activate (GtkWidget *widget);
... ... @@ -432,6 +432,16 @@ static void v3270_class_init(v3270Class *klass)
432 432 NULL, NULL,
433 433 pw3270_VOID__VOID_BOOL,
434 434 G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
  435 +
  436 +#ifdef DEBUG
  437 + trace("%s: Acessibility check starts",__FUNCTION__);
  438 + v3270_accessible_get_type();
  439 + trace("%s: Acessibility check ends",__FUNCTION__);
  440 +#endif // DEBUG
  441 +
  442 +#if GTK_CHECK_VERSION(3,0,0)
  443 + gtk_widget_class_set_accessible_type(widget_class, GTK_TYPE_V3270_ACCESSIBLE);
  444 +#endif
435 445 }
436 446  
437 447 void v3270_update_font_metrics(v3270 *terminal, cairo_t *cr, int width, int height)
... ... @@ -657,6 +667,13 @@ static void v3270_destroy(GtkObject *widget)
657 667  
658 668 trace("%s %p",__FUNCTION__,widget);
659 669  
  670 + if(terminal->accessible)
  671 + {
  672 + gtk_accessible_set_widget(terminal->accessible, NULL);
  673 + g_object_unref(terminal->accessible);
  674 + terminal->accessible = NULL;
  675 + }
  676 +
660 677 if(terminal->host)
661 678 {
662 679 lib3270_session_free(terminal->host);
... ... @@ -1084,3 +1101,5 @@ const GtkWidgetClass * v3270_get_parent_class(void)
1084 1101 {
1085 1102 return GTK_WIDGET_CLASS(v3270_parent_class);
1086 1103 }
  1104 +
  1105 +
... ...