Download as
Browse Code »

Commit 63e53b5a9f91be1a7c470667083cc723a1c0c687

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

Criando string para guardar nome de sessao (vai ser alteravel em algum ponto no … 

…futuro), movendo include com as funções do widget 3270 para o include geral para facilitar a implementação de plugins que atuem direto no widget)
Showing 17 changed files with 419 additions and 375 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,292 +35,292 @@ @@ -35,292 +35,292 @@
35 <Compiler> 35 <Compiler>
36 <Add option="-Wall" /> 36 <Add option="-Wall" />
37 <Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" /> 37 <Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" />
38 - <Add directory="src\include" /> 38 + <Add directory="src/include" />
39 </Compiler> 39 </Compiler>
40 <Linker> 40 <Linker>
41 <Add option="`pkg-config gtk+-3.0 lib3270 --libs`" /> 41 <Add option="`pkg-config gtk+-3.0 lib3270 --libs`" />
42 </Linker> 42 </Linker>
43 <Unit filename="Makefile.in" /> 43 <Unit filename="Makefile.in" />
44 - <Unit filename="android\Makefile" />  
45 - <Unit filename="android\jni\Android.mk" />  
46 - <Unit filename="android\jni\globals.h" />  
47 - <Unit filename="android\jni\main.cpp" />  
48 - <Unit filename="android\jni\misc.cpp" />  
49 - <Unit filename="android\src\br\com\bb\pw3270\PW3270Activity.java" />  
50 - <Unit filename="android\src\br\com\bb\pw3270\lib3270.java" /> 44 + <Unit filename="android/Makefile" />
  45 + <Unit filename="android/jni/Android.mk" />
  46 + <Unit filename="android/jni/globals.h" />
  47 + <Unit filename="android/jni/main.cpp" />
  48 + <Unit filename="android/jni/misc.cpp" />
  49 + <Unit filename="android/src/br/com/bb/pw3270/PW3270Activity.java" />
  50 + <Unit filename="android/src/br/com/bb/pw3270/lib3270.java" />
51 <Unit filename="autogen.sh" /> 51 <Unit filename="autogen.sh" />
52 <Unit filename="colors.conf" /> 52 <Unit filename="colors.conf" />
53 <Unit filename="configure.ac" /> 53 <Unit filename="configure.ac" />
54 <Unit filename="pw3270.spec.in" /> 54 <Unit filename="pw3270.spec.in" />
55 - <Unit filename="src\include\lib3270.h" />  
56 - <Unit filename="src\include\lib3270\action_table.h" />  
57 - <Unit filename="src\include\lib3270\actions.h" />  
58 - <Unit filename="src\include\lib3270\config.h.in" />  
59 - <Unit filename="src\include\lib3270\filetransfer.h" />  
60 - <Unit filename="src\include\lib3270\html.h" />  
61 - <Unit filename="src\include\lib3270\log.h" />  
62 - <Unit filename="src\include\lib3270\macros.h" />  
63 - <Unit filename="src\include\lib3270\popup.h" />  
64 - <Unit filename="src\include\lib3270\selection.h" />  
65 - <Unit filename="src\include\lib3270\session.h" />  
66 - <Unit filename="src\include\lib3270\trace.h" />  
67 - <Unit filename="src\include\pw3270.h" />  
68 - <Unit filename="src\include\rules.mak.in" />  
69 - <Unit filename="src\lib3270\3270ds.h" />  
70 - <Unit filename="src\lib3270\Makefile.in" />  
71 - <Unit filename="src\lib3270\X11keysym.h" />  
72 - <Unit filename="src\lib3270\actionsc.h" />  
73 - <Unit filename="src\lib3270\ansi.c"> 55 + <Unit filename="src/include/lib3270.h" />
  56 + <Unit filename="src/include/lib3270/action_table.h" />
  57 + <Unit filename="src/include/lib3270/actions.h" />
  58 + <Unit filename="src/include/lib3270/config.h.in" />
  59 + <Unit filename="src/include/lib3270/filetransfer.h" />
  60 + <Unit filename="src/include/lib3270/html.h" />
  61 + <Unit filename="src/include/lib3270/log.h" />
  62 + <Unit filename="src/include/lib3270/macros.h" />
  63 + <Unit filename="src/include/lib3270/popup.h" />
  64 + <Unit filename="src/include/lib3270/selection.h" />
  65 + <Unit filename="src/include/lib3270/session.h" />
  66 + <Unit filename="src/include/lib3270/trace.h" />
  67 + <Unit filename="src/include/lib3270/v3270.h" />
  68 + <Unit filename="src/include/pw3270.h" />
  69 + <Unit filename="src/include/rules.mak.in" />
  70 + <Unit filename="src/lib3270/3270ds.h" />
  71 + <Unit filename="src/lib3270/Makefile.in" />
  72 + <Unit filename="src/lib3270/X11keysym.h" />
  73 + <Unit filename="src/lib3270/actionsc.h" />
  74 + <Unit filename="src/lib3270/ansi.c">
74 <Option compilerVar="CC" /> 75 <Option compilerVar="CC" />
75 </Unit> 76 </Unit>
76 - <Unit filename="src\lib3270\ansic.h" />  
77 - <Unit filename="src\lib3270\api.h" />  
78 - <Unit filename="src\lib3270\arpa_telnet.h" />  
79 - <Unit filename="src\lib3270\bounds.c"> 77 + <Unit filename="src/lib3270/ansic.h" />
  78 + <Unit filename="src/lib3270/api.h" />
  79 + <Unit filename="src/lib3270/arpa_telnet.h" />
  80 + <Unit filename="src/lib3270/bounds.c">
80 <Option compilerVar="CC" /> 81 <Option compilerVar="CC" />
81 </Unit> 82 </Unit>
82 - <Unit filename="src\lib3270\cg.h" />  
83 - <Unit filename="src\lib3270\charset.c"> 83 + <Unit filename="src/lib3270/cg.h" />
  84 + <Unit filename="src/lib3270/charset.c">
84 <Option compilerVar="CC" /> 85 <Option compilerVar="CC" />
85 </Unit> 86 </Unit>
86 - <Unit filename="src\lib3270\charsetc.h" />  
87 - <Unit filename="src\lib3270\childc.h" />  
88 - <Unit filename="src\lib3270\ctlr.c"> 87 + <Unit filename="src/lib3270/charsetc.h" />
  88 + <Unit filename="src/lib3270/childc.h" />
  89 + <Unit filename="src/lib3270/ctlr.c">
89 <Option compilerVar="CC" /> 90 <Option compilerVar="CC" />
90 </Unit> 91 </Unit>
91 - <Unit filename="src\lib3270\ctlrc.h" />  
92 - <Unit filename="src\lib3270\ft.c"> 92 + <Unit filename="src/lib3270/ctlrc.h" />
  93 + <Unit filename="src/lib3270/ft.c">
93 <Option compilerVar="CC" /> 94 <Option compilerVar="CC" />
94 </Unit> 95 </Unit>
95 - <Unit filename="src\lib3270\ft_cut.c"> 96 + <Unit filename="src/lib3270/ft_cut.c">
96 <Option compilerVar="CC" /> 97 <Option compilerVar="CC" />
97 </Unit> 98 </Unit>
98 - <Unit filename="src\lib3270\ft_cut_ds.h" />  
99 - <Unit filename="src\lib3270\ft_cutc.h" />  
100 - <Unit filename="src\lib3270\ft_dft.c"> 99 + <Unit filename="src/lib3270/ft_cut_ds.h" />
  100 + <Unit filename="src/lib3270/ft_cutc.h" />
  101 + <Unit filename="src/lib3270/ft_dft.c">
