Download as
Browse Code »

Commit eedb58c8b344e5ed49cf1d600ee5a3554e44b170

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

Movendo tabela de options para a biblioteca

Showing 6 changed files with 289 additions and 224 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,20 +35,20 @@ @@ -35,20 +35,20 @@
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/jni/text.cpp" />  
50 - <Unit filename="android/src/br/com/bb/pw3270/PW3270Activity.java" />  
51 - <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\jni\text.cpp" />
  50 + <Unit filename="android\src\br\com\bb\pw3270\PW3270Activity.java" />
  51 + <Unit filename="android\src\br\com\bb\pw3270\lib3270.java" />
52 <Unit filename="autogen.sh" /> 52 <Unit filename="autogen.sh" />
53 <Unit filename="colors.conf" /> 53 <Unit filename="colors.conf" />
54 <Unit filename="configure.ac" /> 54 <Unit filename="configure.ac" />
@@ -56,307 +56,310 @@ @@ -56,307 +56,310 @@
56 <Unit filename="makegtkruntime.sh.in" /> 56 <Unit filename="makegtkruntime.sh.in" />
57 <Unit filename="pw3270.nsi.in" /> 57 <Unit filename="pw3270.nsi.in" />
58 <Unit filename="pw3270.spec.in" /> 58 <Unit filename="pw3270.spec.in" />
59 - <Unit filename="src/include/lib3270.h" />  
60 - <Unit filename="src/include/lib3270/action_table.h" />  
61 - <Unit filename="src/include/lib3270/actions.h" />  
62 - <Unit filename="src/include/lib3270/config.h.in" />  
63 - <Unit filename="src/include/lib3270/filetransfer.h" />  
64 - <Unit filename="src/include/lib3270/html.h" />  
65 - <Unit filename="src/include/lib3270/internals.h" />  
66 - <Unit filename="src/include/lib3270/log.h" />  
67 - <Unit filename="src/include/lib3270/macros.h" />  
68 - <Unit filename="src/include/lib3270/popup.h" />  
69 - <Unit filename="src/include/lib3270/selection.h" />  
70 - <Unit filename="src/include/lib3270/session.h" />  
71 - <Unit filename="src/include/lib3270/trace.h" />  
72 - <Unit filename="src/include/plugin.mak.in" />  
73 - <Unit filename="src/include/pw3270.h" />  
74 - <Unit filename="src/include/pw3270/hllapi.h" />  
75 - <Unit filename="src/include/pw3270/plugin.h" />  
76 - <Unit filename="src/include/pw3270/v3270.h" />  
77 - <Unit filename="src/include/rules.mak.in" />  
78 - <Unit filename="src/lib3270/3270ds.h" />  
79 - <Unit filename="src/lib3270/Makefile.in" />  
80 - <Unit filename="src/lib3270/X11keysym.h" />  
81 - <Unit filename="src/lib3270/ansi.c"> 59 + <Unit filename="src\include\lib3270.h" />
  60 + <Unit filename="src\include\lib3270\action_table.h" />
  61 + <Unit filename="src\include\lib3270\actions.h" />
  62 + <Unit filename="src\include\lib3270\config.h.in" />
  63 + <Unit filename="src\include\lib3270\filetransfer.h" />
  64 + <Unit filename="src\include\lib3270\html.h" />
  65 + <Unit filename="src\include\lib3270\internals.h" />
  66 + <Unit filename="src\include\lib3270\log.h" />
  67 + <Unit filename="src\include\lib3270\macros.h" />
  68 + <Unit filename="src\include\lib3270\popup.h" />
  69 + <Unit filename="src\include\lib3270\selection.h" />
  70 + <Unit filename="src\include\lib3270\session.h" />
  71 + <Unit filename="src\include\lib3270\trace.h" />
  72 + <Unit filename="src\include\plugin.mak.in" />
  73 + <Unit filename="src\include\pw3270.h" />
  74 + <Unit filename="src\include\pw3270\hllapi.h" />
  75 + <Unit filename="src\include\pw3270\plugin.h" />
  76 + <Unit filename="src\include\pw3270\v3270.h" />
  77 + <Unit filename="src\include\rules.mak.in" />
  78 + <Unit filename="src\lib3270\3270ds.h" />
  79 + <Unit filename="src\lib3270\Makefile.in" />
  80 + <Unit filename="src\lib3270\X11keysym.h" />
  81 + <Unit filename="src\lib3270\ansi.c">
82 <Option compilerVar="CC" /> 82 <Option compilerVar="CC" />
83 </Unit> 83 </Unit>
84 - <Unit filename="src/lib3270/ansic.h" />  
85 - <Unit filename="src/lib3270/api.h" />  
86 - <Unit filename="src/lib3270/arpa_telnet.h" />  
87 - <Unit filename="src/lib3270/bounds.c"> 84 + <Unit filename="src\lib3270\ansic.h" />
  85 + <Unit filename="src\lib3270\api.h" />
  86 + <Unit filename="src\lib3270\arpa_telnet.h" />
  87 + <Unit filename="src\lib3270\bounds.c">
88 <Option compilerVar="CC" /> 88 <Option compilerVar="CC" />
89 </Unit> 89 </Unit>
90 - <Unit filename="src/lib3270/cg.h" />  
91 - <Unit filename="src/lib3270/charset.c"> 90 + <Unit filename="src\lib3270\cg.h" />
  91 + <Unit filename="src\lib3270\charset.c">
92 <Option compilerVar="CC" /> 92 <Option compilerVar="CC" />
93 </Unit> 93 </Unit>
94 - <Unit filename="src/lib3270/charsetc.h" />  
95 - <Unit filename="src/lib3270/ctlr.c"> 94 + <Unit filename="src\lib3270\charsetc.h" />
  95 + <Unit filename="src\lib3270\ctlr.c">
96 <Option compilerVar="CC" /> 96 <Option compilerVar="CC" />
97 </Unit> 97 </Unit>
98 - <Unit filename="src/lib3270/ctlrc.h" />  
99 - <Unit filename="src/lib3270/ft.c"> 98 + <Unit filename="src\lib3270\ctlrc.h" />
  99 + <Unit filename="src\lib3270\ft.c">
100 <Option compilerVar="CC" /> 100 <Option compilerVar="CC" />
101 </Unit> 101 </Unit>
102 - <Unit filename="src/lib3270/ft_cut.c"> 102 + <Unit filename="src\lib3270\ft_cut.c">
103 <Option compilerVar="CC" /> 103 <Option compilerVar="CC" />
104 </Unit> 104 </Unit>
105 - <Unit filename="src/lib3270/ft_cut_ds.h" />  
106 - <Unit filename="src/lib3270/ft_cutc.h" />  
107 - <Unit filename="src/lib3270/ft_dft.c"> 105 + <Unit filename="src\lib3270\ft_cut_ds.h" />
  106 + <Unit filename="src\lib3270\ft_cutc.h" />
  107 + <Unit filename="src\lib3270\ft_dft.c">
108 <Option compilerVar="CC" /> 108 <Option compilerVar="CC" />
109 </Unit> 109 </Unit>
110 - <Unit filename="src/lib3270/ft_dft_ds.h" />  
111 - <Unit filename="src/lib3270/ft_dftc.h" />  
112 - <Unit filename="src/lib3270/ftc.h" />  
113 - <Unit filename="src/lib3270/globals.h" />  
114 - <Unit filename="src/lib3270/glue.c"> 110 + <Unit filename="src\lib3270\ft_dft_ds.h" />
  111 + <Unit filename="src\lib3270\ft_dftc.h" />
  112 + <Unit filename="src\lib3270\ftc.h" />
  113 + <Unit filename="src\lib3270\globals.h" />
  114 + <Unit filename="src\lib3270\glue.c">
115 <Option compilerVar="CC" /> 115 <Option compilerVar="CC" />
116 </Unit> 116 </Unit>
117 - <Unit filename="src/lib3270/gluec.h" />  
118 - <Unit filename="src/lib3270/host.c"> 117 + <Unit filename="src\lib3270\gluec.h" />
  118 + <Unit filename="src\lib3270\host.c">
119 <Option compilerVar="CC" /> 119 <Option compilerVar="CC" />
120 </Unit> 120 </Unit>
121 - <Unit filename="src/lib3270/hostc.h" />  
122 - <Unit filename="src/lib3270/html.c"> 121 + <Unit filename="src\lib3270\hostc.h" />
  122 + <Unit filename="src\lib3270\html.c">
123 <Option compilerVar="CC" /> 123 <Option compilerVar="CC" />
124 </Unit> 124 </Unit>
125 - <Unit filename="src/lib3270/iocalls.c"> 125 + <Unit filename="src\lib3270\iocalls.c">
126 <Option compilerVar="CC" /> 126 <Option compilerVar="CC" />
127 </Unit> 127 </Unit>
128 - <Unit filename="src/lib3270/kybd.c"> 128 + <Unit filename="src\lib3270\kybd.c">
129 <Option compilerVar="CC" /> 129 <Option compilerVar="CC" />
130 </Unit> 130 </Unit>
131 - <Unit filename="src/lib3270/kybdc.h" />  
132 - <Unit filename="src/lib3270/localdefs.h" />  
133 - <Unit filename="src/lib3270/log.c"> 131 + <Unit filename="src\lib3270\kybdc.h" />
  132 + <Unit filename="src\lib3270\localdefs.h" />
  133 + <Unit filename="src\lib3270\log.c">
134 <Option compilerVar="CC" /> 134 <Option compilerVar="CC" />
135 </Unit> 135 </Unit>
136 - <Unit filename="src/lib3270/macros.c"> 136 + <Unit filename="src\lib3270\macros.c">
137 <Option compilerVar="CC" /> 137 <Option compilerVar="CC" />
138 </Unit> 138 </Unit>
139 - <Unit filename="src/lib3270/mkfb.c"> 139 + <Unit filename="src\lib3270\mkfb.c">
140 <Option compilerVar="CC" /> 140 <Option compilerVar="CC" />
141 </Unit> 141 </Unit>
142 - <Unit filename="src/lib3270/paste.c"> 142 + <Unit filename="src\lib3270\options.c">
143 <Option compilerVar="CC" /> 143 <Option compilerVar="CC" />
144 </Unit> 144 </Unit>
145 - <Unit filename="src/lib3270/popupsc.h" />  
146 - <Unit filename="src/lib3270/proxy.c"> 145 + <Unit filename="src\lib3270\paste.c">
147 <Option compilerVar="CC" /> 146 <Option compilerVar="CC" />
148 </Unit> 147 </Unit>
149 - <Unit filename="src/lib3270/proxyc.h" />  
150 - <Unit filename="src/lib3270/resolver.c"> 148 + <Unit filename="src\lib3270\popupsc.h" />
  149 + <Unit filename="src\lib3270\proxy.c">
