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.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 * 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.
… …
66 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 67 "Yellow", /* 3/11: bright yellow (#FFFF00) */
67 "Blue", /* 4/12: bright blue (#0000FF) */ 68 "Blue", /* 4/12: bright blue (#0000FF) */
68 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 69 "Magenta", /* 5/13: bright magenta (#FF00FF) */
69 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 70 "Cyan", /* 6/14: bright cyan (#00FFFF) */
70 "White", /* 7/15: bright white (#FFFFFF) */ 71 "White", /* 7/15: bright white (#FFFFFF) */
71#ifdef TTY_256COLOR 72
72 "rgb:00/00/00", /* default 16-255 color table */ 73 // 88 xterm colours
73 "rgb:00/00/2a", 74 "rgb:00/00/00",
74 "rgb:00/00/55", 75 "rgb:00/00/8b",
75 "rgb:00/00/7f",
76 "rgb:00/00/aa",
77 "rgb:00/00/d4", 76 "rgb:00/00/cd",
77 "rgb:00/00/ff",
78 "rgb:00/2a/00", 78 "rgb:00/8b/00",
79 "rgb:00/2a/2a", 79 "rgb:00/8b/8b",
80 "rgb:00/2a/55",
81 "rgb:00/2a/7f",
82 "rgb:00/2a/aa",
83 "rgb:00/2a/d4", 80 "rgb:00/8b/cd",
84 "rgb:00/55/00",
85 "rgb:00/55/2a",
86 "rgb:00/55/55",
87 "rgb:00/55/7f", 81 "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", 82 "rgb:00/cd/00",
103 "rgb:00/d4/2a", 83 "rgb:00/cd/8b",
104 "rgb:00/d4/55",
105 "rgb:00/d4/7f",
106 "rgb:00/d4/aa",
107 "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",
108 "rgb:2a/00/00", 90 "rgb:8b/00/00",
109 "rgb:2a/00/2a", 91 "rgb:8b/00/8b",
110 "rgb:2a/00/55",
111 "rgb:2a/00/7f",
112 "rgb:2a/00/aa",
113 "rgb:2a/00/d4", 92 "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", 93 "rgb:8b/00/ff",
148 "rgb:55/00/aa",
149 "rgb:55/00/d4",
150 "rgb:55/2a/00", 94 "rgb:8b/8b/00",
151 "rgb:55/2a/2a", 95 "rgb:8b/8b/8b",
152 "rgb:55/2a/55", 96 "rgb:8b/8b/cd",
153 "rgb:55/2a/7f", 97 "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", 98 "rgb:8b/cd/00",
175 "rgb:55/d4/2a", 99 "rgb:8b/cd/8b",
176 "rgb:55/d4/55",
177 "rgb:55/d4/7f",
178 "rgb:55/d4/aa",
179 "rgb:55/d4/d4", 100 "rgb:8b/cd/cd",
180 "rgb:7f/00/00", 101 "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", 102 "rgb:8b/ff/00",
199 "rgb:7f/7f/2a", 103 "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", 104 "rgb:8b/ff/cd",
240 "rgb:aa/aa/00", 105 "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", 106 "rgb:cd/00/00",
253 "rgb:d4/00/2a", 107 "rgb:cd/00/8b",
254 "rgb:d4/00/55",
255 "rgb:d4/00/7f",
256 "rgb:d4/00/aa",
257 "rgb:d4/00/d4", 108 "rgb:cd/00/cd",
109 "rgb:cd/00/ff",
258 "rgb:d4/2a/00", 110 "rgb:cd/8b/00",
259 "rgb:d4/2a/2a", 111 "rgb:cd/8b/8b",
260 "rgb:d4/2a/55",
261 "rgb:d4/2a/7f",
262 "rgb:d4/2a/aa",
263 "rgb:d4/2a/d4", 112 "rgb:cd/8b/cd",
264 "rgb:d4/55/00",
265 "rgb:d4/55/2a",
266 "rgb:d4/55/55",
267 "rgb:d4/55/7f", 113 "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", 114 "rgb:cd/cd/00",
283 "rgb:d4/d4/2a", 115 "rgb:cd/cd/8b",
284 "rgb:d4/d4/55",
285 "rgb:d4/d4/7f",
286 "rgb:d4/d4/aa",
287 "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",
288 "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",
289 "rgb:12/12/12", 138 "rgb:2e/2e/2e",
290 "rgb:1c/1c/1c", 139 "rgb:5c/5c/5c",
291 "rgb:26/26/26",
292 "rgb:30/30/30", 140 "rgb:73/73/73",
293 "rgb:3a/3a/3a",
294 "rgb:44/44/44",
295 "rgb:4e/4e/4e",
296 "rgb:58/58/58", 141 "rgb:8b/8b/8b",
297 "rgb:62/62/62", 142 "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", 143 "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", 144 "rgb:d0/d0/d0",
309 "rgb:da/da/da",
310 "rgb:e4/e4/e4", 145 "rgb:e7/e7/e7",
311 "rgb:ee/ee/ee", 146
312#endif
313#ifndef NO_CURSORCOLOR 147#ifndef NO_CURSORCOLOR
314 COLOR_CURSOR_BACKGROUND, 148 COLOR_CURSOR_BACKGROUND,
315 COLOR_CURSOR_FOREGROUND, 149 COLOR_CURSOR_FOREGROUND,
316#endif /* ! NO_CURSORCOLOR */ 150#endif /* ! NO_CURSORCOLOR */
317 NULL, /* Color_pointer */ 151 NULL, /* Color_pointer_fg */
152 NULL, /* Color_pointer_bg */
318 NULL, /* Color_border */ 153 NULL, /* Color_border */
319#ifndef NO_BOLD_UNDERLINE_REVERSE 154#ifndef NO_BOLD_UNDERLINE_REVERSE
320 NULL, /* Color_BD */ 155 NULL, /* Color_BD */
156 NULL, /* Color_IT */
321 NULL, /* Color_UL */ 157 NULL, /* Color_UL */
322 NULL, /* Color_RV */ 158 NULL, /* Color_RV */
323#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 159#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
324#ifdef OPTION_HC 160#ifdef OPTION_HC
325 NULL, 161 NULL,
326#endif 162#endif
327#ifdef KEEP_SCROLLCOLOR 163#ifdef KEEP_SCROLLCOLOR
328 COLOR_SCROLLBAR, 164 COLOR_SCROLLBAR,
329 COLOR_SCROLLTROUGH, 165 COLOR_SCROLLTROUGH,
330#endif /* KEEP_SCROLLCOLOR */ 166#endif /* KEEP_SCROLLCOLOR */
331 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 {
452 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
453 ttygid = getgid ();
454 }
455 264
456 /* 265 /*
457 * Close all unused file descriptors 266 * Close all unused file descriptors
458 * We don't want them, we don't need them. 267 * We don't want them, we don't need them.
459 */ 268 */
… …
475 { 284 {
476#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ 285#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
477 if (i == 4 || i == 7) 286 if (i == 4 || i == 7)
478 continue; 287 continue;
479#endif 288#endif
480 close(i); 289 close (i);
481 } 290 }
482#endif 291#endif
483} 292}
484 293
485/*----------------------------------------------------------------------*/ 294/*----------------------------------------------------------------------*/
… …
492 301
493 /* 302 /*
494 * 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
495 */ 304 */
496 for (r_argc = 0; r_argc < argc; r_argc++) 305 for (r_argc = 0; r_argc < argc; r_argc++)
497 if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec")) 306 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec"))
498 break; 307 break;
499 308
500 r_argv = (const char **)rxvt_malloc (sizeof(char *) * (r_argc + 1)); 309 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
501 310
502 for (i = 0; i < r_argc; i++) 311 for (i = 0; i < r_argc; i++)
503 r_argv[i] = (const char *)argv[i]; 312 r_argv[i] = (const char *)argv[i];
504 313
505 r_argv[i] = NULL; 314 r_argv[i] = NULL;
506 315
507 if (r_argc == argc) 316 if (r_argc == argc)
508 cmd_argv = NULL; 317 cmd_argv = NULL;
509 else 318 else
510 { 319 {
511 cmd_argv = (const char **)rxvt_malloc (sizeof(char *) * (argc - r_argc)); 320 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
512 321
513 for (i = 0; i < argc - r_argc - 1; i++) 322 for (i = 0; i < argc - r_argc - 1; i++)
514 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 323 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
515 324
516 cmd_argv[i] = NULL; 325 cmd_argv[i] = NULL;
517 } 326 }
518 327
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]); 328 rs[Rs_name] = rxvt_r_basename (argv[0]);
524 329
525 /* 330 /*
526 * Open display, get options/resources and create the window 331 * Open display, get options/resources and create the window
527 */ 332 */
528 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 333 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
… …
532 free (r_argv); 337 free (r_argv);
533 338
534#ifdef LOCAL_X_IS_UNIX 339#ifdef LOCAL_X_IS_UNIX
535 if (rs[Rs_display_name][0] == ':') 340 if (rs[Rs_display_name][0] == ':')
536 { 341 {
537 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 342 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
538 STRCPY (val, "unix"); 343 strcpy (val, "unix");
539 STRCAT (val, rs[Rs_display_name]); 344 strcat (val, rs[Rs_display_name]);
540 Xdisplay = XOpenDisplay (val); 345 display = displays.get (val);
541 free (val); 346 free (val);
542 } 347 }
543#endif 348#endif
544 349
545 if (Xdisplay == NULL 350 if (!display
546 && (Xdisplay = XOpenDisplay (rs[Rs_display_name])) == NULL) 351 && ! (display = displays.get (rs[Rs_display_name])))
547 {
548 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]);
549 exit (EXIT_FAILURE);
550 }
551 353
552 extract_resources (Xdisplay, rs[Rs_name]); 354 extract_resources (display->display, rs[Rs_name]);
553 355
554 /* 356 /*
555 * set any defaults not already set 357 * set any defaults not already set
556 */ 358 */
557 if (cmd_argv && cmd_argv[0]) 359 if (cmd_argv && cmd_argv[0])
558 { 360 {
559 if (!rs[Rs_title]) 361 if (!rs[Rs_title])
560 rs[Rs_title] = rxvt_r_basename(cmd_argv[0]); 362 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);
561 if (!rs[Rs_iconName]) 363 if (!rs[Rs_iconName])
562 rs[Rs_iconName] = rs[Rs_title]; 364 rs[Rs_iconName] = rs[Rs_title];
563 } 365 }
564 else 366 else
565 { 367 {
… …
567 rs[Rs_title] = rs[Rs_name]; 369 rs[Rs_title] = rs[Rs_name];
568 if (!rs[Rs_iconName]) 370 if (!rs[Rs_iconName])
569 rs[Rs_iconName] = rs[Rs_name]; 371 rs[Rs_iconName] = rs[Rs_name];
570 } 372 }
571 373
572 if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) 374 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
573 TermWin.saveLines = BOUND_POSITIVE_INT16(i); 375 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
574 376
575#ifndef NO_FRILLS 377#if ENABLE_FRILLS
576 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)
577 TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ 379 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
578 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)
579 TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ 381 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
580#endif 382#endif
581 383
582#ifndef NO_LINESPACE 384#ifndef NO_LINESPACE
583 if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
584 TermWin.lineSpace = min(i, 100); /* arbitrary limit */ 386 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
585#endif 387#endif
586 388
587#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
588 if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
589 pointerBlankDelay = i; 391 pointerBlankDelay = i;
590 else 392 else
591 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
592#endif 394#endif
593 395
594 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
595 if (!TermWin.saveLines) 397 if (!TermWin.saveLines)
596 Options &= ~Opt_scrollBar; 398 options &= ~Opt_scrollBar;
597 399
598#ifdef PRINTPIPE 400#ifdef PRINTPIPE
599 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
600 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
601#endif 403#endif
602 404
603 if (!rs[Rs_cutchars]) 405 if (!rs[Rs_cutchars])
604 rs[Rs_cutchars] = CUTCHARS; 406 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 407
618#ifndef NO_BACKSPACE_KEY 408#ifndef NO_BACKSPACE_KEY
619 if (!rs[Rs_backspace_key]) 409 if (!rs[Rs_backspace_key])
620# ifdef DEFAULT_BACKSPACE 410# ifdef DEFAULT_BACKSPACE
621 key_backspace = DEFAULT_BACKSPACE; 411 key_backspace = DEFAULT_BACKSPACE;
622# else 412# else
623 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 413 key_backspace = "DEC"; /* can toggle between \010 or \177 */
624# endif 414# endif
625 else 415 else
626 { 416 {
627 val = STRDUP(rs[Rs_backspace_key]); 417 val = strdup (rs[Rs_backspace_key]);
628 rxvt_Str_trim(val); 418 rxvt_Str_trim (val);
629 rxvt_Str_escaped(val); 419 rxvt_Str_escaped (val);
630 key_backspace = val; 420 key_backspace = val;
631 } 421 }
632#endif 422#endif
633 423
634#ifndef NO_DELETE_KEY 424#ifndef NO_DELETE_KEY
… …
638# else 428# else
639 key_delete = "\033[3~"; 429 key_delete = "\033[3~";
640# endif 430# endif
641 else 431 else
642 { 432 {
643 val = STRDUP(rs[Rs_delete_key]); 433 val = strdup (rs[Rs_delete_key]);
644 rxvt_Str_trim(val); 434 rxvt_Str_trim (val);
645 rxvt_Str_escaped(val); 435 rxvt_Str_escaped (val);
646 key_delete = val; 436 key_delete = val;
647 } 437 }
648#endif 438#endif
649 if (rs[Rs_answerbackstring]) 439 if (rs[Rs_answerbackstring])
650 { 440 {
651 rxvt_Str_trim((char *)rs[Rs_answerbackstring]); 441 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
652 rxvt_Str_escaped((char *)rs[Rs_answerbackstring]); 442 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 } 443 }
666 444
667#ifdef HAVE_SCROLLBARS 445#ifdef HAVE_SCROLLBARS
668 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
669 rs[Rs_scrollBar_thickness]);
670#endif 447#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 448
678#ifdef XTERM_REVERSE_VIDEO 449#ifdef XTERM_REVERSE_VIDEO
679 /* this is how xterm implements reverseVideo */ 450 /* this is how xterm implements reverseVideo */
680 if (Options & Opt_reverseVideo) 451 if (options & Opt_reverseVideo)
681 { 452 {
682 if (!rs[Rs_color + Color_fg]) 453 if (!rs[Rs_color + Color_fg])
683 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 454 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
684 if (!rs[Rs_color + Color_bg]) 455 if (!rs[Rs_color + Color_bg])
685 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 456 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
690 if (!rs[Rs_color + i]) 461 if (!rs[Rs_color + i])
691 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
692 463
693#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
694 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
695 if (Options & Opt_reverseVideo) 466 if (options & Opt_reverseVideo)
696 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 *);
697#endif 468#endif
698 469
699 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
700 color_aliases (Color_fg); 471 color_aliases (Color_fg);
701 color_aliases (Color_bg); 472 color_aliases (Color_bg);
702#ifndef NO_CURSORCOLOR 473#ifndef NO_CURSORCOLOR
703 color_aliases (Color_cursor); 474 color_aliases (Color_cursor);
704 color_aliases (Color_cursor2); 475 color_aliases (Color_cursor2);
705#endif /* NO_CURSORCOLOR */ 476#endif /* NO_CURSORCOLOR */
706 color_aliases (Color_pointer); 477 color_aliases (Color_pointer_fg);
478 color_aliases (Color_pointer_bg);
707 color_aliases (Color_border); 479 color_aliases (Color_border);
708#ifndef NO_BOLD_UNDERLINE_REVERSE 480#ifndef NO_BOLD_UNDERLINE_REVERSE
709 color_aliases (Color_BD); 481 color_aliases (Color_BD);
710 color_aliases (Color_UL); 482 color_aliases (Color_UL);
711 color_aliases (Color_RV); 483 color_aliases (Color_RV);
712#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];
713 488
714 return cmd_argv; 489 return cmd_argv;
715} 490}
716 491
717/*----------------------------------------------------------------------*/ 492/*----------------------------------------------------------------------*/
… …
724 499
725#ifdef DISPLAY_IS_IP 500#ifdef DISPLAY_IS_IP
726 /* Fixup display_name for export over pty to any interested terminal 501 /* 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 502 * 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 503 * (for the first non-loopback interface) that we get from
729 * rxvt_network_display(). This is more "name-resolution-portable", if you 504 * rxvt_network_display (). This is more "name-resolution-portable", if you
730 * 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
731 * 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
732 * course that only helps the shell's child processes, not us. 507 * course that only helps the shell's child processes, not us.
733 * 508 *
734 * Giving out the display_name also affords a potential security hole 509 * Giving out the display_name also affords a potential security hole
… …
736 val = rxvt_network_display (rs[Rs_display_name]); 511 val = rxvt_network_display (rs[Rs_display_name]);
737 rs[Rs_display_name] = (const char *)val; 512 rs[Rs_display_name] = (const char *)val;
738 513
739 if (val == NULL) 514 if (val == NULL)
740#endif /* DISPLAY_IS_IP */ 515#endif /* DISPLAY_IS_IP */
741 val = XDisplayString(Xdisplay); 516 val = XDisplayString (display->display);
742 517
743 if (rs[Rs_display_name] == NULL) 518 if (rs[Rs_display_name] == NULL)
744 rs[Rs_display_name] = val; /* use broken `:0' value */ 519 rs[Rs_display_name] = val; /* use broken `:0' value */
745 520
746 i = STRLEN (val); 521 i = strlen (val);
747 env_display = (char *)rxvt_malloc ((i + 9) * sizeof(char)); 522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
748 523
749 sprintf (env_display, "DISPLAY=%s", val); 524 sprintf (env_display, "DISPLAY=%s", val);
750 525
751 /* avoiding the math library: 526 /* avoiding the math library:
752 * i = (int)(ceil(log10((unsigned int)TermWin.parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
753 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++)
754 ; 529 ;
755 MAX_IT(i, 1); 530 MAX_IT (i, 1);
756 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof(char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
757 532
758 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
759 (unsigned int)TermWin.parent[0]); 534 (unsigned int)TermWin.parent[0]);
760 535
761 /* add entries to the environment: 536 /* add entries to the environment:
762 * @ DISPLAY: in case we started with -display 537 * @ DISPLAY: in case we started with -display
763 * @ WINDOWID: X window id number of the window 538 * @ WINDOWID: X window id number of the window
764 * @ COLORTERM: terminal sub-name and also indicates its color 539 * @ COLORTERM: terminal sub-name and also indicates its color
765 * @ TERM: terminal name 540 * @ TERM: terminal name
766 * @ TERMINFO: path to terminfo directory 541 * @ TERMINFO: path to terminfo directory
542 * @ COLORFGBG: fg;bg color codes
767 */ 543 */
768 putenv (env_display); 544 putenv (env_display);
769 putenv (env_windowid); 545 putenv (env_windowid);
546 if (env_colorfgbg)
547 putenv (env_colorfgbg);
770 548
771#ifdef RXVT_TERMINFO 549#ifdef RXVT_TERMINFO
772 putenv ("TERMINFO=" RXVT_TERMINFO); 550 putenv ("TERMINFO=" RXVT_TERMINFO);
773#endif 551#endif
774 552
775 if (Xdepth <= 2) 553 if (display->depth <= 2)
776 putenv ("COLORTERM=" COLORTERMENV "-mono"); 554 putenv ("COLORTERM=" COLORTERMENV "-mono");
777 else 555 else
778 putenv ("COLORTERM=" COLORTERMENVFULL); 556 putenv ("COLORTERM=" COLORTERMENVFULL);
779 557
780 if (rs[Rs_term_name] != NULL) 558 if (rs[Rs_term_name] != NULL)
781 { 559 {
782 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));
783 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 561 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
784 putenv (env_term); 562 putenv (env_term);
785 } 563 }
786 else 564 else
787 putenv ("TERM=" TERMENV); 565 putenv ("TERM=" TERMENV);
… …
802void 580void
803rxvt_term::set_locale (const char *locale) 581rxvt_term::set_locale (const char *locale)
804{ 582{
805#if HAVE_XSETLOCALE || HAVE_SETLOCALE 583#if HAVE_XSETLOCALE || HAVE_SETLOCALE
806 free (this->locale); 584 free (this->locale);
807 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 ();
808#endif 604#endif
605
606#if 0
809#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");
810 free (codeset); 611 free (codeset);
811 codeset = strdup (nl_langinfo (CODESET));
812 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
813 || !STRCASECMP (codeset, "UTF8");
814#else 612#else
815 enc_utf8 = 1; 613 enc_utf8 = 0;
614#endif
816#endif 615#endif
817} 616}
818 617
819void 618void
820rxvt_term::init_xlocale () 619rxvt_term::init_xlocale ()
821{ 620{
822#ifdef USE_XIM 621#ifdef USE_XIM
823 if (!locale) 622 if (!locale)
824 rxvt_print_error ("Setting locale failed."); 623 rxvt_warn ("setting locale failed, working without locale support.\n");
825 else 624 else
826 { 625 {
827 Atom wmlocale; 626 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 627
834 if (!XSupportsLocale ()) 628 if (!XSupportsLocale ())
835 { 629 {
836 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");
837 return; 631 return;
838 } 632 }
839 633
634 im_ev.start (display);
635
840 /* see if we can connect yet */ 636 /* see if we can connect already */
841 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 637 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 } 638 }
848#endif 639#endif
849} 640}
850 641
851/*----------------------------------------------------------------------*/ 642/*----------------------------------------------------------------------*/
852void 643void
853rxvt_term::init_command(const char *const *argv) 644rxvt_term::init_command (const char *const *argv)
854{ 645{
855 /* 646 /*
856 * Initialize the command connection. 647 * Initialize the command connection.
857 * This should be called after the X server connection is established. 648 * This should be called after the X server connection is established.
858 */ 649 */
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 650
873#ifdef META8_OPTION 651#ifdef META8_OPTION
874 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 652 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
875#endif 653#endif
876 654
877 get_ourmods (); 655 get_ourmods ();
878 656
879 if (!(Options & Opt_scrollTtyOutput)) 657 if (!(options & Opt_scrollTtyOutput))
880 PrivateModes |= PrivMode_TtyOutputInh; 658 priv_modes |= PrivMode_TtyOutputInh;
881 if (Options & Opt_scrollTtyKeypress) 659 if (options & Opt_scrollTtyKeypress)
882 PrivateModes |= PrivMode_Keypress; 660 priv_modes |= PrivMode_Keypress;
883 if (!(Options & Opt_jumpScroll)) 661 if (!(options & Opt_jumpScroll))
884 PrivateModes |= PrivMode_smoothScroll; 662 priv_modes |= PrivMode_smoothScroll;
885 663
886#ifndef NO_BACKSPACE_KEY 664#ifndef NO_BACKSPACE_KEY
887 if (STRCMP(key_backspace, "DEC") == 0) 665 if (strcmp (key_backspace, "DEC") == 0)
888 PrivateModes |= PrivMode_HaveBackSpace; 666 priv_modes |= PrivMode_HaveBackSpace;
889#endif 667#endif
890 668
891 /* add value for scrollBar */ 669 /* add value for scrollBar */
892 if (scrollbar_visible ()) 670 if (scrollbar_visible ())
893 { 671 {
894 PrivateModes |= PrivMode_scrollBar; 672 priv_modes |= PrivMode_scrollBar;
895 SavedModes |= PrivMode_scrollBar; 673 SavedModes |= PrivMode_scrollBar;
896 } 674 }
897 if (menubar_visible ()) 675 if (menubar_visible ())
898 { 676 {
899 PrivateModes |= PrivMode_menuBar; 677 priv_modes |= PrivMode_menuBar;
900 SavedModes |= PrivMode_menuBar; 678 SavedModes |= PrivMode_menuBar;
901 } 679 }
902 680
903#ifdef GREEK_SUPPORT
904 greek_init();
905#endif
906
907 Xfd = XConnectionNumber (Xdisplay);
908
909#ifdef CURSOR_BLINK 681#ifdef CURSOR_BLINK
910
911 if (Options & Opt_cursorBlink) 682 if (options & Opt_cursorBlink)
912 (void)gettimeofday (&lastcursorchange, NULL); 683 (void)gettimeofday (&lastcursorchange, NULL);
913#endif 684#endif
914 685
915 if ((cmd_fd = run_command (argv)) < 0) 686 run_command (argv);
916 {
917 rxvt_print_error ("aborting");
918 exit (EXIT_FAILURE);
919 }
920} 687}
921 688
922/*----------------------------------------------------------------------*/ 689/*----------------------------------------------------------------------*/
923void 690void
924rxvt_term::Get_Colours () 691rxvt_term::Get_Colours ()
925{ 692{
926 int i; 693 int i;
927 694
695#ifdef OFF_FOCUS_FADING
696 pix_colors = pix_colors_focused;
697#endif
698
928 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 699 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
929 { 700 {
930 rxvt_color xcol; 701 rxvt_color xcol;
931 702
932 if (!rs[Rs_color + i]) 703 if (!rs[Rs_color + i])
933 continue; 704 continue;
934 705
935 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
936 { 707 {
937#ifndef XTERM_REVERSE_VIDEO 708#ifndef XTERM_REVERSE_VIDEO
938 if (i < 2 && (Options & Opt_reverseVideo)) 709 if (i < 2 && (options & Opt_reverseVideo))
939 {
940 rs[Rs_color + i] = def_colorName[!i]; 710 rs[Rs_color + i] = def_colorName[!i];
941 }
942 else 711 else
943#endif 712#endif
944 rs[Rs_color + i] = def_colorName[i]; 713 rs[Rs_color + i] = def_colorName[i];
945 714
946 if (!rs[Rs_color + i]) 715 if (!rs[Rs_color + i])
… …
951 switch (i) 720 switch (i)
952 { 721 {
953 case Color_fg: 722 case Color_fg:
954 case Color_bg: 723 case Color_bg:
955 /* fatal: need bg/fg color */ 724 /* fatal: need bg/fg color */
956 rxvt_print_error ("aborting"); 725 rxvt_fatal ("unable to get foreground/background colour, aborting.\n");
957 exit (EXIT_FAILURE);
958 /* NOTREACHED */ 726 /* NOTREACHED */
959 break; 727 break;
960#ifndef NO_CURSORCOLOR 728#ifndef NO_CURSORCOLOR
961 case Color_cursor2: 729 case Color_cursor2:
962 xcol = PixColors[Color_fg]; 730 xcol = pix_colors[Color_fg];
963 break; 731 break;
964#endif /* ! NO_CURSORCOLOR */ 732#endif /* ! NO_CURSORCOLOR */
965 case Color_pointer: 733 case Color_pointer_fg:
966 xcol = PixColors[Color_fg]; 734 xcol = pix_colors[Color_fg];
967 break; 735 break;
968 default: 736 default:
969 xcol = PixColors[Color_bg]; /* None */ 737 xcol = pix_colors[Color_bg]; /* None */
970 break; 738 break;
971 } 739 }
972 } 740 }
973 } 741 }
974 742
975 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
976 SET_PIXCOLOR (i); 748 SET_PIXCOLOR (i);
977 } 749 }
978 750
979 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 751 if (display->depth <= 2)
980 PixColors[Color_pointer] = PixColors[Color_fg]; 752 {
981 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];
982 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 }
983 757
984 /* 758 /*
985 * get scrollBar/menuBar shadow colors 759 * get scrollBar/menuBar shadow colors
986 * 760 *
987 * The calculations of topShadow/bottomShadow values are adapted 761 * The calculations of topShadow/bottomShadow values are adapted
988 * from the fvwm window manager. 762 * from the fvwm window manager.
989 */ 763 */
990#ifdef KEEP_SCROLLCOLOR 764#ifdef KEEP_SCROLLCOLOR
991 765
992 if (XDEPTH <= 2) 766 if (display->depth <= 2)
993 { /* Monochrome */ 767 { /* Monochrome */
994 PixColors[Color_scroll] = PixColors[Color_fg]; 768 pix_colors[Color_scroll] = pix_colors[Color_fg];
995 PixColors[Color_topShadow] = PixColors[Color_bg]; 769 pix_colors[Color_topShadow] = pix_colors[Color_bg];
996 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
997 } 771 }
998 else 772 else
999 { 773 {
1000 rxvt_color xcol[3]; 774 rxvt_color xcol[2];
1001 /* xcol[0] == white 775 /* xcol[0] == white
1002 * xcol[1] == top shadow 776 * xcol[1] == top shadow
1003 * xcol[2] == bot shadow */ 777 * xcol[2] == bot shadow */
1004 778
1005 xcol[1] = PixColors[Color_scroll]; 779 xcol[1] = pix_colors[Color_scroll];
1006# ifdef PREFER_24BIT
1007 xcol[0].set (this, 65535, 65535, 65535); 780 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 781
1013 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 782 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1014 783
1015 xcol[0].get (this, pr0, pg0, pb0); 784 xcol[0].get (display, pr0, pg0, pb0);
1016 xcol[1].get (this, pr1, pg1, pb1); 785 xcol[1].get (display, pr1, pg1, pb1);
1017 786
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]; 787 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
1023 788
1024 /* topShadowColor */ 789 /* topShadowColor */
1025 if (!xcol[1].set (this, 790 if (!xcol[1].set (display,
1026 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 791 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1027 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 792 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1028 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 793 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1029 xcol[1] = PixColors[Color_White]; 794 xcol[1] = pix_colors[Color_White];
1030 795
1031 PixColors[Color_topShadow] = xcol[1]; 796 pix_colors[Color_topShadow] = xcol[1];
1032 } 797 }
1033#endif /* KEEP_SCROLLCOLOR */ 798#endif /* KEEP_SCROLLCOLOR */
1034} 799}
1035 800
1036/*----------------------------------------------------------------------*/ 801/*----------------------------------------------------------------------*/
1037/* color aliases, fg/bg bright-bold */ 802/* color aliases, fg/bg bright-bold */
1038void 803void
1039rxvt_term::color_aliases(int idx) 804rxvt_term::color_aliases (int idx)
1040{ 805{
1041 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) 806 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1042 { 807 {
1043 int i = atoi (rs[Rs_color + idx]); 808 int i = atoi (rs[Rs_color + idx]);
1044 809
1045 if (i >= 8 && i <= 15) 810 if (i >= 8 && i <= 15)
1046 { /* bright colors */ 811 { /* bright colors */
1047 i -= 8; 812 i -= 8;
1048#ifndef NO_BRIGHTCOLOR 813#ifndef NO_BRIGHTCOLOR
1049 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 814 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1050 return; 815 return;
1051#endif 816#endif
1052
1053 } 817 }
1054 818
1055 if (i >= 0 && i <= 7) /* normal colors */ 819 if (i >= 0 && i <= 7) /* normal colors */
1056 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 820 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1057 } 821 }
… …
1076 }; 840 };
1077 841
1078 requestedmeta = realmeta = realalt = 0; 842 requestedmeta = realmeta = realalt = 0;
1079 rsmod = rs[Rs_modifier]; 843 rsmod = rs[Rs_modifier];
1080 if (rsmod 844 if (rsmod
1081 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 845 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
1082 requestedmeta = rsmod[3] - '0'; 846 requestedmeta = rsmod[3] - '0';
1083 847
1084 map = XGetModifierMapping(Xdisplay); 848 map = XGetModifierMapping (display->display);
1085 kc = map->modifiermap; 849 kc = map->modifiermap;
1086 for (i = 1; i < 6; i++) 850 for (i = 1; i < 6; i++)
1087 { 851 {
1088 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1089 for (j = map->max_keypermod; j--; k++) 853 for (j = map->max_keypermod; j--; k++)
1090 { 854 {
1091 if (kc[k] == 0) 855 if (kc[k] == 0)
1092 break; 856 break;
1093 switch (XKeycodeToKeysym(Xdisplay, kc[k], 0)) 857 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1094 { 858 {
1095 case XK_Num_Lock: 859 case XK_Num_Lock:
1096 ModNumLockMask = modmasks[i - 1]; 860 ModNumLockMask = modmasks[i - 1];
1097 /* FALLTHROUGH */ 861 /* FALLTHROUGH */
1098 default: 862 default:
1099 continue; /* for(;;) */ 863 continue; /* for (;;) */
1100 case XK_Meta_L: 864 case XK_Meta_L:
1101 case XK_Meta_R: 865 case XK_Meta_R:
1102 cm = "meta"; 866 cm = "meta";
1103 realmeta = i; 867 realmeta = i;
1104 break; 868 break;
… …
1114 case XK_Hyper_L: 878 case XK_Hyper_L:
1115 case XK_Hyper_R: 879 case XK_Hyper_R:
1116 cm = "hyper"; 880 cm = "hyper";
1117 break; 881 break;
1118 } 882 }
1119 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 883 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
1120 requestedmeta = i; 884 requestedmeta = i;
1121 } 885 }
1122 } 886 }
1123 XFreeModifiermap(map); 887 XFreeModifiermap (map);
1124 i = (requestedmeta ? requestedmeta 888 i = (requestedmeta ? requestedmeta
1125 : (realmeta ? realmeta 889 : (realmeta ? realmeta
1126 : (realalt ? realalt : 0))); 890 : (realalt ? realalt : 0)));
1127 if (i) 891 if (i)
1128 ModMetaMask = modmasks[i - 1]; 892 ModMetaMask = modmasks[i - 1];
1129} 893}
1130 894
1131/*----------------------------------------------------------------------*/ 895/*----------------------------------------------------------------------*/
1132/* rxvt_Create_Windows() - Open and map the window */ 896/* rxvt_Create_Windows () - Open and map the window */
1133void 897void
1134rxvt_term::create_windows (int argc, const char *const *argv) 898rxvt_term::create_windows (int argc, const char *const *argv)
1135{ 899{
1136 XClassHint classHint; 900 XClassHint classHint;
1137 XWMHints wmHint; 901 XWMHints wmHint;
902#if ENABLE_FRILLS
903 Atom prop = None;
904 MWMHints mwmhints;
905#endif
1138 XGCValues gcvalue; 906 XGCValues gcvalue;
1139 long vt_emask; 907 long vt_emask;
1140 908 XSetWindowAttributes attributes;
1141 XWindowAttributes gattr; 909 XWindowAttributes gattr;
1142 910
1143 Xcmap = DefaultColormap (Xdisplay, Xscreen); 911#ifdef USING_W11LIB
1144 Xvisual = DefaultVisual (Xdisplay, Xscreen); 912 /* enable W11 callbacks */
1145 Xscreen = DefaultScreen (Xdisplay); 913 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
914#endif
1146 915
916 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
917 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa);
918
1147 if (Options & Opt_transparent) 919 if (options & Opt_transparent)
1148 { 920 {
1149 XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr); 921 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1150 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 }
1151 } 943 }
1152 else 944 else
1153 { 945 {
1154 Xdepth = DefaultDepth(Xdisplay, Xscreen); 946 mwmhints.flags = 0;
1155#ifdef PREFER_24BIT
1156 /*
1157 * If depth is not 24, look for a 24bit visual.
1158 */
1159 if (Xdepth != 24)
1160 {
1161 XVisualInfo vinfo;
1162
1163 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1164 {
1165 Xdepth = 24;
1166 Xvisual = vinfo.visual;
1167 Xcmap = XCreateColormap(Xdisplay,
1168 RootWindow(Xdisplay, Xscreen),
1169 Xvisual, AllocNone);
1170 }
1171 }
1172#endif
1173
1174 } 947 }
948#endif
1175 949
1176 /* grab colors before netscape does */ 950 /* grab colors before netscape does */
1177 Get_Colours (); 951 Get_Colours ();
1178 952
1179 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
1180 window_calc (0, 0); 956 window_calc (0, 0);
1181 old_width = szHint.width; 957 old_width = szHint.width;
1182 old_height = szHint.height; 958 old_height = szHint.height;
1183 959
1184 /* parent window - reverse video so we can see placement errors
1185 * sub-window placement & size in rxvt_resize_subwindows() 960 /* sub-window placement & size in rxvt_resize_subwindows () */
1186 */
1187 961
1188#ifdef PREFER_24BIT 962#ifdef PREFER_24BIT
1189 XSetWindowAttributes attributes;
1190
1191 attributes.background_pixel = PixColors[Color_fg]; 963 attributes.background_pixel = pix_colors_focused[Color_border];
1192 attributes.border_pixel = PixColors[Color_border]; 964 attributes.border_pixel = pix_colors_focused[Color_border];
1193 attributes.colormap = Xcmap; 965 attributes.colormap = display->cmap;
1194 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), 966 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1195 szHint.x, szHint.y, 967 szHint.x, szHint.y,
1196 szHint.width, szHint.height, 968 szHint.width, szHint.height,
1197 TermWin.ext_bwidth, 969 TermWin.ext_bwidth,
1198 Xdepth, InputOutput, 970 display->depth, InputOutput,
1199 Xvisual, 971 display->visual,
1200 CWBackPixel | CWBorderPixel 972 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1201 | CWColormap, &attributes);
1202#else 973#else
1203 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), 974 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1204 szHint.x, szHint.y, 975 szHint.x, szHint.y,
1205 szHint.width, 976 szHint.width, szHint.height,
1206 szHint.height,
1207 TermWin.ext_bwidth, 977 TermWin.ext_bwidth,
1208 PixColors[Color_border], 978 pix_colors_focused[Color_border],
1209 PixColors[Color_fg]); 979 pix_colors_focused[Color_border]);
1210#endif 980#endif
1211 981
1212 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 982 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1213 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 983 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1214 984
1215 classHint.res_name = (char *)rs[Rs_name]; 985 classHint.res_name = (char *)rs[Rs_name];
1216 classHint.res_class = (char *)APL_CLASS; 986 classHint.res_class = (char *)RESCLASS;
1217 987
1218 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 988 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1219 wmHint.input = True; 989 wmHint.input = True;
1220 wmHint.initial_state = (Options & Opt_iconic ? IconicState 990 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1221 : NormalState);
1222 wmHint.window_group = TermWin.parent[0]; 991 wmHint.window_group = TermWin.parent[0];
1223 992
1224 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL, 993 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1225 (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
1226 XSelectInput(Xdisplay, TermWin.parent[0], 1008 XSelectInput (display->display, TermWin.parent[0],
1227 (KeyPressMask 1009 KeyPressMask
1228#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1010#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1229 | KeyReleaseMask 1011 | KeyReleaseMask
1230#endif 1012#endif
1231 | FocusChangeMask | VisibilityChangeMask 1013 | FocusChangeMask | VisibilityChangeMask
1014 | ExposureMask
1232 | 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
1233 1023
1234 /* 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 */
1235 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm); 1025 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1236 1026
1237#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1027#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1238 /* cursor (menuBar/scrollBar): Black-on-White */ 1028 /* cursor (menuBar/scrollBar): Black-on-White */
1239 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); 1029 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1240#endif 1030#endif
1241 1031
1242#ifdef POINTER_BLANK 1032#ifdef POINTER_BLANK
1243
1244 { 1033 {
1245 XColor blackcolour; 1034 XColor blackcolour;
1246 blackcolour.red = 0; 1035 blackcolour.red = 0;
1247 blackcolour.green = 0; 1036 blackcolour.green = 0;
1248 blackcolour.blue = 0; 1037 blackcolour.blue = 0;
1249 Font f = XLoadFont (Xdisplay, "fixed"); 1038 Font f = XLoadFont (display->display, "fixed");
1250 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ', 1039 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1251 &blackcolour, &blackcolour); 1040 &blackcolour, &blackcolour);
1252 XUnloadFont (Xdisplay, f); 1041 XUnloadFont (display->display, f);
1253 } 1042 }
1254#endif 1043#endif
1255 1044
1256 /* the vt window */ 1045 /* the vt window */
1257 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1046 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1258 window_vt_x, window_vt_y, 1047 window_vt_x,
1048 window_vt_y,
1259 TermWin_TotalWidth(), 1049 TermWin_TotalWidth (),
1260 TermWin_TotalHeight(), 1050 TermWin_TotalHeight (),
1261 0, 1051 0,
1262 PixColors[Color_fg], 1052 pix_colors_focused[Color_fg],
1263 PixColors[Color_bg]); 1053 pix_colors_focused[Color_bg]);
1264#ifdef DEBUG_X 1054#ifdef DEBUG_X
1265 XStoreName(Xdisplay, TermWin.vt, "vt window"); 1055 XStoreName (display->display, TermWin.vt, "vt window");
1266#endif 1056#endif
1267 1057
1058 attributes.bit_gravity = NorthWestGravity;
1059 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1060
1268 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1061 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1269 | PropertyChangeMask); 1062
1063 pointer_unblank ();
1270 1064
1271#ifdef POINTER_BLANK 1065#ifdef POINTER_BLANK
1272 pointer_unblank ();
1273
1274 if ((Options & Opt_pointerBlank)) 1066 if (options & Opt_pointerBlank)
1275 vt_emask |= PointerMotionMask; 1067 vt_emask |= PointerMotionMask;
1276 else 1068 else
1277#endif 1069#endif
1278 vt_emask |= (Button1MotionMask | Button3MotionMask); 1070 vt_emask |= Button1MotionMask | Button3MotionMask;
1279 1071
1280 XSelectInput(Xdisplay, TermWin.vt, vt_emask); 1072 XSelectInput (display->display, TermWin.vt, vt_emask);
1073 vt_ev.start (display, TermWin.vt);
1281 1074
1282#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1075#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1283
1284 if (menuBar_height()) 1076 if (menuBar_height ())
1285 { 1077 {
1286 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1078 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1287 window_vt_x, 0, 1079 window_vt_x, 0,
1288 TermWin_TotalWidth(), 1080 TermWin_TotalWidth (),
1289 menuBar_TotalHeight(), 1081 menuBar_TotalHeight (),
1290 0, 1082 0,
1291 PixColors[Color_fg], 1083 pix_colors_focused[Color_fg],
1292 PixColors[Color_scroll]); 1084 pix_colors_focused[Color_scroll]);
1085
1293#ifdef DEBUG_X 1086#ifdef DEBUG_X
1294
1295 XStoreName(Xdisplay, menuBar.win, "menubar"); 1087 XStoreName (display->display, menuBar.win, "menubar");
1296#endif 1088#endif
1297 1089
1298 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
1299 XSelectInput(Xdisplay, menuBar.win, 1095 XSelectInput (display->display, menuBar.win,
1300 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1096 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1301 | Button1MotionMask)); 1097 | Button1MotionMask));
1098 menubar_ev.start (display, menuBar.win);
1302 } 1099 }
1303#endif 1100#endif
1101
1304#ifdef XPM_BACKGROUND 1102#ifdef XPM_BACKGROUND
1305 if (rs[Rs_backgroundPixmap] != NULL 1103 if (rs[Rs_backgroundPixmap] != NULL
1306 && !(Options & Opt_transparent)) 1104 && ! (options & Opt_transparent))
1307 { 1105 {
1308 const char *p = rs[Rs_backgroundPixmap]; 1106 const char *p = rs[Rs_backgroundPixmap];
1309 1107
1310 if ((p = STRCHR(p, ';')) != NULL) 1108 if ((p = strchr (p, ';')) != NULL)
1311 { 1109 {
1312 p++; 1110 p++;
1313 scale_pixmap (p); 1111 scale_pixmap (p);
1314 } 1112 }
1113
1315 set_bgPixmap (rs[Rs_backgroundPixmap]); 1114 set_bgPixmap (rs[Rs_backgroundPixmap]);
1316 scr_touch (True); 1115 scr_touch (true);
1317 } 1116 }
1318#endif 1117#endif
1319 1118
1320 /* graphics context for the vt window */ 1119 /* graphics context for the vt window */
1321 gcvalue.foreground = PixColors[Color_fg]; 1120 gcvalue.foreground = pix_colors[Color_fg];
1322 gcvalue.background = PixColors[Color_bg]; 1121 gcvalue.background = pix_colors[Color_bg];
1323 gcvalue.graphics_exposures = 1; 1122 gcvalue.graphics_exposures = 1;
1324 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, 1123 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1325 GCForeground | GCBackground 1124 GCForeground | GCBackground | GCGraphicsExposures,
1326 | GCGraphicsExposures, &gcvalue); 1125 &gcvalue);
1126
1127 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1327 1128
1328#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1129#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1329
1330 gcvalue.foreground = PixColors[Color_topShadow]; 1130 gcvalue.foreground = pix_colors[Color_topShadow];
1331 topShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1131 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1332 GCForeground, &gcvalue);
1333 gcvalue.foreground = PixColors[Color_bottomShadow]; 1132 gcvalue.foreground = pix_colors[Color_bottomShadow];
1334 botShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1133 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1335 GCForeground, &gcvalue); 1134 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1336 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1135 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1337 : Color_scroll)]; 1136#endif
1338 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt, 1137
1339 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;
1340#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 */
1341} 1372}
1342 1373
1343/*----------------------------------------------------------------------*/ 1374/*----------------------------------------------------------------------*/
1344/* 1375/*
1345 * 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
1346 * 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
1347 * the slave. 1378 * the slave.
1348 */ 1379 */
1349int 1380void
1350rxvt_term::run_command (const char *const *argv) 1381rxvt_term::run_command (const char *const *argv)
1351{ 1382{
1352 int cfd, er; 1383 int er;
1353 1384
1354 /* get master (pty) */ 1385 if (!pty.get ())
1355 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) 1386 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1356 {
1357 rxvt_print_error("can't open pseudo-tty");
1358 return -1;
1359 }
1360 1387
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);
1371
1372 /* get slave (tty) */
1373 if (tty_fd < 0)
1374 {
1375#ifndef NO_SETOWNER_TTYDEV
1376 privileged_ttydev (SAVE);
1377#endif
1378
1379 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1380 {
1381 close(cfd);
1382 rxvt_print_error("can't open slave tty %s", ttydev);
1383 return -1;
1384 }
1385 }
1386#ifndef NO_BACKSPACE_KEY 1388#ifndef NO_BACKSPACE_KEY
1387 if (key_backspace[0] && !key_backspace[1]) 1389 if (key_backspace[0] && !key_backspace[1])
1388 er = key_backspace[0]; 1390 er = key_backspace[0];
1389 else if (STRCMP(key_backspace, "DEC") == 0) 1391 else if (strcmp (key_backspace, "DEC") == 0)
1390 er = '\177'; /* the initial state anyway */ 1392 er = '\177'; /* the initial state anyway */
1391 else 1393 else
1392#endif 1394#endif
1393
1394 er = -1; 1395 er = -1;
1395 1396
1396 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);
1397 1403
1398#ifndef __QNX__ 1404#ifndef __QNX__
1399 /* spin off the command interpreter */ 1405 /* spin off the command interpreter */
1400 switch (cmd_pid = fork ()) 1406 switch (cmd_pid = fork ())
1401 { 1407 {
1402 case -1: 1408 case -1:
1403 rxvt_print_error("can't fork"); 1409 rxvt_fatal ("can't fork, aborting.\n");
1404 return -1;
1405 case 0: 1410 case 0:
1406 close (cfd); /* only keep tty_fd and STDERR open */ 1411 init_env ();
1407 close (Xfd); 1412
1408 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1413 if (!pty.make_controlling_tty ())
1409 rxvt_print_error ("could not obtain control of tty"); 1414 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1410 else 1415 else
1411 { 1416 {
1412 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1417 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1413 dup2 (tty_fd, STDIN_FILENO); 1418 dup2 (pty.tty, STDIN_FILENO);
1414 dup2 (tty_fd, STDOUT_FILENO); 1419 dup2 (pty.tty, STDOUT_FILENO);
1415 dup2 (tty_fd, STDERR_FILENO); 1420 dup2 (pty.tty, STDERR_FILENO);
1416 1421
1417 if (tty_fd > 2) 1422 // close all our file handles that we do no longer need
1418 close (tty_fd); 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 }
1419 1428
1420 run_child (argv); 1429 run_child (argv);
1430 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1421 } 1431 }
1432
1422 exit (EXIT_FAILURE); 1433 _exit (EXIT_FAILURE);
1423 /* NOTREACHED */ 1434
1424 default: 1435 default:
1425 { 1436 {
1426#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1437#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1427 int fdstdin; 1438 int fdstdin;
1428 1439
1429 fdstdin = dup (STDIN_FILENO); 1440 fdstdin = dup (STDIN_FILENO);
1430 dup2 (tty_fd, STDIN_FILENO); 1441 dup2 (pty.tty, STDIN_FILENO);
1431#endif 1442#endif
1432 1443
1433#ifdef UTMP_SUPPORT 1444#ifdef UTMP_SUPPORT
1434 privileged_utmp (SAVE); 1445 privileged_utmp (SAVE);
1435#endif 1446#endif
… …
1437#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1448#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1438 1449
1439 dup2 (fdstdin, STDIN_FILENO); 1450 dup2 (fdstdin, STDIN_FILENO);
1440 close (fdstdin); 1451 close (fdstdin);
1441#endif 1452#endif
1442
1443 } 1453 }
1444 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ 1454
1455 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1445 break; 1456 break;
1446 } 1457 }
1447#else /* __QNX__ uses qnxspawn() */ 1458#else /* __QNX__ uses qnxspawn () */
1448 fchmod (tty_fd, 0622); 1459 fchmod (pty.tty, 0622);
1449 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1460 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1450 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1461 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1451 1462
1452 if (run_child (argv) == -1) 1463 if (run_child (argv) == -1)
1453 exit (EXIT_FAILURE); 1464 exit (EXIT_FAILURE);
1454#endif 1465#endif
1455
1456 return cfd;
1457} 1466}
1458 1467
1459/* ------------------------------------------------------------------------- * 1468/* ------------------------------------------------------------------------- *
1460 * CHILD PROCESS OPERATIONS * 1469 * CHILD PROCESS OPERATIONS *
1461 * ------------------------------------------------------------------------- */ 1470 * ------------------------------------------------------------------------- */
… …
1466int 1475int
1467rxvt_term::run_child (const char *const *argv) 1476rxvt_term::run_child (const char *const *argv)
1468{ 1477{
1469 char *login; 1478 char *login;
1470 1479
1471 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ 1480 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1472 1481
1473 if (Options & Opt_console) 1482 if (options & Opt_console)
1474 { /* be virtual console, fail silently */ 1483 { /* be virtual console, fail silently */
1475#ifdef TIOCCONS 1484#ifdef TIOCCONS
1476 unsigned int on = 1; 1485 unsigned int on = 1;
1477 1486
1478 ioctl (STDIN_FILENO, TIOCCONS, &on); 1487 ioctl (STDIN_FILENO, TIOCCONS, &on);
1479#elif defined (SRIOCSREDIR) 1488#elif defined (SRIOCSREDIR)
1480 int fd; 1489 int fd;
1481 1490
1482 fd = open (CONSOLE, O_WRONLY, 0); 1491 fd = open (CONSOLE, O_WRONLY, 0);
1483 if (fd >= 0) 1492 if (fd >= 0)
1484 {
1485 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1493 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1486 close (fd); 1494 close (fd);
1487 }
1488#endif /* SRIOCSREDIR */ 1495#endif /* SRIOCSREDIR */
1489
1490 } 1496 }
1491 1497
1492 /* reset signals and spin off the command interpreter */ 1498 /* reset signals and spin off the command interpreter */
1493 signal (SIGINT, SIG_DFL); 1499 signal (SIGINT, SIG_DFL);
1494 signal (SIGQUIT, SIG_DFL); 1500 signal (SIGQUIT, SIG_DFL);
1495 signal (SIGCHLD, SIG_DFL); 1501 signal (SIGCHLD, SIG_DFL);
1502 signal (SIGHUP, SIG_DFL);
1503 signal (SIGPIPE, SIG_DFL);
1496 /* 1504 /*
1497 * mimick login's behavior by disabling the job control signals 1505 * mimick login's behavior by disabling the job control signals
1498 * a shell that wants them can turn them back on 1506 * a shell that wants them can turn them back on
1499 */ 1507 */
1500#ifdef SIGTSTP 1508#ifdef SIGTSTP
1501 signal (SIGTSTP, SIG_IGN); 1509 signal (SIGTSTP, SIG_IGN);
1502 signal (SIGTTIN, SIG_IGN); 1510 signal (SIGTTIN, SIG_IGN);
1503 signal (SIGTTOU, SIG_IGN); 1511 signal (SIGTTOU, SIG_IGN);
1504#endif /* SIGTSTP */ 1512#endif /* SIGTSTP */
1505 1513
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 1514 // unblock signals (signals are blocked by iom.C
1515 sigset_t ss; 1515 sigset_t ss;
1516 sigemptyset (&ss); 1516 sigemptyset (&ss);
1517 sigprocmask (SIG_SETMASK, &ss, 0); 1517 sigprocmask (SIG_SETMASK, &ss, 0);
1518 1518
… …
1522 { 1522 {
1523# ifdef DEBUG_CMD 1523# ifdef DEBUG_CMD
1524 int i; 1524 int i;
1525 1525
1526 for (i = 0; argv[i]; i++) 1526 for (i = 0; argv[i]; i++)
1527 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1527 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1528# endif 1528# endif
1529 1529
1530 execvp(argv[0], (char *const *)argv); 1530 execvp (argv[0], (char *const *)argv);
1531 /* no error message: STDERR is closed! */ 1531 /* no error message: STDERR is closed! */
1532 } 1532 }
1533 else 1533 else
1534 { 1534 {
1535 const char *argv0, *shell; 1535 const char *argv0, *shell;
1536 1536
1537 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1537 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1538 shell = "/bin/sh"; 1538 shell = "/bin/sh";
1539 1539
1540 argv0 = (const char *)rxvt_r_basename(shell); 1540 argv0 = (const char *)rxvt_r_basename (shell);
1541
1541 if (Options & Opt_loginShell) 1542 if (options & Opt_loginShell)
1542 { 1543 {
1543 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1544 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1544 1545
1545 login[0] = '-'; 1546 login[0] = '-';
1546 STRCPY(&login[1], argv0); 1547 strcpy (&login[1], argv0);
1547 argv0 = login; 1548 argv0 = login;
1548 } 1549 }
1549 execlp(shell, argv0, NULL); 1550 execlp (shell, argv0, NULL);
1550 /* no error message: STDERR is closed! */ 1551 /* no error message: STDERR is closed! */
1551 } 1552 }
1552 1553
1553#else /* __QNX__ uses qnxspawn() */ 1554#else /* __QNX__ uses qnxspawn () */
1554 1555
1555 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 };
1556 char *command = NULL, fullcommand[_MAX_PATH]; 1557 char *command = NULL, fullcommand[_MAX_PATH];
1557 char **arg_v, *arg_a[2] = { NULL, NULL }; 1558 char **arg_v, *arg_a[2] = { NULL, NULL };
1558 1559
1559 if (argv != NULL) 1560 if (argv != NULL)
1560 { 1561 {
1561 if (access(argv[0], X_OK) == -1) 1562 if (access (argv[0], X_OK) == -1)
1562 { 1563 {
1563 if (STRCHR(argv[0], '/') == NULL) 1564 if (strchr (argv[0], '/') == NULL)
1564 { 1565 {
1565 searchenv(argv[0], "PATH", fullcommand); 1566 searchenv (argv[0], "PATH", fullcommand);
1567
1566 if (fullcommand[0] != '\0') 1568 if (fullcommand[0] != '\0')
1567 command = fullcommand; 1569 command = fullcommand;
1568 } 1570 }
1571
1569 if (access(command, X_OK) == -1) 1572 if (access (command, X_OK) == -1)
1570 return -1; 1573 return -1;
1571 } 1574 }
1572 else 1575 else
1573 command = argv[0]; 1576 command = argv[0];
1577
1574 arg_v = argv; 1578 arg_v = argv;
1575 } 1579 }
1576 else 1580 else
1577 { 1581 {
1578 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1582 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1579 command = "/bin/sh"; 1583 command = "/bin/sh";
1580 1584
1581 arg_a[0] = my_basename(command); 1585 arg_a[0] = my_basename (command);
1586
1582 if (Options & Opt_loginShell) 1587 if (options & Opt_loginShell)
1583 { 1588 {
1584 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1589 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1585 1590
1586 login[0] = '-'; 1591 login[0] = '-';
1587 STRCPY(&login[1], arg_a[0]); 1592 strcpy (&login[1], arg_a[0]);
1588 arg_a[0] = login; 1593 arg_a[0] = login;
1589 } 1594 }
1595
1590 arg_v = arg_a; 1596 arg_v = arg_a;
1591 } 1597 }
1598
1592 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1599 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1593 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1600 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1594 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1601 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1595 command, arg_v, environ, iov_a, 0); 1602 command, arg_v, environ, iov_a, 0);
1596 if (login) 1603 if (login)
1597 free(login); 1604 free (login);
1598 1605
1599 close(tty_fd); 1606 pty.close_tty ();
1600 return cmd_fd; 1607 return pty.pty;
1601
1602#endif 1608#endif
1609
1603 return -1; 1610 return -1;
1604} 1611}
1605 1612
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) -----------------------*/ 1613/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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