101 <Option compilerVar="CC" /> 102 <Option compilerVar="CC" />
102 </Unit> 103 </Unit>
103 - <Unit filename="src\lib3270\ft_dft_ds.h" />  
104 - <Unit filename="src\lib3270\ft_dftc.h" />  
105 - <Unit filename="src\lib3270\ftc.h" />  
106 - <Unit filename="src\lib3270\globals.h" />  
107 - <Unit filename="src\lib3270\glue.c"> 104 + <Unit filename="src/lib3270/ft_dft_ds.h" />
  105 + <Unit filename="src/lib3270/ft_dftc.h" />
  106 + <Unit filename="src/lib3270/ftc.h" />
  107 + <Unit filename="src/lib3270/globals.h" />
  108 + <Unit filename="src/lib3270/glue.c">
108 <Option compilerVar="CC" /> 109 <Option compilerVar="CC" />
109 </Unit> 110 </Unit>
110 - <Unit filename="src\lib3270\gluec.h" />  
111 - <Unit filename="src\lib3270\host.c"> 111 + <Unit filename="src/lib3270/gluec.h" />
  112 + <Unit filename="src/lib3270/host.c">
112 <Option compilerVar="CC" /> 113 <Option compilerVar="CC" />
113 </Unit> 114 </Unit>
114 - <Unit filename="src\lib3270\hostc.h" />  
115 - <Unit filename="src\lib3270\html.c"> 115 + <Unit filename="src/lib3270/hostc.h" />
  116 + <Unit filename="src/lib3270/html.c">
116 <Option compilerVar="CC" /> 117 <Option compilerVar="CC" />
117 </Unit> 118 </Unit>
118 - <Unit filename="src\lib3270\icmdc.h" />  
119 - <Unit filename="src\lib3270\iocalls.c"> 119 + <Unit filename="src/lib3270/icmdc.h" />
  120 + <Unit filename="src/lib3270/iocalls.c">
120 <Option compilerVar="CC" /> 121 <Option compilerVar="CC" />
121 </Unit> 122 </Unit>
122 - <Unit filename="src\lib3270\keypadc.h" />  
123 - <Unit filename="src\lib3270\kybd.c"> 123 + <Unit filename="src/lib3270/keypadc.h" />
  124 + <Unit filename="src/lib3270/kybd.c">
124 <Option compilerVar="CC" /> 125 <Option compilerVar="CC" />
125 </Unit> 126 </Unit>
126 - <Unit filename="src\lib3270\kybdc.h" />  
127 - <Unit filename="src\lib3270\localdefs.h" />  
128 - <Unit filename="src\lib3270\log.c"> 127 + <Unit filename="src/lib3270/kybdc.h" />
  128 + <Unit filename="src/lib3270/localdefs.h" />
  129 + <Unit filename="src/lib3270/log.c">
129 <Option compilerVar="CC" /> 130 <Option compilerVar="CC" />
130 </Unit> 131 </Unit>
131 - <Unit filename="src\lib3270\macros.c"> 132 + <Unit filename="src/lib3270/macros.c">
132 <Option compilerVar="CC" /> 133 <Option compilerVar="CC" />
133 </Unit> 134 </Unit>
134 - <Unit filename="src\lib3270\mkfb.c"> 135 + <Unit filename="src/lib3270/mkfb.c">
135 <Option compilerVar="CC" /> 136 <Option compilerVar="CC" />
136 </Unit> 137 </Unit>
137 - <Unit filename="src\lib3270\objects.h" />  
138 - <Unit filename="src\lib3270\paste.c"> 138 + <Unit filename="src/lib3270/objects.h" />
  139 + <Unit filename="src/lib3270/paste.c">
139 <Option compilerVar="CC" /> 140 <Option compilerVar="CC" />
140 </Unit> 141 </Unit>
141 - <Unit filename="src\lib3270\popupsc.h" />  
142 - <Unit filename="src\lib3270\printc.h" />  
143 - <Unit filename="src\lib3270\printerc.h" />  
144 - <Unit filename="src\lib3270\proxy.c"> 142 + <Unit filename="src/lib3270/popupsc.h" />
  143 + <Unit filename="src/lib3270/printc.h" />
  144 + <Unit filename="src/lib3270/printerc.h" />
  145 + <Unit filename="src/lib3270/proxy.c">
145 <Option compilerVar="CC" /> 146 <Option compilerVar="CC" />
146 </Unit> 147 </Unit>
147 - <Unit filename="src\lib3270\proxyc.h" />  
148 - <Unit filename="src\lib3270\resolver.c"> 148 + <Unit filename="src/lib3270/proxyc.h" />
  149 + <Unit filename="src/lib3270/resolver.c">
149 <Option compilerVar="CC" /> 150 <Option compilerVar="CC" />
150 </Unit> 151 </Unit>
151 - <Unit filename="src\lib3270\resolverc.h" />  
152 - <Unit filename="src\lib3270\resources.c"> 152 + <Unit filename="src/lib3270/resolverc.h" />
  153 + <Unit filename="src/lib3270/resources.c">
153 <Option compilerVar="CC" /> 154 <Option compilerVar="CC" />
154 </Unit> 155 </Unit>
155 - <Unit filename="src\lib3270\resources.h" />  
156 - <Unit filename="src\lib3270\rpq.c"> 156 + <Unit filename="src/lib3270/resources.h" />
  157 + <Unit filename="src/lib3270/rpq.c">
157 <Option compilerVar="CC" /> 158 <Option compilerVar="CC" />
158 </Unit> 159 </Unit>
159 - <Unit filename="src\lib3270\savec.h" />  
160 - <Unit filename="src\lib3270\screen.c"> 160 + <Unit filename="src/lib3270/savec.h" />
  161 + <Unit filename="src/lib3270/screen.c">
161 <Option compilerVar="CC" /> 162 <Option compilerVar="CC" />
162 </Unit> 163 </Unit>
163 - <Unit filename="src\lib3270\screen.h" />  
164 - <Unit filename="src\lib3270\screenc.h" />  
165 - <Unit filename="src\lib3270\scrollc.h" />  
166 - <Unit filename="src\lib3270\see.c"> 164 + <Unit filename="src/lib3270/screen.h" />
  165 + <Unit filename="src/lib3270/screenc.h" />
  166 + <Unit filename="src/lib3270/scrollc.h" />
  167 + <Unit filename="src/lib3270/see.c">
167 <Option compilerVar="CC" /> 168 <Option compilerVar="CC" />
168 </Unit> 169 </Unit>
169 - <Unit filename="src\lib3270\seec.h" />  
170 - <Unit filename="src\lib3270\selection.c"> 170 + <Unit filename="src/lib3270/seec.h" />
  171 + <Unit filename="src/lib3270/selection.c">
171 <Option compilerVar="CC" /> 172 <Option compilerVar="CC" />
172 </Unit> 173 </Unit>
173 - <Unit filename="src\lib3270\session.c"> 174 + <Unit filename="src/lib3270/session.c">
174 <Option compilerVar="CC" /> 175 <Option compilerVar="CC" />
175 </Unit> 176 </Unit>
176 - <Unit filename="src\lib3270\sf.c"> 177 + <Unit filename="src/lib3270/sf.c">
177 <Option compilerVar="CC" /> 178 <Option compilerVar="CC" />
178 </Unit> 179 </Unit>
179 - <Unit filename="src\lib3270\sf.h" />  
180 - <Unit filename="src\lib3270\shlobj_missing.h" />  
181 - <Unit filename="src\lib3270\sources.mak" />  
182 - <Unit filename="src\lib3270\state.c"> 180 + <Unit filename="src/lib3270/sf.h" />
  181 + <Unit filename="src/lib3270/shlobj_missing.h" />
  182 + <Unit filename="src/lib3270/sources.mak" />
  183 + <Unit filename="src/lib3270/state.c">
