ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.19 by pcg, Wed Jan 28 23:40:50 2004 UTC vs.
Revision 1.70 by root, Fri Aug 13 03:47:09 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: init.C,v 1.19 2004/01/28 23:40:50 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
10 * - extensive modifications 9 * - extensive modifications
11 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
12 * - extensive modifications 11 * - extensive modifications
13 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
14 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
68 "Blue", /* 4/12: bright blue (#0000FF) */ 68 "Blue", /* 4/12: bright blue (#0000FF) */
69 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 69 "Magenta", /* 5/13: bright magenta (#FF00FF) */
70 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 70 "Cyan", /* 6/14: bright cyan (#00FFFF) */
71 "White", /* 7/15: bright white (#FFFFFF) */ 71 "White", /* 7/15: bright white (#FFFFFF) */
72#ifdef TTY_256COLOR 72#ifdef TTY_256COLOR
73 "rgb:00/00/00", /* default 16-255 color table */ 73 "rgbi:0/0/0", /* default 16-255 color table */
74 "rgbi:0/0/.2", /* consists of 6 6x6 colour cubes */
75 "rgbi:0/0/.4", /* and a 24 greyscale ramp w/o */
76 "rgbi:0/0/.6", /* black or white */
77 "rgbi:0/0/.8",
74 "rgb:00/00/2a", 78 "rgbi:0/0/1",
75 "rgb:00/00/55",
76 "rgb:00/00/7f",
77 "rgb:00/00/aa",
78 "rgb:00/00/d4",
79 "rgb:00/2a/00", 79 "rgbi:0/.2/0",
80 "rgb:00/2a/2a", 80 "rgbi:0/.2/.2",
81 "rgb:00/2a/55",
82 "rgb:00/2a/7f",
83 "rgb:00/2a/aa",
84 "rgb:00/2a/d4", 81 "rgbi:0/.2/.4",
82 "rgbi:0/.2/.6",
83 "rgbi:0/.2/.8",
85 "rgb:00/55/00", 84 "rgbi:0/.2/1",
86 "rgb:00/55/2a",
87 "rgb:00/55/55",
88 "rgb:00/55/7f",
89 "rgb:00/55/aa",
90 "rgb:00/55/d4",
91 "rgb:00/7f/00",
92 "rgb:00/7f/2a",
93 "rgb:00/7f/55",
94 "rgb:00/7f/7f",
95 "rgb:00/7f/aa",
96 "rgb:00/7f/d4",
97 "rgb:00/aa/00",
98 "rgb:00/aa/2a",
99 "rgb:00/aa/55",
100 "rgb:00/aa/7f",
101 "rgb:00/aa/aa",
102 "rgb:00/aa/d4",
103 "rgb:00/d4/00", 85 "rgbi:0/.4/0",
104 "rgb:00/d4/2a", 86 "rgbi:0/.4/.2",
105 "rgb:00/d4/55",
106 "rgb:00/d4/7f",
107 "rgb:00/d4/aa",
108 "rgb:00/d4/d4", 87 "rgbi:0/.4/.4",
88 "rgbi:0/.4/.6",
89 "rgbi:0/.4/.8",
90 "rgbi:0/.4/1",
91 "rgbi:0/.6/0",
92 "rgbi:0/.6/.2",
93 "rgbi:0/.6/.4",
94 "rgbi:0/.6/.6",
95 "rgbi:0/.6/.8",
96 "rgbi:0/.6/1",
97 "rgbi:0/.8/0",
98 "rgbi:0/.8/.2",
99 "rgbi:0/.8/.4",
100 "rgbi:0/.8/.6",
101 "rgbi:0/.8/.8",
102 "rgbi:0/.8/1",
103 "rgbi:0/1/0",
104 "rgbi:0/1/.2",
105 "rgbi:0/1/.4",
106 "rgbi:0/1/.6",
107 "rgbi:0/1/.8",
108 "rgbi:0/1/1",
109 "rgb:2a/00/00", 109 "rgbi:.2/0/0",
110 "rgb:2a/00/2a", 110 "rgbi:.2/0/.2",
111 "rgb:2a/00/55",
112 "rgb:2a/00/7f",
113 "rgb:2a/00/aa",
114 "rgb:2a/00/d4", 111 "rgbi:.2/0/.4",
112 "rgbi:.2/0/.6",
113 "rgbi:.2/0/.8",
114 "rgbi:.2/0/1",
115 "rgb:2a/2a/00", 115 "rgbi:.2/.2/0",
116 "rgb:2a/2a/2a", 116 "rgbi:.2/.2/.2",
117 "rgb:2a/2a/55",
118 "rgb:2a/2a/7f",
119 "rgb:2a/2a/aa",
120 "rgb:2a/2a/d4", 117 "rgbi:.2/.2/.4",
121 "rgb:2a/55/00", 118 "rgbi:.2/.2/.6",
122 "rgb:2a/55/2a", 119 "rgbi:.2/.2/.8",
123 "rgb:2a/55/55", 120 "rgbi:.2/.2/1",
124 "rgb:2a/55/7f",
125 "rgb:2a/55/aa",
126 "rgb:2a/55/d4",
127 "rgb:2a/7f/00",
128 "rgb:2a/7f/2a",
129 "rgb:2a/7f/55",
130 "rgb:2a/7f/7f",
131 "rgb:2a/7f/aa",
132 "rgb:2a/7f/d4",
133 "rgb:2a/aa/00",
134 "rgb:2a/aa/2a",
135 "rgb:2a/aa/55",
136 "rgb:2a/aa/7f",
137 "rgb:2a/aa/aa",
138 "rgb:2a/aa/d4",
139 "rgb:2a/d4/00", 121 "rgbi:.2/.4/0",
140 "rgb:2a/d4/2a", 122 "rgbi:.2/.4/.2",
141 "rgb:2a/d4/55",
142 "rgb:2a/d4/7f",
143 "rgb:2a/d4/aa",
144 "rgb:2a/d4/d4", 123 "rgbi:.2/.4/.4",
124 "rgbi:.2/.4/.6",
125 "rgbi:.2/.4/.8",
126 "rgbi:.2/.4/1",
127 "rgbi:.2/.6/0",
128 "rgbi:.2/.6/.2",
129 "rgbi:.2/.6/.4",
130 "rgbi:.2/.6/.6",
131 "rgbi:.2/.6/.8",
132 "rgbi:.2/.6/1",
133 "rgbi:.2/.8/0",
134 "rgbi:.2/.8/.2",
135 "rgbi:.2/.8/.4",
136 "rgbi:.2/.8/.6",
137 "rgbi:.2/.8/.8",
138 "rgbi:.2/.8/1",
145 "rgb:55/00/00", 139 "rgbi:.2/1/0",
146 "rgb:55/00/2a", 140 "rgbi:.2/1/.2",
147 "rgb:55/00/55", 141 "rgbi:.2/1/.4",
148 "rgb:55/00/7f", 142 "rgbi:.2/1/.6",
149 "rgb:55/00/aa", 143 "rgbi:.2/1/.8",
150 "rgb:55/00/d4", 144 "rgbi:.2/1/1",
151 "rgb:55/2a/00",
152 "rgb:55/2a/2a",
153 "rgb:55/2a/55",
154 "rgb:55/2a/7f",
155 "rgb:55/2a/aa",
156 "rgb:55/2a/d4",
157 "rgb:55/55/00",
158 "rgb:55/55/2a",
159 "rgb:55/55/55",
160 "rgb:55/55/7f",
161 "rgb:55/55/aa",
162 "rgb:55/55/d4",
163 "rgb:55/7f/00",
164 "rgb:55/7f/2a",
165 "rgb:55/7f/55",
166 "rgb:55/7f/7f",
167 "rgb:55/7f/aa",
168 "rgb:55/7f/d4",
169 "rgb:55/aa/00",
170 "rgb:55/aa/2a",
171 "rgb:55/aa/55",
172 "rgb:55/aa/7f",
173 "rgb:55/aa/aa",
174 "rgb:55/aa/d4",
175 "rgb:55/d4/00",
176 "rgb:55/d4/2a",
177 "rgb:55/d4/55",
178 "rgb:55/d4/7f",
179 "rgb:55/d4/aa",
180 "rgb:55/d4/d4",
181 "rgb:7f/00/00",
182 "rgb:7f/00/2a",
183 "rgb:7f/00/55",
184 "rgb:7f/00/7f",
185 "rgb:7f/00/aa",
186 "rgb:7f/00/d4",
187 "rgb:7f/2a/00",
188 "rgb:7f/2a/2a",
189 "rgb:7f/2a/55",
190 "rgb:7f/2a/7f",
191 "rgb:7f/2a/aa",
192 "rgb:7f/2a/d4",
193 "rgb:7f/55/00",
194 "rgb:7f/55/2a",
195 "rgb:7f/55/55",
196 "rgb:7f/55/7f",
197 "rgb:7f/55/aa",
198 "rgb:7f/55/d4",
199 "rgb:7f/7f/00",
200 "rgb:7f/7f/2a",
201 "rgb:7f/7f/55",
202 "rgb:7f/7f/7f",
203 "rgb:7f/7f/aa",
204 "rgb:7f/7f/d4",
205 "rgb:7f/aa/00",
206 "rgb:7f/aa/2a",
207 "rgb:7f/aa/55",
208 "rgb:7f/aa/7f",
209 "rgb:7f/aa/aa",
210 "rgb:7f/aa/d4",
211 "rgb:7f/d4/00",
212 "rgb:7f/d4/2a",
213 "rgb:7f/d4/55",
214 "rgb:7f/d4/7f",
215 "rgb:7f/d4/aa",
216 "rgb:7f/d4/d4",
217 "rgb:aa/00/00",
218 "rgb:aa/00/2a",
219 "rgb:aa/00/55",
220 "rgb:aa/00/7f",
221 "rgb:aa/00/aa",
222 "rgb:aa/00/d4",
223 "rgb:aa/2a/00",
224 "rgb:aa/2a/2a",
225 "rgb:aa/2a/55",
226 "rgb:aa/2a/7f",
227 "rgb:aa/2a/aa",
228 "rgb:aa/2a/d4",
229 "rgb:aa/55/00",
230 "rgb:aa/55/2a",
231 "rgb:aa/55/55",
232 "rgb:aa/55/7f",
233 "rgb:aa/55/aa",
234 "rgb:aa/55/d4",
235 "rgb:aa/7f/00",
236 "rgb:aa/7f/2a",
237 "rgb:aa/7f/55",
238 "rgb:aa/7f/7f",
239 "rgb:aa/7f/aa",
240 "rgb:aa/7f/d4",
241 "rgb:aa/aa/00",
242 "rgb:aa/aa/2a",
243 "rgb:aa/aa/55",
244 "rgb:aa/aa/7f",
245 "rgb:aa/aa/aa",
246 "rgb:aa/aa/d4",
247 "rgb:aa/d4/00",
248 "rgb:aa/d4/2a",
249 "rgb:aa/d4/55",
250 "rgb:aa/d4/7f",
251 "rgb:aa/d4/aa",
252 "rgb:aa/d4/d4",
253 "rgb:d4/00/00", 145 "rgbi:.4/0/0",
254 "rgb:d4/00/2a", 146 "rgbi:.4/0/.2",
255 "rgb:d4/00/55",
256 "rgb:d4/00/7f",
257 "rgb:d4/00/aa",
258 "rgb:d4/00/d4", 147 "rgbi:.4/0/.4",
148 "rgbi:.4/0/.6",
149 "rgbi:.4/0/.8",
150 "rgbi:.4/0/1",
259 "rgb:d4/2a/00", 151 "rgbi:.4/.2/0",
260 "rgb:d4/2a/2a", 152 "rgbi:.4/.2/.2",
261 "rgb:d4/2a/55",
262 "rgb:d4/2a/7f",
263 "rgb:d4/2a/aa",
264 "rgb:d4/2a/d4", 153 "rgbi:.4/.2/.4",
265 "rgb:d4/55/00", 154 "rgbi:.4/.2/.6",
266 "rgb:d4/55/2a", 155 "rgbi:.4/.2/.8",
267 "rgb:d4/55/55", 156 "rgbi:.4/.2/1",
268 "rgb:d4/55/7f",
269 "rgb:d4/55/aa",
270 "rgb:d4/55/d4",
271 "rgb:d4/7f/00",
272 "rgb:d4/7f/2a",
273 "rgb:d4/7f/55",
274 "rgb:d4/7f/7f",
275 "rgb:d4/7f/aa",
276 "rgb:d4/7f/d4",
277 "rgb:d4/aa/00",
278 "rgb:d4/aa/2a",
279 "rgb:d4/aa/55",
280 "rgb:d4/aa/7f",
281 "rgb:d4/aa/aa",
282 "rgb:d4/aa/d4",
283 "rgb:d4/d4/00", 157 "rgbi:.4/.4/0",
284 "rgb:d4/d4/2a", 158 "rgbi:.4/.4/.2",
285 "rgb:d4/d4/55",
286 "rgb:d4/d4/7f",
287 "rgb:d4/d4/aa",
288 "rgb:d4/d4/d4", 159 "rgbi:.4/.4/.4",
160 "rgbi:.4/.4/.6",
161 "rgbi:.4/.4/.8",
162 "rgbi:.4/.4/1",
163 "rgbi:.4/.6/0",
164 "rgbi:.4/.6/.2",
165 "rgbi:.4/.6/.4",
166 "rgbi:.4/.6/.6",
167 "rgbi:.4/.6/.8",
168 "rgbi:.4/.6/1",
169 "rgbi:.4/.8/0",
170 "rgbi:.4/.8/.2",
171 "rgbi:.4/.8/.4",
172 "rgbi:.4/.8/.6",
173 "rgbi:.4/.8/.8",
174 "rgbi:.4/.8/1",
175 "rgbi:.4/1/0",
176 "rgbi:.4/1/.2",
177 "rgbi:.4/1/.4",
178 "rgbi:.4/1/.6",
179 "rgbi:.4/1/.8",
180 "rgbi:.4/1/1",
181 "rgbi:.6/0/0",
182 "rgbi:.6/0/.2",
183 "rgbi:.6/0/.4",
184 "rgbi:.6/0/.6",
185 "rgbi:.6/0/.8",
186 "rgbi:.6/0/1",
187 "rgbi:.6/.2/0",
188 "rgbi:.6/.2/.2",
189 "rgbi:.6/.2/.4",
190 "rgbi:.6/.2/.6",
191 "rgbi:.6/.2/.8",
192 "rgbi:.6/.2/1",
193 "rgbi:.6/.4/0",
194 "rgbi:.6/.4/.2",
195 "rgbi:.6/.4/.4",
196 "rgbi:.6/.4/.6",
197 "rgbi:.6/.4/.8",
198 "rgbi:.6/.4/1",
199 "rgbi:.6/.6/0",
200 "rgbi:.6/.6/.2",
201 "rgbi:.6/.6/.4",
202 "rgbi:.6/.6/.6",
203 "rgbi:.6/.6/.8",
204 "rgbi:.6/.6/1",
205 "rgbi:.6/.8/0",
206 "rgbi:.6/.8/.2",
207 "rgbi:.6/.8/.4",
208 "rgbi:.6/.8/.6",
209 "rgbi:.6/.8/.8",
210 "rgbi:.6/.8/1",
211 "rgbi:.6/1/0",
212 "rgbi:.6/1/.2",
213 "rgbi:.6/1/.4",
214 "rgbi:.6/1/.6",
215 "rgbi:.6/1/.8",
216 "rgbi:.6/1/1",
217 "rgbi:.8/0/0",
218 "rgbi:.8/0/.2",
219 "rgbi:.8/0/.4",
220 "rgbi:.8/0/.6",
221 "rgbi:.8/0/.8",
222 "rgbi:.8/0/1",
223 "rgbi:.8/.2/0",
224 "rgbi:.8/.2/.2",
225 "rgbi:.8/.2/.4",
226 "rgbi:.8/.2/.6",
227 "rgbi:.8/.2/.8",
228 "rgbi:.8/.2/1",
229 "rgbi:.8/.4/0",
230 "rgbi:.8/.4/.2",
231 "rgbi:.8/.4/.4",
232 "rgbi:.8/.4/.6",
233 "rgbi:.8/.4/.8",
234 "rgbi:.8/.4/1",
235 "rgbi:.8/.6/0",
236 "rgbi:.8/.6/.2",
237 "rgbi:.8/.6/.4",
238 "rgbi:.8/.6/.6",
239 "rgbi:.8/.6/.8",
240 "rgbi:.8/.6/1",
241 "rgbi:.8/.8/0",
242 "rgbi:.8/.8/.2",
243 "rgbi:.8/.8/.4",
244 "rgbi:.8/.8/.6",
245 "rgbi:.8/.8/.8",
246 "rgbi:.8/.8/1",
247 "rgbi:.8/1/0",
248 "rgbi:.8/1/.2",
249 "rgbi:.8/1/.4",
250 "rgbi:.8/1/.6",
251 "rgbi:.8/1/.8",
252 "rgbi:.8/1/1",
253 "rgbi:1/0/0",
254 "rgbi:1/0/.2",
255 "rgbi:1/0/.4",
256 "rgbi:1/0/.6",
257 "rgbi:1/0/.8",
258 "rgbi:1/0/1",
259 "rgbi:1/.2/0",
260 "rgbi:1/.2/.2",
261 "rgbi:1/.2/.4",
262 "rgbi:1/.2/.6",
263 "rgbi:1/.2/.8",
264 "rgbi:1/.2/1",
265 "rgbi:1/.4/0",
266 "rgbi:1/.4/.2",
267 "rgbi:1/.4/.4",
268 "rgbi:1/.4/.6",
269 "rgbi:1/.4/.8",
270 "rgbi:1/.4/1",
271 "rgbi:1/.6/0",
272 "rgbi:1/.6/.2",
273 "rgbi:1/.6/.4",
274 "rgbi:1/.6/.6",
275 "rgbi:1/.6/.8",
276 "rgbi:1/.6/1",
277 "rgbi:1/.8/0",
278 "rgbi:1/.8/.2",
279 "rgbi:1/.8/.4",
280 "rgbi:1/.8/.6",
281 "rgbi:1/.8/.8",
282 "rgbi:1/.8/1",
283 "rgbi:1/1/0",
284 "rgbi:1/1/.2",
285 "rgbi:1/1/.4",
286 "rgbi:1/1/.6",
287 "rgbi:1/1/.8",
288 "rgbi:1/1/1",
289 "rgb:08/08/08", 289 "rgb:08/08/08",
290 "rgb:12/12/12", 290 "rgb:12/12/12",
291 "rgb:1c/1c/1c", 291 "rgb:1c/1c/1c",
292 "rgb:26/26/26", 292 "rgb:26/26/26",
293 "rgb:30/30/30", 293 "rgb:30/30/30",
… …
313#endif 313#endif
314#ifndef NO_CURSORCOLOR 314#ifndef NO_CURSORCOLOR
315 COLOR_CURSOR_BACKGROUND, 315 COLOR_CURSOR_BACKGROUND,
316 COLOR_CURSOR_FOREGROUND, 316 COLOR_CURSOR_FOREGROUND,
317#endif /* ! NO_CURSORCOLOR */ 317#endif /* ! NO_CURSORCOLOR */
318 NULL, /* Color_pointer */ 318 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */
319 NULL, /* Color_border */ 320 NULL, /* Color_border */
320#ifndef NO_BOLD_UNDERLINE_REVERSE 321#ifndef NO_BOLD_UNDERLINE_REVERSE
321 NULL, /* Color_BD */ 322 NULL, /* Color_BD */
322 NULL, /* Color_UL */ 323 NULL, /* Color_UL */
323 NULL, /* Color_RV */ 324 NULL, /* Color_RV */
… …
327#endif 328#endif
328#ifdef KEEP_SCROLLCOLOR 329#ifdef KEEP_SCROLLCOLOR
329 COLOR_SCROLLBAR, 330 COLOR_SCROLLBAR,
330 COLOR_SCROLLTROUGH, 331 COLOR_SCROLLTROUGH,
331#endif /* KEEP_SCROLLCOLOR */ 332#endif /* KEEP_SCROLLCOLOR */
333#if TINTING
334 NULL,
335#endif
332 }; 336 };
333 337
334const char *const xa_names[NUM_XA] = 338const char *const xa_names[NUM_XA] =
335 { 339 {
336 "TEXT", 340 "TEXT",
… …
353 }; 357 };
354 358
355bool 359bool
356rxvt_term::init_vars () 360rxvt_term::init_vars ()
357{ 361{
358 PixColors = new rxvt_color [TOTAL_COLORS]; 362 PixColorsFocused = new rxvt_color [TOTAL_COLORS];
363#ifdef OFF_FOCUS_FADING
364 PixColorsUnFocused = new rxvt_color [TOTAL_COLORS];
365#endif
366 PixColors = PixColorsFocused;
367
359 if (PixColors == NULL) 368 if (PixColors == NULL)
360 return false; 369 return false;
361 370
362#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 371#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
363 TermWin.pixmap = None; 372 TermWin.pixmap = None;
… …
372 MEvent.time = CurrentTime; 381 MEvent.time = CurrentTime;
373 MEvent.button = AnyButton; 382 MEvent.button = AnyButton;
374 Options = DEFAULT_OPTIONS; 383 Options = DEFAULT_OPTIONS;
375 want_refresh = 1; 384 want_refresh = 1;
376 cmd_pid = -1; 385 cmd_pid = -1;
377 cmd_fd = tty_fd = Xfd = -1; 386 cmd_fd = tty_fd = -1;
378 PrivateModes = SavedModes = PrivMode_Default; 387 PrivateModes = SavedModes = PrivMode_Default;
379 TermWin.focus = 0; 388 TermWin.focus = 0;
380 TermWin.ncol = 80; 389 TermWin.ncol = 80;
381 TermWin.nrow = 24; 390 TermWin.nrow = 24;
382 TermWin.int_bwidth = INTERNALBORDERWIDTH; 391 TermWin.int_bwidth = INTERNALBORDERWIDTH;
383 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 392 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
384 TermWin.lineSpace = LINESPACE; 393 TermWin.lineSpace = LINESPACE;
385 TermWin.saveLines = SAVELINES; 394 TermWin.saveLines = SAVELINES;
386 numPixColors = TOTAL_COLORS; 395 numPixColors = TOTAL_COLORS;
387 396
388#ifndef NO_NEW_SELECTION
389 selection_style = NEW_SELECT;
390#else
391 selection_style = OLD_SELECT;
392#endif
393
394#ifndef NO_BRIGHTCOLOR 397#ifndef NO_BRIGHTCOLOR
395 colorfgbg = DEFAULT_RSTYLE; 398 colorfgbg = DEFAULT_RSTYLE;
396#endif
397
398#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
399 ks_bigfont = XK_greater;
400 ks_smallfont = XK_less;
401#endif
402
403#ifdef GREEK_SUPPORT
404 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
405#endif 399#endif
406 400
407 refresh_limit = 1; 401 refresh_limit = 1;
408 refresh_type = SLOW_REFRESH; 402 refresh_type = SLOW_REFRESH;
409 prev_nrow = prev_ncol = 0; 403 prev_nrow = prev_ncol = 0;
410#ifdef MULTICHAR_SET
411# ifdef MULTICHAR_ENCODING
412 encoding_method = MULTICHAR_ENCODING;
413# endif
414 multichar_decode = rxvt_euc2jis;
415#endif
416 404
417 oldcursor.row = oldcursor.col = -1; 405 oldcursor.row = oldcursor.col = -1;
418#ifdef XPM_BACKGROUND 406#ifdef XPM_BACKGROUND
419 /* bgPixmap.w = bgPixmap.h = 0; */ 407 /* bgPixmap.w = bgPixmap.h = 0; */
420 bgPixmap.x = bgPixmap.y = 50; 408 bgPixmap.x = bgPixmap.y = 50;
… …
423 411
424 last_bot = last_state = -1; 412 last_bot = last_state = -1;
425 413
426#ifdef MENUBAR 414#ifdef MENUBAR
427 menu_readonly = 1; 415 menu_readonly = 1;
428# if !(MENUBAR_MAX > 1) 416# if ! (MENUBAR_MAX > 1)
429 CurrentBar = &(BarList); 417 CurrentBar = & (BarList);
430# endif /* (MENUBAR_MAX > 1) */ 418# endif /* (MENUBAR_MAX > 1) */
431#endif 419#endif
432 420
433 return true; 421 return true;
434} 422}
… …
445 ttymode = S_IRUSR | S_IWUSR | S_IWGRP; 433 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
446 ttygid = gr->gr_gid; 434 ttygid = gr->gr_gid;
447 } 435 }
448 else 436 else
449#endif /* TTY_GID_SUPPORT */ 437#endif /* TTY_GID_SUPPORT */
438
450 { 439 {
451 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 440 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
452 ttygid = getgid (); 441 ttygid = getgid ();
453 } 442 }
454 443
… …
474 { 463 {
475#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ 464#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
476 if (i == 4 || i == 7) 465 if (i == 4 || i == 7)
477 continue; 466 continue;
478#endif 467#endif
479 close(i); 468 close (i);
480 } 469 }
481#endif 470#endif
482} 471}
483 472
484/*----------------------------------------------------------------------*/ 473/*----------------------------------------------------------------------*/
… …
491 480
492 /* 481 /*
493 * Look for -exec option. Find => split and make cmd_argv[] of command args 482 * Look for -exec option. Find => split and make cmd_argv[] of command args
494 */ 483 */
495 for (r_argc = 0; r_argc < argc; r_argc++) 484 for (r_argc = 0; r_argc < argc; r_argc++)
496 if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec")) 485 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec"))
497 break; 486 break;
498 487
499 r_argv = (const char **)rxvt_malloc (sizeof(char *) * (r_argc + 1)); 488 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
500 489
501 for (i = 0; i < r_argc; i++) 490 for (i = 0; i < r_argc; i++)
502 r_argv[i] = (const char *)argv[i]; 491 r_argv[i] = (const char *)argv[i];
503 492
504 r_argv[i] = NULL; 493 r_argv[i] = NULL;
505 494
506 if (r_argc == argc) 495 if (r_argc == argc)
507 cmd_argv = NULL; 496 cmd_argv = NULL;
508 else 497 else
509 { 498 {
510 cmd_argv = (const char **)rxvt_malloc (sizeof(char *) * (argc - r_argc)); 499 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
511 500
512 for (i = 0; i < argc - r_argc - 1; i++) 501 for (i = 0; i < argc - r_argc - 1; i++)
513 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 502 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
514 503
515 cmd_argv[i] = NULL; 504 cmd_argv[i] = NULL;
516 } 505 }
517 506
518 /* clear all resources */
519 for (i = 0; i < NUM_RESOURCES;)
520 rs[i++] = NULL;
521
522 rs[Rs_name] = rxvt_r_basename(argv[0]); 507 rs[Rs_name] = rxvt_r_basename (argv[0]);
523 508
524 /* 509 /*
525 * Open display, get options/resources and create the window 510 * Open display, get options/resources and create the window
526 */ 511 */
527 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 512 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
528 rs[Rs_display_name] = ":0"; 513 rs[Rs_display_name] = ":0";
529 514
530 rxvt_get_options (this, r_argc, r_argv); 515 get_options (r_argc, r_argv);
531 free (r_argv); 516 free (r_argv);
532 517
533#ifdef LOCAL_X_IS_UNIX 518#ifdef LOCAL_X_IS_UNIX
534 if (rs[Rs_display_name][0] == ':') 519 if (rs[Rs_display_name][0] == ':')
535 { 520 {
536 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 521 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name]));
537 STRCPY (val, "unix"); 522 STRCPY (val, "unix");
538 STRCAT (val, rs[Rs_display_name]); 523 STRCAT (val, rs[Rs_display_name]);
539 Xdisplay = XOpenDisplay (val); 524 display = displays.get (val);
540 free (val); 525 free (val);
541 } 526 }
542#endif 527#endif
543 528
544 if (Xdisplay == NULL 529 if (!display
545 && (Xdisplay = XOpenDisplay (rs[Rs_display_name])) == NULL) 530 && ! (display = displays.get (rs[Rs_display_name])))
546 {
547 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 531 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
548 exit (EXIT_FAILURE);
549 }
550 532
551 rxvt_extract_resources (this, Xdisplay, rs[Rs_name]); 533 extract_resources (display->display, rs[Rs_name]);
552 534
553 /* 535 /*
554 * set any defaults not already set 536 * set any defaults not already set
555 */ 537 */
556 if (cmd_argv && cmd_argv[0]) 538 if (cmd_argv && cmd_argv[0])
557 { 539 {
558 if (!rs[Rs_title]) 540 if (!rs[Rs_title])
559 rs[Rs_title] = rxvt_r_basename(cmd_argv[0]); 541 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);
560 if (!rs[Rs_iconName]) 542 if (!rs[Rs_iconName])
561 rs[Rs_iconName] = rs[Rs_title]; 543 rs[Rs_iconName] = rs[Rs_title];
562 } 544 }
563 else 545 else
564 { 546 {
… …
566 rs[Rs_title] = rs[Rs_name]; 548 rs[Rs_title] = rs[Rs_name];
567 if (!rs[Rs_iconName]) 549 if (!rs[Rs_iconName])
568 rs[Rs_iconName] = rs[Rs_name]; 550 rs[Rs_iconName] = rs[Rs_name];
569 } 551 }
570 552
571 if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) 553 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
572 TermWin.saveLines = BOUND_POSITIVE_INT16(i); 554 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
573 555
574#ifndef NO_FRILLS 556#ifndef NO_FRILLS
575 if (rs[Rs_int_bwidth] && (i = atoi(rs[Rs_int_bwidth])) >= 0) 557 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
576 TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ 558 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
577 if (rs[Rs_ext_bwidth] && (i = atoi(rs[Rs_ext_bwidth])) >= 0) 559 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
578 TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ 560 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
579#endif 561#endif
580 562
581#ifndef NO_LINESPACE 563#ifndef NO_LINESPACE
582 if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) 564 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
583 TermWin.lineSpace = min(i, 100); /* arbitrary limit */ 565 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
584#endif 566#endif
585 567
586#ifdef POINTER_BLANK 568#ifdef POINTER_BLANK
587 if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0) 569 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
588 pointerBlankDelay = i; 570 pointerBlankDelay = i;
589 else 571 else
590 pointerBlankDelay = 2; 572 pointerBlankDelay = 2;
591#endif 573#endif
592 574
… …
599 rs[Rs_print_pipe] = PRINTPIPE; 581 rs[Rs_print_pipe] = PRINTPIPE;
600#endif 582#endif
601 583
602 if (!rs[Rs_cutchars]) 584 if (!rs[Rs_cutchars])
603 rs[Rs_cutchars] = CUTCHARS; 585 rs[Rs_cutchars] = CUTCHARS;
604
605#ifdef ACS_ASCII
606 if (!rs[Rs_acs_chars])
607 rs[Rs_acs_chars] = ACS_CHARS;
608 if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20)
609 {
610 val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20);
611 for (; i < 0x20; )
612 val[i] = ' ';
613 rs[Rs_acs_chars] = val;
614 }
615#endif
616 586
617#ifndef NO_BACKSPACE_KEY 587#ifndef NO_BACKSPACE_KEY
618 if (!rs[Rs_backspace_key]) 588 if (!rs[Rs_backspace_key])
619# ifdef DEFAULT_BACKSPACE 589# ifdef DEFAULT_BACKSPACE
620 key_backspace = DEFAULT_BACKSPACE; 590 key_backspace = DEFAULT_BACKSPACE;
621# else 591# else
622 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 592 key_backspace = "DEC"; /* can toggle between \010 or \177 */
623# endif 593# endif
624 else 594 else
625 { 595 {
626 val = STRDUP(rs[Rs_backspace_key]); 596 val = STRDUP (rs[Rs_backspace_key]);
627 rxvt_Str_trim(val); 597 rxvt_Str_trim (val);
628 rxvt_Str_escaped(val); 598 rxvt_Str_escaped (val);
629 key_backspace = val; 599 key_backspace = val;
630 } 600 }
631#endif 601#endif
632 602
633#ifndef NO_DELETE_KEY 603#ifndef NO_DELETE_KEY
… …
637# else 607# else
638 key_delete = "\033[3~"; 608 key_delete = "\033[3~";
639# endif 609# endif
640 else 610 else
641 { 611 {
642 val = STRDUP(rs[Rs_delete_key]); 612 val = STRDUP (rs[Rs_delete_key]);
643 rxvt_Str_trim(val); 613 rxvt_Str_trim (val);
644 rxvt_Str_escaped(val); 614 rxvt_Str_escaped (val);
645 key_delete = val; 615 key_delete = val;
646 } 616 }
647#endif 617#endif
648 if (rs[Rs_answerbackstring]) 618 if (rs[Rs_answerbackstring])
649 { 619 {
650 rxvt_Str_trim((char *)rs[Rs_answerbackstring]); 620 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
651 rxvt_Str_escaped((char *)rs[Rs_answerbackstring]); 621 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
652 }
653
654 if (rs[Rs_selectstyle])
655 {
656 if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0)
657 selection_style = OLD_WORD_SELECT;
658#ifndef NO_OLD_SELECTION
659
660 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0)
661 selection_style = OLD_SELECT;
662#endif
663 } 622 }
664 623
665#ifdef HAVE_SCROLLBARS 624#ifdef HAVE_SCROLLBARS
666 rxvt_setup_scrollbar (this, rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 625 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
667 rs[Rs_scrollBar_thickness]); 626 rs[Rs_scrollBar_thickness]);
668#endif 627#endif
669
670 TermWin.fontset = new rxvt_fontset (this);
671 TermWin.fontset->populate (rs[Rs_font]);
672 TermWin.fwidth = TermWin.fontset->base_font ()->width;
673 TermWin.fheight = TermWin.fontset->base_font ()->height;
674 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
675 628
676#ifdef XTERM_REVERSE_VIDEO 629#ifdef XTERM_REVERSE_VIDEO
677 /* this is how xterm implements reverseVideo */ 630 /* this is how xterm implements reverseVideo */
678 if (Options & Opt_reverseVideo) 631 if (Options & Opt_reverseVideo)
679 { 632 {
… …
689 rs[Rs_color + i] = def_colorName[i]; 642 rs[Rs_color + i] = def_colorName[i];
690 643
691#ifndef XTERM_REVERSE_VIDEO 644#ifndef XTERM_REVERSE_VIDEO
692 /* this is how we implement reverseVideo */ 645 /* this is how we implement reverseVideo */
693 if (Options & Opt_reverseVideo) 646 if (Options & Opt_reverseVideo)
694 SWAP_IT(rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 647 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
695#endif 648#endif
696 649
697 /* convenient aliases for setting fg/bg to colors */ 650 /* convenient aliases for setting fg/bg to colors */
698 color_aliases (Color_fg); 651 color_aliases (Color_fg);
699 color_aliases (Color_bg); 652 color_aliases (Color_bg);
700#ifndef NO_CURSORCOLOR 653#ifndef NO_CURSORCOLOR
701 color_aliases (Color_cursor); 654 color_aliases (Color_cursor);
702 color_aliases (Color_cursor2); 655 color_aliases (Color_cursor2);
703#endif /* NO_CURSORCOLOR */ 656#endif /* NO_CURSORCOLOR */
704 color_aliases (Color_pointer); 657 color_aliases (Color_pointer_fg);
658 color_aliases (Color_pointer_bg);
705 color_aliases (Color_border); 659 color_aliases (Color_border);
706#ifndef NO_BOLD_UNDERLINE_REVERSE 660#ifndef NO_BOLD_UNDERLINE_REVERSE
707 color_aliases (Color_BD); 661 color_aliases (Color_BD);
708 color_aliases (Color_UL); 662 color_aliases (Color_UL);
709 color_aliases (Color_RV); 663 color_aliases (Color_RV);
… …
722 676
723#ifdef DISPLAY_IS_IP 677#ifdef DISPLAY_IS_IP
724 /* Fixup display_name for export over pty to any interested terminal 678 /* Fixup display_name for export over pty to any interested terminal
725 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 679 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
726 * (for the first non-loopback interface) that we get from 680 * (for the first non-loopback interface) that we get from
727 * rxvt_network_display(). This is more "name-resolution-portable", if you 681 * rxvt_network_display (). This is more "name-resolution-portable", if you
728 * will, and probably allows for faster x-client startup if your name 682 * will, and probably allows for faster x-client startup if your name
729 * server is beyond a slow link or overloaded at client startup. Of 683 * server is beyond a slow link or overloaded at client startup. Of
730 * course that only helps the shell's child processes, not us. 684 * course that only helps the shell's child processes, not us.
731 * 685 *
732 * Giving out the display_name also affords a potential security hole 686 * Giving out the display_name also affords a potential security hole
… …
734 val = rxvt_network_display (rs[Rs_display_name]); 688 val = rxvt_network_display (rs[Rs_display_name]);
735 rs[Rs_display_name] = (const char *)val; 689 rs[Rs_display_name] = (const char *)val;
736 690
737 if (val == NULL) 691 if (val == NULL)
738#endif /* DISPLAY_IS_IP */ 692#endif /* DISPLAY_IS_IP */
739 val = XDisplayString(Xdisplay); 693 val = XDisplayString (display->display);
740 694
741 if (rs[Rs_display_name] == NULL) 695 if (rs[Rs_display_name] == NULL)
742 rs[Rs_display_name] = val; /* use broken `:0' value */ 696 rs[Rs_display_name] = val; /* use broken `:0' value */
743 697
744 i = STRLEN (val); 698 i = STRLEN (val);
745 env_display = (char *)rxvt_malloc ((i + 9) * sizeof(char)); 699 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
746 700
747 sprintf (env_display, "DISPLAY=%s", val); 701 sprintf (env_display, "DISPLAY=%s", val);
748 702
749 /* avoiding the math library: 703 /* avoiding the math library:
750 * i = (int)(ceil(log10((unsigned int)TermWin.parent[0]))) */ 704 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
751 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 705 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
752 ; 706 ;
753 MAX_IT(i, 1); 707 MAX_IT (i, 1);
754 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof(char)); 708 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
755 709
756 sprintf (env_windowid, "WINDOWID=%u", 710 sprintf (env_windowid, "WINDOWID=%u",
757 (unsigned int)TermWin.parent[0]); 711 (unsigned int)TermWin.parent[0]);
758 712
759 /* add entries to the environment: 713 /* add entries to the environment:
760 * @ DISPLAY: in case we started with -display 714 * @ DISPLAY: in case we started with -display
761 * @ WINDOWID: X window id number of the window 715 * @ WINDOWID: X window id number of the window
762 * @ COLORTERM: terminal sub-name and also indicates its color 716 * @ COLORTERM: terminal sub-name and also indicates its color
763 * @ TERM: terminal name 717 * @ TERM: terminal name
764 * @ TERMINFO: path to terminfo directory 718 * @ TERMINFO: path to terminfo directory
719 * @ COLORFGBG: fg;bg color codes
765 */ 720 */
766 putenv (env_display); 721 putenv (env_display);
767 putenv (env_windowid); 722 putenv (env_windowid);
723 if (env_colorfgbg)
724 putenv (env_colorfgbg);
768 725
769#ifdef RXVT_TERMINFO 726#ifdef RXVT_TERMINFO
770 putenv ("TERMINFO=" RXVT_TERMINFO); 727 putenv ("TERMINFO=" RXVT_TERMINFO);
771#endif 728#endif
772 729
773 if (Xdepth <= 2) 730 if (display->depth <= 2)
774 putenv ("COLORTERM=" COLORTERMENV "-mono"); 731 putenv ("COLORTERM=" COLORTERMENV "-mono");
775 else 732 else
776 putenv ("COLORTERM=" COLORTERMENVFULL); 733 putenv ("COLORTERM=" COLORTERMENVFULL);
777 734
778 if (rs[Rs_term_name] != NULL) 735 if (rs[Rs_term_name] != NULL)
779 { 736 {
780 env_term = (char *)rxvt_malloc ((STRLEN(rs[Rs_term_name]) + 6) * sizeof(char)); 737 env_term = (char *)rxvt_malloc ((STRLEN (rs[Rs_term_name]) + 6) * sizeof (char));
781 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 738 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
782 putenv (env_term); 739 putenv (env_term);
783 } 740 }
784 else 741 else
785 putenv ("TERM=" TERMENV); 742 putenv ("TERM=" TERMENV);
… …
800void 757void
801rxvt_term::set_locale (const char *locale) 758rxvt_term::set_locale (const char *locale)
802{ 759{
803#if HAVE_XSETLOCALE || HAVE_SETLOCALE 760#if HAVE_XSETLOCALE || HAVE_SETLOCALE
804 free (this->locale); 761 free (this->locale);
805 this->locale = strdup (setlocale (LC_CTYPE, "")); 762 this->locale = setlocale (LC_CTYPE, locale);
763
764 if (!this->locale)
765 {
766 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
767 setlocale (LC_CTYPE, "");
768 this->locale = "";
769 }
770
771 this->locale = rxvt_strdup (this->locale);
772 SET_LOCALE (this->locale);
773 mbstate.reset ();
806#endif 774#endif
775#if 0
807#if HAVE_NL_LANGINFO 776#if HAVE_NL_LANGINFO
808 free (codeset); 777 free (codeset);
809 codeset = strdup (nl_langinfo (CODESET)); 778 codeset = strdup (nl_langinfo (CODESET));
810 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 779 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
811 || !STRCASECMP (codeset, "UTF8"); 780 || !STRCASECMP (codeset, "UTF8");
812#else 781#else
813 enc_utf8 = 1; 782 enc_utf8 = 1;
783#endif
814#endif 784#endif
815} 785}
816 786
817void 787void
818rxvt_term::init_xlocale () 788rxvt_term::init_xlocale ()
819{ 789{
820#ifdef USE_XIM 790#ifdef USE_XIM
821 if (!locale) 791 if (!locale)
822 rxvt_print_error ("Setting locale failed."); 792 rxvt_warn ("setting locale failed, working without locale support.\n");
823 else 793 else
824 { 794 {
825 Atom wmlocale; 795 Atom wmlocale;
826 796
827 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False); 797 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
828 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale, 798 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
829 XA_STRING, 8, PropModeReplace, 799 XA_STRING, 8, PropModeReplace,
830 (unsigned char *)locale, STRLEN(locale)); 800 (unsigned char *)locale, STRLEN (locale));
831 801
832 if (!XSupportsLocale ()) 802 if (!XSupportsLocale ())
833 { 803 {
834 rxvt_print_error ("The locale is not supported by Xlib"); 804 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n");
835 return; 805 return;
836 } 806 }
837 807
808 im_ev.start (display);
809
838 /* see if we can connect yet */ 810 /* see if we can connect already */
839 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 811 im_cb ();
840
841 /* To avoid Segmentation Fault in C locale: Solaris only? */
842 if (STRCMP (locale, "C"))
843 XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL,
844 rxvt_IMInstantiateCallback, NULL);
845 } 812 }
846#endif 813#endif
847} 814}
848 815
849/*----------------------------------------------------------------------*/ 816/*----------------------------------------------------------------------*/
850void 817void
851rxvt_term::init_command(const char *const *argv) 818rxvt_term::init_command (const char *const *argv)
852{ 819{
853 /* 820 /*
854 * Initialize the command connection. 821 * Initialize the command connection.
855 * This should be called after the X server connection is established. 822 * This should be called after the X server connection is established.
856 */ 823 */
857 int i; 824 int i;
858 825
859 for (i = 0; i < NUM_XA; i++) 826 for (i = 0; i < NUM_XA; i++)
860 xa[i] = XInternAtom(Xdisplay, xa_names[i], False); 827 xa[i] = XInternAtom (display->display, xa_names[i], False);
861 828
862 /* Enable delete window protocol */ 829 /* Enable delete window protocol */
863 XSetWMProtocols (Xdisplay, TermWin.parent[0], 830 XSetWMProtocols (display->display, TermWin.parent[0],
864 &(xa[XA_WMDELETEWINDOW]), 1); 831 & (xa[XA_WMDELETEWINDOW]), 1);
865 832
866#ifdef USING_W11LIB 833#ifdef USING_W11LIB
867 /* enable W11 callbacks */ 834 /* enable W11 callbacks */
868 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event); 835 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
869#endif 836#endif
870 837
871#ifdef META8_OPTION 838#ifdef META8_OPTION
872 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 839 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
873#endif 840#endif
874 841
875 rxvt_get_ourmods (this); 842 get_ourmods ();
876 843
877 if (!(Options & Opt_scrollTtyOutput)) 844 if (!(Options & Opt_scrollTtyOutput))
878 PrivateModes |= PrivMode_TtyOutputInh; 845 PrivateModes |= PrivMode_TtyOutputInh;
879 if (Options & Opt_scrollTtyKeypress) 846 if (Options & Opt_scrollTtyKeypress)
880 PrivateModes |= PrivMode_Keypress; 847 PrivateModes |= PrivMode_Keypress;
881 if (!(Options & Opt_jumpScroll)) 848 if (!(Options & Opt_jumpScroll))
882 PrivateModes |= PrivMode_smoothScroll; 849 PrivateModes |= PrivMode_smoothScroll;
883 850
884#ifndef NO_BACKSPACE_KEY 851#ifndef NO_BACKSPACE_KEY
885 if (STRCMP(key_backspace, "DEC") == 0) 852 if (STRCMP (key_backspace, "DEC") == 0)
886 PrivateModes |= PrivMode_HaveBackSpace; 853 PrivateModes |= PrivMode_HaveBackSpace;
887#endif 854#endif
888 855
889 /* add value for scrollBar */ 856 /* add value for scrollBar */
890 if (scrollbar_visible (this)) 857 if (scrollbar_visible ())
891 { 858 {
892 PrivateModes |= PrivMode_scrollBar; 859 PrivateModes |= PrivMode_scrollBar;
893 SavedModes |= PrivMode_scrollBar; 860 SavedModes |= PrivMode_scrollBar;
894 } 861 }
895 if (menubar_visible (this)) 862 if (menubar_visible ())
896 { 863 {
897 PrivateModes |= PrivMode_menuBar; 864 PrivateModes |= PrivMode_menuBar;
898 SavedModes |= PrivMode_menuBar; 865 SavedModes |= PrivMode_menuBar;
899 } 866 }
900 867
901#ifdef GREEK_SUPPORT
902 greek_init();
903#endif
904
905 Xfd = XConnectionNumber (Xdisplay);
906
907#ifdef CURSOR_BLINK 868#ifdef CURSOR_BLINK
908
909 if (Options & Opt_cursorBlink) 869 if (Options & Opt_cursorBlink)
910 (void)gettimeofday (&lastcursorchange, NULL); 870 (void)gettimeofday (&lastcursorchange, NULL);
911#endif 871#endif
912 872
913 if ((cmd_fd = run_command (argv)) < 0) 873 run_command (argv);
914 {
915 rxvt_print_error ("aborting");
916 exit (EXIT_FAILURE);
917 }
918} 874}
919 875
920/*----------------------------------------------------------------------*/ 876/*----------------------------------------------------------------------*/
921/* INTPROTO */
922void 877void
923rxvt_Get_Colours (pR) 878rxvt_term::Get_Colours ()
924{ 879{
925 int i; 880 int i;
926 881
882#ifdef OFF_FOCUS_FADING
883 PixColors = PixColorsFocused;
884#endif
885
927 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 886 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
928 { 887 {
929 rxvt_color xcol; 888 rxvt_color xcol;
930 889
931 if (!R->rs[Rs_color + i]) 890 if (!rs[Rs_color + i])
932 continue; 891 continue;
933 892
934 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 893 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
935 { 894 {
936#ifndef XTERM_REVERSE_VIDEO 895#ifndef XTERM_REVERSE_VIDEO
937 if (i < 2 && (R->Options & Opt_reverseVideo)) 896 if (i < 2 && (Options & Opt_reverseVideo))
938 {
939 R->rs[Rs_color + i] = def_colorName[!i]; 897 rs[Rs_color + i] = def_colorName[!i];
940 }
941 else 898 else
942#endif 899#endif
943 R->rs[Rs_color + i] = def_colorName[i]; 900 rs[Rs_color + i] = def_colorName[i];
944 901
945 if (!R->rs[Rs_color + i]) 902 if (!rs[Rs_color + i])
946 continue; 903 continue;
947 904
948 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 905 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
949 { 906 {
950 switch (i) 907 switch (i)
951 { 908 {
952 case Color_fg: 909 case Color_fg:
953 case Color_bg: 910 case Color_bg:
954 /* fatal: need bg/fg color */ 911 /* fatal: need bg/fg color */
955 rxvt_print_error ("aborting"); 912 rxvt_fatal ("unable to get foreground/background colour, aborting");
956 exit (EXIT_FAILURE);
957 /* NOTREACHED */ 913 /* NOTREACHED */
958 break; 914 break;
959#ifndef NO_CURSORCOLOR 915#ifndef NO_CURSORCOLOR
960 case Color_cursor2: 916 case Color_cursor2:
961 xcol = R->PixColors[Color_fg]; 917 xcol = PixColors[Color_fg];
962 break; 918 break;
963#endif /* ! NO_CURSORCOLOR */ 919#endif /* ! NO_CURSORCOLOR */
964 case Color_pointer: 920 case Color_pointer_fg:
965 xcol = R->PixColors[Color_fg]; 921 xcol = PixColors[Color_fg];
966 break; 922 break;
967 default: 923 default:
968 xcol = R->PixColors[Color_bg]; /* None */ 924 xcol = PixColors[Color_bg]; /* None */
969 break; 925 break;
970 } 926 }
971 } 927 }
972 } 928 }
973 929
974 R->PixColors[i] = xcol; 930 PixColors[i] = xcol;
931#ifdef OFF_FOCUS_FADING
932 if (rs[Rs_fade])
933 PixColorsUnFocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
934#endif
975 SET_PIXCOLOR (R, i); 935 SET_PIXCOLOR (i);
936 }
937
938 if (display->depth <= 2)
976 } 939 {
977 940 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
978 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 941 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg];
979 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 942 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg];
980 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 943 }
981 R->PixColors[Color_border] = R->PixColors[Color_fg];
982 944
983 /* 945 /*
984 * get scrollBar/menuBar shadow colors 946 * get scrollBar/menuBar shadow colors
985 * 947 *
986 * The calculations of topShadow/bottomShadow values are adapted 948 * The calculations of topShadow/bottomShadow values are adapted
987 * from the fvwm window manager. 949 * from the fvwm window manager.
988 */ 950 */
989#ifdef KEEP_SCROLLCOLOR 951#ifdef KEEP_SCROLLCOLOR
990 952
991 if (XDEPTH <= 2) 953 if (display->depth <= 2)
992 { /* Monochrome */ 954 { /* Monochrome */
993 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 955 PixColors[Color_scroll] = PixColors[Color_fg];
994 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 956 PixColors[Color_topShadow] = PixColors[Color_bg];
995 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 957 PixColors[Color_bottomShadow] = PixColors[Color_bg];
996 } 958 }
997 else 959 else
998 { 960 {
999 rxvt_color xcol[3]; 961 rxvt_color xcol[2];
1000 /* xcol[0] == white 962 /* xcol[0] == white
1001 * xcol[1] == top shadow 963 * xcol[1] == top shadow
1002 * xcol[2] == bot shadow */ 964 * xcol[2] == bot shadow */
1003 965
1004 xcol[1] = R->PixColors[Color_scroll]; 966 xcol[1] = PixColors[Color_scroll];
1005# ifdef PREFER_24BIT
1006 xcol[0].set (R, 65535, 65535, 65535); 967 xcol[0].set (display, 65535, 65535, 65535);
1007 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */
1008# else
1009 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen));
1010# endif
1011 968
1012 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 969 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1013 970
1014 xcol[0].get (R, pr0, pg0, pb0); 971 xcol[0].get (display, pr0, pg0, pb0);
1015 xcol[1].get (R, pr1, pg1, pb1); 972 xcol[1].get (display, pr1, pg1, pb1);
1016 973
1017 /* bottomShadowColor */
1018 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2))
1019 xcol[2] = R->PixColors[Color_Black];
1020
1021 R->PixColors[Color_bottomShadow] = xcol[2]; 974 PixColors[Color_bottomShadow] = xcol[1].fade (display, 50);
1022 975
1023 /* topShadowColor */ 976 /* topShadowColor */
1024 if (!xcol[1].set (aR_ 977 if (!xcol[1].set (display,
1025 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 978 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1026 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 979 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1027 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 980 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1028 xcol[1] = R->PixColors[Color_White]; 981 xcol[1] = PixColors[Color_White];
1029 982
1030 R->PixColors[Color_topShadow] = xcol[1]; 983 PixColors[Color_topShadow] = xcol[1];
1031 } 984 }
1032#endif /* KEEP_SCROLLCOLOR */ 985#endif /* KEEP_SCROLLCOLOR */
1033} 986}
1034 987
1035/*----------------------------------------------------------------------*/ 988/*----------------------------------------------------------------------*/
1036/* color aliases, fg/bg bright-bold */ 989/* color aliases, fg/bg bright-bold */
1037void 990void
1038rxvt_term::color_aliases(int idx) 991rxvt_term::color_aliases (int idx)
1039{ 992{
1040 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) 993 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1041 { 994 {
1042 int i = atoi (rs[Rs_color + idx]); 995 int i = atoi (rs[Rs_color + idx]);
1043 996
1044 if (i >= 8 && i <= 15) 997 if (i >= 8 && i <= 15)
1045 { /* bright colors */ 998 { /* bright colors */
1046 i -= 8; 999 i -= 8;
1047#ifndef NO_BRIGHTCOLOR 1000#ifndef NO_BRIGHTCOLOR
1048 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1001 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1049 return; 1002 return;
1050#endif 1003#endif
1004
1051 } 1005 }
1052 1006
1053 if (i >= 0 && i <= 7) /* normal colors */ 1007 if (i >= 0 && i <= 7) /* normal colors */
1054 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1008 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1055 } 1009 }
… …
1058/*----------------------------------------------------------------------*/ 1012/*----------------------------------------------------------------------*/
1059/* 1013/*
1060 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings 1014 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings
1061 * Use resource ``modifier'' to override the Meta modifier 1015 * Use resource ``modifier'' to override the Meta modifier
1062 */ 1016 */
1063/* INTPROTO */
1064void 1017void
1065rxvt_get_ourmods(pR) 1018rxvt_term::get_ourmods ()
1066{ 1019{
1067 int i, j, k; 1020 int i, j, k;
1068 int requestedmeta, realmeta, realalt; 1021 int requestedmeta, realmeta, realalt;
1069 const char *cm, *rsmod; 1022 const char *cm, *rsmod;
1070 XModifierKeymap *map; 1023 XModifierKeymap *map;
… …
1073 { 1026 {
1074 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1027 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1075 }; 1028 };
1076 1029
1077 requestedmeta = realmeta = realalt = 0; 1030 requestedmeta = realmeta = realalt = 0;
1078 rsmod = R->rs[Rs_modifier]; 1031 rsmod = rs[Rs_modifier];
1079 if (rsmod 1032 if (rsmod
1080 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1033 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0)
1081 requestedmeta = rsmod[3] - '0'; 1034 requestedmeta = rsmod[3] - '0';
1082 1035
1083 map = XGetModifierMapping(R->Xdisplay); 1036 map = XGetModifierMapping (display->display);
1084 kc = map->modifiermap; 1037 kc = map->modifiermap;
1085 for (i = 1; i < 6; i++) 1038 for (i = 1; i < 6; i++)
1086 { 1039 {
1087 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1040 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1088 for (j = map->max_keypermod; j--; k++) 1041 for (j = map->max_keypermod; j--; k++)
1089 { 1042 {
1090 if (kc[k] == 0) 1043 if (kc[k] == 0)
1091 break; 1044 break;
1092 switch (XKeycodeToKeysym(R->Xdisplay, kc[k], 0)) 1045 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1093 { 1046 {
1094 case XK_Num_Lock: 1047 case XK_Num_Lock:
1095 R->ModNumLockMask = modmasks[i - 1]; 1048 ModNumLockMask = modmasks[i - 1];
1096 /* FALLTHROUGH */ 1049 /* FALLTHROUGH */
1097 default: 1050 default:
1098 continue; /* for(;;) */ 1051 continue; /* for (;;) */
1099 case XK_Meta_L: 1052 case XK_Meta_L:
1100 case XK_Meta_R: 1053 case XK_Meta_R:
1101 cm = "meta"; 1054 cm = "meta";
1102 realmeta = i; 1055 realmeta = i;
1103 break; 1056 break;
1104 case XK_Alt_L: 1057 case XK_Alt_L:
1105 case XK_Alt_R: 1058 case XK_Alt_R:
1106 cm = "alt"; 1059 cm = "alt";
1107 realalt = i; 1060 realalt = i;
1108 break; 1061 break;
1109 case XK_Super_L: 1062 case XK_Super_L:
1110 case XK_Super_R: 1063 case XK_Super_R:
1111 cm = "super"; 1064 cm = "super";
1112 break; 1065 break;
1113 case XK_Hyper_L: 1066 case XK_Hyper_L:
1114 case XK_Hyper_R: 1067 case XK_Hyper_R:
1115 cm = "hyper"; 1068 cm = "hyper";
1116 break; 1069 break;
1117 } 1070 }
1118 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1071 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0)
1119 requestedmeta = i; 1072 requestedmeta = i;
1120 } 1073 }
1121 } 1074 }
1122 XFreeModifiermap(map); 1075 XFreeModifiermap (map);
1123 i = (requestedmeta ? requestedmeta 1076 i = (requestedmeta ? requestedmeta
1124 : (realmeta ? realmeta 1077 : (realmeta ? realmeta
1125 : (realalt ? realalt : 0))); 1078 : (realalt ? realalt : 0)));
1126 if (i) 1079 if (i)
1127 R->ModMetaMask = modmasks[i - 1]; 1080 ModMetaMask = modmasks[i - 1];
1128} 1081}
1129 1082
1130/*----------------------------------------------------------------------*/ 1083/*----------------------------------------------------------------------*/
1131/* rxvt_Create_Windows() - Open and map the window */ 1084/* rxvt_Create_Windows () - Open and map the window */
1132void 1085void
1133rxvt_term::create_windows (int argc, const char *const *argv) 1086rxvt_term::create_windows (int argc, const char *const *argv)
1134{ 1087{
1135 XClassHint classHint; 1088 XClassHint classHint;
1136 XWMHints wmHint; 1089 XWMHints wmHint;
1090#ifndef NO_FRILLS
1091 Atom prop = None;
1092 MWMHints mwmhints;
1093#endif
1137 XGCValues gcvalue; 1094 XGCValues gcvalue;
1138 long vt_emask; 1095 long vt_emask;
1139
1140 XSetWindowAttributes attributes; 1096 XSetWindowAttributes attributes;
1141 XWindowAttributes gattr; 1097 XWindowAttributes gattr;
1142 1098
1143 Xcmap = DefaultColormap (Xdisplay, Xscreen);
1144 Xvisual = DefaultVisual (Xdisplay, Xscreen);
1145 Xscreen = DefaultScreen (Xdisplay);
1146
1147 if (Options & Opt_transparent) 1099 if (Options & Opt_transparent)
1148 { 1100 {
1149 XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr); 1101 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1150 Xdepth = gattr.depth; 1102 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1103 }
1104
1105#ifndef NO_FRILLS
1106 if (Options & Opt_borderLess)
1107 {
1108 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);
1109 if (prop == None)
1110 {
1111 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
1112#ifdef PREFER_24BIT
1113 attributes.override_redirect = TRUE;
1114#endif
1115 mwmhints.flags = 0;
1116 }
1117 else
1118 {
1119 mwmhints.flags = MWM_HINTS_DECORATIONS;
1120 mwmhints.decorations = 0;
1121 }
1151 } 1122 }
1152 else 1123 else
1153 { 1124 {
1154 Xdepth = DefaultDepth(Xdisplay, Xscreen); 1125 mwmhints.flags = 0;
1155#ifdef PREFER_24BIT
1156 /*
1157 * If depth is not 24, look for a 24bit visual.
1158 */
1159 if (Xdepth != 24)
1160 {
1161 XVisualInfo vinfo;
1162
1163 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1164 {
1165 Xdepth = 24;
1166 Xvisual = vinfo.visual;
1167 Xcmap = XCreateColormap(Xdisplay,
1168 RootWindow(Xdisplay, Xscreen),
1169 Xvisual, AllocNone);
1170 }
1171 }
1172#endif
1173 } 1126 }
1127#endif
1174 1128
1175 /* grab colors before netscape does */ 1129 /* grab colors before netscape does */
1176 rxvt_Get_Colours (this); 1130 Get_Colours ();
1177 1131
1178 rxvt_change_font (this, 1, NULL); 1132 if (!change_font (rs[Rs_font]))
1133 {
1134 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1135 destroy ();
1136 return;
1137 }
1138
1179 window_calc (0, 0); 1139 window_calc (0, 0);
1180 old_width = szHint.width; 1140 old_width = szHint.width;
1181 old_height = szHint.height; 1141 old_height = szHint.height;
1182 1142
1183 /* parent window - reverse video so we can see placement errors
1184 * sub-window placement & size in rxvt_resize_subwindows() 1143 /* sub-window placement & size in rxvt_resize_subwindows () */
1185 */
1186 1144
1187#ifdef PREFER_24BIT 1145#ifdef PREFER_24BIT
1188 attributes.background_pixel = PixColors[Color_fg]; 1146 attributes.background_pixel = PixColors[Color_bg];
1189 attributes.border_pixel = PixColors[Color_border]; 1147 attributes.border_pixel = PixColors[Color_border];
1190 attributes.colormap = Xcmap; 1148 attributes.colormap = display->cmap;
1191 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1149 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1192 szHint.x, szHint.y, 1150 szHint.x, szHint.y,
1193 szHint.width, szHint.height, 1151 szHint.width, szHint.height,
1194 TermWin.ext_bwidth, 1152 TermWin.ext_bwidth,
1195 Xdepth, InputOutput, 1153 display->depth, InputOutput,
1196 Xvisual, 1154 display->visual,
1197 CWBackPixel | CWBorderPixel 1155 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1198 | CWColormap, &attributes);
1199#else 1156#else
1200 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1157 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1201 szHint.x, szHint.y, 1158 szHint.x, szHint.y,
1202 szHint.width, 1159 szHint.width, szHint.height,
1203 szHint.height,
1204 TermWin.ext_bwidth, 1160 TermWin.ext_bwidth,
1205 PixColors[Color_border], 1161 PixColors[Color_border],
1206 PixColors[Color_fg]); 1162 PixColors[Color_bg]);
1207#endif 1163#endif
1208 1164
1209 rxvt_xterm_seq (this, XTerm_title, rs[Rs_title], CHAR_ST); 1165 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1210 rxvt_xterm_seq (this, XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1166 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1211 1167
1212 classHint.res_name = (char *)rs[Rs_name]; 1168 classHint.res_name = (char *)rs[Rs_name];
1213 classHint.res_class = (char *)APL_CLASS; 1169 classHint.res_class = (char *)RESCLASS;
1214 1170
1215 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1171 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1216 wmHint.input = True; 1172 wmHint.input = True;
1217 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1173 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1218 : NormalState);
1219 wmHint.window_group = TermWin.parent[0]; 1174 wmHint.window_group = TermWin.parent[0];
1220 1175
1221 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL, 1176 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1222 (char **)argv, argc, &szHint, &wmHint, &classHint); 1177 (char **)argv, argc, &szHint, &wmHint, &classHint);
1178
1179#ifndef NO_FRILLS
1180 long pid = getpid ();
1181 XChangeProperty (display->display, TermWin.parent[0],
1182 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1183 PropModeReplace, (unsigned char *)&pid, 1);
1184#endif
1185
1223 XSelectInput(Xdisplay, TermWin.parent[0], 1186 XSelectInput (display->display, TermWin.parent[0],
1224 (KeyPressMask 1187 KeyPressMask
1225#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1188#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1226 | KeyReleaseMask 1189 | KeyReleaseMask
1227#endif 1190#endif
1228 | FocusChangeMask | VisibilityChangeMask 1191 | FocusChangeMask | VisibilityChangeMask
1192 | ExposureMask
1229 | StructureNotifyMask)); 1193 | StructureNotifyMask);
1194 termwin_ev.start (display, TermWin.parent[0]);
1195
1196#ifndef NO_FRILLS
1197 if (mwmhints.flags)
1198 {
1199 prop = XInternAtom(display->display, "_MOTIF_WM_HINTS", False);
1200 XChangeProperty(display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1201 }
1202#endif
1230 1203
1231 /* vt cursor: Black-on-White is standard, but this is more popular */ 1204 /* vt cursor: Black-on-White is standard, but this is more popular */
1232 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm); 1205 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1233 1206
1234#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1207#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1235 /* cursor (menuBar/scrollBar): Black-on-White */ 1208 /* cursor (menuBar/scrollBar): Black-on-White */
1236 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); 1209 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1237#endif 1210#endif
1238 1211
1239#ifdef POINTER_BLANK 1212#ifdef POINTER_BLANK
1240
1241 { 1213 {
1242 XColor blackcolour; 1214 XColor blackcolour;
1243 blackcolour.red = 0; 1215 blackcolour.red = 0;
1244 blackcolour.green = 0; 1216 blackcolour.green = 0;
1245 blackcolour.blue = 0; 1217 blackcolour.blue = 0;
1246 Font f = XLoadFont (Xdisplay, "fixed"); 1218 Font f = XLoadFont (display->display, "fixed");
1247 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ', 1219 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1248 &blackcolour, &blackcolour); 1220 &blackcolour, &blackcolour);
1249 XUnloadFont (Xdisplay, f); 1221 XUnloadFont (display->display, f);
1250 } 1222 }
1251#endif 1223#endif
1252 1224
1253 /* the vt window */ 1225 /* the vt window */
1254 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1226 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1255 window_vt_x, window_vt_y, 1227 window_vt_x,
1228 window_vt_y,
1256 TermWin_TotalWidth(), 1229 TermWin_TotalWidth (),
1257 TermWin_TotalHeight(), 1230 TermWin_TotalHeight (),
1258 0, 1231 0,
1259 PixColors[Color_fg], 1232 PixColors[Color_fg],
1260 PixColors[Color_bg]); 1233 PixColors[Color_bg]);
1261#ifdef DEBUG_X 1234#ifdef DEBUG_X
1262 XStoreName(Xdisplay, TermWin.vt, "vt window"); 1235 XStoreName (display->display, TermWin.vt, "vt window");
1263#endif 1236#endif
1264 1237
1238 attributes.bit_gravity = NorthWestGravity;
1239 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1240
1265 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1241 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1266 | PropertyChangeMask); 1242
1243 pointer_unblank ();
1267 1244
1268#ifdef POINTER_BLANK 1245#ifdef POINTER_BLANK
1269 pointer_unblank ();
1270
1271 if ((Options & Opt_pointerBlank)) 1246 if (Options & Opt_pointerBlank)
1272 vt_emask |= PointerMotionMask; 1247 vt_emask |= PointerMotionMask;
1273 else 1248 else
1274#endif 1249#endif
1275 vt_emask |= (Button1MotionMask | Button3MotionMask); 1250 vt_emask |= Button1MotionMask | Button3MotionMask;
1276 1251
1277 XSelectInput(Xdisplay, TermWin.vt, vt_emask); 1252 XSelectInput (display->display, TermWin.vt, vt_emask);
1253 vt_ev.start (display, TermWin.vt);
1278 1254
1279#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1255#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1280
1281 if (menuBar_height()) 1256 if (menuBar_height ())
1282 { 1257 {
1283 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1258 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1284 window_vt_x, 0, 1259 window_vt_x, 0,
1285 TermWin_TotalWidth(), 1260 TermWin_TotalWidth (),
1286 menuBar_TotalHeight(), 1261 menuBar_TotalHeight (),
1287 0, 1262 0,
1288 PixColors[Color_fg], 1263 PixColors[Color_fg],
1289 PixColors[Color_scroll]); 1264 PixColors[Color_scroll]);
1265
1290#ifdef DEBUG_X 1266#ifdef DEBUG_X
1291
1292 XStoreName(Xdisplay, menuBar.win, "menubar"); 1267 XStoreName (display->display, menuBar.win, "menubar");
1293#endif 1268#endif
1294 1269
1295 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr); 1270 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1271
1272 XDefineCursor (display->display, menuBar.win,
1273 XCreateFontCursor (display->display, XC_left_ptr));
1274
1296 XSelectInput(Xdisplay, menuBar.win, 1275 XSelectInput (display->display, menuBar.win,
1297 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1276 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1298 | Button1MotionMask)); 1277 | Button1MotionMask));
1278 menubar_ev.start (display, menuBar.win);
1299 } 1279 }
1300#endif 1280#endif
1281
1301#ifdef XPM_BACKGROUND 1282#ifdef XPM_BACKGROUND
1302 if (rs[Rs_backgroundPixmap] != NULL 1283 if (rs[Rs_backgroundPixmap] != NULL
1303 && !(Options & Opt_transparent)) 1284 && ! (Options & Opt_transparent))
1304 { 1285 {
1305 const char *p = rs[Rs_backgroundPixmap]; 1286 const char *p = rs[Rs_backgroundPixmap];
1306 1287
1307 if ((p = STRCHR(p, ';')) != NULL) 1288 if ((p = STRCHR (p, ';')) != NULL)
1308 { 1289 {
1309 p++; 1290 p++;
1310 rxvt_scale_pixmap (this, p); 1291 scale_pixmap (p);
1311 } 1292 }
1312 rxvt_set_bgPixmap (this, rs[Rs_backgroundPixmap]); 1293 set_bgPixmap (rs[Rs_backgroundPixmap]);
1313 rxvt_scr_touch (this, True); 1294 scr_touch (True);
1314 } 1295 }
1315#endif 1296#endif
1316 1297
1317 /* graphics context for the vt window */ 1298 /* graphics context for the vt window */
1318 gcvalue.foreground = PixColors[Color_fg]; 1299 gcvalue.foreground = PixColors[Color_fg];
1319 gcvalue.background = PixColors[Color_bg]; 1300 gcvalue.background = PixColors[Color_bg];
1320 gcvalue.graphics_exposures = 1; 1301 gcvalue.graphics_exposures = 1;
1321 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, 1302 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1322 GCForeground | GCBackground 1303 GCForeground | GCBackground | GCGraphicsExposures,
1323 | GCGraphicsExposures, &gcvalue); 1304 &gcvalue);
1305
1306 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1324 1307
1325#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1308#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1326
1327 gcvalue.foreground = PixColors[Color_topShadow]; 1309 gcvalue.foreground = PixColors[Color_topShadow];
1328 topShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1310 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1329 GCForeground, &gcvalue);
1330 gcvalue.foreground = PixColors[Color_bottomShadow]; 1311 gcvalue.foreground = PixColors[Color_bottomShadow];
1331 botShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1312 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1332 GCForeground, &gcvalue); 1313 gcvalue.foreground = PixColors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1333 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1314 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1334 : Color_scroll)]; 1315#endif
1335 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt, 1316
1336 GCForeground, &gcvalue); 1317#ifdef OFF_FOCUS_FADING
1318 // initially we are in unfocused state
1319 if (rs[Rs_fade])
1320 PixColors = PixColorsUnFocused;
1337#endif 1321#endif
1338} 1322}
1339 1323
1340/*----------------------------------------------------------------------*/ 1324/*----------------------------------------------------------------------*/
1341/* 1325/*
1342 * Run the command in a subprocess and return a file descriptor for the 1326 * Run the command in a subprocess and return a file descriptor for the
1343 * master end of the pseudo-teletype pair with the command talking to 1327 * master end of the pseudo-teletype pair with the command talking to
1344 * the slave. 1328 * the slave.
1345 */ 1329 */
1346int 1330void
1347rxvt_term::run_command (const char *const *argv) 1331rxvt_term::run_command (const char *const *argv)
1348{ 1332{
1349 int cfd, er; 1333 int er;
1350 1334
1351 /* get master (pty) */ 1335 /* get master (pty) */
1352 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) 1336 if ((cmd_fd = rxvt_get_pty (&tty_fd, &ttydev)) < 0)
1353 {
1354 rxvt_print_error("can't open pseudo-tty"); 1337 rxvt_fatal ("can't open pseudo-tty");
1355 return -1;
1356 }
1357 1338
1358#ifdef FD_SETSIZE
1359 if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1360 {
1361 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1362 rxvt_clean_exit();
1363 exit(EXIT_FAILURE);
1364 }
1365#endif
1366
1367 fcntl (cfd, F_SETFL, O_NONBLOCK); 1339 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
1368 1340
1369 /* get slave (tty) */ 1341 /* get slave (tty) */
1370 if (tty_fd < 0) 1342 if (tty_fd < 0)
1371 { 1343 {
1372#ifndef NO_SETOWNER_TTYDEV 1344#ifndef NO_SETOWNER_TTYDEV
1373 rxvt_privileged_ttydev (aR_ SAVE); 1345 privileged_ttydev (SAVE);
1374#endif 1346#endif
1375 1347
1376 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1348 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1377 { 1349 {
1378 close(cfd); 1350 close (cmd_fd);
1351 cmd_fd = -1;
1379 rxvt_print_error("can't open slave tty %s", ttydev); 1352 rxvt_fatal ("can't open slave tty %s", ttydev);
1380 return -1;
1381 } 1353 }
1382 } 1354 }
1355
1383#ifndef NO_BACKSPACE_KEY 1356#ifndef NO_BACKSPACE_KEY
1384 if (key_backspace[0] && !key_backspace[1]) 1357 if (key_backspace[0] && !key_backspace[1])
1385 er = key_backspace[0]; 1358 er = key_backspace[0];
1386 else if (STRCMP(key_backspace, "DEC") == 0) 1359 else if (STRCMP (key_backspace, "DEC") == 0)
1387 er = '\177'; /* the initial state anyway */ 1360 er = '\177'; /* the initial state anyway */
1388 else 1361 else
1389#endif 1362#endif
1390
1391 er = -1; 1363 er = -1;
1392 1364
1393 rxvt_get_ttymode (&(tio), er); 1365 rxvt_get_ttymode (&tio, er);
1394 1366
1395#ifndef __QNX__ 1367#ifndef __QNX__
1396 /* spin off the command interpreter */ 1368 /* spin off the command interpreter */
1397 switch (cmd_pid = fork ()) 1369 switch (cmd_pid = fork ())
1398 { 1370 {
1399 case -1: 1371 case -1:
1400 rxvt_print_error("can't fork"); 1372 rxvt_fatal ("can't fork");
1401 return -1;
1402 case 0: 1373 case 0:
1403 close (cfd); /* only keep tty_fd and STDERR open */ 1374 init_env ();
1404 close (Xfd); 1375
1405 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1376 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1406 rxvt_print_error ("could not obtain control of tty"); 1377 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1407 else 1378 else
1379 {
1380 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1381 dup2 (tty_fd, STDIN_FILENO);
1382 dup2 (tty_fd, STDOUT_FILENO);
1383 dup2 (tty_fd, STDERR_FILENO);
1384
1385 // close all our file handles that we do no longer need
1386 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1387 {
1388 if ((*t)->cmd_fd > 2) close ((*t)->cmd_fd);
1389 if ((*t)->tty_fd > 2) close ((*t)->tty_fd);
1390 }
1391
1392 run_child (argv);
1393 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1394 }
1395
1396 _exit (EXIT_FAILURE);
1397
1398 default:
1408 { 1399 {
1409 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1400#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1401 int fdstdin;
1402
1403 fdstdin = dup (STDIN_FILENO);
1410 dup2 (tty_fd, STDIN_FILENO); 1404 dup2 (tty_fd, STDIN_FILENO);
1405#endif
1406
1407#ifdef UTMP_SUPPORT
1408 privileged_utmp (SAVE);
1409#endif
1410
1411#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1412
1411 dup2 (tty_fd, STDOUT_FILENO); 1413 dup2 (fdstdin, STDIN_FILENO);
1412 dup2 (tty_fd, STDERR_FILENO);
1413
1414 if (tty_fd > 2)
1415 close (tty_fd); 1414 close (fdstdin);
1416 1415#endif
1417 run_child (argv);
1418 } 1416 }
1419 exit (EXIT_FAILURE);
1420 /* NOTREACHED */
1421 default:
1422 {
1423#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1424 int fdstdin;
1425 1417
1426 fdstdin = dup (STDIN_FILENO);
1427 dup2 (tty_fd, STDIN_FILENO);
1428#endif
1429
1430#ifdef UTMP_SUPPORT
1431 rxvt_privileged_utmp (this, SAVE);
1432#endif
1433
1434#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1435
1436 dup2 (fdstdin, STDIN_FILENO);
1437 close (fdstdin);
1438#endif
1439
1440 }
1441 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ 1418 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1442 break; 1419 break;
1443 } 1420 }
1444#else /* __QNX__ uses qnxspawn() */ 1421#else /* __QNX__ uses qnxspawn () */
1445 fchmod (tty_fd, 0622); 1422 fchmod (tty_fd, 0622);
1446 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1423 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1447 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1424 fcntl (cmd_fd, F_SETFD, FD_CLOEXEC);
1448 1425
1449 if (run_child (argv) == -1) 1426 if (run_child (argv) == -1)
1450 exit (EXIT_FAILURE); 1427 exit (EXIT_FAILURE);
1451#endif 1428#endif
1452
1453 return cfd;
1454} 1429}
1455 1430
1456/* ------------------------------------------------------------------------- * 1431/* ------------------------------------------------------------------------- *
1457 * CHILD PROCESS OPERATIONS * 1432 * CHILD PROCESS OPERATIONS *
1458 * ------------------------------------------------------------------------- */ 1433 * ------------------------------------------------------------------------- */
… …
1463int 1438int
1464rxvt_term::run_child (const char *const *argv) 1439rxvt_term::run_child (const char *const *argv)
1465{ 1440{
1466 char *login; 1441 char *login;
1467 1442
1468 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ 1443 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1469 1444
1470 if (Options & Opt_console) 1445 if (Options & Opt_console)
1471 { /* be virtual console, fail silently */ 1446 { /* be virtual console, fail silently */
1472#ifdef TIOCCONS 1447#ifdef TIOCCONS
1473 unsigned int on = 1; 1448 unsigned int on = 1;
… …
1476#elif defined (SRIOCSREDIR) 1451#elif defined (SRIOCSREDIR)
1477 int fd; 1452 int fd;
1478 1453
1479 fd = open (CONSOLE, O_WRONLY, 0); 1454 fd = open (CONSOLE, O_WRONLY, 0);
1480 if (fd >= 0) 1455 if (fd >= 0)
1481 {
1482 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1456 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1483 close (fd); 1457 close (fd);
1484 }
1485#endif /* SRIOCSREDIR */ 1458#endif /* SRIOCSREDIR */
1459
1486 } 1460 }
1487 1461
1488 /* reset signals and spin off the command interpreter */ 1462 /* reset signals and spin off the command interpreter */
1489 signal (SIGINT, SIG_DFL); 1463 signal (SIGINT, SIG_DFL);
1490 signal (SIGQUIT, SIG_DFL); 1464 signal (SIGQUIT, SIG_DFL);
… …
1518 { 1492 {
1519# ifdef DEBUG_CMD 1493# ifdef DEBUG_CMD
1520 int i; 1494 int i;
1521 1495
1522 for (i = 0; argv[i]; i++) 1496 for (i = 0; argv[i]; i++)
1523 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1497 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1524# endif 1498# endif
1525 1499
1526 execvp(argv[0], (char *const *)argv); 1500 execvp (argv[0], (char *const *)argv);
1527 /* no error message: STDERR is closed! */ 1501 /* no error message: STDERR is closed! */
1528 } 1502 }
1529 else 1503 else
1530 { 1504 {
1531 const char *argv0, *shell; 1505 const char *argv0, *shell;
1532 1506
1533 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1507 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1534 shell = "/bin/sh"; 1508 shell = "/bin/sh";
1535 1509
1536 argv0 = (const char *)rxvt_r_basename(shell); 1510 argv0 = (const char *)rxvt_r_basename (shell);
1537 if (Options & Opt_loginShell) 1511 if (Options & Opt_loginShell)
1538 { 1512 {
1539 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1513 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1540 1514
1541 login[0] = '-'; 1515 login[0] = '-';
1542 STRCPY(&login[1], argv0); 1516 STRCPY (&login[1], argv0);
1543 argv0 = login; 1517 argv0 = login;
1544 } 1518 }
1545 execlp(shell, argv0, NULL); 1519 execlp (shell, argv0, NULL);
1546 /* no error message: STDERR is closed! */ 1520 /* no error message: STDERR is closed! */
1547 } 1521 }
1548 1522
1549#else /* __QNX__ uses qnxspawn() */ 1523#else /* __QNX__ uses qnxspawn () */
1550 1524
1551 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1525 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1552 char *command = NULL, fullcommand[_MAX_PATH]; 1526 char *command = NULL, fullcommand[_MAX_PATH];
1553 char **arg_v, *arg_a[2] = { NULL, NULL }; 1527 char **arg_v, *arg_a[2] = { NULL, NULL };
1554 1528
1555 if (argv != NULL) 1529 if (argv != NULL)
1556 { 1530 {
1557 if (access(argv[0], X_OK) == -1) 1531 if (access (argv[0], X_OK) == -1)
1558 { 1532 {
1559 if (STRCHR(argv[0], '/') == NULL) 1533 if (STRCHR (argv[0], '/') == NULL)
1560 { 1534 {
1561 searchenv(argv[0], "PATH", fullcommand); 1535 searchenv (argv[0], "PATH", fullcommand);
1562 if (fullcommand[0] != '\0') 1536 if (fullcommand[0] != '\0')
1563 command = fullcommand; 1537 command = fullcommand;
1564 } 1538 }
1565 if (access(command, X_OK) == -1) 1539 if (access (command, X_OK) == -1)
1566 return -1; 1540 return -1;
1567 } 1541 }
1568 else 1542 else
1569 command = argv[0]; 1543 command = argv[0];
1570 arg_v = argv; 1544 arg_v = argv;
1571 } 1545 }
1572 else 1546 else
1573 { 1547 {
1574 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1548 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1575 command = "/bin/sh"; 1549 command = "/bin/sh";
1576 1550
1577 arg_a[0] = my_basename(command); 1551 arg_a[0] = my_basename (command);
1578 if (Options & Opt_loginShell) 1552 if (Options & Opt_loginShell)
1579 { 1553 {
1580 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1554 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1581 1555
1582 login[0] = '-'; 1556 login[0] = '-';
1583 STRCPY(&login[1], arg_a[0]); 1557 STRCPY (&login[1], arg_a[0]);
1584 arg_a[0] = login; 1558 arg_a[0] = login;
1585 } 1559 }
1586 arg_v = arg_a; 1560 arg_v = arg_a;
1587 } 1561 }
1588 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1562 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1589 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1563 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1590 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1564 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1591 command, arg_v, environ, iov_a, 0); 1565 command, arg_v, environ, iov_a, 0);
1592 if (login) 1566 if (login)
1593 free(login); 1567 free (login);
1594 1568
1595 close(tty_fd); 1569 close (tty_fd);
1596 return cmd_fd; 1570 return cmd_fd;
1597 1571
1598#endif 1572#endif
1599 return -1; 1573 return -1;
1600} 1574}
1601 1575
1602/* ------------------------------------------------------------------------- * 1576/* ------------------------------------------------------------------------- *
1603 * GET TTY CURRENT STATE * 1577 * GET TTY CURRENT STATE *
1604 * ------------------------------------------------------------------------- */ 1578 * ------------------------------------------------------------------------- */
1605/* rxvt_get_ttymode() */ 1579/* rxvt_get_ttymode () */
1606/* INTPROTO */ 1580/* EXTPROTO */
1607void 1581void
1608rxvt_get_ttymode(ttymode_t *tio, int erase) 1582rxvt_get_ttymode (ttymode_t *tio, int erase)
1609{ 1583{
1610#ifdef HAVE_TERMIOS_H 1584#ifdef HAVE_TERMIOS_H
1611 /* 1585 /*
1612 * standard System V termios interface 1586 * standard System V termios interface
1613 */ 1587 */
1614 if (GET_TERMIOS(STDIN_FILENO, tio) < 0) 1588 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1615 { 1589 {
1616 /* return error - use system defaults */ 1590 /* return error - use system defaults */
1617 tio->c_cc[VINTR] = CINTR; 1591 tio->c_cc[VINTR] = CINTR;
1618 tio->c_cc[VQUIT] = CQUIT; 1592 tio->c_cc[VQUIT] = CQUIT;
1619 tio->c_cc[VERASE] = CERASE; 1593 tio->c_cc[VERASE] = CERASE;
… …
1693 /* 1667 /*
1694 * sgtty interface 1668 * sgtty interface
1695 */ 1669 */
1696 1670
1697 /* get parameters -- gtty */ 1671 /* get parameters -- gtty */
1698 if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) 1672 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1699 { 1673 {
1700 tio->sg.sg_erase = CERASE; /* ^H */ 1674 tio->sg.sg_erase = CERASE; /* ^H */
1701 tio->sg.sg_kill = CKILL; /* ^U */ 1675 tio->sg.sg_kill = CKILL; /* ^U */
1702 } 1676 }
1703 if (erase != -1) 1677 if (erase != -1)
1704 tio->sg.sg_erase = (char)erase; 1678 tio->sg.sg_erase = (char)erase;
1705 1679
1706 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1680 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1707 1681
1708 /* get special characters */ 1682 /* get special characters */
1709 if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) 1683 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1710 { 1684 {
1711 tio->tc.t_intrc = CINTR; /* ^C */ 1685 tio->tc.t_intrc = CINTR; /* ^C */
1712 tio->tc.t_quitc = CQUIT; /* ^\ */ 1686 tio->tc.t_quitc = CQUIT; /* ^\ */
1713 tio->tc.t_startc = CSTART; /* ^Q */ 1687 tio->tc.t_startc = CSTART; /* ^Q */
1714 tio->tc.t_stopc = CSTOP; /* ^S */ 1688 tio->tc.t_stopc = CSTOP; /* ^S */
1715 tio->tc.t_eofc = CEOF; /* ^D */ 1689 tio->tc.t_eofc = CEOF; /* ^D */
1716 tio->tc.t_brkc = -1; 1690 tio->tc.t_brkc = -1;
1717 } 1691 }
1718 /* get local special chars */ 1692 /* get local special chars */
1719 if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) 1693 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1720 { 1694 {
1721 tio->lc.t_suspc = CSUSP; /* ^Z */ 1695 tio->lc.t_suspc = CSUSP; /* ^Z */
1722 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1696 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1723 tio->lc.t_rprntc = CRPRNT; /* ^R */ 1697 tio->lc.t_rprntc = CRPRNT; /* ^R */
1724 tio->lc.t_flushc = CFLUSH; /* ^O */ 1698 tio->lc.t_flushc = CFLUSH; /* ^O */
1725 tio->lc.t_werasc = CWERASE; /* ^W */ 1699 tio->lc.t_werasc = CWERASE; /* ^W */
1726 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1700 tio->lc.t_lnextc = CLNEXT; /* ^V */
1727 } 1701 }
1728 /* get line discipline */ 1702 /* get line discipline */
1729 ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); 1703 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1730# ifdef NTTYDISC 1704# ifdef NTTYDISC
1731 1705
1732 tio->line = NTTYDISC; 1706 tio->line = NTTYDISC;
1733# endif /* NTTYDISC */ 1707# endif /* NTTYDISC */
1734 1708
… …
1739 * Debugging 1713 * Debugging
1740 */ 1714 */
1741#ifdef DEBUG_TTYMODE 1715#ifdef DEBUG_TTYMODE
1742#ifdef HAVE_TERMIOS_H 1716#ifdef HAVE_TERMIOS_H
1743 /* c_iflag bits */ 1717 /* c_iflag bits */
1744 fprintf(stderr, "Input flags\n"); 1718 fprintf (stderr, "Input flags\n");
1745 1719
1746 /* cpp token stringize doesn't work on all machines <sigh> */ 1720 /* cpp token stringize doesn't work on all machines <sigh> */
1747# define FOO(flag,name) \ 1721# define FOO(flag,name) \
1748 if ((tio->c_iflag) & flag) \ 1722 if ((tio->c_iflag) & flag) \
1749 fprintf (stderr, "%s ", name) 1723 fprintf (stderr, "%s ", name)
1750 1724
1751 /* c_iflag bits */ 1725 /* c_iflag bits */
1752 FOO(IGNBRK, "IGNBRK"); 1726 FOO (IGNBRK, "IGNBRK");
1753 FOO(BRKINT, "BRKINT"); 1727 FOO (BRKINT, "BRKINT");
1754 FOO(IGNPAR, "IGNPAR"); 1728 FOO (IGNPAR, "IGNPAR");
1755 FOO(PARMRK, "PARMRK"); 1729 FOO (PARMRK, "PARMRK");
1756 FOO(INPCK, "INPCK"); 1730 FOO (INPCK, "INPCK");
1757 FOO(ISTRIP, "ISTRIP"); 1731 FOO (ISTRIP, "ISTRIP");
1758 FOO(INLCR, "INLCR"); 1732 FOO (INLCR, "INLCR");
1759 FOO(IGNCR, "IGNCR"); 1733 FOO (IGNCR, "IGNCR");
1760 FOO(ICRNL, "ICRNL"); 1734 FOO (ICRNL, "ICRNL");
1761 FOO(IXON, "IXON"); 1735 FOO (IXON, "IXON");
1762 FOO(IXOFF, "IXOFF"); 1736 FOO (IXOFF, "IXOFF");
1763# ifdef IUCLC 1737# ifdef IUCLC
1764 1738
1765 FOO(IUCLC, "IUCLC"); 1739 FOO (IUCLC, "IUCLC");
1766# endif 1740# endif
1767# ifdef IXANY 1741# ifdef IXANY
1768 1742
1769 FOO(IXANY, "IXANY"); 1743 FOO (IXANY, "IXANY");
1770# endif 1744# endif
1771# ifdef IMAXBEL 1745# ifdef IMAXBEL
1772 1746
1773 FOO(IMAXBEL, "IMAXBEL"); 1747 FOO (IMAXBEL, "IMAXBEL");
1774# endif 1748# endif
1775 1749
1776 fprintf(stderr, "\n"); 1750 fprintf (stderr, "\n");
1777 1751
1778# undef FOO 1752# undef FOO
1779# define FOO(entry, name) \ 1753# define FOO(entry, name) \
1780 fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) 1754 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1781 1755
1782 FOO(VINTR, "VINTR"); 1756 FOO (VINTR, "VINTR");
1783 FOO(VQUIT, "VQUIT"); 1757 FOO (VQUIT, "VQUIT");
1784 FOO(VERASE, "VERASE"); 1758 FOO (VERASE, "VERASE");
1785 FOO(VKILL, "VKILL"); 1759 FOO (VKILL, "VKILL");
1786 FOO(VEOF, "VEOF"); 1760 FOO (VEOF, "VEOF");
1787 FOO(VEOL, "VEOL"); 1761 FOO (VEOL, "VEOL");
1788# ifdef VEOL2 1762# ifdef VEOL2
1789 1763
1790 FOO(VEOL2, "VEOL2"); 1764 FOO (VEOL2, "VEOL2");
1791# endif 1765# endif
1792# ifdef VSWTC 1766# ifdef VSWTC
1793 1767
1794 FOO(VSWTC, "VSWTC"); 1768 FOO (VSWTC, "VSWTC");
1795# endif 1769# endif
1796# ifdef VSWTCH 1770# ifdef VSWTCH
1797 1771
1798 FOO(VSWTCH, "VSWTCH"); 1772 FOO (VSWTCH, "VSWTCH");
1799# endif 1773# endif
1800 1774
1801 FOO(VSTART, "VSTART"); 1775 FOO (VSTART, "VSTART");
1802 FOO(VSTOP, "VSTOP"); 1776 FOO (VSTOP, "VSTOP");
1803 FOO(VSUSP, "VSUSP"); 1777 FOO (VSUSP, "VSUSP");
1804# ifdef VDSUSP 1778# ifdef VDSUSP
1805 1779
1806 FOO(VDSUSP, "VDSUSP"); 1780 FOO (VDSUSP, "VDSUSP");
1807# endif 1781# endif
1808# ifdef VREPRINT 1782# ifdef VREPRINT
1809 1783
1810 FOO(VREPRINT, "VREPRINT"); 1784 FOO (VREPRINT, "VREPRINT");
1811# endif 1785# endif
1812# ifdef VDISCRD 1786# ifdef VDISCRD
1813 1787
1814 FOO(VDISCRD, "VDISCRD"); 1788 FOO (VDISCRD, "VDISCRD");
1815# endif 1789# endif
1816# ifdef VWERSE 1790# ifdef VWERSE
1817 1791
1818 FOO(VWERSE, "VWERSE"); 1792 FOO (VWERSE, "VWERSE");
1819# endif 1793# endif
1820# ifdef VLNEXT 1794# ifdef VLNEXT
1821 1795
1822 FOO(VLNEXT, "VLNEXT"); 1796 FOO (VLNEXT, "VLNEXT");
1823# endif 1797# endif
1824 1798
1825 fprintf(stderr, "\n"); 1799 fprintf (stderr, "\n");
1826# undef FOO 1800# undef FOO
1827# endif /* HAVE_TERMIOS_H */ 1801# endif /* HAVE_TERMIOS_H */
1828#endif /* DEBUG_TTYMODE */ 1802#endif /* DEBUG_TTYMODE */
1829} 1803}
1830 1804

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines