Download as
Browse Code »

Commit c84b4cfc87a9bae5809e1f830d3e77caa2b22c95

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

Incluindo macros de manipulacao do clipboard

Showing 8 changed files with 272 additions and 206 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,310 +56,313 @@ @@ -56,310 +56,313 @@
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\options.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\paste.c"> 145 + <Unit filename="src/lib3270/paste.c">
146 <Option compilerVar="CC" /> 146 <Option compilerVar="CC" />
147 </Unit> 147 </Unit>
148 - <Unit filename="src\lib3270\popupsc.h" />  
149 - <Unit filename="src\lib3270\proxy.c"> 148 + <Unit filename="src/lib3270/popupsc.h" />
  149 + <Unit filename="src/lib3270/proxy.c">
150 <Option compilerVar="CC" /> 150 <Option compilerVar="CC" />
151 </Unit> 151 </Unit>
152 - <Unit filename="src\lib3270\proxyc.h" />  
153 - <Unit filename="src\lib3270\resolver.c"> 152 + <Unit filename="src/lib3270/proxyc.h" />
  153 + <Unit filename="src/lib3270/resolver.c">
154 <Option compilerVar="CC" /> 154 <Option compilerVar="CC" />
155 </Unit> 155 </Unit>
156 - <Unit filename="src\lib3270\resolverc.h" />  
157 - <Unit filename="src\lib3270\resources.c"> 156 + <Unit filename="src/lib3270/resolverc.h" />
  157 + <Unit filename="src/lib3270/resources.c">
158 <Option compilerVar="CC" /> 158 <Option compilerVar="CC" />
159 </Unit> 159 </Unit>
160 - <Unit filename="src\lib3270\resources.h" />  
161 - <Unit filename="src\lib3270\rpq.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.c"> 164 + <Unit filename="src/lib3270/screen.c">
165 <Option compilerVar="CC" /> 165 <Option compilerVar="CC" />
166 </Unit> 166 </Unit>
167 - <Unit filename="src\lib3270\screen.h" />  
168 - <Unit filename="src\lib3270\screenc.h" />  
169 - <Unit filename="src\lib3270\see.c"> 167 + <Unit filename="src/lib3270/screen.h" />
  168 + <Unit filename="src/lib3270/screenc.h" />
  169 + <Unit filename="src/lib3270/see.c">
170 <Option compilerVar="CC" /> 170 <Option compilerVar="CC" />
171 </Unit> 171 </Unit>
172 - <Unit filename="src\lib3270\seec.h" />  
173 - <Unit filename="src\lib3270\selection.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\session.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.c"> 179 + <Unit filename="src/lib3270/sf.c">
180 <Option compilerVar="CC" /> 180 <Option compilerVar="CC" />
181 </Unit> 181 </Unit>
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"> 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">
186 <Option compilerVar="CC" /> 186 <Option compilerVar="CC" />
187 </Unit> 187 </Unit>
188 - <Unit filename="src\lib3270\statusc.h" />  
189 - <Unit filename="src\lib3270\tables.c"> 188 + <Unit filename="src/lib3270/statusc.h" />
  189 + <Unit filename="src/lib3270/tables.c">
190 <Option compilerVar="CC" /> 190 <Option compilerVar="CC" />
191 </Unit> 191 </Unit>
192 - <Unit filename="src\lib3270\tablesc.h" />  
193 - <Unit filename="src\lib3270\telnet.c"> 192 + <Unit filename="src/lib3270/tablesc.h" />
  193 + <Unit filename="src/lib3270/telnet.c">
194 <Option compilerVar="CC" /> 194 <Option compilerVar="CC" />
195 </Unit> 195 </Unit>
196 - <Unit filename="src\lib3270\telnetc.h" />  
197 - <Unit filename="src\lib3270\testprogram.c"> 196 + <Unit filename="src/lib3270/telnetc.h" />
  197 + <Unit filename="src/lib3270/testprogram.c">
198 <Option compilerVar="CC" /> 198 <Option compilerVar="CC" />
199 </Unit> 199 </Unit>
200 - <Unit filename="src\lib3270\tn3270e.h" />  
201 - <Unit filename="src\lib3270\toggle.h" />  
202 - <Unit filename="src\lib3270\toggles.c"> 200 + <Unit filename="src/lib3270/tn3270e.h" />
  201 + <Unit filename="src/lib3270/toggle.h" />
  202 + <Unit filename="src/lib3270/toggles.c">
203 <Option compilerVar="CC" /> 203 <Option compilerVar="CC" />
204 </Unit> 204 </Unit>
205 - <Unit filename="src\lib3270\togglesc.h" />  
206 - <Unit filename="src\lib3270\trace_ds.c"> 205 + <Unit filename="src/lib3270/togglesc.h" />
  206 + <Unit filename="src/lib3270/trace_ds.c">
207 <Option compilerVar="CC" /> 207 <Option compilerVar="CC" />
208 </Unit> 208 </Unit>
209 - <Unit filename="src\lib3270\trace_dsc.h" />  
210 - <Unit filename="src\lib3270\utf8.c"> 209 + <Unit filename="src/lib3270/trace_dsc.h" />
  210 + <Unit filename="src/lib3270/utf8.c">
211 <Option compilerVar="CC" /> 211 <Option compilerVar="CC" />
212 </Unit> 212 </Unit>
213 - <Unit filename="src\lib3270\utf8c.h" />  
214 - <Unit filename="src\lib3270\util.c"> 213 + <Unit filename="src/lib3270/utf8c.h" />
  214 + <Unit filename="src/lib3270/util.c">
215 <Option compilerVar="CC" /> 215 <Option compilerVar="CC" />
216 </Unit> 216 </Unit>
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"> 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\pipesource.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.c"> 230 + <Unit filename="src/plugins/remotectl/remotectl.c">
231 <Option compilerVar="CC" /> 231 <Option compilerVar="CC" />
232 </Unit> 232 </Unit>
233 - <Unit filename="src\plugins\remotectl\remotectl.h" />  
234 - <Unit filename="src\plugins\remotectl\testprogram.c"> 233 + <Unit filename="src/plugins/remotectl/remotectl.h" />
  234 + <Unit filename="src/plugins/remotectl/testprogram.c">
235 <Option compilerVar="CC" /> 235 <Option compilerVar="CC" />
236 </Unit> 236 </Unit>
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"> 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\colors.c"> 247 + <Unit filename="src/pw3270/colors.c">
248 <Option compilerVar="CC" /> 248 <Option compilerVar="CC" />
249 </Unit> 249 </Unit>
250 - <Unit filename="src\pw3270\common\common.h" />  
251 - <Unit filename="src\pw3270\common\config.c"> 250 + <Unit filename="src/pw3270/common/common.h" />
  251 + <Unit filename="src/pw3270/common/config.c">
252 <Option compilerVar="CC" /> 252 <Option compilerVar="CC" />
253 </Unit> 253 </Unit>
254 - <Unit filename="src\pw3270\common\sources.mak" />  
255 - <Unit filename="src\pw3270\dialog.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.c"> 258 + <Unit filename="src/pw3270/filetransfer.c">
259 <Option compilerVar="CC" /> 259 <Option compilerVar="CC" />
260 </Unit> 260 </Unit>
261 - <Unit filename="src\pw3270\filetransfer.h" />  
262 - <Unit filename="src\pw3270\fonts.c"> 261 + <Unit filename="src/pw3270/filetransfer.h" />
  262 + <Unit filename="src/pw3270/fonts.c">
263 <Option compilerVar="CC" /> 263 <Option compilerVar="CC" />
264 </Unit> 264 </Unit>
265 - <Unit filename="src\pw3270\globals.h" />  
266 - <Unit filename="src\pw3270\main.c"> 265 + <Unit filename="src/pw3270/globals.h" />
  266 + <Unit filename="src/pw3270/macros.c">