183 <Option compilerVar="CC" /> 184 <Option compilerVar="CC" />
184 </Unit> 185 </Unit>
185 - <Unit filename="src\lib3270\statusc.h" />  
186 - <Unit filename="src\lib3270\tables.c"> 186 + <Unit filename="src/lib3270/statusc.h" />
  187 + <Unit filename="src/lib3270/tables.c">
187 <Option compilerVar="CC" /> 188 <Option compilerVar="CC" />
188 </Unit> 189 </Unit>
189 - <Unit filename="src\lib3270\tablesc.h" />  
190 - <Unit filename="src\lib3270\telnet.c"> 190 + <Unit filename="src/lib3270/tablesc.h" />
  191 + <Unit filename="src/lib3270/telnet.c">
191 <Option compilerVar="CC" /> 192 <Option compilerVar="CC" />
192 </Unit> 193 </Unit>
193 - <Unit filename="src\lib3270\telnetc.h" />  
194 - <Unit filename="src\lib3270\testprogram.c"> 194 + <Unit filename="src/lib3270/telnetc.h" />
  195 + <Unit filename="src/lib3270/testprogram.c">
195 <Option compilerVar="CC" /> 196 <Option compilerVar="CC" />
196 </Unit> 197 </Unit>
197 - <Unit filename="src\lib3270\tn3270e.h" />  
198 - <Unit filename="src\lib3270\toggle.h" />  
199 - <Unit filename="src\lib3270\toggles.c"> 198 + <Unit filename="src/lib3270/tn3270e.h" />
  199 + <Unit filename="src/lib3270/toggle.h" />
  200 + <Unit filename="src/lib3270/toggles.c">
200 <Option compilerVar="CC" /> 201 <Option compilerVar="CC" />
201 </Unit> 202 </Unit>
202 - <Unit filename="src\lib3270\togglesc.h" />  
203 - <Unit filename="src\lib3270\trace_ds.c"> 203 + <Unit filename="src/lib3270/togglesc.h" />
  204 + <Unit filename="src/lib3270/trace_ds.c">
204 <Option compilerVar="CC" /> 205 <Option compilerVar="CC" />
205 </Unit> 206 </Unit>
206 - <Unit filename="src\lib3270\trace_dsc.h" />  
207 - <Unit filename="src\lib3270\utf8.c"> 207 + <Unit filename="src/lib3270/trace_dsc.h" />
  208 + <Unit filename="src/lib3270/utf8.c">
208 <Option compilerVar="CC" /> 209 <Option compilerVar="CC" />
209 </Unit> 210 </Unit>
210 - <Unit filename="src\lib3270\utf8c.h" />  
211 - <Unit filename="src\lib3270\util.c"> 211 + <Unit filename="src/lib3270/utf8c.h" />
  212 + <Unit filename="src/lib3270/util.c">
212 <Option compilerVar="CC" /> 213 <Option compilerVar="CC" />
213 </Unit> 214 </Unit>
214 - <Unit filename="src\lib3270\utilc.h" />  
215 - <Unit filename="src\lib3270\w3miscc.h" />  
216 - <Unit filename="src\lib3270\widec.h" />  
217 - <Unit filename="src\lib3270\winversc.h" />  
218 - <Unit filename="src\lib3270\xioc.h" />  
219 - <Unit filename="src\lib3270\xl.h" />  
220 - <Unit filename="src\pw3270\Makefile.in" />  
221 - <Unit filename="src\pw3270\actions.c"> 215 + <Unit filename="src/lib3270/utilc.h" />
  216 + <Unit filename="src/lib3270/w3miscc.h" />
  217 + <Unit filename="src/lib3270/widec.h" />
  218 + <Unit filename="src/lib3270/winversc.h" />
  219 + <Unit filename="src/lib3270/xioc.h" />
  220 + <Unit filename="src/lib3270/xl.h" />
  221 + <Unit filename="src/pw3270/Makefile.in" />
  222 + <Unit filename="src/pw3270/actions.c">
222 <Option compilerVar="CC" /> 223 <Option compilerVar="CC" />
223 </Unit> 224 </Unit>
224 - <Unit filename="src\pw3270\colors.c"> 225 + <Unit filename="src/pw3270/colors.c">
225 <Option compilerVar="CC" /> 226 <Option compilerVar="CC" />
226 </Unit> 227 </Unit>
227 - <Unit filename="src\pw3270\common\common.h.in" />  
228 - <Unit filename="src\pw3270\common\config.c"> 228 + <Unit filename="src/pw3270/common/common.h.in" />
  229 + <Unit filename="src/pw3270/common/config.c">
229 <Option compilerVar="CC" /> 230 <Option compilerVar="CC" />
230 </Unit> 231 </Unit>
231 - <Unit filename="src\pw3270\common\sources.mak" />  
232 - <Unit filename="src\pw3270\dialog.c"> 232 + <Unit filename="src/pw3270/common/sources.mak" />
  233 + <Unit filename="src/pw3270/dialog.c">
233 <Option compilerVar="CC" /> 234 <Option compilerVar="CC" />
234 </Unit> 235 </Unit>
235 - <Unit filename="src\pw3270\filetransfer.c"> 236 + <Unit filename="src/pw3270/filetransfer.c">
236 <Option compilerVar="CC" /> 237 <Option compilerVar="CC" />
237 </Unit> 238 </Unit>
238 - <Unit filename="src\pw3270\filetransfer.h" />  
239 - <Unit filename="src\pw3270\fonts.c"> 239 + <Unit filename="src/pw3270/filetransfer.h" />
  240 + <Unit filename="src/pw3270/fonts.c">
240 <Option compilerVar="CC" /> 241 <Option compilerVar="CC" />
241 </Unit> 242 </Unit>
242 - <Unit filename="src\pw3270\globals.h" />  
243 - <Unit filename="src\pw3270\main.c"> 243 + <Unit filename="src/pw3270/globals.h" />
  244 + <Unit filename="src/pw3270/main.c">
244 <Option compilerVar="CC" /> 245 <Option compilerVar="CC" />
245 </Unit> 246 </Unit>
246 - <Unit filename="src\pw3270\print.c"> 247 + <Unit filename="src/pw3270/print.c">
247 <Option compilerVar="CC" /> 248 <Option compilerVar="CC" />
248 </Unit> 249 </Unit>
249 - <Unit filename="src\pw3270\uiparser\Makefile.in" />  
250 - <Unit filename="src\pw3270\uiparser\accelerator.c"> 250 + <Unit filename="src/pw3270/uiparser/Makefile.in" />
  251 + <Unit filename="src/pw3270/uiparser/accelerator.c">
251 <Option compilerVar="CC" /> 252 <Option compilerVar="CC" />
252 </Unit> 253 </Unit>
253 - <Unit filename="src\pw3270\uiparser\action.c"> 254 + <Unit filename="src/pw3270/uiparser/action.c">
254 <Option compilerVar="CC" /> 255 <Option compilerVar="CC" />
255 </Unit> 256 </Unit>
256 - <Unit filename="src\pw3270\uiparser\menu.c"> 257 + <Unit filename="src/pw3270/uiparser/menu.c">
257 <Option compilerVar="CC" /> 258 <Option compilerVar="CC" />
258 </Unit> 259 </Unit>
259 - <Unit filename="src\pw3270\uiparser\menubar.c"> 260 + <Unit filename="src/pw3270/uiparser/menubar.c">
260 <Option compilerVar="CC" /> 261 <Option compilerVar="CC" />
261 </Unit> 262 </Unit>
262 - <Unit filename="src\pw3270\uiparser\menuitem.c"> 263 + <Unit filename="src/pw3270/uiparser/menuitem.c">
263 <Option compilerVar="CC" /> 264 <Option compilerVar="CC" />
264 </Unit> 265 </Unit>
265 - <Unit filename="src\pw3270\uiparser\parsefile.c"> 266 + <Unit filename="src/pw3270/uiparser/parsefile.c">
266 <Option compilerVar="CC" /> 267 <Option compilerVar="CC" />
267 </Unit> 268 </Unit>
268 - <Unit filename="src\pw3270\uiparser\parser.c"> 269 + <Unit filename="src/pw3270/uiparser/parser.c">
269 <Option compilerVar="CC" /> 270 <Option compilerVar="CC" />
270 </Unit> 271 </Unit>
271 - <Unit filename="src\pw3270\uiparser\parser.h" />  
272 - <Unit filename="src\pw3270\uiparser\popup.c"> 272 + <Unit filename="src/pw3270/uiparser/parser.h" />
  273 + <Unit filename="src/pw3270/uiparser/popup.c">