151 <Option compilerVar="CC" /> 150 <Option compilerVar="CC" />
152 </Unit> 151 </Unit>
153 - <Unit filename="src/lib3270/resolverc.h" />  
154 - <Unit filename="src/lib3270/resources.c"> 152 + <Unit filename="src\lib3270\proxyc.h" />
  153 + <Unit filename="src\lib3270\resolver.c">
155 <Option compilerVar="CC" /> 154 <Option compilerVar="CC" />
156 </Unit> 155 </Unit>
157 - <Unit filename="src/lib3270/resources.h" />  
158 - <Unit filename="src/lib3270/rpq.c"> 156 + <Unit filename="src\lib3270\resolverc.h" />
  157 + <Unit filename="src\lib3270\resources.c">
159 <Option compilerVar="CC" /> 158 <Option compilerVar="CC" />
160 </Unit> 159 </Unit>
161 - <Unit filename="src/lib3270/screen.c"> 160 + <Unit filename="src\lib3270\resources.h" />
  161 + <Unit filename="src\lib3270\rpq.c">
162 <Option compilerVar="CC" /> 162 <Option compilerVar="CC" />
163 </Unit> 163 </Unit>
164 - <Unit filename="src/lib3270/screen.h" />  
165 - <Unit filename="src/lib3270/screenc.h" />  
166 - <Unit filename="src/lib3270/see.c"> 164 + <Unit filename="src\lib3270\screen.c">
167 <Option compilerVar="CC" /> 165 <Option compilerVar="CC" />
168 </Unit> 166 </Unit>
169 - <Unit filename="src/lib3270/seec.h" />  
170 - <Unit filename="src/lib3270/selection.c"> 167 + <Unit filename="src\lib3270\screen.h" />
  168 + <Unit filename="src\lib3270\screenc.h" />
  169 + <Unit filename="src\lib3270\see.c">
171 <Option compilerVar="CC" /> 170 <Option compilerVar="CC" />
172 </Unit> 171 </Unit>
173 - <Unit filename="src/lib3270/session.c"> 172 + <Unit filename="src\lib3270\seec.h" />
  173 + <Unit filename="src\lib3270\selection.c">
174 <Option compilerVar="CC" /> 174 <Option compilerVar="CC" />
175 </Unit> 175 </Unit>
176 - <Unit filename="src/lib3270/sf.c"> 176 + <Unit filename="src\lib3270\session.c">
177 <Option compilerVar="CC" /> 177 <Option compilerVar="CC" />
178 </Unit> 178 </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"> 179 + <Unit filename="src\lib3270\sf.c">
183 <Option compilerVar="CC" /> 180 <Option compilerVar="CC" />
184 </Unit> 181 </Unit>
185 - <Unit filename="src/lib3270/statusc.h" />  
186 - <Unit filename="src/lib3270/tables.c"> 182 + <Unit filename="src\lib3270\sf.h" />
  183 + <Unit filename="src\lib3270\shlobj_missing.h" />
  184 + <Unit filename="src\lib3270\sources.mak" />
  185 + <Unit filename="src\lib3270\state.c">
187 <Option compilerVar="CC" /> 186 <Option compilerVar="CC" />
188 </Unit> 187 </Unit>
189 - <Unit filename="src/lib3270/tablesc.h" />  
190 - <Unit filename="src/lib3270/telnet.c"> 188 + <Unit filename="src\lib3270\statusc.h" />
  189 + <Unit filename="src\lib3270\tables.c">
191 <Option compilerVar="CC" /> 190 <Option compilerVar="CC" />
192 </Unit> 191 </Unit>
193 - <Unit filename="src/lib3270/telnetc.h" />  
194 - <Unit filename="src/lib3270/testprogram.c"> 192 + <Unit filename="src\lib3270\tablesc.h" />
  193 + <Unit filename="src\lib3270\telnet.c">
195 <Option compilerVar="CC" /> 194 <Option compilerVar="CC" />
196 </Unit> 195 </Unit>
197 - <Unit filename="src/lib3270/tn3270e.h" />  
198 - <Unit filename="src/lib3270/toggle.h" />  
199 - <Unit filename="src/lib3270/toggles.c"> 196 + <Unit filename="src\lib3270\telnetc.h" />
  197 + <Unit filename="src\lib3270\testprogram.c">
200 <Option compilerVar="CC" /> 198 <Option compilerVar="CC" />
201 </Unit> 199 </Unit>
202 - <Unit filename="src/lib3270/togglesc.h" />  
203 - <Unit filename="src/lib3270/trace_ds.c"> 200 + <Unit filename="src\lib3270\tn3270e.h" />
  201 + <Unit filename="src\lib3270\toggle.h" />
  202 + <Unit filename="src\lib3270\toggles.c">
204 <Option compilerVar="CC" /> 203 <Option compilerVar="CC" />
205 </Unit> 204 </Unit>
206 - <Unit filename="src/lib3270/trace_dsc.h" />  
207 - <Unit filename="src/lib3270/utf8.c"> 205 + <Unit filename="src\lib3270\togglesc.h" />
  206 + <Unit filename="src\lib3270\trace_ds.c">
208 <Option compilerVar="CC" /> 207 <Option compilerVar="CC" />
209 </Unit> 208 </Unit>
210 - <Unit filename="src/lib3270/utf8c.h" />  
211 - <Unit filename="src/lib3270/util.c"> 209 + <Unit filename="src\lib3270\trace_dsc.h" />
  210 + <Unit filename="src\lib3270\utf8.c">
