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.20 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.97 by root, Wed Dec 15 00:12:58 2004 UTC

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

Diff Legend

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