267 <Option compilerVar="CC" /> 267 <Option compilerVar="CC" />
268 </Unit> 268 </Unit>
269 - <Unit filename="src\pw3270\plugin.c"> 269 + <Unit filename="src/pw3270/main.c">
270 <Option compilerVar="CC" /> 270 <Option compilerVar="CC" />
271 </Unit> 271 </Unit>
272 - <Unit filename="src\pw3270\print.c"> 272 + <Unit filename="src/pw3270/plugin.c">
273 <Option compilerVar="CC" /> 273 <Option compilerVar="CC" />
274 </Unit> 274 </Unit>
275 - <Unit filename="src\pw3270\resources.rc"> 275 + <Unit filename="src/pw3270/print.c">
  276 + <Option compilerVar="CC" />
  277 + </Unit>
  278 + <Unit filename="src/pw3270/resources.rc">
276 <Option compilerVar="WINDRES" /> 279 <Option compilerVar="WINDRES" />
277 </Unit> 280 </Unit>
278 - <Unit filename="src\pw3270\tools.c"> 281 + <Unit filename="src/pw3270/tools.c">
279 <Option compilerVar="CC" /> 282 <Option compilerVar="CC" />
280 </Unit> 283 </Unit>
281 - <Unit filename="src\pw3270\uiparser\Makefile.in" />  
282 - <Unit filename="src\pw3270\uiparser\accelerator.c"> 284 + <Unit filename="src/pw3270/uiparser/Makefile.in" />
  285 + <Unit filename="src/pw3270/uiparser/accelerator.c">
283 <Option compilerVar="CC" /> 286 <Option compilerVar="CC" />
284 </Unit> 287 </Unit>
285 - <Unit filename="src\pw3270\uiparser\action.c"> 288 + <Unit filename="src/pw3270/uiparser/action.c">
286 <Option compilerVar="CC" /> 289 <Option compilerVar="CC" />
287 </Unit> 290 </Unit>
288 - <Unit filename="src\pw3270\uiparser\keypad.c"> 291 + <Unit filename="src/pw3270/uiparser/keypad.c">
289 <Option compilerVar="CC" /> 292 <Option compilerVar="CC" />
290 </Unit> 293 </Unit>
291 - <Unit filename="src\pw3270\uiparser\menu.c"> 294 + <Unit filename="src/pw3270/uiparser/menu.c">
292 <Option compilerVar="CC" /> 295 <Option compilerVar="CC" />
293 </Unit> 296 </Unit>
294 - <Unit filename="src\pw3270\uiparser\menubar.c"> 297 + <Unit filename="src/pw3270/uiparser/menubar.c">
295 <Option compilerVar="CC" /> 298 <Option compilerVar="CC" />
296 </Unit> 299 </Unit>
297 - <Unit filename="src\pw3270\uiparser\menuitem.c"> 300 + <Unit filename="src/pw3270/uiparser/menuitem.c">
298 <Option compilerVar="CC" /> 301 <Option compilerVar="CC" />
299 </Unit> 302 </Unit>
300 - <Unit filename="src\pw3270\uiparser\parsefile.c"> 303 + <Unit filename="src/pw3270/uiparser/parsefile.c">
301 <Option compilerVar="CC" /> 304 <Option compilerVar="CC" />
302 </Unit> 305 </Unit>
303 - <Unit filename="src\pw3270\uiparser\parser.c"> 306 + <Unit filename="src/pw3270/uiparser/parser.c">
304 <Option compilerVar="CC" /> 307 <Option compilerVar="CC" />
305 </Unit> 308 </Unit>
306 - <Unit filename="src\pw3270\uiparser\parser.h" />  
307 - <Unit filename="src\pw3270\uiparser\popup.c"> 309 + <Unit filename="src/pw3270/uiparser/parser.h" />
  310 + <Unit filename="src/pw3270/uiparser/popup.c">
308 <Option compilerVar="CC" /> 311 <Option compilerVar="CC" />
309 </Unit> 312 </Unit>
310 - <Unit filename="src\pw3270\uiparser\private.h" />  
311 - <Unit filename="src\pw3270\uiparser\script.c"> 313 + <Unit filename="src/pw3270/uiparser/private.h" />
  314 + <Unit filename="src/pw3270/uiparser/script.c">