273 <Option compilerVar="CC" /> 274 <Option compilerVar="CC" />
274 </Unit> 275 </Unit>
275 - <Unit filename="src\pw3270\uiparser\private.h" />  
276 - <Unit filename="src\pw3270\uiparser\script.c"> 276 + <Unit filename="src/pw3270/uiparser/private.h" />
  277 + <Unit filename="src/pw3270/uiparser/script.c">
277 <Option compilerVar="CC" /> 278 <Option compilerVar="CC" />
278 </Unit> 279 </Unit>
279 - <Unit filename="src\pw3270\uiparser\separator.c"> 280 + <Unit filename="src/pw3270/uiparser/separator.c">
280 <Option compilerVar="CC" /> 281 <Option compilerVar="CC" />
281 </Unit> 282 </Unit>
282 - <Unit filename="src\pw3270\uiparser\sources.mak" />  
283 - <Unit filename="src\pw3270\uiparser\toolbar.c"> 283 + <Unit filename="src/pw3270/uiparser/sources.mak" />
  284 + <Unit filename="src/pw3270/uiparser/toolbar.c">
284 <Option compilerVar="CC" /> 285 <Option compilerVar="CC" />
285 </Unit> 286 </Unit>
286 - <Unit filename="src\pw3270\uiparser\toolitem.c"> 287 + <Unit filename="src/pw3270/uiparser/toolitem.c">
287 <Option compilerVar="CC" /> 288 <Option compilerVar="CC" />
288 </Unit> 289 </Unit>
289 - <Unit filename="src\pw3270\v3270\accessible.c"> 290 + <Unit filename="src/pw3270/v3270/accessible.c">
290 <Option compilerVar="CC" /> 291 <Option compilerVar="CC" />
291 </Unit> 292 </Unit>
292 - <Unit filename="src\pw3270\v3270\accessible.h" />  
293 - <Unit filename="src\pw3270\v3270\draw.c"> 293 + <Unit filename="src/pw3270/v3270/accessible.h" />
  294 + <Unit filename="src/pw3270/v3270/draw.c">
294 <Option compilerVar="CC" /> 295 <Option compilerVar="CC" />
295 </Unit> 296 </Unit>
296 - <Unit filename="src\pw3270\v3270\genmarshal" />  
297 - <Unit filename="src\pw3270\v3270\iocallback.c"> 297 + <Unit filename="src/pw3270/v3270/genmarshal" />
  298 + <Unit filename="src/pw3270/v3270/iocallback.c">
298 <Option compilerVar="CC" /> 299 <Option compilerVar="CC" />
299 </Unit> 300 </Unit>
300 - <Unit filename="src\pw3270\v3270\keyboard.c"> 301 + <Unit filename="src/pw3270/v3270/keyboard.c">
301 <Option compilerVar="CC" /> 302 <Option compilerVar="CC" />
302 </Unit> 303 </Unit>
303 - <Unit filename="src\pw3270\v3270\mouse.c"> 304 + <Unit filename="src/pw3270/v3270/mouse.c">
304 <Option compilerVar="CC" /> 305 <Option compilerVar="CC" />
305 </Unit> 306 </Unit>
306 - <Unit filename="src\pw3270\v3270\oia.c"> 307 + <Unit filename="src/pw3270/v3270/oia.c">
307 <Option compilerVar="CC" /> 308 <Option compilerVar="CC" />
308 </Unit> 309 </Unit>
309 - <Unit filename="src\pw3270\v3270\private.h" />  
310 - <Unit filename="src\pw3270\v3270\selection.c"> 310 + <Unit filename="src/pw3270/v3270/private.h" />
  311 + <Unit filename="src/pw3270/v3270/selection.c">
311 <Option compilerVar="CC" /> 312 <Option compilerVar="CC" />
312 </Unit> 313 </Unit>
313 - <Unit filename="src\pw3270\v3270\sources.mak" />  
314 - <Unit filename="src\pw3270\v3270\v3270.h" />  
315 - <Unit filename="src\pw3270\v3270\widget.c"> 314 + <Unit filename="src/pw3270/v3270/sources.mak" />
  315 + <Unit filename="src/pw3270/v3270/widget.c">
316 <Option compilerVar="CC" /> 316 <Option compilerVar="CC" />
317 </Unit> 317 </Unit>
318 - <Unit filename="src\pw3270\window.c"> 318 + <Unit filename="src/pw3270/window.c">
319 <Option compilerVar="CC" /> 319 <Option compilerVar="CC" />
320 </Unit> 320 </Unit>
321 - <Unit filename="src\tools\Makefile.in" />  
322 - <Unit filename="ui\00default.xml" />  
323 - <Unit filename="ui\99debug.xml" /> 321 + <Unit filename="src/tools/Makefile.in" />
  322 + <Unit filename="ui/00default.xml" />
  323 + <Unit filename="ui/99debug.xml" />
324 <Extensions> 324 <Extensions>
325 <code_completion /> 325 <code_completion />
326 <debugger /> 326 <debugger />
src/include/lib3270/v3270.h 0 → 100644
  Diff comments   View file @63e53b5