212 <Option compilerVar="CC" /> 211 <Option compilerVar="CC" />
213 </Unit> 212 </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/plugins/remotectl/Makefile.in" />  
221 - <Unit filename="src/plugins/remotectl/hllapi.c"> 213 + <Unit filename="src\lib3270\utf8c.h" />
  214 + <Unit filename="src\lib3270\util.c">
222 <Option compilerVar="CC" /> 215 <Option compilerVar="CC" />
223 </Unit> 216 </Unit>
224 - <Unit filename="src/plugins/remotectl/pipesource.c"> 217 + <Unit filename="src\lib3270\utilc.h" />
  218 + <Unit filename="src\lib3270\w3miscc.h" />
  219 + <Unit filename="src\lib3270\widec.h" />
  220 + <Unit filename="src\lib3270\winversc.h" />
  221 + <Unit filename="src\lib3270\xioc.h" />
  222 + <Unit filename="src\lib3270\xl.h" />
  223 + <Unit filename="src\plugins\remotectl\Makefile.in" />
  224 + <Unit filename="src\plugins\remotectl\hllapi.c">
225 <Option compilerVar="CC" /> 225 <Option compilerVar="CC" />
226 </Unit> 226 </Unit>
227 - <Unit filename="src/plugins/remotectl/remotectl.c"> 227 + <Unit filename="src\plugins\remotectl\pipesource.c">
228 <Option compilerVar="CC" /> 228 <Option compilerVar="CC" />
229 </Unit> 229 </Unit>
230 - <Unit filename="src/plugins/remotectl/remotectl.h" />  
231 - <Unit filename="src/plugins/remotectl/testprogram.c"> 230 + <Unit filename="src\plugins\remotectl\remotectl.c">
232 <Option compilerVar="CC" /> 231 <Option compilerVar="CC" />
233 </Unit> 232 </Unit>
234 - <Unit filename="src/plugins/rx3270/Makefile.in" />  
235 - <Unit filename="src/plugins/rx3270/pluginmain.cc" />  
236 - <Unit filename="src/plugins/rx3270/rx3270.h" />  
237 - <Unit filename="src/plugins/rx3270/rxapimain.cc" />  
238 - <Unit filename="src/plugins/rx3270/text.cc" />  
239 - <Unit filename="src/plugins/rx3270/typed_routines.cc" />  
240 - <Unit filename="src/pw3270/Makefile.in" />  
241 - <Unit filename="src/pw3270/actions.c"> 233 + <Unit filename="src\plugins\remotectl\remotectl.h" />
  234 + <Unit filename="src\plugins\remotectl\testprogram.c">
242 <Option compilerVar="CC" /> 235 <Option compilerVar="CC" />
243 </Unit> 236 </Unit>
244 - <Unit filename="src/pw3270/colors.c"> 237 + <Unit filename="src\plugins\rx3270\Makefile.in" />
  238 + <Unit filename="src\plugins\rx3270\pluginmain.cc" />
  239 + <Unit filename="src\plugins\rx3270\rx3270.h" />
  240 + <Unit filename="src\plugins\rx3270\rxapimain.cc" />
  241 + <Unit filename="src\plugins\rx3270\text.cc" />
  242 + <Unit filename="src\plugins\rx3270\typed_routines.cc" />
  243 + <Unit filename="src\pw3270\Makefile.in" />
  244 + <Unit filename="src\pw3270\actions.c">
245 <Option compilerVar="CC" /> 245 <Option compilerVar="CC" />
246 </Unit> 246 </Unit>
247 - <Unit filename="src/pw3270/common/common.h" />  
248 - <Unit filename="src/pw3270/common/config.c"> 247 + <Unit filename="src\pw3270\colors.c">
249 <Option compilerVar="CC" /> 248 <Option compilerVar="CC" />
250 </Unit> 249 </Unit>
251 - <Unit filename="src/pw3270/common/sources.mak" />  
252 - <Unit filename="src/pw3270/dialog.c"> 250 + <Unit filename="src\pw3270\common\common.h" />
  251 + <Unit filename="src\pw3270\common\config.c">
253 <Option compilerVar="CC" /> 252 <Option compilerVar="CC" />
254 </Unit> 253 </Unit>
255 - <Unit filename="src/pw3270/filetransfer.c"> 254 + <Unit filename="src\pw3270\common\sources.mak" />
  255 + <Unit filename="src\pw3270\dialog.c">
256 <Option compilerVar="CC" /> 256 <Option compilerVar="CC" />
257 </Unit> 257 </Unit>
258 - <Unit filename="src/pw3270/filetransfer.h" />  
259 - <Unit filename="src/pw3270/fonts.c"> 258 + <Unit filename="src\pw3270\filetransfer.c">
260 <Option compilerVar="CC" /> 259 <Option compilerVar="CC" />
261 </Unit> 260 </Unit>
262 - <Unit filename="src/pw3270/globals.h" />  
263 - <Unit filename="src/pw3270/main.c"> 261 + <Unit filename="src\pw3270\filetransfer.h" />
  262 + <Unit filename="src\pw3270\fonts.c">
264 <Option compilerVar="CC" /> 263 <Option compilerVar="CC" />
265 </Unit> 264 </Unit>
266 - <Unit filename="src/pw3270/plugin.c"> 265 + <Unit filename="src\pw3270\globals.h" />
  266 + <Unit filename="src\pw3270\main.c">
267 <Option compilerVar="CC" /> 267 <Option compilerVar="CC" />
268 </Unit> 268 </Unit>
269 - <Unit filename="src/pw3270/print.c"> 269 + <Unit filename="src\pw3270\plugin.c">
270 <Option compilerVar="CC" /> 270 <Option compilerVar="CC" />
271 </Unit> 271 </Unit>
272 - <Unit filename="src/pw3270/resources.rc"> 272 + <Unit filename="src\pw3270\print.c">
  273 + <Option compilerVar="CC" />
  274 + </Unit>
  275 + <Unit filename="src\pw3270\resources.rc">
273 <Option compilerVar="WINDRES" /> 276 <Option compilerVar="WINDRES" />
274 </Unit> 277 </Unit>
275 - <Unit filename="src/pw3270/tools.c"> 278 + <Unit filename="src\pw3270\tools.c">
276 <Option compilerVar="CC" /> 279 <Option compilerVar="CC" />
277 </Unit> 280 </Unit>
278 - <Unit filename="src/pw3270/uiparser/Makefile.in" />  
279 - <Unit filename="src/pw3270/uiparser/accelerator.c"> 281 + <Unit filename="src\pw3270\uiparser\Makefile.in" />
  282 + <Unit filename="src\pw3270\uiparser\accelerator.c">
280 <Option compilerVar="CC" /> 283 <Option compilerVar="CC" />
281 </Unit> 284 </Unit>
282 - <Unit filename="src/pw3270/uiparser/action.c"> 285 + <Unit filename="src\pw3270\uiparser\action.c">
283 <Option compilerVar="CC" /> 286 <Option compilerVar="CC" />
284 </Unit> 287 </Unit>
285 - <Unit filename="src/pw3270/uiparser/keypad.c"> 288 + <Unit filename="src\pw3270\uiparser\keypad.c">
286 <Option compilerVar="CC" /> 289 <Option compilerVar="CC" />
287 </Unit> 290 </Unit>
288 - <Unit filename="src/pw3270/uiparser/menu.c"> 291 + <Unit filename="src\pw3270\uiparser\menu.c">
289 <Option compilerVar="CC" /> 292 <Option compilerVar="CC" />
290 </Unit> 293 </Unit>
291 - <Unit filename="src/pw3270/uiparser/menubar.c"> 294 + <Unit filename="src\pw3270\uiparser\menubar.c">
292 <Option compilerVar="CC" /> 295 <Option compilerVar="CC" />
293 </Unit> 296 </Unit>
294 - <Unit filename="src/pw3270/uiparser/menuitem.c"> 297 + <Unit filename="src\pw3270\uiparser\menuitem.c">
295 <Option compilerVar="CC" /> 298 <Option compilerVar="CC" />
296 </Unit> 299 </Unit>
297 - <Unit filename="src/pw3270/uiparser/parsefile.c"> 300 + <Unit filename="src\pw3270\uiparser\parsefile.c">
298 <Option compilerVar="CC" /> 301 <Option compilerVar="CC" />
299 </Unit> 302 </Unit>
300 - <Unit filename="src/pw3270/uiparser/parser.c"> 303 + <Unit filename="src\pw3270\uiparser\parser.c">
301 <Option compilerVar="CC" /> 304 <Option compilerVar="CC" />
302 </Unit> 305 </Unit>
303 - <Unit filename="src/pw3270/uiparser/parser.h" />  
304 - <Unit filename="src/pw3270/uiparser/popup.c"> 306 + <Unit filename="src\pw3270\uiparser\parser.h" />
  307 + <Unit filename="src\pw3270\uiparser\popup.c">
305 <Option compilerVar="CC" /> 308 <Option compilerVar="CC" />
306 </Unit> 309 </Unit>
307 - <Unit filename="src/pw3270/uiparser/private.h" />  
308 - <Unit filename="src/pw3270/uiparser/script.c"> 310 + <Unit filename="src\pw3270\uiparser\private.h" />
  311 + <Unit filename="src\pw3270\uiparser\script.c">
309 <Option compilerVar="CC" /> 312 <Option compilerVar="CC" />
310 </Unit> 313 </Unit>
311 - <Unit filename="src/pw3270/uiparser/scroll.c"> 314 + <Unit filename="src\pw3270\uiparser\scroll.c">
312 <Option compilerVar="CC" /> 315 <Option compilerVar="CC" />
313 </Unit> 316 </Unit>
314 - <Unit filename="src/pw3270/uiparser/separator.c"> 317 + <Unit filename="src\pw3270\uiparser\separator.c">
315 <Option compilerVar="CC" /> 318 <Option compilerVar="CC" />
316 </Unit> 319 </Unit>
317 - <Unit filename="src/pw3270/uiparser/sources.mak" />  
318 - <Unit filename="src/pw3270/uiparser/toolbar.c"> 320 + <Unit filename="src\pw3270\uiparser\sources.mak" />
  321 + <Unit filename="src\pw3270\uiparser\toolbar.c">
319 <Option compilerVar="CC" /> 322 <Option compilerVar="CC" />
320 </Unit> 323 </Unit>
321 - <Unit filename="src/pw3270/uiparser/toolitem.c"> 324 + <Unit filename="src\pw3270\uiparser\toolitem.c">
322 <Option compilerVar="CC" /> 325 <Option compilerVar="CC" />
323 </Unit> 326 </Unit>
324 - <Unit filename="src/pw3270/v3270/accessible.c"> 327 + <Unit filename="src\pw3270\v3270\accessible.c">
325 <Option compilerVar="CC" /> 328 <Option compilerVar="CC" />
326 </Unit> 329 </Unit>
327 - <Unit filename="src/pw3270/v3270/accessible.h" />  
328 - <Unit filename="src/pw3270/v3270/draw.c"> 330 + <Unit filename="src\pw3270\v3270\accessible.h" />
  331 + <Unit filename="src\pw3270\v3270\draw.c">