312 <Option compilerVar="CC" /> 315 <Option compilerVar="CC" />
313 </Unit> 316 </Unit>
314 - <Unit filename="src\pw3270\uiparser\scroll.c"> 317 + <Unit filename="src/pw3270/uiparser/scroll.c">
315 <Option compilerVar="CC" /> 318 <Option compilerVar="CC" />
316 </Unit> 319 </Unit>
317 - <Unit filename="src\pw3270\uiparser\separator.c"> 320 + <Unit filename="src/pw3270/uiparser/separator.c">
318 <Option compilerVar="CC" /> 321 <Option compilerVar="CC" />
319 </Unit> 322 </Unit>
320 - <Unit filename="src\pw3270\uiparser\sources.mak" />  
321 - <Unit filename="src\pw3270\uiparser\toolbar.c"> 323 + <Unit filename="src/pw3270/uiparser/sources.mak" />
  324 + <Unit filename="src/pw3270/uiparser/toolbar.c">
322 <Option compilerVar="CC" /> 325 <Option compilerVar="CC" />
323 </Unit> 326 </Unit>
324 - <Unit filename="src\pw3270\uiparser\toolitem.c"> 327 + <Unit filename="src/pw3270/uiparser/toolitem.c">
325 <Option compilerVar="CC" /> 328 <Option compilerVar="CC" />
326 </Unit> 329 </Unit>
327 - <Unit filename="src\pw3270\v3270\accessible.c"> 330 + <Unit filename="src/pw3270/v3270/accessible.c">
328 <Option compilerVar="CC" /> 331 <Option compilerVar="CC" />
329 </Unit> 332 </Unit>
330 - <Unit filename="src\pw3270\v3270\accessible.h" />  
331 - <Unit filename="src\pw3270\v3270\draw.c"> 333 + <Unit filename="src/pw3270/v3270/accessible.h" />
  334 + <Unit filename="src/pw3270/v3270/draw.c">
332 <Option compilerVar="CC" /> 335 <Option compilerVar="CC" />
333 </Unit> 336 </Unit>
334 - <Unit filename="src\pw3270\v3270\genmarshal" />  
335 - <Unit filename="src\pw3270\v3270\iocallback.c"> 337 + <Unit filename="src/pw3270/v3270/genmarshal" />
  338 + <Unit filename="src/pw3270/v3270/iocallback.c">
336 <Option compilerVar="CC" /> 339 <Option compilerVar="CC" />
337 </Unit> 340 </Unit>
338 - <Unit filename="src\pw3270\v3270\keyboard.c"> 341 + <Unit filename="src/pw3270/v3270/keyboard.c">
339 <Option compilerVar="CC" /> 342 <Option compilerVar="CC" />
340 </Unit> 343 </Unit>
341 - <Unit filename="src\pw3270\v3270\mouse.c"> 344 + <Unit filename="src/pw3270/v3270/mouse.c">
342 <Option compilerVar="CC" /> 345 <Option compilerVar="CC" />
343 </Unit> 346 </Unit>
344 - <Unit filename="src\pw3270\v3270\oia.c"> 347 + <Unit filename="src/pw3270/v3270/oia.c">
345 <Option compilerVar="CC" /> 348 <Option compilerVar="CC" />
346 </Unit> 349 </Unit>
347 - <Unit filename="src\pw3270\v3270\private.h" />  
348 - <Unit filename="src\pw3270\v3270\selection.c"> 350 + <Unit filename="src/pw3270/v3270/private.h" />
  351 + <Unit filename="src/pw3270/v3270/selection.c">
349 <Option compilerVar="CC" /> 352 <Option compilerVar="CC" />
350 </Unit> 353 </Unit>
351 - <Unit filename="src\pw3270\v3270\sources.mak" />  
352 - <Unit filename="src\pw3270\v3270\widget.c"> 354 + <Unit filename="src/pw3270/v3270/sources.mak" />
  355 + <Unit filename="src/pw3270/v3270/widget.c">
