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

Diff Legend

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