329 <Option compilerVar="CC" /> 332 <Option compilerVar="CC" />
330 </Unit> 333 </Unit>
331 - <Unit filename="src/pw3270/v3270/genmarshal" />  
332 - <Unit filename="src/pw3270/v3270/iocallback.c"> 334 + <Unit filename="src\pw3270\v3270\genmarshal" />
  335 + <Unit filename="src\pw3270\v3270\iocallback.c">
333 <Option compilerVar="CC" /> 336 <Option compilerVar="CC" />
334 </Unit> 337 </Unit>
335 - <Unit filename="src/pw3270/v3270/keyboard.c"> 338 + <Unit filename="src\pw3270\v3270\keyboard.c">
336 <Option compilerVar="CC" /> 339 <Option compilerVar="CC" />
337 </Unit> 340 </Unit>
338 - <Unit filename="src/pw3270/v3270/mouse.c"> 341 + <Unit filename="src\pw3270\v3270\mouse.c">
339 <Option compilerVar="CC" /> 342 <Option compilerVar="CC" />
340 </Unit> 343 </Unit>
341 - <Unit filename="src/pw3270/v3270/oia.c"> 344 + <Unit filename="src\pw3270\v3270\oia.c">
342 <Option compilerVar="CC" /> 345 <Option compilerVar="CC" />
343 </Unit> 346 </Unit>
344 - <Unit filename="src/pw3270/v3270/private.h" />  
345 - <Unit filename="src/pw3270/v3270/selection.c"> 347 + <Unit filename="src\pw3270\v3270\private.h" />
  348 + <Unit filename="src\pw3270\v3270\selection.c">
346 <Option compilerVar="CC" /> 349 <Option compilerVar="CC" />
347 </Unit> 350 </Unit>
348 - <Unit filename="src/pw3270/v3270/sources.mak" />  
349 - <Unit filename="src/pw3270/v3270/widget.c"> 351 + <Unit filename="src\pw3270\v3270\sources.mak" />
  352 + <Unit filename="src\pw3270\v3270\widget.c">
350 <Option compilerVar="CC" /> 353 <Option compilerVar="CC" />
351 </Unit> 354 </Unit>
352 - <Unit filename="src/pw3270/window.c"> 355 + <Unit filename="src\pw3270\window.c">
353 <Option compilerVar="CC" /> 356 <Option compilerVar="CC" />
354 </Unit> 357 </Unit>
355 - <Unit filename="src/tools/Makefile.in" />  
356 - <Unit filename="ui/00default.xml" />  
357 - <Unit filename="ui/10functions.xml" />  
358 - <Unit filename="ui/10keypad.xml" />  
359 - <Unit filename="ui/99debug.xml" /> 358 + <Unit filename="src\tools\Makefile.in" />
  359 + <Unit filename="ui\00default.xml" />
  360 + <Unit filename="ui\10functions.xml" />
  361 + <Unit filename="ui\10keypad.xml" />
  362 + <Unit filename="ui\99debug.xml" />
360 <Unit filename="updateChangeLog.sh" /> 363 <Unit filename="updateChangeLog.sh" />
361 <Extensions> 364 <Extensions>
362 <code_completion /> 365 <code_completion />
src/include/lib3270.h
  Diff comments   View file @eedb58c
@@ -246,6 +246,16 @@ @@ -246,6 +246,16 @@
246 246
247 } LIB3270_OPTION; 247 } LIB3270_OPTION;
248 248
  249 + #define LIB3270_OPTION_COUNT 2
  250 +
  251 + typedef struct _lib3270_option_entry
  252 + {
  253 + LIB3270_OPTION value;
  254 + const char * key;
  255 + const char * text;
  256 + const char * tooltip;
  257 + } LIB3270_OPTION_ENTRY;
  258 +