@@ -0,0 +1,193 @@ @@ -0,0 +1,193 @@
  1 +/*
  2 + * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
  3 + * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
  4 + * aplicativos mainframe. Registro no INPI sob o nome G3270.
  5 + *
  6 + * Copyright (C) <2008> <Banco do Brasil S.A.>
  7 + *
  8 + * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
  9 + * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
  10 + * Free Software Foundation.
  11 + *
  12 + * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
  13 + * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
  14 + * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
  15 + * obter mais detalhes.
  16 + *
  17 + * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
  18 + * programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple
  19 + * Place, Suite 330, Boston, MA, 02111-1307, USA
  20 + *
  21 + * Este programa está nomeado como v3270.h e possui - linhas de código.
  22 + *
  23 + * Contatos:
  24 + *
  25 + * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
  26 + * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
  27 + * licinio@bb.com.br (Licínio Luis Branco)
  28 + * kraucer@bb.com.br (Kraucer Fernandes Mazuco)
  29 + *
  30 + */
  31 +
  32 +#ifndef V3270_H_INCLUDED
  33 +
  34 + #include <lib3270/config.h>
  35 + #include <lib3270.h>
  36 +
  37 + #define V3270_H_INCLUDED 1
  38 +
  39 + G_BEGIN_DECLS
  40 +
  41 + #define GTK_TYPE_V3270 (v3270_get_type ())
  42 + #define GTK_V3270(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_V3270, v3270))
  43 + #define GTK_V3270_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_V3270, v3270Class))
  44 + #define GTK_IS_V3270(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_V3270))
  45 + #define GTK_IS_V3270_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_V3270))
  46 + #define GTK_V3270_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_V3270, v3270Class))
  47 +
  48 +
  49 + typedef struct _v3270 v3270;
  50 + typedef struct _v3270Class v3270Class;
  51 +
  52 + enum V3270_COLOR
  53 + {
  54 + V3270_COLOR_BACKGROUND,
  55 + V3270_COLOR_BLUE,
  56 + V3270_COLOR_RED,
  57 + V3270_COLOR_PINK,
  58 + V3270_COLOR_GREEN,
  59 + V3270_COLOR_TURQUOISE,
  60 + V3270_COLOR_YELLOW,
  61 + V3270_COLOR_WHITE,
  62 + V3270_COLOR_BLACK,
  63 + V3270_COLOR_DARK_BLUE,
  64 + V3270_COLOR_ORANGE,
  65 + V3270_COLOR_PURPLE,
  66 + V3270_COLOR_DARK_GREEN,
  67 + V3270_COLOR_DARK_TURQUOISE,
  68 + V3270_COLOR_MUSTARD,
  69 + V3270_COLOR_GRAY,
  70 +
  71 + V3270_COLOR_FIELD,
  72 + V3270_COLOR_FIELD_INTENSIFIED,
  73 + V3270_COLOR_FIELD_PROTECTED,
  74 + V3270_COLOR_FIELD_PROTECTED_INTENSIFIED,
  75 +
  76 + V3270_COLOR_SELECTED_BG,
  77 + V3270_COLOR_SELECTED_FG,
  78 +
  79 + V3270_COLOR_CROSS_HAIR,
  80 +
  81 + // Oia Colors (Must be the last block)
  82 + V3270_COLOR_OIA_BACKGROUND,
  83 + V3270_COLOR_OIA_FOREGROUND,
  84 + V3270_COLOR_OIA_SEPARATOR,
  85 + V3270_COLOR_OIA_STATUS_OK,
  86 + V3270_COLOR_OIA_STATUS_INVALID,
  87 +
  88 + V3270_COLOR_COUNT
  89 + };
  90 +
  91 + #define V3270_COLOR_OIA_STATUS_WARNING V3270_COLOR_OIA_STATUS_OK
  92 +
  93 + typedef enum _v3270_oia_field
  94 + {
  95 + V3270_OIA_UNDERA, /**< "A" underlined */
  96 + V3270_OIA_CONNECTION, /**< solid box if connected, "?" in a box if not */
  97 + V3270_OIA_MESSAGE, /**< message area */
  98 + V3270_OIA_SSL, /**< SSL Status */
  99 + /**< Meta indication ("M" or blank) */
  100 + V3270_OIA_ALT, /**< Alt indication ("A" or blank) */
  101 + /**< Compose indication ("C" or blank) */
  102 + /**< Compose first character */
  103 + V3270_OIA_SHIFT, /**< Shift Status */
  104 + V3270_OIA_TYPEAHEAD, /**< Typeahead indication ("T" or blank) */
  105 + V3270_OIA_INSERT, /**< Insert mode indication (Special symbol/"I" or blank) */
  106 + V3270_OIA_SCRIPT, /**< Script indication ("S" or blank) */
  107 + V3270_OIA_LUNAME, /**< LU Name */
  108 + V3270_OIA_SPINNER, /**< command timing spinner */
  109 + V3270_OIA_TIMER, /**< command timing (mmm:ss, or blank) */
  110 + V3270_OIA_CURSOR_POSITION, /**< cursor position (rrr/ccc or blank) */
  111 +
  112 +// V3270_OIA_CAPS, /**< Caps indication ("A" or blank) */
  113 +
  114 +#ifdef X3270_PRINTER
  115 + V3270_OIA_PRINTER, /**< Printer indication ("P" or blank) */
  116 +#endif // X3270_PRINTER
  117 +
  118 + V3270_OIA_FIELD_COUNT
  119 +
  120 + } V3270_OIA_FIELD;
  121 +
  122 +
  123 + #define V3270_COLOR_OIA_SPINNER V3270_COLOR_OIA_FOREGROUND
  124 + #define V3270_COLOR_OIA_LUNAME V3270_COLOR_OIA_FOREGROUND
  125 + #define V3270_COLOR_OIA_INSERT V3270_COLOR_OIA_FOREGROUND
  126 +
  127 + #ifndef v3270char
  128 + #define v3270char void
  129 + #endif // v3270_char
  130 +
  131 + GtkWidget * v3270_new(void);
  132 + GType v3270_get_type(void);
  133 +
  134 + void v3270_reload(GtkWidget * widget);
  135 +
  136 + void v3270_set_font_family(GtkWidget *widget, const gchar *name);
  137 + const gchar * v3270_get_font_family(GtkWidget *widget);
  138 +
  139 + H3270 * v3270_get_session(GtkWidget *widget);
  140 +
  141 + int v3270_connect(GtkWidget *widget, const gchar *host);
  142 + void v3270_disconnect(GtkWidget *widget);
  143 +
  144 + // Clipboard
  145 + typedef enum _v3270_select_format
  146 + {
  147 + V3270_SELECT_TEXT,
  148 + V3270_SELECT_TABLE,
  149 +
  150 + V3270_SELECT_MAX
  151 + } V3270_SELECT_FORMAT;
  152 +
  153 + const gchar * v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode);
  154 + const gchar * v3270_copy_append(GtkWidget *widget);
  155 +
  156 + const gchar * v3270_get_selected_text(GtkWidget *widget);
  157 + const gchar * v3270_get_copy(GtkWidget *widget);
  158 + gchar * v3270_get_text(GtkWidget *widget,int offset, int len);
  159 + gchar * v3270_get_region(GtkWidget *widget, gint start_pos, gint end_pos, gboolean all);
  160 +
  161 + void v3270_set_string(GtkWidget *widget, const gchar *str);
  162 + void v3270_tab(GtkWidget *widget);
  163 + void v3270_backtab(GtkWidget *widget);
  164 +
  165 + // Cut & Paste
  166 + gboolean v3270_get_selection_bounds(GtkWidget *widget, gint *start, gint *end);
  167 + void v3270_unselect(GtkWidget *widget);
  168 + void v3270_paste(GtkWidget *widget);
  169 + void v3270_paste_string(GtkWidget *widget, const gchar *text, const gchar *encoding);
  170 + void v3270_select_region(GtkWidget *widget, gint start, gint end);
  171 +
  172 + // Colors
  173 + void v3270_set_colors(GtkWidget *widget, const gchar *);
  174 + void v3270_set_color_table(GdkColor *table, const gchar *colors);
  175 + const GdkColor * v3270_get_color_table(GtkWidget *widget);
  176 + void v3270_set_mono_color_table(GdkColor *table, const gchar *fg, const gchar *bg);
  177 + void v3270_draw_element(cairo_t *cr, unsigned char chr, unsigned short attr, H3270 *session, guint height, GdkRectangle *rect, GdkColor *color);
  178 + void v3270_set_color(GtkWidget *widget, enum V3270_COLOR id, GdkColor *color);
  179 + GdkColor * v3270_get_color(GtkWidget *widget, enum V3270_COLOR id);
  180 +
  181 + // Misc
  182 + GtkIMContext * v3270_get_im_context(GtkWidget *widget);
  183 + gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix);
  184 + void v3270_popup_message(GtkWidget *widget, LIB3270_NOTIFY type, const gchar *title, const gchar *message, const gchar *text);
  185 + const gchar * v3270_get_session_name(GtkWidget *widget);
  186 + void v3270_set_session_name(GtkWidget *widget, const gchar *name);
  187 +
  188 + void v3270_set_host(GtkWidget *widget, const gchar *uri);
  189 +
  190 +
  191 +G_END_DECLS
  192 +
  193 +#endif // V3270_H_INCLUDED
