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.14 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.90 by root, Wed Aug 25 03:47:20 2004 UTC

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

Diff Legend

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