353 <Option compilerVar="CC" /> 356 <Option compilerVar="CC" />
354 </Unit> 357 </Unit>
355 - <Unit filename="src\pw3270\window.c"> 358 + <Unit filename="src/pw3270/window.c">
356 <Option compilerVar="CC" /> 359 <Option compilerVar="CC" />
357 </Unit> 360 </Unit>
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" /> 361 + <Unit filename="src/tools/Makefile.in" />
  362 + <Unit filename="ui/00default.xml" />
  363 + <Unit filename="ui/10functions.xml" />
  364 + <Unit filename="ui/10keypad.xml" />
  365 + <Unit filename="ui/99debug.xml" />
363 <Unit filename="updateChangeLog.sh" /> 366 <Unit filename="updateChangeLog.sh" />
364 <Extensions> 367 <Extensions>
365 <code_completion /> 368 <code_completion />
src/include/lib3270/session.h
  Diff comments   View file @c84b4cf
@@ -403,7 +403,6 @@ @@ -403,7 +403,6 @@
403 void (*update_model)(H3270 *session, const char *name, int model, int rows, int cols); 403 void (*update_model)(H3270 *session, const char *name, int model, int rows, int cols);
404 void (*update_selection)(H3270 *session, int start, int end); 404 void (*update_selection)(H3270 *session, int start, int end);
405 void (*update_ssl)(H3270 *session, LIB3270_SSL_STATE state); 405 void (*update_ssl)(H3270 *session, LIB3270_SSL_STATE state);
406 -// void (*update_formatted)(H3270 *session,int state);  
407 406
408 void (*set_timer)(H3270 *session, unsigned char on); 407 void (*set_timer)(H3270 *session, unsigned char on);
409 void (*erase)(H3270 *session); 408 void (*erase)(H3270 *session);
src/include/pw3270.h
  Diff comments   View file @c84b4cf
@@ -71,6 +71,8 @@ @@ -71,6 +71,8 @@
71 LIB3270_EXPORT void pw3270_set_integer(GtkWidget *widget, const gchar *group, const gchar *key, gint val); 71 LIB3270_EXPORT void pw3270_set_integer(GtkWidget *widget, const gchar *group, const gchar *key, gint val);
72 72
73 LIB3270_EXPORT gboolean pw3270_get_boolean(GtkWidget *widget, const gchar *group, const gchar *key, gboolean def); 73 LIB3270_EXPORT gboolean pw3270_get_boolean(GtkWidget *widget, const gchar *group, const gchar *key, gboolean def);
  74 +
  75 + LIB3270_EXPORT int pw3270_run_macro(GtkWidget *widget, int argc, const char **argv);