src/pw3270/actions.c
  Diff comments   View file @63e53b5
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 31
32 #include "globals.h" 32 #include "globals.h"
33 #include "uiparser/parser.h" 33 #include "uiparser/parser.h"
34 - #include "v3270/v3270.h" 34 + #include <lib3270/v3270.h>
35 #include "filetransfer.h" 35 #include "filetransfer.h"
36 #include <lib3270/actions.h> 36 #include <lib3270/actions.h>
37 #include <lib3270/selection.h> 37 #include <lib3270/selection.h>
src/pw3270/dialog.c
  Diff comments   View file @63e53b5
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 */ 30 */
31 31
32 #include "globals.h" 32 #include "globals.h"
33 - #include "v3270/v3270.h" 33 + #include <lib3270/v3270.h>
34 34
35 /*--[ Implement ]------------------------------------------------------------------------------------*/ 35 /*--[ Implement ]------------------------------------------------------------------------------------*/
36 36
src/pw3270/globals.h
  Diff comments   View file @63e53b5
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 #include <glib/gi18n.h> 37 #include <glib/gi18n.h>
38 #include <gtk/gtk.h> 38 #include <gtk/gtk.h>
39 39
40 - #include "v3270/v3270.h" 40 + #include <lib3270/v3270.h>
41 41
42 // Special actions 42 // Special actions
43 enum 43 enum
src/pw3270/main.c
  Diff comments   View file @63e53b5
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 31
32 #include <glib.h> 32 #include <glib.h>
33 #include "globals.h" 33 #include "globals.h"
34 -#include "v3270/v3270.h" 34 + #include <lib3270/v3270.h>
35 #include "v3270/accessible.h" 35 #include "v3270/accessible.h"
36 #include <stdlib.h> 36 #include <stdlib.h>
37 37
src/pw3270/print.c
  Diff comments   View file @63e53b5
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 */ 30 */
31 31
32 #include "globals.h" 32 #include "globals.h"
33 - #include "v3270/v3270.h" 33 + #include <lib3270/v3270.h>
34 #include <lib3270/selection.h> 34 #include <lib3270/selection.h>
35 35
36 /*--[ Structs ]--------------------------------------------------------------------------------------*/ 36 /*--[ Structs ]--------------------------------------------------------------------------------------*/
src/pw3270/v3270/accessible.c
  Diff comments   View file @63e53b5
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 38
39 #include <pw3270.h> 39 #include <pw3270.h>
40 #include <lib3270/log.h> 40 #include <lib3270/log.h>
41 - #include "v3270.h" 41 + #include <lib3270/v3270.h>
42 #include "private.h" 42 #include "private.h"
43 #include "accessible.h" 43 #include "accessible.h"
44 44
src/pw3270/v3270/draw.c
  Diff comments   View file @63e53b5
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 #include <pw3270.h> 31 #include <pw3270.h>
32 #include <lib3270.h> 32 #include <lib3270.h>
33 #include <lib3270/session.h> 33 #include <lib3270/session.h>
34 - #include "v3270.h" 34 + #include <lib3270/v3270.h>
35 #include "private.h" 35 #include "private.h"
36 36
37 /*--[ Implement ]------------------------------------------------------------------------------------*/ 37 /*--[ Implement ]------------------------------------------------------------------------------------*/
src/pw3270/v3270/keyboard.c
  Diff comments   View file @63e53b5
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 #include <string.h> 38 #include <string.h>
39 #include <gdk/gdk.h> 39 #include <gdk/gdk.h>
40 40
41 - #include "v3270.h" 41 + #include <lib3270/v3270.h>
42 #include "private.h" 42 #include "private.h"
43 43
44 #if GTK_CHECK_VERSION(3,0,0) 44 #if GTK_CHECK_VERSION(3,0,0)
src/pw3270/v3270/mouse.c
  Diff comments   View file @63e53b5
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 #include <gtk/gtk.h> 30 #include <gtk/gtk.h>
31 #include <gdk/gdk.h> 31 #include <gdk/gdk.h>
32 #include <pw3270.h> 32 #include <pw3270.h>
33 - #include "v3270.h" 33 + #include <lib3270/v3270.h>
34 #include "private.h" 34 #include "private.h"
35 #include <lib3270/selection.h> 35 #include <lib3270/selection.h>
36 #include <lib3270/actions.h> 36 #include <lib3270/actions.h>
src/pw3270/v3270/oia.c
  Diff comments   View file @63e53b5
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 #include <math.h> 39 #include <math.h>
40 #endif // HAVE_LIBM 40 #endif // HAVE_LIBM
41 41
42 - #include "v3270.h" 42 + #include <lib3270/v3270.h>
43 #include "private.h" 43 #include "private.h"
44 44
45 /*--[ Prototipes ]-----------------------------------------------------------------------------------*/ 45 /*--[ Prototipes ]-----------------------------------------------------------------------------------*/
src/pw3270/v3270/private.h
  Diff comments   View file @63e53b5
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 #include <glib/gi18n.h> 38 #include <glib/gi18n.h>
39 39
40 #ifndef V3270_H_INCLUDED 40 #ifndef V3270_H_INCLUDED
41 - #include "v3270.h" 41 + #include <lib3270/v3270.h>
42 #endif 42 #endif
43 43
44 G_BEGIN_DECLS 44 G_BEGIN_DECLS
@@ -176,8 +176,9 @@ G_BEGIN_DECLS @@ -176,8 +176,9 @@ G_BEGIN_DECLS
176 // Acessibility 176 // Acessibility
177 GtkAccessible * accessible; 177 GtkAccessible * accessible;
178 178
179 - // lib3270 stuff 179 + // Session
180 H3270 * host; /**< Related 3270 session */ 180 H3270 * host; /**< Related 3270 session */
  181 + gchar * session_name; /**< Session name (for window title) */
181 182
182 }; 183 };
183 184
src/pw3270/v3270/selection.c
  Diff comments   View file @63e53b5
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 29
30 #include <gtk/gtk.h> 30 #include <gtk/gtk.h>
31 #include <pw3270.h> 31 #include <pw3270.h>
32 - #include "v3270.h" 32 + #include <lib3270/v3270.h>
33 #include "private.h" 33 #include "private.h"
34 #include <lib3270/selection.h> 34 #include <lib3270/selection.h>
35 #include <lib3270/log.h> 35 #include <lib3270/log.h>
src/pw3270/v3270/v3270.h
View file @c5dbb5f
@@ -1,191 +0,0 @@ @@ -1,191 +0,0 @@
1 -/*  
2 - * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270  
3 - * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a  
4 - * aplicativos mainframe. Registro no INPI sob o nome G3270.  
5 - *  
6 - * Copyright (C) <2008> <Banco do Brasil S.A.>  
7 - *  
8 - * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob  
9 - * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela  
10 - * Free Software Foundation.  
11 - *  
12 - * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER  
13 - * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO  
14 - * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para  
15 - * obter mais detalhes.  
16 - *  
17 - * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este  
18 - * programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple  
19 - * Place, Suite 330, Boston, MA, 02111-1307, USA  
20 - *  
21 - * Este programa está nomeado como v3270.h e possui - linhas de código.  
22 - *  
23 - * Contatos:  
24 - *  
25 - * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)  
26 - * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)  
27 - * licinio@bb.com.br (Licínio Luis Branco)  
28 - * kraucer@bb.com.br (Kraucer Fernandes Mazuco)  
29 - *  
30 - */  
31 -  
32 -#ifndef V3270_H_INCLUDED  
33 -  
34 - #include <lib3270/config.h>  
35 - #include <lib3270.h>  
36 -  
37 - #define V3270_H_INCLUDED 1  
38 -  
39 - G_BEGIN_DECLS  
40 -  
41 - #define GTK_TYPE_V3270 (v3270_get_type ())  
42 - #define GTK_V3270(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_V3270, v3270))  
43 - #define GTK_V3270_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_V3270, v3270Class))  
44 - #define GTK_IS_V3270(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_V3270))  
45 - #define GTK_IS_V3270_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_V3270))  
46 - #define GTK_V3270_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_V3270, v3270Class))  
47 -  
48 -  
49 - typedef struct _v3270 v3270;  
50 - typedef struct _v3270Class v3270Class;  
51 -  
52 - enum V3270_COLOR  
53 - {  
54 - V3270_COLOR_BACKGROUND,  
55 - V3270_COLOR_BLUE,  
56 - V3270_COLOR_RED,  
57 - V3270_COLOR_PINK,  
58 - V3270_COLOR_GREEN,  
59 - V3270_COLOR_TURQUOISE,  
60 - V3270_COLOR_YELLOW,  
61 - V3270_COLOR_WHITE,  
62 - V3270_COLOR_BLACK,  
63 - V3270_COLOR_DARK_BLUE,  
64 - V3270_COLOR_ORANGE,  
65 - V3270_COLOR_PURPLE,  
66 - V3270_COLOR_DARK_GREEN,  
67 - V3270_COLOR_DARK_TURQUOISE,  
68 - V3270_COLOR_MUSTARD,  
69 - V3270_COLOR_GRAY,  
70 -  
71 - V3270_COLOR_FIELD,  
72 - V3270_COLOR_FIELD_INTENSIFIED,  
73 - V3270_COLOR_FIELD_PROTECTED,  
74 - V3270_COLOR_FIELD_PROTECTED_INTENSIFIED,  
75 -  
76 - V3270_COLOR_SELECTED_BG,  
77 - V3270_COLOR_SELECTED_FG,  
78 -  
79 - V3270_COLOR_CROSS_HAIR,  
80 -  
81 - // Oia Colors (Must be the last block)  
82 - V3270_COLOR_OIA_BACKGROUND,  
83 - V3270_COLOR_OIA_FOREGROUND,  
84 - V3270_COLOR_OIA_SEPARATOR,  
85 - V3270_COLOR_OIA_STATUS_OK,  
86 - V3270_COLOR_OIA_STATUS_INVALID,  
87 -  
88 - V3270_COLOR_COUNT  
89 - };  
90 -  
91 - #define V3270_COLOR_OIA_STATUS_WARNING V3270_COLOR_OIA_STATUS_OK  
92 -  
93 - typedef enum _v3270_oia_field  
94 - {  
95 - V3270_OIA_UNDERA, /**< "A" underlined */  
96 - V3270_OIA_CONNECTION, /**< solid box if connected, "?" in a box if not */  
97 - V3270_OIA_MESSAGE, /**< message area */  
98 - V3270_OIA_SSL, /**< SSL Status */  
99 - /**< Meta indication ("M" or blank) */  
100 - V3270_OIA_ALT, /**< Alt indication ("A" or blank) */  
101 - /**< Compose indication ("C" or blank) */  
102 - /**< Compose first character */  
103 - V3270_OIA_SHIFT, /**< Shift Status */  
104 - V3270_OIA_TYPEAHEAD, /**< Typeahead indication ("T" or blank) */  
105 - V3270_OIA_INSERT, /**< Insert mode indication (Special symbol/"I" or blank) */  
106 - V3270_OIA_SCRIPT, /**< Script indication ("S" or blank) */  
107 - V3270_OIA_LUNAME, /**< LU Name */  
108 - V3270_OIA_SPINNER, /**< command timing spinner */  
109 - V3270_OIA_TIMER, /**< command timing (mmm:ss, or blank) */  
110 - V3270_OIA_CURSOR_POSITION, /**< cursor position (rrr/ccc or blank) */  
111 -  
112 -// V3270_OIA_CAPS, /**< Caps indication ("A" or blank) */  
113 -  
114 -#ifdef X3270_PRINTER  
115 - V3270_OIA_PRINTER, /**< Printer indication ("P" or blank) */  
116 -#endif // X3270_PRINTER  
117 -  
118 - V3270_OIA_FIELD_COUNT  
119 -  
120 - } V3270_OIA_FIELD;  
121 -  
122 -  
123 - #define V3270_COLOR_OIA_SPINNER V3270_COLOR_OIA_FOREGROUND  
124 - #define V3270_COLOR_OIA_LUNAME V3270_COLOR_OIA_FOREGROUND  
125 - #define V3270_COLOR_OIA_INSERT V3270_COLOR_OIA_FOREGROUND  
126 -  
127 - #ifndef v3270char  
128 - #define v3270char void  
129 - #endif // v3270_char  
130 -  
131 - GtkWidget * v3270_new(void);  
132 - GType v3270_get_type(void);  
133 -  
134 - void v3270_reload(GtkWidget * widget);  
135 -  
136 - void v3270_set_font_family(GtkWidget *widget, const gchar *name);  
137 - const gchar * v3270_get_font_family(GtkWidget *widget);  
138 -  
139 - H3270 * v3270_get_session(GtkWidget *widget);  
140 -  
141 - int v3270_connect(GtkWidget *widget, const gchar *host);  
142 - void v3270_disconnect(GtkWidget *widget);  
143 -  
144 - // Clipboard  
145 - typedef enum _v3270_select_format  
146 - {  
147 - V3270_SELECT_TEXT,  
148 - V3270_SELECT_TABLE,  
149 -  
150 - V3270_SELECT_MAX  
151 - } V3270_SELECT_FORMAT;  
152 -  
153 - const gchar * v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode);  
154 - const gchar * v3270_copy_append(GtkWidget *widget);  
155 -  
156 - const gchar * v3270_get_selected_text(GtkWidget *widget);  
157 - const gchar * v3270_get_copy(GtkWidget *widget);  
158 - gchar * v3270_get_text(GtkWidget *widget,int offset, int len);  
159 - gchar * v3270_get_region(GtkWidget *widget, gint start_pos, gint end_pos, gboolean all);  
160 -  
161 - void v3270_set_string(GtkWidget *widget, const gchar *str);  
162 - void v3270_tab(GtkWidget *widget);  
163 - void v3270_backtab(GtkWidget *widget);  
164 -  
165 - // Cut & Paste  
166 - gboolean v3270_get_selection_bounds(GtkWidget *widget, gint *start, gint *end);  
167 - void v3270_unselect(GtkWidget *widget);  
168 - void v3270_paste(GtkWidget *widget);  
169 - void v3270_paste_string(GtkWidget *widget, const gchar *text, const gchar *encoding);  
170 - void v3270_select_region(GtkWidget *widget, gint start, gint end);  
171 -  
172 - // Colors  
173 - void v3270_set_colors(GtkWidget *widget, const gchar *);  
174 - void v3270_set_color_table(GdkColor *table, const gchar *colors);  
175 - const GdkColor * v3270_get_color_table(GtkWidget *widget);  
176 - void v3270_set_mono_color_table(GdkColor *table, const gchar *fg, const gchar *bg);  
177 - void v3270_draw_element(cairo_t *cr, unsigned char chr, unsigned short attr, H3270 *session, guint height, GdkRectangle *rect, GdkColor *color);  
178 - void v3270_set_color(GtkWidget *widget, enum V3270_COLOR id, GdkColor *color);  
179 - GdkColor * v3270_get_color(GtkWidget *widget, enum V3270_COLOR id);  
180 -  
181 - // Misc  
182 - GtkIMContext * v3270_get_im_context(GtkWidget *widget);  
183 - gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix);  
184 - void v3270_popup_message(GtkWidget *widget, LIB3270_NOTIFY type, const gchar *title, const gchar *message, const gchar *text);  
185 -  
186 - void v3270_set_host(GtkWidget *widget, const gchar *uri);  
187 -  
188 -  
189 -G_END_DECLS  
190 -  
191 -#endif // V3270_H_INCLUDED  
src/pw3270/v3270/widget.c
  Diff comments   View file @63e53b5
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 #include <malloc.h> 38 #include <malloc.h>
39 #endif // HAVE_MALLOC_H 39 #endif // HAVE_MALLOC_H
40 40
41 - #include "v3270.h" 41 + #include <lib3270/v3270.h>
42 #include "private.h" 42 #include "private.h"
43 #include "accessible.h" 43 #include "accessible.h"
44 #include "marshal.h" 44 #include "marshal.h"
@@ -898,6 +898,12 @@ static void v3270_destroy(GtkObject *widget) @@ -898,6 +898,12 @@ static void v3270_destroy(GtkObject *widget)
898 terminal->clipboard = NULL; 898 terminal->clipboard = NULL;
899 } 899 }
900 900
  901 + if(terminal->session_name)
  902 + {
  903 + g_free(terminal->session_name);
  904 + terminal->session_name = NULL;
  905 + }
  906 +
