Download as
Browse Code »

Commit 4782124c619a7cf9c65f338df1a08655489a09de

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

Corrigindo acao "print-copy", removendo fontes obsoletos

Showing 12 changed files with 258 additions and 246 deletions   Show diff stats
@@ -68,19 +68,12 @@ @@ -68,19 +68,12 @@
68 <Unit filename="src/lib3270/3270ds.h" /> 68 <Unit filename="src/lib3270/3270ds.h" />
69 <Unit filename="src/lib3270/Makefile.in" /> 69 <Unit filename="src/lib3270/Makefile.in" />
70 <Unit filename="src/lib3270/X11keysym.h" /> 70 <Unit filename="src/lib3270/X11keysym.h" />
71 - <Unit filename="src/lib3270/XtGlue.c">  
72 - <Option compilerVar="CC" />  
73 - </Unit>  
74 <Unit filename="src/lib3270/actionsc.h" /> 71 <Unit filename="src/lib3270/actionsc.h" />
75 <Unit filename="src/lib3270/ansi.c"> 72 <Unit filename="src/lib3270/ansi.c">
76 <Option compilerVar="CC" /> 73 <Option compilerVar="CC" />
77 </Unit> 74 </Unit>
78 <Unit filename="src/lib3270/ansic.h" /> 75 <Unit filename="src/lib3270/ansic.h" />
79 <Unit filename="src/lib3270/api.h" /> 76 <Unit filename="src/lib3270/api.h" />
80 - <Unit filename="src/lib3270/apl.c">  
81 - <Option compilerVar="CC" />  
82 - </Unit>  
83 - <Unit filename="src/lib3270/aplc.h" />  
84 <Unit filename="src/lib3270/arpa_telnet.h" /> 77 <Unit filename="src/lib3270/arpa_telnet.h" />
85 <Unit filename="src/lib3270/bounds.c"> 78 <Unit filename="src/lib3270/bounds.c">
86 <Option compilerVar="CC" /> 79 <Option compilerVar="CC" />
@@ -218,14 +211,8 @@ @@ -218,14 +211,8 @@
218 <Option compilerVar="CC" /> 211 <Option compilerVar="CC" />
219 </Unit> 212 </Unit>
220 <Unit filename="src/lib3270/utilc.h" /> 213 <Unit filename="src/lib3270/utilc.h" />
221 - <Unit filename="src/lib3270/w3misc.c">  
222 - <Option compilerVar="CC" />  
223 - </Unit>  
224 <Unit filename="src/lib3270/w3miscc.h" /> 214 <Unit filename="src/lib3270/w3miscc.h" />
225 <Unit filename="src/lib3270/widec.h" /> 215 <Unit filename="src/lib3270/widec.h" />
226 - <Unit filename="src/lib3270/winvers.c">  
227 - <Option compilerVar="CC" />  
228 - </Unit>  
229 <Unit filename="src/lib3270/winversc.h" /> 216 <Unit filename="src/lib3270/winversc.h" />
230 <Unit filename="src/lib3270/xioc.h" /> 217 <Unit filename="src/lib3270/xioc.h" />
231 <Unit filename="src/lib3270/xl.h" /> 218 <Unit filename="src/lib3270/xl.h" />
src/lib3270/XtGlue.c
  Diff comments   View file @4782124
@@ -30,6 +30,8 @@ @@ -30,6 +30,8 @@
30 * 30 *
31 */ 31 */
32 32
  33 +#error Deprecated
  34 +
