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.29 by pcg, Sat Feb 21 21:43:37 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 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * 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>
7 * - original version 7 * - original version
… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
14 * 15 *
15 * 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
16 * 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
17 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
18 * (at your option) any later version. 19 * (at your option) any later version.
… …
67 "Blue", /* 4/12: bright blue (#0000FF) */ 68 "Blue", /* 4/12: bright blue (#0000FF) */
68 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 69 "Magenta", /* 5/13: bright magenta (#FF00FF) */
69 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 70 "Cyan", /* 6/14: bright cyan (#00FFFF) */
70 "White", /* 7/15: bright white (#FFFFFF) */ 71 "White", /* 7/15: bright white (#FFFFFF) */
71#ifdef TTY_256COLOR 72#ifdef TTY_256COLOR
72 "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",
73 "rgb:00/00/2a", 78 "rgbi:0/0/1",
74 "rgb:00/00/55",
75 "rgb:00/00/7f",
76 "rgb:00/00/aa",
77 "rgb:00/00/d4",
78 "rgb:00/2a/00", 79 "rgbi:0/.2/0",
79 "rgb:00/2a/2a", 80 "rgbi:0/.2/.2",
80 "rgb:00/2a/55",
81 "rgb:00/2a/7f",
82 "rgb:00/2a/aa",
83 "rgb:00/2a/d4", 81 "rgbi:0/.2/.4",
82 "rgbi:0/.2/.6",
83 "rgbi:0/.2/.8",
84 "rgb:00/55/00", 84 "rgbi:0/.2/1",
85 "rgb:00/55/2a",
86 "rgb:00/55/55",
87 "rgb:00/55/7f",
88 "rgb:00/55/aa",
89 "rgb:00/55/d4",
90 "rgb:00/7f/00",
91 "rgb:00/7f/2a",
92 "rgb:00/7f/55",
93 "rgb:00/7f/7f",
94 "rgb:00/7f/aa",
95 "rgb:00/7f/d4",
96 "rgb:00/aa/00",
97 "rgb:00/aa/2a",
98 "rgb:00/aa/55",
99 "rgb:00/aa/7f",
100 "rgb:00/aa/aa",
101 "rgb:00/aa/d4",
102 "rgb:00/d4/00", 85 "rgbi:0/.4/0",
103 "rgb:00/d4/2a", 86 "rgbi:0/.4/.2",
104 "rgb:00/d4/55",
105 "rgb:00/d4/7f",
106 "rgb:00/d4/aa",
107 "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",
108 "rgb:2a/00/00", 109 "rgbi:.2/0/0",
109 "rgb:2a/00/2a", 110 "rgbi:.2/0/.2",
110 "rgb:2a/00/55",
111 "rgb:2a/00/7f",
112 "rgb:2a/00/aa",
113 "rgb:2a/00/d4", 111 "rgbi:.2/0/.4",
112 "rgbi:.2/0/.6",
113 "rgbi:.2/0/.8",
114 "rgbi:.2/0/1",
114 "rgb:2a/2a/00", 115 "rgbi:.2/.2/0",
115 "rgb:2a/2a/2a", 116 "rgbi:.2/.2/.2",
116 "rgb:2a/2a/55",
117 "rgb:2a/2a/7f",
118 "rgb:2a/2a/aa",
119 "rgb:2a/2a/d4", 117 "rgbi:.2/.2/.4",
120 "rgb:2a/55/00", 118 "rgbi:.2/.2/.6",
121 "rgb:2a/55/2a", 119 "rgbi:.2/.2/.8",
122 "rgb:2a/55/55", 120 "rgbi:.2/.2/1",
123 "rgb:2a/55/7f",
124 "rgb:2a/55/aa",
125 "rgb:2a/55/d4",
126 "rgb:2a/7f/00",
127 "rgb:2a/7f/2a",
128 "rgb:2a/7f/55",
129 "rgb:2a/7f/7f",
130 "rgb:2a/7f/aa",
131 "rgb:2a/7f/d4",
132 "rgb:2a/aa/00",
133 "rgb:2a/aa/2a",
134 "rgb:2a/aa/55",
135 "rgb:2a/aa/7f",
136 "rgb:2a/aa/aa",
137 "rgb:2a/aa/d4",
138 "rgb:2a/d4/00", 121 "rgbi:.2/.4/0",
139 "rgb:2a/d4/2a", 122 "rgbi:.2/.4/.2",
140 "rgb:2a/d4/55",
141 "rgb:2a/d4/7f",
142 "rgb:2a/d4/aa",
143 "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",
144 "rgb:55/00/00", 139 "rgbi:.2/1/0",
145 "rgb:55/00/2a", 140 "rgbi:.2/1/.2",
146 "rgb:55/00/55", 141 "rgbi:.2/1/.4",
147 "rgb:55/00/7f", 142 "rgbi:.2/1/.6",
148 "rgb:55/00/aa", 143 "rgbi:.2/1/.8",
149 "rgb:55/00/d4", 144 "rgbi:.2/1/1",
150 "rgb:55/2a/00",
151 "rgb:55/2a/2a",
152 "rgb:55/2a/55",
153 "rgb:55/2a/7f",
154 "rgb:55/2a/aa",
155 "rgb:55/2a/d4",
156 "rgb:55/55/00",
157 "rgb:55/55/2a",
158 "rgb:55/55/55",
159 "rgb:55/55/7f",
160 "rgb:55/55/aa",
161 "rgb:55/55/d4",
162 "rgb:55/7f/00",
163 "rgb:55/7f/2a",
164 "rgb:55/7f/55",
165 "rgb:55/7f/7f",
166 "rgb:55/7f/aa",
167 "rgb:55/7f/d4",
168 "rgb:55/aa/00",
169 "rgb:55/aa/2a",
170 "rgb:55/aa/55",
171 "rgb:55/aa/7f",
172 "rgb:55/aa/aa",
173 "rgb:55/aa/d4",
174 "rgb:55/d4/00",
175 "rgb:55/d4/2a",
176 "rgb:55/d4/55",
177 "rgb:55/d4/7f",
178 "rgb:55/d4/aa",
179 "rgb:55/d4/d4",
180 "rgb:7f/00/00",
181 "rgb:7f/00/2a",
182 "rgb:7f/00/55",
183 "rgb:7f/00/7f",
184 "rgb:7f/00/aa",
185 "rgb:7f/00/d4",
186 "rgb:7f/2a/00",
187 "rgb:7f/2a/2a",
188 "rgb:7f/2a/55",
189 "rgb:7f/2a/7f",
190 "rgb:7f/2a/aa",
191 "rgb:7f/2a/d4",
192 "rgb:7f/55/00",
193 "rgb:7f/55/2a",
194 "rgb:7f/55/55",
195 "rgb:7f/55/7f",
196 "rgb:7f/55/aa",
197 "rgb:7f/55/d4",
198 "rgb:7f/7f/00",
199 "rgb:7f/7f/2a",
200 "rgb:7f/7f/55",
201 "rgb:7f/7f/7f",
202 "rgb:7f/7f/aa",
203 "rgb:7f/7f/d4",
204 "rgb:7f/aa/00",
205 "rgb:7f/aa/2a",
206 "rgb:7f/aa/55",
207 "rgb:7f/aa/7f",
208 "rgb:7f/aa/aa",
209 "rgb:7f/aa/d4",
210 "rgb:7f/d4/00",
211 "rgb:7f/d4/2a",
212 "rgb:7f/d4/55",
213 "rgb:7f/d4/7f",
214 "rgb:7f/d4/aa",
215 "rgb:7f/d4/d4",
216 "rgb:aa/00/00",
217 "rgb:aa/00/2a",
218 "rgb:aa/00/55",
219 "rgb:aa/00/7f",
220 "rgb:aa/00/aa",
221 "rgb:aa/00/d4",
222 "rgb:aa/2a/00",
223 "rgb:aa/2a/2a",
224 "rgb:aa/2a/55",
225 "rgb:aa/2a/7f",
226 "rgb:aa/2a/aa",
227 "rgb:aa/2a/d4",
228 "rgb:aa/55/00",
229 "rgb:aa/55/2a",
230 "rgb:aa/55/55",
231 "rgb:aa/55/7f",
232 "rgb:aa/55/aa",
233 "rgb:aa/55/d4",
234 "rgb:aa/7f/00",
235 "rgb:aa/7f/2a",
236 "rgb:aa/7f/55",
237 "rgb:aa/7f/7f",
238 "rgb:aa/7f/aa",
239 "rgb:aa/7f/d4",
240 "rgb:aa/aa/00",
241 "rgb:aa/aa/2a",
242 "rgb:aa/aa/55",
243 "rgb:aa/aa/7f",
244 "rgb:aa/aa/aa",
245 "rgb:aa/aa/d4",
246 "rgb:aa/d4/00",
247 "rgb:aa/d4/2a",
248 "rgb:aa/d4/55",
249 "rgb:aa/d4/7f",
250 "rgb:aa/d4/aa",
251 "rgb:aa/d4/d4",
252 "rgb:d4/00/00", 145 "rgbi:.4/0/0",
253 "rgb:d4/00/2a", 146 "rgbi:.4/0/.2",
254 "rgb:d4/00/55",
255 "rgb:d4/00/7f",
256 "rgb:d4/00/aa",
257 "rgb:d4/00/d4", 147 "rgbi:.4/0/.4",
148 "rgbi:.4/0/.6",
149 "rgbi:.4/0/.8",
150 "rgbi:.4/0/1",
258 "rgb:d4/2a/00", 151 "rgbi:.4/.2/0",
259 "rgb:d4/2a/2a", 152 "rgbi:.4/.2/.2",
260 "rgb:d4/2a/55",
261 "rgb:d4/2a/7f",
262 "rgb:d4/2a/aa",
263 "rgb:d4/2a/d4", 153 "rgbi:.4/.2/.4",
264 "rgb:d4/55/00", 154 "rgbi:.4/.2/.6",
265 "rgb:d4/55/2a", 155 "rgbi:.4/.2/.8",
266 "rgb:d4/55/55", 156 "rgbi:.4/.2/1",
267 "rgb:d4/55/7f",
268 "rgb:d4/55/aa",
269 "rgb:d4/55/d4",
270 "rgb:d4/7f/00",
271 "rgb:d4/7f/2a",
272 "rgb:d4/7f/55",
273 "rgb:d4/7f/7f",
274 "rgb:d4/7f/aa",
275 "rgb:d4/7f/d4",
276 "rgb:d4/aa/00",
277 "rgb:d4/aa/2a",
278 "rgb:d4/aa/55",
279 "rgb:d4/aa/7f",
280 "rgb:d4/aa/aa",
281 "rgb:d4/aa/d4",
282 "rgb:d4/d4/00", 157 "rgbi:.4/.4/0",
283 "rgb:d4/d4/2a", 158 "rgbi:.4/.4/.2",
284 "rgb:d4/d4/55",
285 "rgb:d4/d4/7f",
286 "rgb:d4/d4/aa",
287 "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",
288 "rgb:08/08/08", 289 "rgb:08/08/08",
289 "rgb:12/12/12", 290 "rgb:12/12/12",
290 "rgb:1c/1c/1c", 291 "rgb:1c/1c/1c",
291 "rgb:26/26/26", 292 "rgb:26/26/26",
292 "rgb:30/30/30", 293 "rgb:30/30/30",
… …
312#endif 313#endif
313#ifndef NO_CURSORCOLOR 314#ifndef NO_CURSORCOLOR
314 COLOR_CURSOR_BACKGROUND, 315 COLOR_CURSOR_BACKGROUND,
315 COLOR_CURSOR_FOREGROUND, 316 COLOR_CURSOR_FOREGROUND,
316#endif /* ! NO_CURSORCOLOR */ 317#endif /* ! NO_CURSORCOLOR */
317 NULL, /* Color_pointer */ 318 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */
318 NULL, /* Color_border */ 320 NULL, /* Color_border */
319#ifndef NO_BOLD_UNDERLINE_REVERSE 321#ifndef NO_BOLD_UNDERLINE_REVERSE
320 NULL, /* Color_BD */ 322 NULL, /* Color_BD */
321 NULL, /* Color_UL */ 323 NULL, /* Color_UL */
322 NULL, /* Color_RV */ 324 NULL, /* Color_RV */
… …
326#endif 328#endif
327#ifdef KEEP_SCROLLCOLOR 329#ifdef KEEP_SCROLLCOLOR
328 COLOR_SCROLLBAR, 330 COLOR_SCROLLBAR,
329 COLOR_SCROLLTROUGH, 331 COLOR_SCROLLTROUGH,
330#endif /* KEEP_SCROLLCOLOR */ 332#endif /* KEEP_SCROLLCOLOR */
331 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;
… …
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;
… …
514 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 502 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
515 503
516 cmd_argv[i] = NULL; 504 cmd_argv[i] = NULL;
517 } 505 }
518 506
519 /* clear all resources */
520 for (i = 0; i < NUM_RESOURCES;)
521 rs[i++] = NULL;
522
523 rs[Rs_name] = rxvt_r_basename (argv[0]); 507 rs[Rs_name] = rxvt_r_basename (argv[0]);
524 508
525 /* 509 /*
526 * Open display, get options/resources and create the window 510 * Open display, get options/resources and create the window
527 */ 511 */
… …
542 } 526 }
543#endif 527#endif
544 528
545 if (!display 529 if (!display
546 && ! (display = displays.get (rs[Rs_display_name]))) 530 && ! (display = displays.get (rs[Rs_display_name])))
547 {
548 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 531 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
549 exit (EXIT_FAILURE);
550 }
551 532
552 extract_resources (display->display, rs[Rs_name]); 533 extract_resources (display->display, rs[Rs_name]);
553 534
554 /* 535 /*
555 * set any defaults not already set 536 * set any defaults not already set
… …
600 rs[Rs_print_pipe] = PRINTPIPE; 581 rs[Rs_print_pipe] = PRINTPIPE;
601#endif 582#endif
602 583
603 if (!rs[Rs_cutchars]) 584 if (!rs[Rs_cutchars])
604 rs[Rs_cutchars] = CUTCHARS; 585 rs[Rs_cutchars] = CUTCHARS;
605
606#ifdef ACS_ASCII
607 if (!rs[Rs_acs_chars])
608 rs[Rs_acs_chars] = ACS_CHARS;
609 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
610 {
611 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
612 for (; i < 0x20; )
613 val[i] = ' ';
614 rs[Rs_acs_chars] = val;
615 }
616#endif
617 586
618#ifndef NO_BACKSPACE_KEY 587#ifndef NO_BACKSPACE_KEY
619 if (!rs[Rs_backspace_key]) 588 if (!rs[Rs_backspace_key])
620# ifdef DEFAULT_BACKSPACE 589# ifdef DEFAULT_BACKSPACE
621 key_backspace = DEFAULT_BACKSPACE; 590 key_backspace = DEFAULT_BACKSPACE;
… …
650 { 619 {
651 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 620 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
652 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 621 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
653 } 622 }
654 623
655 if (rs[Rs_selectstyle])
656 {
657 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
658 selection_style = OLD_WORD_SELECT;
659#ifndef NO_OLD_SELECTION
660
661 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
662 selection_style = OLD_SELECT;
663#endif
664
665 }
666
667#ifdef HAVE_SCROLLBARS 624#ifdef HAVE_SCROLLBARS
668 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 625 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
669 rs[Rs_scrollBar_thickness]); 626 rs[Rs_scrollBar_thickness]);
670#endif 627#endif
671
672 TermWin.fontset = new rxvt_fontset (this);
673 TermWin.fontset->populate (rs[Rs_font]);
674 TermWin.fwidth = TermWin.fontset->base_font ()->width;
675 TermWin.fheight = TermWin.fontset->base_font ()->height;
676 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
677 628
678#ifdef XTERM_REVERSE_VIDEO 629#ifdef XTERM_REVERSE_VIDEO
679 /* this is how xterm implements reverseVideo */ 630 /* this is how xterm implements reverseVideo */
680 if (Options & Opt_reverseVideo) 631 if (Options & Opt_reverseVideo)
681 { 632 {
… …
701 color_aliases (Color_bg); 652 color_aliases (Color_bg);
702#ifndef NO_CURSORCOLOR 653#ifndef NO_CURSORCOLOR
703 color_aliases (Color_cursor); 654 color_aliases (Color_cursor);
704 color_aliases (Color_cursor2); 655 color_aliases (Color_cursor2);
705#endif /* NO_CURSORCOLOR */ 656#endif /* NO_CURSORCOLOR */
706 color_aliases (Color_pointer); 657 color_aliases (Color_pointer_fg);
658 color_aliases (Color_pointer_bg);
707 color_aliases (Color_border); 659 color_aliases (Color_border);
708#ifndef NO_BOLD_UNDERLINE_REVERSE 660#ifndef NO_BOLD_UNDERLINE_REVERSE
709 color_aliases (Color_BD); 661 color_aliases (Color_BD);
710 color_aliases (Color_UL); 662 color_aliases (Color_UL);
711 color_aliases (Color_RV); 663 color_aliases (Color_RV);
… …
805void 757void
806rxvt_term::set_locale (const char *locale) 758rxvt_term::set_locale (const char *locale)
807{ 759{
808#if HAVE_XSETLOCALE || HAVE_SETLOCALE 760#if HAVE_XSETLOCALE || HAVE_SETLOCALE
809 free (this->locale); 761 free (this->locale);
810 this->locale = rxvt_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);
811 SET_LOCALE (this->locale); 772 SET_LOCALE (this->locale);
812 mbstate.reset (); 773 mbstate.reset ();
813#endif 774#endif
775#if 0
814#if HAVE_NL_LANGINFO 776#if HAVE_NL_LANGINFO
815 free (codeset); 777 free (codeset);
816 codeset = strdup (nl_langinfo (CODESET)); 778 codeset = strdup (nl_langinfo (CODESET));
817 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 779 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
818 || !STRCASECMP (codeset, "UTF8"); 780 || !STRCASECMP (codeset, "UTF8");
819#else 781#else
820 enc_utf8 = 1; 782 enc_utf8 = 1;
821#endif 783#endif
784#endif
822} 785}
823 786
824void 787void
825rxvt_term::init_xlocale () 788rxvt_term::init_xlocale ()
826{ 789{
827#ifdef USE_XIM 790#ifdef USE_XIM
828 if (!locale) 791 if (!locale)
829 rxvt_print_error ("Setting locale failed."); 792 rxvt_warn ("setting locale failed, working without locale support.\n");
830 else 793 else
831 { 794 {
832 Atom wmlocale; 795 Atom wmlocale;
833 796
834 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 797 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
836 XA_STRING, 8, PropModeReplace, 799 XA_STRING, 8, PropModeReplace,
837 (unsigned char *)locale, STRLEN (locale)); 800 (unsigned char *)locale, STRLEN (locale));
838 801
839 if (!XSupportsLocale ()) 802 if (!XSupportsLocale ())
840 { 803 {
841 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");
842 return; 805 return;
843 } 806 }
844 807
845 im_ev.start (display); 808 im_ev.start (display);
846 809
… …
876 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 839 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
877#endif 840#endif
878 841
879 get_ourmods (); 842 get_ourmods ();
880 843
881 if (! (Options & Opt_scrollTtyOutput)) 844 if (!(Options & Opt_scrollTtyOutput))
882 PrivateModes |= PrivMode_TtyOutputInh; 845 PrivateModes |= PrivMode_TtyOutputInh;
883 if (Options & Opt_scrollTtyKeypress) 846 if (Options & Opt_scrollTtyKeypress)
884 PrivateModes |= PrivMode_Keypress; 847 PrivateModes |= PrivMode_Keypress;
885 if (! (Options & Opt_jumpScroll)) 848 if (!(Options & Opt_jumpScroll))
886 PrivateModes |= PrivMode_smoothScroll; 849 PrivateModes |= PrivMode_smoothScroll;
887 850
888#ifndef NO_BACKSPACE_KEY 851#ifndef NO_BACKSPACE_KEY
889 if (STRCMP (key_backspace, "DEC") == 0) 852 if (STRCMP (key_backspace, "DEC") == 0)
890 PrivateModes |= PrivMode_HaveBackSpace; 853 PrivateModes |= PrivMode_HaveBackSpace;
… …
900 { 863 {
901 PrivateModes |= PrivMode_menuBar; 864 PrivateModes |= PrivMode_menuBar;
902 SavedModes |= PrivMode_menuBar; 865 SavedModes |= PrivMode_menuBar;
903 } 866 }
904 867
905#ifdef GREEK_SUPPORT
906 greek_init ();
907#endif
908
909#ifdef CURSOR_BLINK 868#ifdef CURSOR_BLINK
910 if (Options & Opt_cursorBlink) 869 if (Options & Opt_cursorBlink)
911 (void)gettimeofday (&lastcursorchange, NULL); 870 (void)gettimeofday (&lastcursorchange, NULL);
912#endif 871#endif
913 872
914 if ((cmd_fd = run_command (argv)) < 0) 873 run_command (argv);
915 {
916 rxvt_print_error ("aborting");
917 exit (EXIT_FAILURE);
918 }
919} 874}
920 875
921/*----------------------------------------------------------------------*/ 876/*----------------------------------------------------------------------*/
922void 877void
923rxvt_term::Get_Colours () 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 (!rs[Rs_color + i]) 890 if (!rs[Rs_color + i])
932 continue; 891 continue;
… …
948 switch (i) 907 switch (i)
949 { 908 {
950 case Color_fg: 909 case Color_fg:
951 case Color_bg: 910 case Color_bg:
952 /* fatal: need bg/fg color */ 911 /* fatal: need bg/fg color */
953 rxvt_print_error ("aborting"); 912 rxvt_fatal ("unable to get foreground/background colour, aborting");
954 exit (EXIT_FAILURE);
955 /* NOTREACHED */ 913 /* NOTREACHED */
956 break; 914 break;
957#ifndef NO_CURSORCOLOR 915#ifndef NO_CURSORCOLOR
958 case Color_cursor2: 916 case Color_cursor2:
959 xcol = PixColors[Color_fg]; 917 xcol = PixColors[Color_fg];
960 break; 918 break;
961#endif /* ! NO_CURSORCOLOR */ 919#endif /* ! NO_CURSORCOLOR */
962 case Color_pointer: 920 case Color_pointer_fg:
963 xcol = PixColors[Color_fg]; 921 xcol = PixColors[Color_fg];
964 break; 922 break;
965 default: 923 default:
966 xcol = PixColors[Color_bg]; /* None */ 924 xcol = PixColors[Color_bg]; /* None */
967 break; 925 break;
968 } 926 }
969 } 927 }
970 } 928 }
971 929
972 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
973 SET_PIXCOLOR (i); 935 SET_PIXCOLOR (i);
974 } 936 }
975 937
976 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 938 if (display->depth <= 2)
977 PixColors[Color_pointer] = PixColors[Color_fg]; 939 {
978 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 940 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
979 PixColors[Color_border] = PixColors[Color_fg]; 941 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg];
942 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg];
943 }
980 944
981 /* 945 /*
982 * get scrollBar/menuBar shadow colors 946 * get scrollBar/menuBar shadow colors
983 * 947 *
984 * The calculations of topShadow/bottomShadow values are adapted 948 * The calculations of topShadow/bottomShadow values are adapted
985 * from the fvwm window manager. 949 * from the fvwm window manager.
986 */ 950 */
987#ifdef KEEP_SCROLLCOLOR 951#ifdef KEEP_SCROLLCOLOR
988 952
989 if (XDEPTH <= 2) 953 if (display->depth <= 2)
990 { /* Monochrome */ 954 { /* Monochrome */
991 PixColors[Color_scroll] = PixColors[Color_fg]; 955 PixColors[Color_scroll] = PixColors[Color_fg];
992 PixColors[Color_topShadow] = PixColors[Color_bg]; 956 PixColors[Color_topShadow] = PixColors[Color_bg];
993 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 957 PixColors[Color_bottomShadow] = PixColors[Color_bg];
994 } 958 }
995 else 959 else
996 { 960 {
997 rxvt_color xcol[3]; 961 rxvt_color xcol[2];
998 /* xcol[0] == white 962 /* xcol[0] == white
999 * xcol[1] == top shadow 963 * xcol[1] == top shadow
1000 * xcol[2] == bot shadow */ 964 * xcol[2] == bot shadow */
1001 965
1002 xcol[1] = PixColors[Color_scroll]; 966 xcol[1] = PixColors[Color_scroll];
1003# ifdef PREFER_24BIT
1004 xcol[0].set (display, 65535, 65535, 65535); 967 xcol[0].set (display, 65535, 65535, 65535);
1005 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1006# else
1007 xcol[0].set (display, WhitePixel (display->display, display->screen));
1008# endif
1009 968
1010 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 969 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1011 970
1012 xcol[0].get (display, pr0, pg0, pb0); 971 xcol[0].get (display, pr0, pg0, pb0);
1013 xcol[1].get (display, pr1, pg1, pb1); 972 xcol[1].get (display, pr1, pg1, pb1);
1014 973
1015 /* bottomShadowColor */
1016 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1017 xcol[2] = PixColors[Color_Black];
1018
1019 PixColors[Color_bottomShadow] = xcol[2]; 974 PixColors[Color_bottomShadow] = xcol[1].fade (display, 50);
1020 975
1021 /* topShadowColor */ 976 /* topShadowColor */
1022 if (!xcol[1].set (display, 977 if (!xcol[1].set (display,
1023 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 978 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1024 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 979 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
… …
1128/*----------------------------------------------------------------------*/ 1083/*----------------------------------------------------------------------*/
1129/* rxvt_Create_Windows () - Open and map the window */ 1084/* rxvt_Create_Windows () - Open and map the window */
1130void 1085void
1131rxvt_term::create_windows (int argc, const char *const *argv) 1086rxvt_term::create_windows (int argc, const char *const *argv)
1132{ 1087{
1133 XClassHint classHint; 1088 XClassHint classHint;
1134 XWMHints wmHint; 1089 XWMHints wmHint;
1090#ifndef NO_FRILLS
1091 Atom prop = None;
1092 MWMHints mwmhints;
1093#endif
1135 XGCValues gcvalue; 1094 XGCValues gcvalue;
1136 long vt_emask; 1095 long vt_emask;
1137 1096 XSetWindowAttributes attributes;
1138 XWindowAttributes gattr; 1097 XWindowAttributes gattr;
1139 1098
1140 if (Options & Opt_transparent) 1099 if (Options & Opt_transparent)
1141 { 1100 {
1142 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1101 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1143 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1102 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1144 } 1103 }
1145 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 }
1122 }
1123 else
1124 {
1125 mwmhints.flags = 0;
1126 }
1127#endif
1128
1146 /* grab colors before netscape does */ 1129 /* grab colors before netscape does */
1147 Get_Colours (); 1130 Get_Colours ();
1148 1131
1149 change_font (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
1150 window_calc (0, 0); 1139 window_calc (0, 0);
1151 old_width = szHint.width; 1140 old_width = szHint.width;
1152 old_height = szHint.height; 1141 old_height = szHint.height;
1153 1142
1154 /* parent window - reverse video so we can see placement errors
1155 * sub-window placement & size in rxvt_resize_subwindows () 1143 /* sub-window placement & size in rxvt_resize_subwindows () */
1156 */
1157 1144
1158#ifdef PREFER_24BIT 1145#ifdef PREFER_24BIT
1159 XSetWindowAttributes attributes;
1160
1161 attributes.background_pixel = PixColors[Color_fg]; 1146 attributes.background_pixel = PixColors[Color_bg];
1162 attributes.border_pixel = PixColors[Color_border]; 1147 attributes.border_pixel = PixColors[Color_border];
1163 attributes.colormap = display->cmap; 1148 attributes.colormap = display->cmap;
1164 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1149 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1165 szHint.x, szHint.y, 1150 szHint.x, szHint.y,
1166 szHint.width, szHint.height, 1151 szHint.width, szHint.height,
1167 TermWin.ext_bwidth, 1152 TermWin.ext_bwidth,
1168 display->depth, InputOutput, 1153 display->depth, InputOutput,
1169 display->visual, 1154 display->visual,
1170 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1155 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1171#else 1156#else
1172 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1157 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1173 szHint.x, szHint.y, 1158 szHint.x, szHint.y,
1174 szHint.width, 1159 szHint.width, szHint.height,
1175 szHint.height,
1176 TermWin.ext_bwidth, 1160 TermWin.ext_bwidth,
1177 PixColors[Color_border], 1161 PixColors[Color_border],
1178 PixColors[Color_fg]); 1162 PixColors[Color_bg]);
1179#endif 1163#endif
1180 1164
1181 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1165 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1182 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1166 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1183 1167
1184 classHint.res_name = (char *)rs[Rs_name]; 1168 classHint.res_name = (char *)rs[Rs_name];
1185 classHint.res_class = (char *)APL_CLASS; 1169 classHint.res_class = (char *)RESCLASS;
1186 1170
1187 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1171 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1188 wmHint.input = True; 1172 wmHint.input = True;
1189 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1173 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1190 : NormalState);
1191 wmHint.window_group = TermWin.parent[0]; 1174 wmHint.window_group = TermWin.parent[0];
1192 1175
1193 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1176 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1194 (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
1195 1185
1196 XSelectInput (display->display, TermWin.parent[0], 1186 XSelectInput (display->display, TermWin.parent[0],
1197 KeyPressMask 1187 KeyPressMask
1198#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1188#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1199 | KeyReleaseMask 1189 | KeyReleaseMask
1200#endif 1190#endif
1201 | FocusChangeMask | VisibilityChangeMask 1191 | FocusChangeMask | VisibilityChangeMask
1192 | ExposureMask
1202 | StructureNotifyMask); 1193 | StructureNotifyMask);
1203 termwin_ev.start (display, TermWin.parent[0]); 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
1204 1203
1205 /* 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 */
1206 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1205 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1207 1206
1208#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1207#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
… …
1223 } 1222 }
1224#endif 1223#endif
1225 1224
1226 /* the vt window */ 1225 /* the vt window */
1227 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1226 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1228 window_vt_x, window_vt_y, 1227 window_vt_x,
1228 window_vt_y,
1229 TermWin_TotalWidth (), 1229 TermWin_TotalWidth (),
1230 TermWin_TotalHeight (), 1230 TermWin_TotalHeight (),
1231 0, 1231 0,
1232 PixColors[Color_fg], 1232 PixColors[Color_fg],
1233 PixColors[Color_bg]); 1233 PixColors[Color_bg]);
1234
1235#ifdef DEBUG_X 1234#ifdef DEBUG_X
1236 XStoreName (display->display, TermWin.vt, "vt window"); 1235 XStoreName (display->display, TermWin.vt, "vt window");
1237#endif 1236#endif
1238 1237
1238 attributes.bit_gravity = NorthWestGravity;
1239 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1240
1239 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1241 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1240 | PropertyChangeMask); 1242
1243 pointer_unblank ();
1241 1244
1242#ifdef POINTER_BLANK 1245#ifdef POINTER_BLANK
1243 pointer_unblank ();
1244
1245 if ((Options & Opt_pointerBlank)) 1246 if (Options & Opt_pointerBlank)
1246 vt_emask |= PointerMotionMask; 1247 vt_emask |= PointerMotionMask;
1247 else 1248 else
1248#endif 1249#endif
1249 vt_emask |= (Button1MotionMask | Button3MotionMask); 1250 vt_emask |= Button1MotionMask | Button3MotionMask;
1250 1251
1251 XSelectInput (display->display, TermWin.vt, vt_emask); 1252 XSelectInput (display->display, TermWin.vt, vt_emask);
1252 vt_ev.start (display, TermWin.vt); 1253 vt_ev.start (display, TermWin.vt);
1253 1254
1254#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1255#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1255 if (menuBar_height ()) 1256 if (menuBar_height ())
1256 { 1257 {
1257 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1258 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1258 window_vt_x, 0, 1259 window_vt_x, 0,
1259 TermWin_TotalWidth (), 1260 TermWin_TotalWidth (),
1260 menuBar_TotalHeight (), 1261 menuBar_TotalHeight (),
1261 0, 1262 0,
1262 PixColors[Color_fg], 1263 PixColors[Color_fg],
1263 PixColors[Color_scroll]); 1264 PixColors[Color_scroll]);
1265
1264#ifdef DEBUG_X 1266#ifdef DEBUG_X
1265 XStoreName (display->display, menuBar.win, "menubar"); 1267 XStoreName (display->display, menuBar.win, "menubar");
1266#endif 1268#endif
1267 1269
1270 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1271
1268 XDefineCursor (display->display, menuBar.win, pointer_leftptr); 1272 XDefineCursor (display->display, menuBar.win,
1273 XCreateFontCursor (display->display, XC_left_ptr));
1269 1274
1270 XSelectInput (display->display, menuBar.win, 1275 XSelectInput (display->display, menuBar.win,
1271 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1276 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1272 | Button1MotionMask)); 1277 | Button1MotionMask));
1273 menubar_ev.start (display, menuBar.win); 1278 menubar_ev.start (display, menuBar.win);
… …
1276 1281
1277#ifdef XPM_BACKGROUND 1282#ifdef XPM_BACKGROUND
1278 if (rs[Rs_backgroundPixmap] != NULL 1283 if (rs[Rs_backgroundPixmap] != NULL
1279 && ! (Options & Opt_transparent)) 1284 && ! (Options & Opt_transparent))
1280 { 1285 {
1281 const char *p = rs[Rs_backgroundPixmap]; 1286 const char *p = rs[Rs_backgroundPixmap];
1282 1287
1283 if ((p = STRCHR (p, ';')) != NULL) 1288 if ((p = STRCHR (p, ';')) != NULL)
1284 { 1289 {
1285 p++; 1290 p++;
1286 scale_pixmap (p); 1291 scale_pixmap (p);
… …
1293 /* graphics context for the vt window */ 1298 /* graphics context for the vt window */
1294 gcvalue.foreground = PixColors[Color_fg]; 1299 gcvalue.foreground = PixColors[Color_fg];
1295 gcvalue.background = PixColors[Color_bg]; 1300 gcvalue.background = PixColors[Color_bg];
1296 gcvalue.graphics_exposures = 1; 1301 gcvalue.graphics_exposures = 1;
1297 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1302 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1298 GCForeground | GCBackground 1303 GCForeground | GCBackground | GCGraphicsExposures,
1299 | GCGraphicsExposures, &gcvalue); 1304 &gcvalue);
1305
1306 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1300 1307
1301#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1308#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1302 gcvalue.foreground = PixColors[Color_topShadow]; 1309 gcvalue.foreground = PixColors[Color_topShadow];
1303 topShadowGC = XCreateGC (display->display, TermWin.vt, 1310 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1304 GCForeground, &gcvalue);
1305 gcvalue.foreground = PixColors[Color_bottomShadow]; 1311 gcvalue.foreground = PixColors[Color_bottomShadow];
1306 botShadowGC = XCreateGC (display->display, TermWin.vt, 1312 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1307 GCForeground, &gcvalue); 1313 gcvalue.foreground = PixColors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1308 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg
1309 : Color_scroll)];
1310 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1314 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1311 GCForeground, &gcvalue); 1315#endif
1316
1317#ifdef OFF_FOCUS_FADING
1318 // initially we are in unfocused state
1319 if (rs[Rs_fade])
1320 PixColors = PixColorsUnFocused;
1312#endif 1321#endif
1313} 1322}
1314 1323
1315/*----------------------------------------------------------------------*/ 1324/*----------------------------------------------------------------------*/
1316/* 1325/*
1317 * 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
1318 * 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
1319 * the slave. 1328 * the slave.
1320 */ 1329 */
1321int 1330void
1322rxvt_term::run_command (const char *const *argv) 1331rxvt_term::run_command (const char *const *argv)
1323{ 1332{
1324 int cfd, er; 1333 int er;
1325 1334
1326 /* get master (pty) */ 1335 /* get master (pty) */
1327 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1336 if ((cmd_fd = rxvt_get_pty (&tty_fd, &ttydev)) < 0)
1328 {
1329 rxvt_print_error ("can't open pseudo-tty"); 1337 rxvt_fatal ("can't open pseudo-tty");
1330 return -1;
1331 }
1332 1338
1333 fcntl (cfd, F_SETFL, O_NONBLOCK); 1339 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
1334 1340
1335 /* get slave (tty) */ 1341 /* get slave (tty) */
1336 if (tty_fd < 0) 1342 if (tty_fd < 0)
1337 { 1343 {
1338#ifndef NO_SETOWNER_TTYDEV 1344#ifndef NO_SETOWNER_TTYDEV
1339 privileged_ttydev (SAVE); 1345 privileged_ttydev (SAVE);
1340#endif 1346#endif
1341 1347
1342 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1348 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1343 { 1349 {
1344 close (cfd); 1350 close (cmd_fd);
1351 cmd_fd = -1;
1345 rxvt_print_error ("can't open slave tty %s", ttydev); 1352 rxvt_fatal ("can't open slave tty %s", ttydev);
1346 return -1;
1347 } 1353 }
1348 } 1354 }
1355
1349#ifndef NO_BACKSPACE_KEY 1356#ifndef NO_BACKSPACE_KEY
1350 if (key_backspace[0] && !key_backspace[1]) 1357 if (key_backspace[0] && !key_backspace[1])
1351 er = key_backspace[0]; 1358 er = key_backspace[0];
1352 else if (STRCMP (key_backspace, "DEC") == 0) 1359 else if (STRCMP (key_backspace, "DEC") == 0)
1353 er = '\177'; /* the initial state anyway */ 1360 er = '\177'; /* the initial state anyway */
1354 else 1361 else
1355#endif 1362#endif
1356
1357 er = -1; 1363 er = -1;
1358 1364
1359 rxvt_get_ttymode (& (tio), er); 1365 rxvt_get_ttymode (&tio, er);
1360 1366
1361#ifndef __QNX__ 1367#ifndef __QNX__
1362 /* spin off the command interpreter */ 1368 /* spin off the command interpreter */
1363 switch (cmd_pid = fork ()) 1369 switch (cmd_pid = fork ())
1364 { 1370 {
1365 case -1: 1371 case -1:
1366 rxvt_print_error ("can't fork"); 1372 rxvt_fatal ("can't fork");
1367 return -1;
1368 case 0: 1373 case 0:
1369 close (cfd); /* only keep tty_fd and STDERR open */
1370
1371 init_env (); 1374 init_env ();
1372 1375
1373 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1376 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1374 rxvt_print_error ("could not obtain control of tty"); 1377 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1375 else 1378 else
1376 { 1379 {
1377 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1380 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1378 dup2 (tty_fd, STDIN_FILENO); 1381 dup2 (tty_fd, STDIN_FILENO);
1379 dup2 (tty_fd, STDOUT_FILENO); 1382 dup2 (tty_fd, STDOUT_FILENO);
1380 dup2 (tty_fd, STDERR_FILENO); 1383 dup2 (tty_fd, STDERR_FILENO);
1381 1384
1382 if (tty_fd > 2) 1385 // close all our file handles that we do no longer need
1383 close (tty_fd); 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 }
1384 1391
1385 run_child (argv); 1392 run_child (argv);
1393 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1386 } 1394 }
1395
1387 exit (EXIT_FAILURE); 1396 _exit (EXIT_FAILURE);
1388 /* NOTREACHED */ 1397
1389 default: 1398 default:
1390 { 1399 {
1391#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1400#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1392 int fdstdin; 1401 int fdstdin;
1393 1402
… …
1402#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1411#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1403 1412
1404 dup2 (fdstdin, STDIN_FILENO); 1413 dup2 (fdstdin, STDIN_FILENO);
1405 close (fdstdin); 1414 close (fdstdin);
1406#endif 1415#endif
1407
1408 } 1416 }
1417
1409 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1418 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1410 break; 1419 break;
1411 } 1420 }
1412#else /* __QNX__ uses qnxspawn () */ 1421#else /* __QNX__ uses qnxspawn () */
1413 fchmod (tty_fd, 0622); 1422 fchmod (tty_fd, 0622);
1414 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1423 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1415 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1424 fcntl (cmd_fd, F_SETFD, FD_CLOEXEC);
1416 1425
1417 if (run_child (argv) == -1) 1426 if (run_child (argv) == -1)
1418 exit (EXIT_FAILURE); 1427 exit (EXIT_FAILURE);
1419#endif 1428#endif
1420
1421 return cfd;
1422} 1429}
1423 1430
1424/* ------------------------------------------------------------------------- * 1431/* ------------------------------------------------------------------------- *
1425 * CHILD PROCESS OPERATIONS * 1432 * CHILD PROCESS OPERATIONS *
1426 * ------------------------------------------------------------------------- */ 1433 * ------------------------------------------------------------------------- */
… …
1444#elif defined (SRIOCSREDIR) 1451#elif defined (SRIOCSREDIR)
1445 int fd; 1452 int fd;
1446 1453
1447 fd = open (CONSOLE, O_WRONLY, 0); 1454 fd = open (CONSOLE, O_WRONLY, 0);
1448 if (fd >= 0) 1455 if (fd >= 0)
1449 {
1450 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1456 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1451 close (fd); 1457 close (fd);
1452 }
1453#endif /* SRIOCSREDIR */ 1458#endif /* SRIOCSREDIR */
1454 1459
1455 } 1460 }
1456 1461
1457 /* reset signals and spin off the command interpreter */ 1462 /* reset signals and spin off the command interpreter */

Diff Legend

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