74 76
75 typedef enum pw3270_src 77 typedef enum pw3270_src
76 { 78 {
src/include/pw3270/v3270.h
  Diff comments   View file @c84b4cf
@@ -194,6 +194,7 @@ @@ -194,6 +194,7 @@
194 // Keyboard & Mouse special actions 194 // Keyboard & Mouse special actions
195 LIB3270_EXPORT gboolean v3270_set_keyboard_action(GtkWidget *widget, const gchar *key_name, GtkAction *action); 195 LIB3270_EXPORT gboolean v3270_set_keyboard_action(GtkWidget *widget, const gchar *key_name, GtkAction *action);
196 LIB3270_EXPORT void v3270_set_scroll_action(GtkWidget *widget, GdkScrollDirection direction, GtkAction *action); 196 LIB3270_EXPORT void v3270_set_scroll_action(GtkWidget *widget, GdkScrollDirection direction, GtkAction *action);
  197 +
197 198
198 G_END_DECLS 199 G_END_DECLS
199 200
src/lib3270/macros.c
  Diff comments   View file @c84b4cf
@@ -49,32 +49,6 @@ @@ -49,32 +49,6 @@
49 char *(*exec)(H3270 *session, int argc, const char **argv); 49 char *(*exec)(H3270 *session, int argc, const char **argv);
50 }; 50 };
51 51
52 -/*  
53 - #define LIB3270_MACRO_ENTRY( name ) { #name, lib3270_macro_ ## name }  
54 -  
55 - static const struct cmd[] =  
56 - {  
57 - LIB3270_MACRO_ENTRY( connect ),  
58 - LIB3270_MACRO_ENTRY( cstate ),  
59 - LIB3270_MACRO_ENTRY( disconnect ),  
60 - LIB3270_MACRO_ENTRY( encoding ),  
61 - LIB3270_MACRO_ENTRY( enter ),  
62 - LIB3270_MACRO_ENTRY( get ),  
63 - LIB3270_MACRO_ENTRY( luname ),  
64 - LIB3270_MACRO_ENTRY( pa ),  
65 - LIB3270_MACRO_ENTRY( pf ),  
66 - LIB3270_MACRO_ENTRY( set ),  
67 - LIB3270_MACRO_ENTRY( status ),  
68 -  
69 - {NULL, NULL}  
70 - };  
71 -  
72 - LIB3270_EXPORT const LIB3270_MACRO_LIST * get_3270_calls(void)  
73 - {  
74 - return macro_list;  
75 - }  
76 -*/  
77 -  
78 /*--[ Implement ]------------------------------------------------------------------------------------*/ 52 /*--[ Implement ]------------------------------------------------------------------------------------*/
79 53
80 static const char * get_state(H3270 *h) 54 static const char * get_state(H3270 *h)
@@ -356,6 +330,8 @@ @@ -356,6 +330,8 @@
356 int f; 330 int f;
357 331
358 CHECK_SESSION_HANDLE(session); 332 CHECK_SESSION_HANDLE(session);
  333 +
  334 + trace("macro(%s)",argv[0]);
359 335
360 // Get the number of arguments 336 // Get the number of arguments
361 for(argc = 0; argv[argc]; argc++); 337 for(argc = 0; argv[argc]; argc++);
src/pw3270/Makefile.in
  Diff comments   View file @c84b4cf
@@ -59,7 +59,7 @@ include uiparser/sources.mak @@ -59,7 +59,7 @@ include uiparser/sources.mak
59 APP_SOURCES= main.c @APP_GUI_SRC@ 59 APP_SOURCES= main.c @APP_GUI_SRC@
60 60
61 LIB_SOURCES= window.c actions.c fonts.c dialog.c print.c colors.c \ 61 LIB_SOURCES= window.c actions.c fonts.c dialog.c print.c colors.c \
62 - filetransfer.c tools.c plugin.c \ 62 + filetransfer.c tools.c plugin.c macros.c\
63 $(foreach SRC, $(UI_PARSER_SRC), uiparser/$(SRC)) \ 63 $(foreach SRC, $(UI_PARSER_SRC), uiparser/$(SRC)) \
64 $(foreach SRC, $(V3270_SRC), v3270/$(SRC)) \ 64 $(foreach SRC, $(V3270_SRC), v3270/$(SRC)) \
65 $(foreach SRC, $(COMMON_SRC), common/$(SRC)) 65 $(foreach SRC, $(COMMON_SRC), common/$(SRC))
src/pw3270/actions.c
  Diff comments   View file @c84b4cf