33 /* glue for missing Xt code */ 35 /* glue for missing Xt code */
34 #if defined(_WIN32) 36 #if defined(_WIN32)
35 #include <winsock2.h> 37 #include <winsock2.h>
@@ -81,233 +83,6 @@ @@ -81,233 +83,6 @@
81 83
82 /*---[ Implement external calls ]---------------------------------------------------------------------------*/ 84 /*---[ Implement external calls ]---------------------------------------------------------------------------*/
83 85
84 -static struct {  
85 - const char *name;  
86 - KeySym keysym;  
87 -} latin1[] = {  
88 - { "space", XK_space },  
89 - { "exclam", XK_exclam },  
90 - { "quotedbl", XK_quotedbl },  
91 - { "numbersign", XK_numbersign },  
92 - { "dollar", XK_dollar },  
93 - { "percent", XK_percent },  
94 - { "ampersand", XK_ampersand },  
95 - { "apostrophe", XK_apostrophe },  
96 - { "quoteright", XK_quoteright },  
97 - { "parenleft", XK_parenleft },  
98 - { "parenright", XK_parenright },  
99 - { "asterisk", XK_asterisk },  
100 - { "plus", XK_plus },  
101 - { "comma", XK_comma },  
102 - { "minus", XK_minus },  
103 - { "period", XK_period },  
104 - { "slash", XK_slash },  
105 - { "0", XK_0 },  
106 - { "1", XK_1 },  
107 - { "2", XK_2 },  
108 - { "3", XK_3 },  
109 - { "4", XK_4 },  
110 - { "5", XK_5 },  
111 - { "6", XK_6 },  
112 - { "7", XK_7 },  
113 - { "8", XK_8 },  
114 - { "9", XK_9 },  
115 - { "colon", XK_colon },  
116 - { "semicolon", XK_semicolon },  
117 - { "less", XK_less },  
118 - { "equal", XK_equal },  
119 - { "greater", XK_greater },  
120 - { "question", XK_question },  
121 - { "at", XK_at },  
122 - { "A", XK_A },  
123 - { "B", XK_B },  
124 - { "C", XK_C },  
125 - { "D", XK_D },  
126 - { "E", XK_E },  
127 - { "F", XK_F },  
128 - { "G", XK_G },  
129 - { "H", XK_H },  
130 - { "I", XK_I },  
131 - { "J", XK_J },  
132 - { "K", XK_K },  
133 - { "L", XK_L },  
134 - { "M", XK_M },  
135 - { "N", XK_N },  
136 - { "O", XK_O },  
137 - { "P", XK_P },  
138 - { "Q", XK_Q },  
139 - { "R", XK_R },  
140 - { "S", XK_S },  
141 - { "T", XK_T },  
142 - { "U", XK_U },  
143 - { "V", XK_V },  
144 - { "W", XK_W },  
145 - { "X", XK_X },  
146 - { "Y", XK_Y },  
147 - { "Z", XK_Z },  
148 - { "bracketleft", XK_bracketleft },  
149 - { "backslash", XK_backslash },  
150 - { "bracketright", XK_bracketright },  
151 - { "asciicircum", XK_asciicircum },  
152 - { "underscore", XK_underscore },  
153 - { "grave", XK_grave },  
154 - { "quoteleft", XK_quoteleft },  
155 - { "a", XK_a },  
156 - { "b", XK_b },  
157 - { "c", XK_c },  
158 - { "d", XK_d },  
159 - { "e", XK_e },  
160 - { "f", XK_f },  
161 - { "g", XK_g },  
162 - { "h", XK_h },  
163 - { "i", XK_i },  
164 - { "j", XK_j },  
165 - { "k", XK_k },  
166 - { "l", XK_l },  
167 - { "m", XK_m },  
168 - { "n", XK_n },  
169 - { "o", XK_o },  
170 - { "p", XK_p },  
171 - { "q", XK_q },  
172 - { "r", XK_r },  
173 - { "s", XK_s },  
174 - { "t", XK_t },  
175 - { "u", XK_u },  
176 - { "v", XK_v },  
177 - { "w", XK_w },  
178 - { "x", XK_x },  
179 - { "y", XK_y },  
180 - { "z", XK_z },  
181 - { "braceleft", XK_braceleft },  
182 - { "bar", XK_bar },  
183 - { "braceright", XK_braceright },  
184 - { "asciitilde", XK_asciitilde },  
185 - { "nobreakspace", XK_nobreakspace },  
186 - { "exclamdown", XK_exclamdown },  
187 - { "cent", XK_cent },  
188 - { "sterling", XK_sterling },  
189 - { "currency", XK_currency },  
190 - { "yen", XK_yen },  
191 - { "brokenbar", XK_brokenbar },  
192 - { "section", XK_section },  
193 - { "diaeresis", XK_diaeresis },  
194 - { "copyright", XK_copyright },  
195 - { "ordfeminine", XK_ordfeminine },  
196 - { "guillemotleft", XK_guillemotleft },  
197 - { "notsign", XK_notsign },  
198 - { "hyphen", XK_hyphen },  
199 - { "registered", XK_registered },  
200 - { "macron", XK_macron },  
201 - { "degree", XK_degree },  
202 - { "plusminus", XK_plusminus },  
203 - { "twosuperior", XK_twosuperior },  
204 - { "threesuperior", XK_threesuperior },  
205 - { "acute", XK_acute },  
206 - { "mu", XK_mu },  
207 - { "paragraph", XK_paragraph },  
208 - { "periodcentered", XK_periodcentered },  
209 - { "cedilla", XK_cedilla },  
210 - { "onesuperior", XK_onesuperior },  
211 - { "masculine", XK_masculine },  
212 - { "guillemotright", XK_guillemotright },  
213 - { "onequarter", XK_onequarter },  
214 - { "onehalf", XK_onehalf },  
215 - { "threequarters", XK_threequarters },  
216 - { "questiondown", XK_questiondown },  
217 - { "Agrave", XK_Agrave },  
218 - { "Aacute", XK_Aacute },  
219 - { "Acircumflex", XK_Acircumflex },  
220 - { "Atilde", XK_Atilde },  
221 - { "Adiaeresis", XK_Adiaeresis },  
222 - { "Aring", XK_Aring },  
223 - { "AE", XK_AE },  
224 - { "Ccedilla", XK_Ccedilla },  
225 - { "Egrave", XK_Egrave },  
226 - { "Eacute", XK_Eacute },  
227 - { "Ecircumflex", XK_Ecircumflex },  
228 - { "Ediaeresis", XK_Ediaeresis },  
229 - { "Igrave", XK_Igrave },  
230 - { "Iacute", XK_Iacute },  
231 - { "Icircumflex", XK_Icircumflex },  
232 - { "Idiaeresis", XK_Idiaeresis },  
233 - { "ETH", XK_ETH },  
234 - { "Eth", XK_Eth },  
235 - { "Ntilde", XK_Ntilde },  
236 - { "Ograve", XK_Ograve },  
237 - { "Oacute", XK_Oacute },  
238 - { "Ocircumflex", XK_Ocircumflex },  
239 - { "Otilde", XK_Otilde },  
240 - { "Odiaeresis", XK_Odiaeresis },  
241 - { "multiply", XK_multiply },  
242 - { "Ooblique", XK_Ooblique },  
243 - { "Ugrave", XK_Ugrave },  
244 - { "Uacute", XK_Uacute },  
245 - { "Ucircumflex", XK_Ucircumflex },  
246 - { "Udiaeresis", XK_Udiaeresis },  
247 - { "Yacute", XK_Yacute },  
248 - { "THORN", XK_THORN },  
249 - { "Thorn", XK_Thorn },  
250 - { "ssharp", XK_ssharp },  
251 - { "agrave", XK_agrave },  
252 - { "aacute", XK_aacute },  
253 - { "acircumflex", XK_acircumflex },  
254 - { "atilde", XK_atilde },  
255 - { "adiaeresis", XK_adiaeresis },  
256 - { "aring", XK_aring },  
257 - { "ae", XK_ae },  
258 - { "ccedilla", XK_ccedilla },  
259 - { "egrave", XK_egrave },  
260 - { "eacute", XK_eacute },  
261 - { "ecircumflex", XK_ecircumflex },  
262 - { "ediaeresis", XK_ediaeresis },  
263 - { "igrave", XK_igrave },  
264 - { "iacute", XK_iacute },  
265 - { "icircumflex", XK_icircumflex },  
266 - { "idiaeresis", XK_idiaeresis },  
267 - { "eth", XK_eth },  
268 - { "ntilde", XK_ntilde },  
269 - { "ograve", XK_ograve },  
270 - { "oacute", XK_oacute },  
271 - { "ocircumflex", XK_ocircumflex },  
272 - { "otilde", XK_otilde },  
273 - { "odiaeresis", XK_odiaeresis },  
274 - { "division", XK_division },  
275 - { "oslash", XK_oslash },  
276 - { "ugrave", XK_ugrave },  
277 - { "uacute", XK_uacute },  
278 - { "ucircumflex", XK_ucircumflex },  
279 - { "udiaeresis", XK_udiaeresis },  
280 - { "yacute", XK_yacute },  
281 - { "thorn", XK_thorn },  
282 - { "ydiaeresis", XK_ydiaeresis },  
283 -  
284 - // The following are, umm, hacks to allow symbolic names for  
285 - // control codes.  
286 -#if !defined(_WIN32)  
287 - { "BackSpace", 0x08 },  
288 - { "Tab", 0x09 },  
289 - { "Linefeed", 0x0a },  
290 - { "Return", 0x0d },  
291 - { "Escape", 0x1b },  
292 - { "Delete", 0x7f },  
293 -#endif  
294 -  
295 - { (char *)NULL, NoSymbol }  
296 -};  
297 -  
298 -KeySym StringToKeysym(char *s)  
299 -{  
300 - int i;  
301 -  
302 - if (strlen(s) == 1 && (*(unsigned char *)s & 0x7f) > ' ')  
303 - return (KeySym)*(unsigned char *)s;  
304 - for (i = 0; latin1[i].name != (char *)NULL; i++) {  
305 - if (!strcmp(s, latin1[i].name))  
306 - return latin1[i].keysym;  
307 - }  
308 - return NoSymbol;  
309 -}  
310 -  
311 /* 86 /*
312 const char * KeysymToString(KeySym k) 87 const char * KeysymToString(KeySym k)
313 { 88 {
src/lib3270/aplc.h
  Diff comments   View file @4782124
@@ -17,4 +17,6 @@ @@ -17,4 +17,6 @@
17 * Global declarations for apl.c. 17 * Global declarations for apl.c.
18 */ 18 */
19 19
  20 +#error Deprecated
  21 +