249 /** 259 /**
250 * SSL state 260 * SSL state
251 * 261 *
@@ -968,6 +978,8 @@ @@ -968,6 +978,8 @@
968 LIB3270_EXPORT LIB3270_OPTION lib3270_get_options(H3270 *hSession); 978 LIB3270_EXPORT LIB3270_OPTION lib3270_get_options(H3270 *hSession);
969 LIB3270_EXPORT void lib3270_set_options(H3270 *hSession, LIB3270_OPTION opt); 979 LIB3270_EXPORT void lib3270_set_options(H3270 *hSession, LIB3270_OPTION opt);
970 980
  981 + LIB3270_EXPORT const LIB3270_OPTION_ENTRY * lib3270_get_option_list(void);
  982 +
971 983
972 #ifdef __cplusplus 984 #ifdef __cplusplus
973 } 985 }
src/lib3270/options.c 0 → 100644
  Diff comments   View file @eedb58c
@@ -0,0 +1,83 @@ @@ -0,0 +1,83 @@
  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. 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., 51 Franklin
  19 + * St, Fifth Floor, Boston, MA 02110-1301 USA
  20 + *
  21 + * Este programa está nomeado como options.c 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 +#include "globals.h"
  33 +
  34 +/*---[ Globals ]--------------------------------------------------------------------------------------------------------------*/
  35 +
  36 +
  37 +/*---[ Statics ]--------------------------------------------------------------------------------------------------------------*/
  38 +
  39 + static const const LIB3270_OPTION_ENTRY options[LIB3270_OPTION_COUNT+1] =
  40 + {
  41 + {
  42 + LIB3270_OPTION_COLOR8,
  43 + "color8",
  44 + N_( "_8 colors" ),
  45 + N_( "If active, pw3270 will respond to a Query(Color) with a list of 8 supported colors." )
  46 + },
  47 +
  48 + {
  49 + LIB3270_OPTION_AS400,
  50 + "as400",
  51 + N_( "Host is AS_400" ),
  52 + NULL
  53 + },
  54 +
  55 + {
  56 + 0,
  57 + NULL,
  58 + NULL,
  59 + NULL
  60 + }
  61 +
  62 + };
  63 +
  64 +
  65 +
  66 +/*---[ Implement ]------------------------------------------------------------------------------------------------------------*/
  67 +
  68 +LIB3270_EXPORT LIB3270_OPTION lib3270_get_options(H3270 *hSession)
  69 +{
  70 + CHECK_SESSION_HANDLE(hSession);
  71 + return hSession->options;
  72 +}
  73 +
  74 +LIB3270_EXPORT void lib3270_set_options(H3270 *hSession, LIB3270_OPTION opt)
  75 +{
  76 + CHECK_SESSION_HANDLE(hSession);
  77 + hSession->options = opt;
  78 +}
  79 +
  80 +LIB3270_EXPORT const LIB3270_OPTION_ENTRY * lib3270_get_option_list(void)
  81 +{
  82 + return options;
  83 +}
src/lib3270/session.c
  Diff comments   View file @eedb58c
@@ -454,14 +454,3 @@ LIB3270_EXPORT void * lib3270_get_widget(H3270 *h) @@ -454,14 +454,3 @@ LIB3270_EXPORT void * lib3270_get_widget(H3270 *h)
454 return h->widget; 454 return h->widget;
455 } 455 }
456 456
457 -LIB3270_EXPORT LIB3270_OPTION lib3270_get_options(H3270 *hSession)  
458 -{  
459 - CHECK_SESSION_HANDLE(hSession);  
460 - return hSession->options;  
461 -}  
462 -  
463 -LIB3270_EXPORT void lib3270_set_options(H3270 *hSession, LIB3270_OPTION opt)  
464 -{  
465 - CHECK_SESSION_HANDLE(hSession);  
466 - hSession->options = opt;  
467 -}  
src/lib3270/sources.mak
  Diff comments   View file @eedb58c
@@ -28,12 +28,12 @@ @@ -28,12 +28,12 @@
28 TERMINAL_SOURCES = bounds.c ctlr.c util.c toggles.c screen.c selection.c kybd.c telnet.c \ 28 TERMINAL_SOURCES = bounds.c ctlr.c util.c toggles.c screen.c selection.c kybd.c telnet.c \
29 host.c sf.c ansi.c resolver.c tables.c utf8.c charset.c \ 29 host.c sf.c ansi.c resolver.c tables.c utf8.c charset.c \
30 version.c session.c state.c html.c trace_ds.c see.c \ 30 version.c session.c state.c html.c trace_ds.c see.c \
31 - paste.c 31 + paste.c
32 32
33 # Network I/O Sources 33 # Network I/O Sources
34 NETWORK_SOURCES = iocalls.c proxy.c 34 NETWORK_SOURCES = iocalls.c proxy.c
35 35
36 # Full library sources 36 # Full library sources
37 SOURCES = $(TERMINAL_SOURCES) $(NETWORK_SOURCES) ft.c ft_cut.c ft_dft.c glue.c resources.c \ 37 SOURCES = $(TERMINAL_SOURCES) $(NETWORK_SOURCES) ft.c ft_cut.c ft_dft.c glue.c resources.c \
38 - rpq.c macros.c fallbacks.c log.c 38 + rpq.c macros.c fallbacks.c log.c options.c
39 39
src/pw3270/dialog.c
  Diff comments   View file @eedb58c