@@ -844,7 +844,7 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash @@ -844,7 +844,7 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash
844 844
845 return action; 845 return action;
846 } 846 }
847 - 847 +
848 static void action_text_script(GtkAction *action, GtkWidget *widget) 848 static void action_text_script(GtkAction *action, GtkWidget *widget)
849 { 849 {
850 gchar **ln = g_strsplit(g_object_get_data(G_OBJECT(action),"script_text"),"\n",-1); 850 gchar **ln = g_strsplit(g_object_get_data(G_OBJECT(action),"script_text"),"\n",-1);
@@ -858,10 +858,13 @@ static void action_text_script(GtkAction *action, GtkWidget *widget) @@ -858,10 +858,13 @@ static void action_text_script(GtkAction *action, GtkWidget *widget)
858 gchar **argv = NULL; 858 gchar **argv = NULL;
859 859
860 if(g_shell_parse_argv(g_strstrip(ln[f]),&argc,&argv,&error)) 860 if(g_shell_parse_argv(g_strstrip(ln[f]),&argc,&argv,&error))
861 - {  
862 - gchar *rsp = lib3270_run_macro(hSession,(const gchar **) argv);  
863 - if(rsp)  
864 - g_free(rsp); 861 + {
  862 + if(pw3270_run_macro(widget, argc,(const gchar **) argv) < 0)
  863 + {
  864 + gchar *rsp = lib3270_run_macro(hSession,(const gchar **) argv);
  865 + if(rsp)
  866 + g_free(rsp);
  867 + }
865 } 868 }
866 else 869 else
867 { 870 {
@@ -883,6 +886,8 @@ void ui_connect_text_script(GtkWidget *widget, GtkAction *action, const gchar *s @@ -883,6 +886,8 @@ void ui_connect_text_script(GtkWidget *widget, GtkAction *action, const gchar *s
883 gchar *base = g_strstrip(g_strdup(script_text)); 886 gchar *base = g_strstrip(g_strdup(script_text));
884 gchar *text = g_strdup(base); 887 gchar *text = g_strdup(base);
885 g_free(base); 888 g_free(base);
  889 +
  890 + lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p\n",gtk_action_get_name(action),widget);
886 891
887 gtk_action_set_sensitive(action,TRUE); 892 gtk_action_set_sensitive(action,TRUE);
888 g_object_set_data_full(G_OBJECT(action),"script_text",text,g_free); 893 g_object_set_data_full(G_OBJECT(action),"script_text",text,g_free);
src/pw3270/macros.c 0 → 100644
  Diff comments   View file @c84b4cf
@@ -0,0 +1,80 @@ @@ -0,0 +1,80 @@
  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., 51 Franklin
  19 + * St, Fifth Floor, Boston, MA 02110-1301 USA
  20 + *
  21 + * Este programa está nomeado como macros.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 + * macmiranda@bb.com.br (Marco Aurélio Caldas Miranda)
  30 + *
  31 + */
  32 +
  33 + #include "globals.h"
  34 + #include <pw3270/v3270.h>
  35 +
  36 +
  37 +
  38 +/*--[ Implement ]------------------------------------------------------------------------------------*/
  39 +
  40 + static int pw3270_macro_copy(GtkWidget *widget, int argc, const char **argv)
  41 + {
  42 + trace("%s",__FUNCTION__);
  43 + v3270_copy(widget, V3270_SELECT_TEXT, FALSE);
  44 + return 0;
  45 + }
  46 +
  47 + static int pw3270_macro_append(GtkWidget *widget, int argc, const char **argv)
  48 + {
  49 + trace("%s",__FUNCTION__);
  50 + v3270_copy_append(widget);
  51 + return 0;
  52 + }
  53 +
  54 + LIB3270_EXPORT int pw3270_run_macro(GtkWidget *widget, int argc, const char **argv)
  55 + {
  56 + #define PW3270_MACRO( name ) { #name, pw3270_macro_ ## name }
  57 +
  58 + static const struct _list
  59 + {
  60 + const char *name;
  61 + int (*exec)(GtkWidget *widget, int argc, const char **argv);
  62 + } list[] =
  63 + {
  64 + PW3270_MACRO( copy ),
  65 + PW3270_MACRO( append ),
  66 + };
  67 + int f;
  68 +
  69 + trace("<%s>",argv[0]);
  70 +
  71 + for(f=0;f<G_N_ELEMENTS(list);f++)
  72 + {
  73 + if(!g_strcasecmp(argv[0],list[f].name))
  74 + return list[f].exec(widget,argc,argv);
  75 + }
  76 +
  77 + trace("<%s>",argv[0]);
  78 +
  79 + return -1;
  80 + }