20 LIB3270_INTERNAL KeySym APLStringToKeysym(char *s, int *is_gep); 22 LIB3270_INTERNAL KeySym APLStringToKeysym(char *s, int *is_gep);
src/lib3270/charset.c
  Diff comments   View file @4782124
@@ -55,6 +55,7 @@ @@ -55,6 +55,7 @@
55 #include "utf8c.h" 55 #include "utf8c.h"
56 #include "utilc.h" 56 #include "utilc.h"
57 #include "widec.h" 57 #include "widec.h"
  58 +#include "X11keysym.h"
58 59
59 #include <errno.h> 60 #include <errno.h>
60 61
@@ -103,6 +104,8 @@ static char *char_if_ascii7(unsigned long l); @@ -103,6 +104,8 @@ static char *char_if_ascii7(unsigned long l);
103 static void set_cgcsgids(const char *spec); 104 static void set_cgcsgids(const char *spec);
104 static int set_cgcsgid(char *spec, unsigned long *idp); 105 static int set_cgcsgid(char *spec, unsigned long *idp);
105 106
  107 +static KeySym StringToKeysym(char *s);
  108 +
106 // static void set_charset_name(char *csname); 109 // static void set_charset_name(char *csname);
107 // static char *charset_name = CN; 110 // static char *charset_name = CN;
108 111
@@ -748,3 +751,232 @@ LIB3270_EXPORT const char * lib3270_get_charset(H3270 *session) @@ -748,3 +751,232 @@ LIB3270_EXPORT const char * lib3270_get_charset(H3270 *session)
748 CHECK_SESSION_HANDLE(session); 751 CHECK_SESSION_HANDLE(session);
749 return session->charset ? session->charset : "ISO-8859-1"; 752 return session->charset ? session->charset : "ISO-8859-1";
750 } 753 }
  754 +
  755 +static KeySym StringToKeysym(char *s)
  756 +{
  757 + static struct
  758 + {
  759 + const char *name;
  760 + KeySym keysym;
  761 + } latin1[] =
  762 + {
  763 + { "space", XK_space },
  764 + { "exclam", XK_exclam },
  765 + { "quotedbl", XK_quotedbl },
  766 + { "numbersign", XK_numbersign },
  767 + { "dollar", XK_dollar },
  768 + { "percent", XK_percent },
  769 + { "ampersand", XK_ampersand },
  770 + { "apostrophe", XK_apostrophe },
  771 + { "quoteright", XK_quoteright },
  772 + { "parenleft", XK_parenleft },
  773 + { "parenright", XK_parenright },
  774 + { "asterisk", XK_asterisk },
  775 + { "plus", XK_plus },
  776 + { "comma", XK_comma },
  777 + { "minus", XK_minus },
  778 + { "period", XK_period },
  779 + { "slash", XK_slash },
  780 + { "0", XK_0 },
  781 + { "1", XK_1 },
  782 + { "2", XK_2 },
  783 + { "3", XK_3 },
  784 + { "4", XK_4 },
  785 + { "5", XK_5 },
  786 + { "6", XK_6 },
  787 + { "7", XK_7 },
  788 + { "8", XK_8 },
  789 + { "9", XK_9 },
  790 + { "colon", XK_colon },
  791 + { "semicolon", XK_semicolon },
  792 + { "less", XK_less },
  793 + { "equal", XK_equal },
  794 + { "greater", XK_greater },
  795 + { "question", XK_question },
  796 + { "at", XK_at },
  797 + { "A", XK_A },
  798 + { "B", XK_B },
  799 + { "C", XK_C },
  800 + { "D", XK_D },
  801 + { "E", XK_E },
  802 + { "F", XK_F },
  803 + { "G", XK_G },
  804 + { "H", XK_H },
  805 + { "I", XK_I },
  806 + { "J", XK_J },
  807 + { "K", XK_K },
  808 + { "L", XK_L },
  809 + { "M", XK_M },
  810 + { "N", XK_N },
  811 + { "O", XK_O },
  812 + { "P", XK_P },
  813 + { "Q", XK_Q },
  814 + { "R", XK_R },
  815 + { "S", XK_S },
  816 + { "T", XK_T },
  817 + { "U", XK_U },
  818 + { "V", XK_V },
  819 + { "W", XK_W },
  820 + { "X", XK_X },
  821 + { "Y", XK_Y },
  822 + { "Z", XK_Z },
  823 + { "bracketleft", XK_bracketleft },
  824 + { "backslash", XK_backslash },
  825 + { "bracketright", XK_bracketright },
  826 + { "asciicircum", XK_asciicircum },
  827 + { "underscore", XK_underscore },
  828 + { "grave", XK_grave },
  829 + { "quoteleft", XK_quoteleft },
  830 + { "a", XK_a },
  831 + { "b", XK_b },
  832 + { "c", XK_c },
  833 + { "d", XK_d },
  834 + { "e", XK_e },
  835 + { "f", XK_f },
  836 + { "g", XK_g },
  837 + { "h", XK_h },
  838 + { "i", XK_i },
  839 + { "j", XK_j },
  840 + { "k", XK_k },
  841 + { "l", XK_l },
  842 + { "m", XK_m },
  843 + { "n", XK_n },
  844 + { "o", XK_o },
  845 + { "p", XK_p },
  846 + { "q", XK_q },
  847 + { "r", XK_r },
  848 + { "s", XK_s },
  849 + { "t", XK_t },
  850 + { "u", XK_u },
  851 + { "v", XK_v },
  852 + { "w", XK_w },
  853 + { "x", XK_x },
  854 + { "y", XK_y },
  855 + { "z", XK_z },
  856 + { "braceleft", XK_braceleft },
  857 + { "bar", XK_bar },
  858 + { "braceright", XK_braceright },
  859 + { "asciitilde", XK_asciitilde },
  860 + { "nobreakspace", XK_nobreakspace },
  861 + { "exclamdown", XK_exclamdown },
  862 + { "cent", XK_cent },
  863 + { "sterling", XK_sterling },
  864 + { "currency", XK_currency },
  865 + { "yen", XK_yen },
  866 + { "brokenbar", XK_brokenbar },
  867 + { "section", XK_section },
  868 + { "diaeresis", XK_diaeresis },
  869 + { "copyright", XK_copyright },
  870 + { "ordfeminine", XK_ordfeminine },
  871 + { "guillemotleft", XK_guillemotleft },
  872 + { "notsign", XK_notsign },
  873 + { "hyphen", XK_hyphen },
  874 + { "registered", XK_registered },
  875 + { "macron", XK_macron },
  876 + { "degree", XK_degree },
  877 + { "plusminus", XK_plusminus },
  878 + { "twosuperior", XK_twosuperior },
  879 + { "threesuperior", XK_threesuperior },
  880 + { "acute", XK_acute },
  881 + { "mu", XK_mu },
  882 + { "paragraph", XK_paragraph },
  883 + { "periodcentered", XK_periodcentered },
  884 + { "cedilla", XK_cedilla },
  885 + { "onesuperior", XK_onesuperior },
  886 + { "masculine", XK_masculine },
  887 + { "guillemotright", XK_guillemotright },
  888 + { "onequarter", XK_onequarter },
  889 + { "onehalf", XK_onehalf },
  890 + { "threequarters", XK_threequarters },
  891 + { "questiondown", XK_questiondown },
  892 + { "Agrave", XK_Agrave },
  893 + { "Aacute", XK_Aacute },
  894 + { "Acircumflex", XK_Acircumflex },
  895 + { "Atilde", XK_Atilde },
  896 + { "Adiaeresis", XK_Adiaeresis },
  897 + { "Aring", XK_Aring },
  898 + { "AE", XK_AE },
  899 + { "Ccedilla", XK_Ccedilla },
  900 + { "Egrave", XK_Egrave },
  901 + { "Eacute", XK_Eacute },
  902 + { "Ecircumflex", XK_Ecircumflex },
  903 + { "Ediaeresis", XK_Ediaeresis },
  904 + { "Igrave", XK_Igrave },
  905 + { "Iacute", XK_Iacute },
  906 + { "Icircumflex", XK_Icircumflex },
  907 + { "Idiaeresis", XK_Idiaeresis },
  908 + { "ETH", XK_ETH },
  909 + { "Eth", XK_Eth },
  910 + { "Ntilde", XK_Ntilde },
  911 + { "Ograve", XK_Ograve },
  912 + { "Oacute", XK_Oacute },
  913 + { "Ocircumflex", XK_Ocircumflex },
  914 + { "Otilde", XK_Otilde },
  915 + { "Odiaeresis", XK_Odiaeresis },
  916 + { "multiply", XK_multiply },
  917 + { "Ooblique", XK_Ooblique },
  918 + { "Ugrave", XK_Ugrave },
  919 + { "Uacute", XK_Uacute },
  920 + { "Ucircumflex", XK_Ucircumflex },
  921 + { "Udiaeresis", XK_Udiaeresis },
  922 + { "Yacute", XK_Yacute },
  923 + { "THORN", XK_THORN },
  924 + { "Thorn", XK_Thorn },
  925 + { "ssharp", XK_ssharp },
  926 + { "agrave", XK_agrave },
  927 + { "aacute", XK_aacute },
  928 + { "acircumflex", XK_acircumflex },
  929 + { "atilde", XK_atilde },
  930 + { "adiaeresis", XK_adiaeresis },
  931 + { "aring", XK_aring },
  932 + { "ae", XK_ae },
  933 + { "ccedilla", XK_ccedilla },
  934 + { "egrave", XK_egrave },
  935 + { "eacute", XK_eacute },
  936 + { "ecircumflex", XK_ecircumflex },
  937 + { "ediaeresis", XK_ediaeresis },
  938 + { "igrave", XK_igrave },
  939 + { "iacute", XK_iacute },
  940 + { "icircumflex", XK_icircumflex },
  941 + { "idiaeresis", XK_idiaeresis },
  942 + { "eth", XK_eth },
  943 + { "ntilde", XK_ntilde },
  944 + { "ograve", XK_ograve },
  945 + { "oacute", XK_oacute },
  946 + { "ocircumflex", XK_ocircumflex },
  947 + { "otilde", XK_otilde },
  948 + { "odiaeresis", XK_odiaeresis },
  949 + { "division", XK_division },
  950 + { "oslash", XK_oslash },
  951 + { "ugrave", XK_ugrave },
  952 + { "uacute", XK_uacute },
  953 + { "ucircumflex", XK_ucircumflex },
  954 + { "udiaeresis", XK_udiaeresis },
  955 + { "yacute", XK_yacute },
  956 + { "thorn", XK_thorn },
  957 + { "ydiaeresis", XK_ydiaeresis },
  958 +
  959 + // The following are, umm, hacks to allow symbolic names for
  960 + // control codes.
  961 + #if !defined(_WIN32)
  962 + { "BackSpace", 0x08 },
  963 + { "Tab", 0x09 },
  964 + { "Linefeed", 0x0a },
  965 + { "Return", 0x0d },
  966 + { "Escape", 0x1b },
  967 + { "Delete", 0x7f },
  968 + #endif
  969 +
  970 + { (char *)NULL, NoSymbol }
  971 + };
  972 +
  973 + int i;
  974 +
  975 + if (strlen(s) == 1 && (*(unsigned char *)s & 0x7f) > ' ')
  976 + return (KeySym)*(unsigned char *)s;
  977 + for (i = 0; latin1[i].name != (char *)NULL; i++) {
  978 + if (!strcmp(s, latin1[i].name))
  979 + return latin1[i].keysym;
  980 + }
  981 + return NoSymbol;
  982 +}