901 #if GTK_CHECK_VERSION(3,0,0) 907 #if GTK_CHECK_VERSION(3,0,0)
902 GTK_WIDGET_CLASS(v3270_parent_class)->destroy(widget); 908 GTK_WIDGET_CLASS(v3270_parent_class)->destroy(widget);
903 #else 909 #else
@@ -1373,3 +1379,21 @@ void v3270_set_host(GtkWidget *widget, const gchar *uri) @@ -1373,3 +1379,21 @@ void v3270_set_host(GtkWidget *widget, const gchar *uri)
1373 g_return_if_fail(uri != NULL); 1379 g_return_if_fail(uri != NULL);
1374 lib3270_set_host(GTK_V3270(widget)->host,uri); 1380 lib3270_set_host(GTK_V3270(widget)->host,uri);
1375 } 1381 }
  1382 +
  1383 +const gchar * v3270_get_session_name(GtkWidget *widget)
  1384 +{
  1385 + if(!GTK_IS_V3270(widget) || GTK_V3270(widget)->session_name == NULL)
  1386 + return g_get_application_name();
  1387 + return GTK_V3270(widget)->session_name;
  1388 +}
  1389 +
  1390 +void v3270_set_session_name(GtkWidget *widget, const gchar *name)
  1391 +{
  1392 + g_return_if_fail(GTK_IS_V3270(widget));
  1393 + g_return_if_fail(name != NULL);
  1394 +
  1395 + if(GTK_V3270(widget)->session_name)
  1396 + g_free(GTK_V3270(widget)->session_name);
  1397 +
  1398 + GTK_V3270(widget)->session_name = g_strdup(name);
  1399 +}
src/pw3270/window.c
  Diff comments   View file @63e53b5
@@ -257,21 +257,38 @@ @@ -257,21 +257,38 @@
257 gtk_action_set_sensitive(action[ACTION_PASTENEXT],on); 257 gtk_action_set_sensitive(action[ACTION_PASTENEXT],on);
258 } 258 }
259 259
260 - static void disconnected(GtkWidget *widget, GtkActionGroup **group) 260 + static void disconnected(GtkWidget *terminal, GtkWidget * window)
261 { 261 {
262 - gtk_action_group_set_sensitive(group[ACTION_GROUP_PASTE],FALSE);  
263 - gtk_action_group_set_sensitive(group[ACTION_GROUP_ONLINE],FALSE);  
264 - gtk_action_group_set_sensitive(group[ACTION_GROUP_OFFLINE],TRUE);  
265 - gtk_window_set_title(GTK_WINDOW(gtk_widget_get_toplevel(widget)),g_get_application_name()); 262 + GtkActionGroup **group = g_object_get_data(G_OBJECT(window),"action_groups");
  263 +
  264 + if(group)
  265 + {
  266 + gtk_action_group_set_sensitive(group[ACTION_GROUP_PASTE],FALSE);
  267 + gtk_action_group_set_sensitive(group[ACTION_GROUP_ONLINE],FALSE);
  268 + gtk_action_group_set_sensitive(group[ACTION_GROUP_OFFLINE],TRUE);
  269 + }
  270 +
  271 + gtk_window_set_title(GTK_WINDOW(window),v3270_get_session_name(terminal));
266 } 272 }
267 273
268 - static void connected(GtkWidget *widget, const gchar *host, GtkActionGroup **group) 274 + static void connected(GtkWidget *terminal, const gchar *host, GtkWidget * window)
269 { 275 {
  276 + gchar * title;
  277 + GtkActionGroup **group = g_object_get_data(G_OBJECT(window),"action_groups");
  278 +
  279 + if(group)
  280 + {
  281 + gtk_action_group_set_sensitive(group[ACTION_GROUP_ONLINE],TRUE);
  282 + gtk_action_group_set_sensitive(group[ACTION_GROUP_OFFLINE],FALSE);
  283 + gtk_action_group_set_sensitive(group[ACTION_GROUP_PASTE],TRUE);
  284 + }
  285 +
270 set_string_to_config("host","uri","%s",host); 286 set_string_to_config("host","uri","%s",host);
271 - gtk_window_set_title(GTK_WINDOW(gtk_widget_get_toplevel(widget)),host);  
272 - gtk_action_group_set_sensitive(group[ACTION_GROUP_ONLINE],TRUE);  
273 - gtk_action_group_set_sensitive(group[ACTION_GROUP_OFFLINE],FALSE);  
274 - gtk_action_group_set_sensitive(group[ACTION_GROUP_PASTE],TRUE); 287 +
  288 + title = g_strdup_printf("%s - %s",v3270_get_session_name(terminal),host);
  289 + gtk_window_set_title(GTK_WINDOW(window),title);
  290 + g_free(title);
  291 +
275 } 292 }
276 293
277 static void update_config(GtkWidget *widget, const gchar *name, const gchar *value) 294 static void update_config(GtkWidget *widget, const gchar *name, const gchar *value)
@@ -421,7 +438,7 @@ @@ -421,7 +438,7 @@
421 gtk_action_group_set_sensitive(group[ACTION_GROUP_FILETRANSFER],FALSE); 438 gtk_action_group_set_sensitive(group[ACTION_GROUP_FILETRANSFER],FALSE);
422 gtk_action_group_set_sensitive(group[ACTION_GROUP_PASTE],FALSE); 439 gtk_action_group_set_sensitive(group[ACTION_GROUP_PASTE],FALSE);
423 440
424 - disconnected(widget->terminal, (gpointer) group); 441 + disconnected(widget->terminal, GTK_WIDGET(widget));
425 442
426 // Setup actions 443 // Setup actions
427 if(action[ACTION_FULLSCREEN]) 444 if(action[ACTION_FULLSCREEN])
@@ -441,8 +458,8 @@ @@ -441,8 +458,8 @@
441 458
442 459
443 // Connect action signals 460 // Connect action signals
444 - g_signal_connect(widget->terminal,"disconnected",G_CALLBACK(disconnected),group);  
445 - g_signal_connect(widget->terminal,"connected",G_CALLBACK(connected),group); 461 + g_signal_connect(widget->terminal,"disconnected",G_CALLBACK(disconnected),widget);
  462 + g_signal_connect(widget->terminal,"connected",G_CALLBACK(connected),widget);
446 g_signal_connect(widget->terminal,"update_config",G_CALLBACK(update_config),0); 463 g_signal_connect(widget->terminal,"update_config",G_CALLBACK(update_config),0);
447 g_signal_connect(widget->terminal,"model_changed",G_CALLBACK(update_model),0); 464 g_signal_connect(widget->terminal,"model_changed",G_CALLBACK(update_model),0);
448 g_signal_connect(widget->terminal,"selecting",G_CALLBACK(selecting),group); 465 g_signal_connect(widget->terminal,"selecting",G_CALLBACK(selecting),group);