@@ -32,42 +32,18 @@ @@ -32,42 +32,18 @@
32 #include "globals.h" 32 #include "globals.h"
33 #include <pw3270/v3270.h> 33 #include <pw3270/v3270.h>
34 34
35 - static const struct _lib3270_options  
36 - {  
37 - LIB3270_OPTION value;  
38 - const gchar * key;  
39 - const gchar * text;  
40 - const gchar * tooltip;  
41 - } lib3270_options[] =  
42 - {  
43 - {  
44 - LIB3270_OPTION_COLOR8,  
45 - "color8",  
46 - N_( "_8 colors" ),  
47 - N_( "If active, pw3270 will respond to a Query(Color) with a list of 8 supported colors." )  
48 - },  
49 -  
50 - {  
51 - LIB3270_OPTION_AS400,  
52 - "as400",  
53 - N_( "Host is AS_400" ),  
54 - NULL  
55 - },  
56 -  
57 - };  
58 -  
59 -  
60 /*--[ Globals ]--------------------------------------------------------------------------------------*/ 35 /*--[ Globals ]--------------------------------------------------------------------------------------*/
61 36
62 void load_3270_options_from_config(GtkWidget *widget) 37 void load_3270_options_from_config(GtkWidget *widget)
63 { 38 {
64 int f; 39 int f;
65 - LIB3270_OPTION opt = 0; 40 + LIB3270_OPTION opt = 0;
  41 + const LIB3270_OPTION_ENTRY *options = lib3270_get_option_list();
66 42
67 - for(f=0;f<G_N_ELEMENTS(lib3270_options);f++) 43 + for(f=0;f<LIB3270_OPTION_COUNT;f++)
68 { 44 {
69 - if(get_boolean_from_config("host",lib3270_options[f].key,FALSE))  
70 - opt |= lib3270_options[f].value; 45 + if(get_boolean_from_config("host",options[f].key,FALSE))
  46 + opt |= options[f].value;
71 } 47 }
72 lib3270_set_options(v3270_get_session(widget),opt); 48 lib3270_set_options(v3270_get_session(widget),opt);
73 } 49 }
@@ -328,6 +304,8 @@ @@ -328,6 +304,8 @@
328 304
329 void hostname_action(GtkAction *action, GtkWidget *widget) 305 void hostname_action(GtkAction *action, GtkWidget *widget)
330 { 306 {
  307 + const LIB3270_OPTION_ENTRY *options = lib3270_get_option_list();
  308 +
331 const gchar * title = g_object_get_data(G_OBJECT(action),"title"); 309 const gchar * title = g_object_get_data(G_OBJECT(action),"title");
332 gchar * cfghost = get_string_from_config("host","uri",""); 310 gchar * cfghost = get_string_from_config("host","uri","");
333 gchar * hostname; 311 gchar * hostname;
@@ -338,8 +316,8 @@ @@ -338,8 +316,8 @@
338 GtkEntry * host = GTK_ENTRY(gtk_entry_new()); 316 GtkEntry * host = GTK_ENTRY(gtk_entry_new());
339 GtkEntry * port = GTK_ENTRY(gtk_entry_new()); 317 GtkEntry * port = GTK_ENTRY(gtk_entry_new());
340 GtkToggleButton * sslcheck = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_mnemonic( _( "_Secure connection" ) )); 318 GtkToggleButton * sslcheck = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_mnemonic( _( "_Secure connection" ) ));
341 - GtkToggleButton * optcheck[G_N_ELEMENTS(lib3270_options)];  
342 - GtkWidget * dialog = gtk_dialog_new_with_buttons( gettext(title ? title : N_( "Select hostname" )), 319 + GtkToggleButton * optcheck[LIB3270_OPTION_COUNT];
  320 + GtkWidget * dialog = gtk_dialog_new_with_buttons( gettext(title ? title : N_( "Select hostname" )),
343 GTK_WINDOW(gtk_widget_get_toplevel(widget)), 321 GTK_WINDOW(gtk_widget_get_toplevel(widget)),
344 GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, 322 GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
345 GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, 323 GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT,
@@ -371,15 +349,15 @@ @@ -371,15 +349,15 @@
371 GtkTable * frame = GTK_TABLE(gtk_table_new(2,2,FALSE)); 349 GtkTable * frame = GTK_TABLE(gtk_table_new(2,2,FALSE));
372 gtk_table_attach(frame,GTK_WIDGET(sslcheck), 0,1,0,1,GTK_EXPAND|GTK_FILL,0,0,0); 350 gtk_table_attach(frame,GTK_WIDGET(sslcheck), 0,1,0,1,GTK_EXPAND|GTK_FILL,0,0,0);
373 351
374 - for(f=0;f<G_N_ELEMENTS(lib3270_options);f++) 352 + for(f=0;f<LIB3270_OPTION_COUNT;f++)
375 { 353 {
376 - optcheck[f] = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_mnemonic( gettext( lib3270_options[f].text ) )); 354 + optcheck[f] = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_mnemonic( gettext( options[f].text ) ));
377 355
378 - if(lib3270_options[f].tooltip)  
379 - gtk_widget_set_tooltip_markup(GTK_WIDGET(optcheck[f]),gettext(lib3270_options[f].tooltip)); 356 + if(options[f].tooltip)
  357 + gtk_widget_set_tooltip_markup(GTK_WIDGET(optcheck[f]),gettext(options[f].tooltip));
380 358
381 gtk_table_attach(frame,GTK_WIDGET(optcheck[f]),col,col+1,row,row+1,GTK_EXPAND|GTK_FILL,0,0,0); 359 gtk_table_attach(frame,GTK_WIDGET(optcheck[f]),col,col+1,row,row+1,GTK_EXPAND|GTK_FILL,0,0,0);
382 - gtk_toggle_button_set_active(optcheck[f],get_boolean_from_config("host", lib3270_options[f].key, FALSE)); 360 + gtk_toggle_button_set_active(optcheck[f],get_boolean_from_config("host", options[f].key, FALSE));
383 361
384 if(++col > 1); 362 if(++col > 1);
385 { 363 {
@@ -446,12 +424,12 @@ @@ -446,12 +424,12 @@
446 int f; 424 int f;
447 LIB3270_OPTION opt = 0; 425 LIB3270_OPTION opt = 0;
448 426
449 - for(f=0;f<G_N_ELEMENTS(lib3270_options);f++) 427 + for(f=0;f<LIB3270_OPTION_COUNT;f++)
450 { 428 {
451 gboolean val = gtk_toggle_button_get_active(optcheck[f]); 429 gboolean val = gtk_toggle_button_get_active(optcheck[f]);
452 if(val) 430 if(val)
453 - opt |= lib3270_options[f].value;  
454 - set_boolean_to_config("host", lib3270_options[f].key, val); 431 + opt |= options[f].value;
  432 + set_boolean_to_config("host", options[f].key, val);
455 } 433 }
456 434
457 lib3270_set_options(v3270_get_session(widget),opt); 435 lib3270_set_options(v3270_get_session(widget),opt);