src/lib3270/kybd.c
  Diff comments   View file @4782124
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 54
55 #include "actionsc.h" 55 #include "actionsc.h"
56 #include "ansic.h" 56 #include "ansic.h"
57 -#include "aplc.h" 57 +//#include "aplc.h"
58 #include "ctlrc.h" 58 #include "ctlrc.h"
59 #include "ftc.h" 59 #include "ftc.h"
60 #include "hostc.h" 60 #include "hostc.h"
src/lib3270/paste.c
  Diff comments   View file @4782124
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 53
54 #include "actionsc.h" 54 #include "actionsc.h"
55 #include "ansic.h" 55 #include "ansic.h"
56 -#include "aplc.h" 56 +//#include "aplc.h"
57 #include "ctlrc.h" 57 #include "ctlrc.h"
58 #include "ftc.h" 58 #include "ftc.h"
59 #include "hostc.h" 59 #include "hostc.h"
src/lib3270/sources.mak
  Diff comments   View file @4782124
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 # 25 #
26 26
27 # Terminal only sources 27 # Terminal only sources
28 -TERMINAL_SOURCES = bounds.c XtGlue.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 30 version.c session.c state.c html.c
31 31
src/lib3270/trace_ds.c
  Diff comments   View file @4782124
@@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@
110 static void __vwtrace(H3270 *session, const char *fmt, va_list args); 110 static void __vwtrace(H3270 *session, const char *fmt, va_list args);
111 static void wtrace(const char *fmt, ...); 111 static void wtrace(const char *fmt, ...);
112 // static char *create_tracefile_header(const char *mode); 112 // static char *create_tracefile_header(const char *mode);
113 -static void stop_tracing(void); 113 +// static void stop_tracing(void);
114 114
115 /* Globals */ 115 /* Globals */
116 struct timeval ds_ts; 116 struct timeval ds_ts;
src/lib3270/utilc.h
  Diff comments   View file @4782124
@@ -44,7 +44,6 @@ LIB3270_INTERNAL void * AddTimeOut(unsigned long msec, H3270 *session, void (*fn @@ -44,7 +44,6 @@ LIB3270_INTERNAL void * AddTimeOut(unsigned long msec, H3270 *session, void (*fn
44 LIB3270_INTERNAL void RemoveTimeOut(void *cookie); 44 LIB3270_INTERNAL void RemoveTimeOut(void *cookie);
45 45
46 LIB3270_INTERNAL const char * KeysymToString(KeySym k); 46 LIB3270_INTERNAL const char * KeysymToString(KeySym k);
47 -LIB3270_INTERNAL KeySym StringToKeysym(char *s);  
48 47
49 // LIB3270_INTERNAL int read_resource_file(const char *filename, Boolean fatal); 48 // LIB3270_INTERNAL int read_resource_file(const char *filename, Boolean fatal);
50 LIB3270_INTERNAL Boolean split_hier(char *label, char **base, char ***parents); 49 LIB3270_INTERNAL Boolean split_hier(char *label, char **base, char ***parents);
src/lib3270/w3misc.c
  Diff comments   View file @4782124
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
30 * 30 *
31 */ 31 */
32 32
  33 +#error Deprecated
33 34
34 /* 35 /*
35 * w3misc.c 36 * w3misc.c
src/lib3270/winvers.c
  Diff comments   View file @4782124
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
30 * 30 *
31 */ 31 */
32 32
  33 +#error Deprecated
33 34
34 /* 35 /*
35 * winvers.c 36 * winvers.c
src/pw3270/print.c
  Diff comments   View file @4782124
@@ -544,11 +544,26 @@ static gchar * enum_to_string(GType type, guint enum_value) @@ -544,11 +544,26 @@ static gchar * enum_to_string(GType type, guint enum_value)
544 544
545 static void draw_text(GtkPrintOperation *prt, GtkPrintContext *context, gint pg, PRINT_INFO *info) 545 static void draw_text(GtkPrintOperation *prt, GtkPrintContext *context, gint pg, PRINT_INFO *info)
546 { 546 {
547 - cairo_t * cr = gtk_print_context_get_cairo_context(context); 547 + cairo_t * cr = gtk_print_context_get_cairo_context(context);
  548 + GdkRectangle rect;
  549 + int row = pg*info->lpp;
  550 + int l;
548 551
549 cairo_set_scaled_font(cr,info->font_scaled); 552 cairo_set_scaled_font(cr,info->font_scaled);
550 553
  554 + memset(&rect,0,sizeof(rect));
  555 + rect.y = 2;
  556 + rect.height = (info->extents.height + info->extents.descent)+1;
  557 + rect.width = info->extents.max_x_advance+1;
551 558
  559 + for(l=0;l<info->lpp && row < info->rows;l++)
  560 + {
  561 + cairo_move_to(cr,2,rect.y+rect.height);
  562 + cairo_show_text(cr, info->text[row]);
  563 + cairo_stroke(cr);
  564 + row++;
  565 + rect.y += (rect.height-1);
  566 + }
552 567
553 } 568 }
554 569