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.97 by root, Wed Dec 15 00:12:58 2004 UTC vs.
Revision 1.190 by sasha, Thu Jul 12 22:33:16 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
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>
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 * Copyright (c) 2003-2006 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.
31 * Initialisation routines. 31 * Initialisation routines.
32 */ 32 */
33 33
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h"
36#include "init.h" 37#include "init.h"
37 38
39#include <limits>
40
38#include <signal.h> 41#include <csignal>
39 42
40const char *const def_colorName[] = 43const char *const def_colorName[] =
41 { 44 {
42 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
44 /* low-intensity colors */ 47 /* low-intensity colors */
45 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
46#ifndef NO_BRIGHTCOLOR 49 "rgb:cd/00/00", // 1: red (Red3)
47 "Red3", /* 1: red (#CD0000) */ 50 "rgb:00/cd/00", // 2: green (Green3)
48 "Green3", /* 2: green (#00CD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
49 "Yellow3", /* 3: yellow (#CDCD00) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
50 "Blue3", /* 4: blue (#0000CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
51 "Magenta3", /* 5: magenta (#CD00CD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
52 "Cyan3", /* 6: cyan (#00CDCD) */ 55# ifdef XTERM_COLORS
53# ifdef XTERM_COLORS 56 "rgb:e5/e5/e5", // 7: white (Grey90)
54 "Grey90", /* 7: white (#E5E5E5) */ 57# else
55# else 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
56 "AntiqueWhite", /* 7: white (#FAEBD7) */
57# endif 59# endif
58 /* high-intensity colors */ 60 /* high-intensity colors */
59# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
60 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
61# else 63# else
62 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
63# endif 65# endif
64#endif /* NO_BRIGHTCOLOR */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
65 "Red", /* 1/9: bright red (#FF0000) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
66 "Green", /* 2/10: bright green (#00FF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
67 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
68 "Blue", /* 4/12: bright blue (#0000FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
69 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
70 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
71 "White", /* 7/15: bright white (#FFFFFF) */
72 73
73 // 88 xterm colours 74 // 88 xterm colours
74 "rgb:00/00/00", 75 "rgb:00/00/00",
75 "rgb:00/00/8b", 76 "rgb:00/00/8b",
76 "rgb:00/00/cd", 77 "rgb:00/00/cd",
155 NULL, /* Color_BD */ 156 NULL, /* Color_BD */
156 NULL, /* Color_IT */ 157 NULL, /* Color_IT */
157 NULL, /* Color_UL */ 158 NULL, /* Color_UL */
158 NULL, /* Color_RV */ 159 NULL, /* Color_RV */
159#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS
162 NULL, // Color_underline
163#endif
160#ifdef OPTION_HC 164#ifdef OPTION_HC
161 NULL, 165 NULL,
162#endif 166#endif
163#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
164 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
165 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
166#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
167#if TINTING 171#if TINTING
168 NULL, 172 NULL,
169#endif 173#endif
170 }; 174#if OFF_FOCUS_FADING
171 175 "rgb:00/00/00",
172const char *const xa_names[] =
173 {
174 "TEXT",
175 "COMPOUND_TEXT",
176 "UTF8_STRING",
177 "MULTIPLE",
178 "TARGETS",
179 "TIMESTAMP",
180 "VT_SELECTION",
181 "INCR",
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
193#ifdef TRANSPARENT
194 "_XROOTPMAP_ID",
195 "_XSETROOT_ID",
196#endif
197#ifdef OFFIX_DND
198 "DndProtocol",
199 "DndSelection",
200#endif 176#endif
201 }; 177 };
202 178
203bool 179bool
204rxvt_term::init_vars () 180rxvt_term::init_vars ()
205{ 181{
206 sw_term.start (SIGTERM); 182 pix_colors = //
207
208 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
209#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
210 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
211#endif 186#endif
212 pix_colors = pix_colors_focused;
213 187
214 if (pix_colors == NULL)
215 return false;
216
217#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
218 TermWin.pixmap = None; 189 pixmap = None;
219#endif 190#endif
220 191
221 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
222 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
223 options = DEFAULT_OPTIONS;
224 want_refresh = 1; 194 want_refresh = 1;
225 cmd_pid = -1;
226 pty.pty = pty.tty = -1;
227 priv_modes = SavedModes = PrivMode_Default; 195 priv_modes = SavedModes = PrivMode_Default;
228 TermWin.focus = 0;
229 TermWin.ncol = 80; 196 ncol = 80;
230 TermWin.nrow = 24; 197 nrow = 24;
231 TermWin.int_bwidth = INTERNALBORDERWIDTH; 198 int_bwidth = INTERNALBORDERWIDTH;
232 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 199 ext_bwidth = EXTERNALBORDERWIDTH;
233 TermWin.lineSpace = LINESPACE; 200 lineSpace = LINESPACE;
234 TermWin.saveLines = SAVELINES; 201 saveLines = SAVELINES;
235 numpix_colors = TOTAL_COLORS; 202 numpix_colors = TOTAL_COLORS;
236 203
237 refresh_limit = 1;
238 refresh_type = SLOW_REFRESH; 204 refresh_type = SLOW_REFRESH;
239 prev_nrow = prev_ncol = 0;
240 205
241 oldcursor.row = oldcursor.col = -1; 206 oldcursor.row = oldcursor.col = -1;
242#ifdef XPM_BACKGROUND 207#ifdef XPM_BACKGROUND
243 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
244 bgPixmap.x = bgPixmap.y = 50; 209 bgPixmap.x = bgPixmap.y = 0;
245 bgPixmap.pixmap = None; 210 bgPixmap.pixmap = None;
246#endif 211#endif
247 212
248 last_bot = last_state = -1; 213 last_bot = last_state = -1;
249 214
250#ifdef MENUBAR 215 set_option (Opt_scrollBar);
251 menu_readonly = 1; 216 set_option (Opt_scrollTtyOutput);
252# if ! (MENUBAR_MAX > 1) 217 set_option (Opt_jumpScroll);
253 CurrentBar = & (BarList); 218 set_option (Opt_skipScroll);
254# endif /* (MENUBAR_MAX > 1) */ 219 set_option (Opt_secondaryScreen);
255#endif 220 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52);
256 224
257 return true; 225 return true;
258} 226}
259 227
260void 228void
298 int i, r_argc; 266 int i, r_argc;
299 char *val; 267 char *val;
300 const char **cmd_argv, **r_argv; 268 const char **cmd_argv, **r_argv;
301 269
302 /* 270 /*
303 * Look for -exec option. Find => split and make cmd_argv[] of command args 271 * Look for -e option. Find => split and make cmd_argv[] of command args
304 */ 272 */
305 for (r_argc = 0; r_argc < argc; r_argc++) 273 for (r_argc = 0; r_argc < argc; r_argc++)
306 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 274 if (!strcmp (argv[r_argc], "-e"))
307 break; 275 break;
308 276
309 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
310 278
311 for (i = 0; i < r_argc; i++) 279 for (i = 0; i < r_argc; i++)
328 rs[Rs_name] = rxvt_r_basename (argv[0]); 296 rs[Rs_name] = rxvt_r_basename (argv[0]);
329 297
330 /* 298 /*
331 * Open display, get options/resources and create the window 299 * Open display, get options/resources and create the window
332 */ 300 */
301
333 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 302 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
334 rs[Rs_display_name] = ":0"; 303 rs[Rs_display_name] = ":0";
335 304
336 get_options (r_argc, r_argv); 305 get_options (r_argc, r_argv);
306
307 if (!(display = displays.get (rs[Rs_display_name])))
308 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
309
310 // using a local pointer decreases code size a lot
311 xa = display->xa;
312
313 set (display);
314 extract_resources ();
315
316#if XFT
317 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif
320
321#ifdef HAVE_AFTERIMAGE
322 ::dpy = NULL ; /* init global var from libAfter... */
323 asv = AFTERIMAGE_DPY_OP(create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL));
324#endif
337 free (r_argv); 325 free (r_argv);
338 326
339#ifdef LOCAL_X_IS_UNIX 327 for (int i = NUM_RESOURCES; i--; )
340 if (rs[Rs_display_name][0] == ':') 328 if (rs [i] == resval_undef)
341 { 329 rs [i] = 0;
342 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 330
343 strcpy (val, "unix"); 331#if ENABLE_PERL
344 strcat (val, rs[Rs_display_name]); 332 if (!rs[Rs_perl_ext_1])
345 display = displays.get (val); 333 rs[Rs_perl_ext_1] = "default";
346 free (val); 334
335 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
336 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
337 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
347 } 338 {
339 rxvt_perl.init (this);
340 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
341 }
348#endif 342#endif
349
350 if (!display
351 && ! (display = displays.get (rs[Rs_display_name])))
352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353
354 extract_resources (display->display, rs[Rs_name]);
355 343
356 /* 344 /*
357 * set any defaults not already set 345 * set any defaults not already set
358 */ 346 */
359 if (cmd_argv && cmd_argv[0]) 347 if (cmd_argv && cmd_argv[0])
370 if (!rs[Rs_iconName]) 358 if (!rs[Rs_iconName])
371 rs[Rs_iconName] = rs[Rs_name]; 359 rs[Rs_iconName] = rs[Rs_name];
372 } 360 }
373 361
374 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 362 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
375 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 363 saveLines = min (i, MAX_SAVELINES);
376 364
377#if ENABLE_FRILLS 365#if ENABLE_FRILLS
378 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)
379 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 367 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
368
380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 369 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
381 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 370 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
382#endif
383 371
384#ifndef NO_LINESPACE
385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 372 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
386 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 373 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
387#endif 374#endif
388 375
389#ifdef POINTER_BLANK 376#ifdef POINTER_BLANK
390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 377 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
391 pointerBlankDelay = i; 378 pointerBlankDelay = i;
392 else 379 else
393 pointerBlankDelay = 2; 380 pointerBlankDelay = 2;
394#endif 381#endif
395 382
396 /* no point having a scrollbar without having any scrollback! */ 383 /* no point having a scrollbar without having any scrollback! */
397 if (!TermWin.saveLines) 384 if (!saveLines)
398 options &= ~Opt_scrollBar; 385 set_option (Opt_scrollBar, 0);
399 386
400#ifdef PRINTPIPE 387#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 388 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 389 rs[Rs_print_pipe] = PRINTPIPE;
403#endif 390#endif
446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 433 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
447#endif 434#endif
448 435
449#ifdef XTERM_REVERSE_VIDEO 436#ifdef XTERM_REVERSE_VIDEO
450 /* this is how xterm implements reverseVideo */ 437 /* this is how xterm implements reverseVideo */
451 if (options & Opt_reverseVideo) 438 if (option (Opt_reverseVideo))
452 { 439 {
453 if (!rs[Rs_color + Color_fg]) 440 if (!rs[Rs_color + Color_fg])
454 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 441 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
442
455 if (!rs[Rs_color + Color_bg]) 443 if (!rs[Rs_color + Color_bg])
456 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 444 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
457 } 445 }
458#endif 446#endif
459 447
461 if (!rs[Rs_color + i]) 449 if (!rs[Rs_color + i])
462 rs[Rs_color + i] = def_colorName[i]; 450 rs[Rs_color + i] = def_colorName[i];
463 451
464#ifndef XTERM_REVERSE_VIDEO 452#ifndef XTERM_REVERSE_VIDEO
465 /* this is how we implement reverseVideo */ 453 /* this is how we implement reverseVideo */
466 if (options & Opt_reverseVideo) 454 if (option (Opt_reverseVideo))
467 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 455 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468#endif 456#endif
469 457
470 /* convenient aliases for setting fg/bg to colors */ 458 /* convenient aliases for setting fg/bg to colors */
471 color_aliases (Color_fg); 459 color_aliases (Color_fg);
472 color_aliases (Color_bg); 460 color_aliases (Color_bg);
511 val = rxvt_network_display (rs[Rs_display_name]); 499 val = rxvt_network_display (rs[Rs_display_name]);
512 rs[Rs_display_name] = (const char *)val; 500 rs[Rs_display_name] = (const char *)val;
513 501
514 if (val == NULL) 502 if (val == NULL)
515#endif /* DISPLAY_IS_IP */ 503#endif /* DISPLAY_IS_IP */
516 val = XDisplayString (display->display); 504 val = XDisplayString (dpy);
517 505
518 if (rs[Rs_display_name] == NULL) 506 if (rs[Rs_display_name] == NULL)
519 rs[Rs_display_name] = val; /* use broken `:0' value */ 507 rs[Rs_display_name] = val; /* use broken `:0' value */
520 508
521 i = strlen (val); 509 i = strlen (val);
522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 510 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
523 511
524 sprintf (env_display, "DISPLAY=%s", val); 512 sprintf (env_display, "DISPLAY=%s", val);
525 513
526 /* avoiding the math library: 514 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
527 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
528 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
529 ;
530 MAX_IT (i, 1);
531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
532
533 sprintf (env_windowid, "WINDOWID=%u",
534 (unsigned int)TermWin.parent[0]);
535 515
536 /* add entries to the environment: 516 /* add entries to the environment:
537 * @ DISPLAY: in case we started with -display 517 * @ DISPLAY: in case we started with -display
538 * @ WINDOWID: X window id number of the window 518 * @ WINDOWID: X window id number of the window
539 * @ COLORTERM: terminal sub-name and also indicates its color 519 * @ COLORTERM: terminal sub-name and also indicates its color
541 * @ TERMINFO: path to terminfo directory 521 * @ TERMINFO: path to terminfo directory
542 * @ COLORFGBG: fg;bg color codes 522 * @ COLORFGBG: fg;bg color codes
543 */ 523 */
544 putenv (env_display); 524 putenv (env_display);
545 putenv (env_windowid); 525 putenv (env_windowid);
526
546 if (env_colorfgbg) 527 if (env_colorfgbg)
547 putenv (env_colorfgbg); 528 putenv (env_colorfgbg);
548 529
549#ifdef RXVT_TERMINFO 530#ifdef RXVT_TERMINFO
550 putenv ("TERMINFO=" RXVT_TERMINFO); 531 putenv ("TERMINFO=" RXVT_TERMINFO);
551#endif 532#endif
552 533
553 if (display->depth <= 2) 534 if (depth <= 2)
554 putenv ("COLORTERM=" COLORTERMENV "-mono"); 535 putenv ("COLORTERM=" COLORTERMENV "-mono");
555 else 536 else
556 putenv ("COLORTERM=" COLORTERMENVFULL); 537 putenv ("COLORTERM=" COLORTERMENVFULL);
557 538
558 if (rs[Rs_term_name] != NULL) 539 if (rs[Rs_term_name] != NULL)
578 * This should support all European type languages. 559 * This should support all European type languages.
579 */ 560 */
580void 561void
581rxvt_term::set_locale (const char *locale) 562rxvt_term::set_locale (const char *locale)
582{ 563{
564 set_environ (envv);
565
583#if HAVE_XSETLOCALE || HAVE_SETLOCALE 566#if HAVE_XSETLOCALE || HAVE_SETLOCALE
584 free (this->locale); 567 free (this->locale);
585 this->locale = setlocale (LC_CTYPE, locale); 568 this->locale = setlocale (LC_CTYPE, locale);
586 569
587 if (!this->locale) 570 if (!this->locale)
588 { 571 {
589 if (*locale) 572 if (*locale)
590 { 573 {
591 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 574 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592 setlocale (LC_CTYPE, ""); 575 setlocale (LC_CTYPE, "C");
593 } 576 }
594 else 577 else
595 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 578 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596 579
597 this->locale = ""; 580 this->locale = "C";
598 } 581 }
599 582
600 583
601 this->locale = rxvt_strdup (this->locale); 584 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 585 SET_LOCALE (this->locale);
603 mbstate.reset (); 586 mbstate.reset ();
604#endif 587#endif
605 588
606#if 0
607#if HAVE_NL_LANGINFO 589#if HAVE_NL_LANGINFO
608 char *codeset = strdup (nl_langinfo (CODESET)); 590 char *codeset = strdup (nl_langinfo (CODESET));
609 enc_utf8 = !strcasecmp (codeset, "UTF-8") 591 // /^UTF.?8/i
610 || !strcasecmp (codeset, "UTF8"); 592 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
593 && (codeset[1] == 'T' || codeset[1] == 't')
594 && (codeset[2] == 'F' || codeset[2] == 'f')
595 && (codeset[3] == '8' || codeset[4] == '8');
611 free (codeset); 596 free (codeset);
612#else 597#else
613 enc_utf8 = 0; 598 enc_utf8 = 0;
614#endif 599#endif
615#endif
616} 600}
617 601
618void 602void
619rxvt_term::init_xlocale () 603rxvt_term::init_xlocale ()
620{ 604{
605 set_environ (envv);
606
621#ifdef USE_XIM 607#ifdef USE_XIM
622 if (!locale) 608 if (!locale)
623 rxvt_warn ("setting locale failed, working without locale support.\n"); 609 rxvt_warn ("setting locale failed, working without locale support.\n");
624 else 610 else
625 { 611 {
647 * Initialize the command connection. 633 * Initialize the command connection.
648 * This should be called after the X server connection is established. 634 * This should be called after the X server connection is established.
649 */ 635 */
650 636
651#ifdef META8_OPTION 637#ifdef META8_OPTION
652 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 638 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
653#endif 639#endif
654 640
655 get_ourmods (); 641 get_ourmods ();
656 642
657 if (!(options & Opt_scrollTtyOutput)) 643 if (!option (Opt_scrollTtyOutput))
658 priv_modes |= PrivMode_TtyOutputInh; 644 priv_modes |= PrivMode_TtyOutputInh;
659 if (options & Opt_scrollTtyKeypress) 645 if (option (Opt_scrollTtyKeypress))
660 priv_modes |= PrivMode_Keypress; 646 priv_modes |= PrivMode_Keypress;
661 if (!(options & Opt_jumpScroll)) 647 if (!option (Opt_jumpScroll))
662 priv_modes |= PrivMode_smoothScroll; 648 priv_modes |= PrivMode_smoothScroll;
663 649
664#ifndef NO_BACKSPACE_KEY 650#ifndef NO_BACKSPACE_KEY
665 if (strcmp (key_backspace, "DEC") == 0) 651 if (strcmp (key_backspace, "DEC") == 0)
666 priv_modes |= PrivMode_HaveBackSpace; 652 priv_modes |= PrivMode_HaveBackSpace;
667#endif 653#endif
668 654
669 /* add value for scrollBar */ 655 /* add value for scrollBar */
670 if (scrollbar_visible ()) 656 if (scrollBar.state)
671 { 657 {
672 priv_modes |= PrivMode_scrollBar; 658 priv_modes |= PrivMode_scrollBar;
673 SavedModes |= PrivMode_scrollBar; 659 SavedModes |= PrivMode_scrollBar;
674 } 660 }
675 if (menubar_visible ())
676 {
677 priv_modes |= PrivMode_menuBar;
678 SavedModes |= PrivMode_menuBar;
679 }
680
681#ifdef CURSOR_BLINK
682 if (options & Opt_cursorBlink)
683 (void)gettimeofday (&lastcursorchange, NULL);
684#endif
685 661
686 run_command (argv); 662 run_command (argv);
687} 663}
688 664
689/*----------------------------------------------------------------------*/ 665/*----------------------------------------------------------------------*/
694 670
695#ifdef OFF_FOCUS_FADING 671#ifdef OFF_FOCUS_FADING
696 pix_colors = pix_colors_focused; 672 pix_colors = pix_colors_focused;
697#endif 673#endif
698 674
699 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 675 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
700 { 676 {
677 const char *name = rs[Rs_color + i];
678
679 if (!name)
680 continue;
681
701 rxvt_color xcol; 682 rxvt_color xcol;
702 683
703 if (!rs[Rs_color + i]) 684 if (!set_color (xcol, name))
704 continue;
705
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
707 { 685 {
708#ifndef XTERM_REVERSE_VIDEO 686#ifndef XTERM_REVERSE_VIDEO
709 if (i < 2 && (options & Opt_reverseVideo)) 687 if (i < 2 && option (Opt_reverseVideo))
710 rs[Rs_color + i] = def_colorName[!i]; 688 name = def_colorName [1 - i];
711 else 689 else
712#endif 690#endif
713 rs[Rs_color + i] = def_colorName[i]; 691 name = def_colorName [i];
714 692
715 if (!rs[Rs_color + i]) 693 if (!name)
716 continue; 694 continue;
717 695
718 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 696 if (!set_color (xcol, name))
719 { 697 {
720 switch (i) 698 switch (i)
721 { 699 {
722 case Color_fg: 700 case Color_fg:
723 case Color_bg: 701 case Color_bg:
724 /* fatal: need bg/fg color */
725 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 702 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
726 /* NOTREACHED */ 703 name = "";
727 break; 704 break;
728#ifndef NO_CURSORCOLOR 705#ifndef NO_CURSORCOLOR
729 case Color_cursor2: 706 case Color_cursor2:
730 xcol = pix_colors[Color_fg]; 707#endif
731 break;
732#endif /* ! NO_CURSORCOLOR */
733 case Color_pointer_fg: 708 case Color_pointer_fg:
734 xcol = pix_colors[Color_fg]; 709 name = rs[Rs_color + Color_fg];
710 xcol.set (this, name);
735 break; 711 break;
736 default: 712 default:
737 xcol = pix_colors[Color_bg]; /* None */ 713 name = rs[Rs_color + Color_bg];
714 xcol.set (this, name);
738 break; 715 break;
739 } 716 }
740 } 717 }
741 } 718 }
742 719
743 pix_colors[i] = xcol; 720 pix_colors[i] = xcol;
744#ifdef OFF_FOCUS_FADING 721 rs[Rs_color + i] = name;
745 if (rs[Rs_fade])
746 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
747#endif
748 SET_PIXCOLOR (i);
749 }
750
751 if (display->depth <= 2)
752 { 722 }
723
724 if (depth <= 2)
725 {
753 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 726 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
754 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 727 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
755 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 728 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
756 } 729 }
757 730
758 /* 731 /*
759 * get scrollBar/menuBar shadow colors 732 * get scrollBar shadow colors
760 * 733 *
761 * The calculations of topShadow/bottomShadow values are adapted 734 * The calculations of topShadow/bottomShadow values are adapted
762 * from the fvwm window manager. 735 * from the fvwm window manager.
763 */ 736 */
764#ifdef KEEP_SCROLLCOLOR 737#ifdef KEEP_SCROLLCOLOR
765
766 if (display->depth <= 2) 738 if (depth <= 2)
739 {
767 { /* Monochrome */ 740 /* Monochrome */
768 pix_colors[Color_scroll] = pix_colors[Color_fg]; 741 alias_color (Color_scroll, Color_fg);
769 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 742 alias_color (Color_topShadow, Color_bg);
770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 743 alias_color (Color_bottomShadow, Color_bg);
771 } 744 }
772 else 745 else
773 { 746 {
774 rxvt_color xcol[2]; 747 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
775 /* xcol[0] == white
776 * xcol[1] == top shadow
777 * xcol[2] == bot shadow */
778 748
779 xcol[1] = pix_colors[Color_scroll]; 749 rgba cscroll;
780 xcol[0].set (display, 65535, 65535, 65535); 750 pix_colors [Color_scroll].get (cscroll);
781
782 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
783
784 xcol[0].get (display, pr0, pg0, pb0);
785 xcol[1].get (display, pr1, pg1, pb1);
786
787 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
788 751
789 /* topShadowColor */ 752 /* topShadowColor */
790 if (!xcol[1].set (display, 753 if (!pix_colors[Color_topShadow].set (this,
791 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 754 rgba (
792 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 755 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
793 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 756 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
794 xcol[1] = pix_colors[Color_White]; 757 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
795 758 cscroll.a)
796 pix_colors[Color_topShadow] = xcol[1]; 759 ))
760 alias_color (Color_topShadow, Color_White);
797 } 761 }
798#endif /* KEEP_SCROLLCOLOR */ 762#endif /* KEEP_SCROLLCOLOR */
763
764#ifdef OFF_FOCUS_FADING
765 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
766 update_fade_color (i);
767#endif
799} 768}
800 769
801/*----------------------------------------------------------------------*/ 770/*----------------------------------------------------------------------*/
802/* color aliases, fg/bg bright-bold */ 771/* color aliases, fg/bg bright-bold */
803void 772void
808 int i = atoi (rs[Rs_color + idx]); 777 int i = atoi (rs[Rs_color + idx]);
809 778
810 if (i >= 8 && i <= 15) 779 if (i >= 8 && i <= 15)
811 { /* bright colors */ 780 { /* bright colors */
812 i -= 8; 781 i -= 8;
813#ifndef NO_BRIGHTCOLOR
814 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 782 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
815 return; 783 return;
816#endif
817 } 784 }
818 785
819 if (i >= 0 && i <= 7) /* normal colors */ 786 if (i >= 0 && i <= 7) /* normal colors */
820 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 787 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
821 } 788 }
827 * Use resource ``modifier'' to override the Meta modifier 794 * Use resource ``modifier'' to override the Meta modifier
828 */ 795 */
829void 796void
830rxvt_term::get_ourmods () 797rxvt_term::get_ourmods ()
831{ 798{
832 int i, j, k; 799 int i, j, k;
833 int requestedmeta, realmeta, realalt; 800 int requestedmeta, realmeta, realalt;
834 const char *cm, *rsmod; 801 const char *cm, *rsmod;
835 XModifierKeymap *map; 802 XModifierKeymap *map;
836 KeyCode *kc; 803 KeyCode *kc;
837 const unsigned int modmasks[] = 804 const unsigned int modmasks[] =
838 { 805 {
839 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 806 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
840 }; 807 };
841 808
842 requestedmeta = realmeta = realalt = 0; 809 requestedmeta = realmeta = realalt = 0;
843 rsmod = rs[Rs_modifier]; 810 rsmod = rs[Rs_modifier];
811
844 if (rsmod 812 if (rsmod
845 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 813 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
846 requestedmeta = rsmod[3] - '0'; 814 requestedmeta = rsmod[3] - '0';
847 815
848 map = XGetModifierMapping (display->display); 816 map = XGetModifierMapping (dpy);
849 kc = map->modifiermap; 817 kc = map->modifiermap;
818
850 for (i = 1; i < 6; i++) 819 for (i = 1; i < 6; i++)
851 { 820 {
852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 821 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
822
853 for (j = map->max_keypermod; j--; k++) 823 for (j = map->max_keypermod; j--; k++)
854 { 824 {
855 if (kc[k] == 0) 825 if (kc[k] == 0)
856 break; 826 break;
827
857 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 828 switch (XKeycodeToKeysym (dpy, kc[k], 0))
858 { 829 {
859 case XK_Num_Lock: 830 case XK_Num_Lock:
860 ModNumLockMask = modmasks[i - 1]; 831 ModNumLockMask = modmasks[i - 1];
861 /* FALLTHROUGH */ 832 continue;
862 default: 833
863 continue; /* for (;;) */ 834 case XK_ISO_Level3_Shift:
835 ModLevel3Mask = modmasks[i - 1];
836 continue;
837
864 case XK_Meta_L: 838 case XK_Meta_L:
865 case XK_Meta_R: 839 case XK_Meta_R:
866 cm = "meta"; 840 cm = "meta";
867 realmeta = i; 841 realmeta = i;
868 break; 842 break;
843
869 case XK_Alt_L: 844 case XK_Alt_L:
870 case XK_Alt_R: 845 case XK_Alt_R:
871 cm = "alt"; 846 cm = "alt";
872 realalt = i; 847 realalt = i;
873 break; 848 break;
849
874 case XK_Super_L: 850 case XK_Super_L:
875 case XK_Super_R: 851 case XK_Super_R:
876 cm = "super"; 852 cm = "super";
877 break; 853 break;
854
878 case XK_Hyper_L: 855 case XK_Hyper_L:
879 case XK_Hyper_R: 856 case XK_Hyper_R:
880 cm = "hyper"; 857 cm = "hyper";
881 break; 858 break;
859
860 default:
861 continue;
882 } 862 }
863
883 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 864 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
884 requestedmeta = i; 865 requestedmeta = i;
885 } 866 }
886 } 867 }
868
887 XFreeModifiermap (map); 869 XFreeModifiermap (map);
870
888 i = (requestedmeta ? requestedmeta 871 i = requestedmeta ? requestedmeta
889 : (realmeta ? realmeta 872 : realmeta ? realmeta
890 : (realalt ? realalt : 0))); 873 : realalt ? realalt
874 : 0;
875
891 if (i) 876 if (i)
892 ModMetaMask = modmasks[i - 1]; 877 ModMetaMask = modmasks[i - 1];
893} 878}
894 879
895/*----------------------------------------------------------------------*/ 880/*----------------------------------------------------------------------*/
898rxvt_term::create_windows (int argc, const char *const *argv) 883rxvt_term::create_windows (int argc, const char *const *argv)
899{ 884{
900 XClassHint classHint; 885 XClassHint classHint;
901 XWMHints wmHint; 886 XWMHints wmHint;
902#if ENABLE_FRILLS 887#if ENABLE_FRILLS
903 Atom prop = None;
904 MWMHints mwmhints; 888 MWMHints mwmhints;
905#endif 889#endif
906 XGCValues gcvalue; 890 XGCValues gcvalue;
907 long vt_emask;
908 XSetWindowAttributes attributes; 891 XSetWindowAttributes attributes;
909 XWindowAttributes gattr; 892 Window top, parent;
910 893
911#ifdef USING_W11LIB 894 dLocal (Display *, dpy);
912 /* enable W11 callbacks */
913 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
914#endif
915 895
916 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 896 /* grab colors before netscape does */
917 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 897 Get_Colours ();
918 898
919 if (options & Opt_transparent) 899 if (!set_fonts ())
920 { 900 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
921 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 901
922 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 902 parent = display->root;
923 } 903
904 attributes.override_redirect = !!option (Opt_override_redirect);
924 905
925#if ENABLE_FRILLS 906#if ENABLE_FRILLS
926 if (options & Opt_borderLess) 907 if (option (Opt_borderLess))
927 { 908 {
928 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 909 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
929
930 if (prop == None)
931 { 910 {
932 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 911 /* 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; 912 attributes.override_redirect = true;
935#endif
936 mwmhints.flags = 0; 913 mwmhints.flags = 0;
937 } 914 }
938 else 915 else
939 { 916 {
940 mwmhints.flags = MWM_HINTS_DECORATIONS; 917 mwmhints.flags = MWM_HINTS_DECORATIONS;
941 mwmhints.decorations = 0; 918 mwmhints.decorations = 0;
942 } 919 }
943 } 920 }
944 else 921 else
945 {
946 mwmhints.flags = 0; 922 mwmhints.flags = 0;
923#endif
924
925#if ENABLE_XEMBED
926 if (rs[Rs_embed])
947 } 927 {
948#endif 928 XWindowAttributes wattr;
949 929
950 /* grab colors before netscape does */ 930 parent = strtol (rs[Rs_embed], 0, 0);
951 Get_Colours ();
952 931
953 if (!set_fonts ()) 932 if (!XGetWindowAttributes (dpy, parent, &wattr))
954 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 933 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
934
935 window_calc (wattr.width, wattr.height);
936 }
937#endif
955 938
956 window_calc (0, 0); 939 window_calc (0, 0);
940
941 /* sub-window placement & size in rxvt_resize_subwindows () */
942 attributes.background_pixel = pix_colors_focused [Color_border];
943 attributes.border_pixel = pix_colors_focused [Color_border];
944 attributes.colormap = cmap;
945
946 top = XCreateWindow (dpy, parent,
947 szHint.x, szHint.y,
948 szHint.width, szHint.height,
949 ext_bwidth,
950 depth, InputOutput, visual,
951 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
952 &attributes);
953
954 this->parent[0] = top;
955
957 old_width = szHint.width; 956 old_width = szHint.width;
958 old_height = szHint.height; 957 old_height = szHint.height;
959 958
960 /* sub-window placement & size in rxvt_resize_subwindows () */
961
962#ifdef PREFER_24BIT
963 attributes.background_pixel = pix_colors_focused[Color_border];
964 attributes.border_pixel = pix_colors_focused[Color_border];
965 attributes.colormap = display->cmap;
966 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
967 szHint.x, szHint.y,
968 szHint.width, szHint.height,
969 TermWin.ext_bwidth,
970 display->depth, InputOutput,
971 display->visual,
972 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
973#else
974 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
975 szHint.x, szHint.y,
976 szHint.width, szHint.height,
977 TermWin.ext_bwidth,
978 pix_colors_focused[Color_border],
979 pix_colors_focused[Color_border]);
980#endif
981
982 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 959 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
983 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 960 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
984 961
985 classHint.res_name = (char *)rs[Rs_name]; 962 classHint.res_name = (char *)rs[Rs_name];
986 classHint.res_class = (char *)RESCLASS; 963 classHint.res_class = (char *)RESCLASS;
987 964
988 wmHint.flags = InputHint | StateHint | WindowGroupHint; 965 wmHint.flags = InputHint | StateHint | WindowGroupHint;
989 wmHint.input = True; 966 wmHint.input = True;
990 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 967 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
991 wmHint.window_group = TermWin.parent[0]; 968 wmHint.window_group = top;
992 969
993 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 970 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
994 (char **)argv, argc, &szHint, &wmHint, &classHint); 971 &szHint, &wmHint, &classHint);
995
996 /* Enable delete window protocol */
997 XSetWMProtocols (display->display, TermWin.parent[0],
998 &xa[XA_WMDELETEWINDOW], 1);
999 972
1000#if ENABLE_FRILLS 973#if ENABLE_FRILLS
974 if (mwmhints.flags)
975 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
976 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
977#endif
978
979 Atom protocols[] = {
980 xa[XA_WM_DELETE_WINDOW],
981#if ENABLE_EWMH
982 xa[XA_NET_WM_PING],
983#endif
984 };
985
986 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
987
988#if ENABLE_FRILLS
989 if (rs[Rs_transient_for])
990 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
991#endif
992
993#if ENABLE_EWMH
1001 long pid = getpid (); 994 long pid = getpid ();
1002 995
1003 XChangeProperty (display->display, TermWin.parent[0], 996 XChangeProperty (dpy, top,
1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 997 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1005 PropModeReplace, (unsigned char *)&pid, 1); 998 PropModeReplace, (unsigned char *)&pid, 1);
1006#endif
1007 999
1008 XSelectInput (display->display, TermWin.parent[0], 1000 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1001#endif
1002
1003 XSelectInput (dpy, top,
1009 KeyPressMask 1004 KeyPressMask
1010#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1005#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1011 | KeyReleaseMask 1006 | KeyReleaseMask
1012#endif 1007#endif
1013 | FocusChangeMask | VisibilityChangeMask 1008 | FocusChangeMask | VisibilityChangeMask
1014 | ExposureMask
1015 | StructureNotifyMask); 1009 | ExposureMask | StructureNotifyMask);
1010
1016 termwin_ev.start (display, TermWin.parent[0]); 1011 termwin_ev.start (display, top);
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
1023 1012
1024 /* vt cursor: Black-on-White is standard, but this is more popular */ 1013 /* vt cursor: Black-on-White is standard, but this is more popular */
1025 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1014 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1026 1015
1027#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1016#ifdef HAVE_SCROLLBARS
1028 /* cursor (menuBar/scrollBar): Black-on-White */ 1017 /* cursor scrollBar: Black-on-White */
1029 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1018 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1030#endif
1031
1032#ifdef POINTER_BLANK
1033 {
1034 XColor blackcolour;
1035 blackcolour.red = 0;
1036 blackcolour.green = 0;
1037 blackcolour.blue = 0;
1038 Font f = XLoadFont (display->display, "fixed");
1039 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1040 &blackcolour, &blackcolour);
1041 XUnloadFont (display->display, f);
1042 }
1043#endif 1019#endif
1044 1020
1045 /* the vt window */ 1021 /* the vt window */
1046 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1022 vt = XCreateSimpleWindow (dpy, top,
1047 window_vt_x,
1048 window_vt_y, 1023 window_vt_x, window_vt_y,
1049 TermWin_TotalWidth (), 1024 width, height,
1050 TermWin_TotalHeight (),
1051 0, 1025 0,
1052 pix_colors_focused[Color_fg], 1026 pix_colors_focused[Color_fg],
1053 pix_colors_focused[Color_bg]); 1027 pix_colors_focused[Color_bg]);
1054#ifdef DEBUG_X
1055 XStoreName (display->display, TermWin.vt, "vt window");
1056#endif
1057 1028
1058 attributes.bit_gravity = NorthWestGravity; 1029 attributes.bit_gravity = NorthWestGravity;
1059 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1030 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1060 1031
1061 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1032 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1062 1033
1063 pointer_unblank ();
1064
1065#ifdef POINTER_BLANK
1066 if (options & Opt_pointerBlank) 1034 if (option (Opt_pointerBlank))
1067 vt_emask |= PointerMotionMask; 1035 vt_emask |= PointerMotionMask;
1068 else 1036 else
1069#endif
1070 vt_emask |= Button1MotionMask | Button3MotionMask; 1037 vt_emask |= Button1MotionMask | Button3MotionMask;
1071 1038
1072 XSelectInput (display->display, TermWin.vt, vt_emask); 1039 vt_select_input ();
1040
1073 vt_ev.start (display, TermWin.vt); 1041 vt_ev.start (display, vt);
1074
1075#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1076 if (menuBar_height ())
1077 {
1078 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1079 window_vt_x, 0,
1080 TermWin_TotalWidth (),
1081 menuBar_TotalHeight (),
1082 0,
1083 pix_colors_focused[Color_fg],
1084 pix_colors_focused[Color_scroll]);
1085
1086#ifdef DEBUG_X
1087 XStoreName (display->display, menuBar.win, "menubar");
1088#endif
1089
1090 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1091
1092 XDefineCursor (display->display, menuBar.win,
1093 XCreateFontCursor (display->display, XC_left_ptr));
1094
1095 XSelectInput (display->display, menuBar.win,
1096 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1097 | Button1MotionMask));
1098 menubar_ev.start (display, menuBar.win);
1099 }
1100#endif
1101 1042
1102#ifdef XPM_BACKGROUND 1043#ifdef XPM_BACKGROUND
1103 if (rs[Rs_backgroundPixmap] != NULL 1044 if (rs[Rs_backgroundPixmap] != NULL
1045#ifndef HAVE_AFTERIMAGE
1104 && ! (options & Opt_transparent)) 1046 && !option (Opt_transparent)
1047#endif
1048 )
1105 { 1049 {
1106 const char *p = rs[Rs_backgroundPixmap]; 1050 const char *p = rs[Rs_backgroundPixmap];
1107 1051
1108 if ((p = strchr (p, ';')) != NULL) 1052 if ((p = strchr (p, ';')) != NULL)
1109 { 1053 {
1115 scr_touch (true); 1059 scr_touch (true);
1116 } 1060 }
1117#endif 1061#endif
1118 1062
1119 /* graphics context for the vt window */ 1063 /* graphics context for the vt window */
1120 gcvalue.foreground = pix_colors[Color_fg]; 1064 gcvalue.foreground = pix_colors[Color_fg];
1121 gcvalue.background = pix_colors[Color_bg]; 1065 gcvalue.background = pix_colors[Color_bg];
1122 gcvalue.graphics_exposures = 1; 1066 gcvalue.graphics_exposures = 0;
1123 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1067
1068 gc = XCreateGC (dpy, vt,
1124 GCForeground | GCBackground | GCGraphicsExposures, 1069 GCForeground | GCBackground | GCGraphicsExposures,
1125 &gcvalue); 1070 &gcvalue);
1126 1071
1127 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1072 drawable = new rxvt_drawable (this, vt);
1128 1073
1129#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1074#ifdef RXVT_SCROLLBAR
1130 gcvalue.foreground = pix_colors[Color_topShadow]; 1075 gcvalue.foreground = pix_colors[Color_topShadow];
1131 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1076 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1132 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1077 gcvalue.foreground = pix_colors[Color_bottomShadow];
1133 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1078 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1134 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1079 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1135 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1080 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1136#endif 1081#endif
1137 1082
1138#ifdef OFF_FOCUS_FADING 1083#ifdef OFF_FOCUS_FADING
1139 // initially we are in unfocused state 1084 // initially we are in unfocused state
1140 if (rs[Rs_fade]) 1085 if (rs[Rs_fade])
1141 pix_colors = pix_colors_unfocused; 1086 pix_colors = pix_colors_unfocused;
1142#endif 1087#endif
1143 1088
1089 pointer_unblank ();
1144 scr_recolour (); 1090 scr_recolour ();
1145} 1091}
1146 1092
1147/* ------------------------------------------------------------------------- * 1093/* ------------------------------------------------------------------------- *
1148 * GET TTY CURRENT STATE * 1094 * GET TTY CURRENT STATE *
1149 * ------------------------------------------------------------------------- */ 1095 * ------------------------------------------------------------------------- */
1150void 1096void
1151rxvt_get_ttymode (ttymode_t *tio, int erase) 1097rxvt_get_ttymode (ttymode_t *tio, int erase)
1152{ 1098{
1153#ifdef HAVE_TERMIOS_H
1154 /* 1099 /*
1155 * standard System V termios interface 1100 * standard System V termios interface
1156 */ 1101 */
1157 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1102 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1158 { 1103 {
1159 /* return error - use system defaults */ 1104 // return error - use system defaults,
1105 // where possible, and zero elsewhere
1106 memset (tio, 0, sizeof (ttymode_t));
1107
1160 tio->c_cc[VINTR] = CINTR; 1108 tio->c_cc[VINTR] = CINTR;
1161 tio->c_cc[VQUIT] = CQUIT; 1109 tio->c_cc[VQUIT] = CQUIT;
1162 tio->c_cc[VERASE] = CERASE; 1110 tio->c_cc[VERASE] = CERASE;
1111#ifdef VERASE2
1112 tio->c_cc[VERASE2] = CERASE2;
1113#endif
1163 tio->c_cc[VKILL] = CKILL; 1114 tio->c_cc[VKILL] = CKILL;
1164 tio->c_cc[VSTART] = CSTART; 1115 tio->c_cc[VSTART] = CSTART;
1165 tio->c_cc[VSTOP] = CSTOP; 1116 tio->c_cc[VSTOP] = CSTOP;
1166 tio->c_cc[VSUSP] = CSUSP; 1117 tio->c_cc[VSUSP] = CSUSP;
1167# ifdef VDSUSP 1118# ifdef VDSUSP
1168
1169 tio->c_cc[VDSUSP] = CDSUSP; 1119 tio->c_cc[VDSUSP] = CDSUSP;
1170# endif 1120# endif
1171# ifdef VREPRINT 1121# ifdef VREPRINT
1172
1173 tio->c_cc[VREPRINT] = CRPRNT; 1122 tio->c_cc[VREPRINT] = CRPRNT;
1174# endif 1123# endif
1175# ifdef VDISCRD 1124# ifdef VDISCRD
1176
1177 tio->c_cc[VDISCRD] = CFLUSH; 1125 tio->c_cc[VDISCRD] = CFLUSH;
1178# endif 1126# endif
1179# ifdef VWERSE 1127# ifdef VWERSE
1180
1181 tio->c_cc[VWERSE] = CWERASE; 1128 tio->c_cc[VWERSE] = CWERASE;
1182# endif 1129# endif
1183# ifdef VLNEXT 1130# ifdef VLNEXT
1184
1185 tio->c_cc[VLNEXT] = CLNEXT; 1131 tio->c_cc[VLNEXT] = CLNEXT;
1186# endif 1132# endif
1187
1188 } 1133 }
1134
1189 tio->c_cc[VEOF] = CEOF; 1135 tio->c_cc[VEOF] = CEOF;
1190 tio->c_cc[VEOL] = VDISABLE; 1136 tio->c_cc[VEOL] = VDISABLE;
1191# ifdef VEOL2 1137# ifdef VEOL2
1192
1193 tio->c_cc[VEOL2] = VDISABLE; 1138 tio->c_cc[VEOL2] = VDISABLE;
1194# endif 1139# endif
1195# ifdef VSWTC 1140# ifdef VSWTC
1196
1197 tio->c_cc[VSWTC] = VDISABLE; 1141 tio->c_cc[VSWTC] = VDISABLE;
1198# endif 1142# endif
1199# ifdef VSWTCH 1143# ifdef VSWTCH
1200
1201 tio->c_cc[VSWTCH] = VDISABLE; 1144 tio->c_cc[VSWTCH] = VDISABLE;
1202# endif 1145# endif
1203# if VMIN != VEOF 1146# if VMIN != VEOF
1204
1205 tio->c_cc[VMIN] = 1; 1147 tio->c_cc[VMIN] = 1;
1206# endif 1148# endif
1207# if VTIME != VEOL 1149# if VTIME != VEOL
1208
1209 tio->c_cc[VTIME] = 0; 1150 tio->c_cc[VTIME] = 0;
1210# endif 1151# endif
1211 1152
1212 if (erase != -1) 1153 if (erase != -1)
1213 tio->c_cc[VERASE] = (char)erase; 1154 tio->c_cc[VERASE] = (char)erase;
1229 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1170 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1230# if defined (ECHOCTL) && defined (ECHOKE) 1171# if defined (ECHOCTL) && defined (ECHOKE)
1231 | ECHOCTL | ECHOKE 1172 | ECHOCTL | ECHOKE
1232# endif 1173# endif
1233 | ECHOE | ECHOK); 1174 | 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 1175
1281 /* 1176 /*
1282 * Debugging 1177 * Debugging
1283 */ 1178 */
1284#ifdef DEBUG_TTYMODE 1179#ifdef DEBUG_TTYMODE
1302 FOO (IGNCR, "IGNCR"); 1197 FOO (IGNCR, "IGNCR");
1303 FOO (ICRNL, "ICRNL"); 1198 FOO (ICRNL, "ICRNL");
1304 FOO (IXON, "IXON"); 1199 FOO (IXON, "IXON");
1305 FOO (IXOFF, "IXOFF"); 1200 FOO (IXOFF, "IXOFF");
1306# ifdef IUCLC 1201# ifdef IUCLC
1307
1308 FOO (IUCLC, "IUCLC"); 1202 FOO (IUCLC, "IUCLC");
1309# endif 1203# endif
1310# ifdef IXANY 1204# ifdef IXANY
1311
1312 FOO (IXANY, "IXANY"); 1205 FOO (IXANY, "IXANY");
1313# endif 1206# endif
1314# ifdef IMAXBEL 1207# ifdef IMAXBEL
1315
1316 FOO (IMAXBEL, "IMAXBEL"); 1208 FOO (IMAXBEL, "IMAXBEL");
1317# endif 1209# endif
1318 1210
1319 fprintf (stderr, "\n"); 1211 fprintf (stderr, "\n");
1320 1212
1327 FOO (VERASE, "VERASE"); 1219 FOO (VERASE, "VERASE");
1328 FOO (VKILL, "VKILL"); 1220 FOO (VKILL, "VKILL");
1329 FOO (VEOF, "VEOF"); 1221 FOO (VEOF, "VEOF");
1330 FOO (VEOL, "VEOL"); 1222 FOO (VEOL, "VEOL");
1331# ifdef VEOL2 1223# ifdef VEOL2
1332
1333 FOO (VEOL2, "VEOL2"); 1224 FOO (VEOL2, "VEOL2");
1334# endif 1225# endif
1335# ifdef VSWTC 1226# ifdef VSWTC
1336
1337 FOO (VSWTC, "VSWTC"); 1227 FOO (VSWTC, "VSWTC");
1338# endif 1228# endif
1339# ifdef VSWTCH 1229# ifdef VSWTCH
1340
1341 FOO (VSWTCH, "VSWTCH"); 1230 FOO (VSWTCH, "VSWTCH");
1342# endif 1231# endif
1343
1344 FOO (VSTART, "VSTART"); 1232 FOO (VSTART, "VSTART");
1345 FOO (VSTOP, "VSTOP"); 1233 FOO (VSTOP, "VSTOP");
1346 FOO (VSUSP, "VSUSP"); 1234 FOO (VSUSP, "VSUSP");
1347# ifdef VDSUSP 1235# ifdef VDSUSP
1348
1349 FOO (VDSUSP, "VDSUSP"); 1236 FOO (VDSUSP, "VDSUSP");
1350# endif 1237# endif
1351# ifdef VREPRINT 1238# ifdef VREPRINT
1352
1353 FOO (VREPRINT, "VREPRINT"); 1239 FOO (VREPRINT, "VREPRINT");
1354# endif 1240# endif
1355# ifdef VDISCRD 1241# ifdef VDISCRD
1356
1357 FOO (VDISCRD, "VDISCRD"); 1242 FOO (VDISCRD, "VDISCRD");
1358# endif 1243# endif
1359# ifdef VWERSE 1244# ifdef VWERSE
1360
1361 FOO (VWERSE, "VWERSE"); 1245 FOO (VWERSE, "VWERSE");
1362# endif 1246# endif
1363# ifdef VLNEXT 1247# ifdef VLNEXT
1364
1365 FOO (VLNEXT, "VLNEXT"); 1248 FOO (VLNEXT, "VLNEXT");
1366# endif 1249# endif
1367 1250
1368 fprintf (stderr, "\n"); 1251 fprintf (stderr, "\n");
1369# undef FOO 1252# undef FOO
1378 * the slave. 1261 * the slave.
1379 */ 1262 */
1380void 1263void
1381rxvt_term::run_command (const char *const *argv) 1264rxvt_term::run_command (const char *const *argv)
1382{ 1265{
1266#if ENABLE_FRILLS
1267 if (rs[Rs_pty_fd])
1268 {
1269 pty->pty = atoi (rs[Rs_pty_fd]);
1270
1271 if (pty->pty >= 0)
1272 {
1273 if (getfd_hook)
1274 pty->pty = (*getfd_hook) (pty->pty);
1275
1276 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1277 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1278 }
1279 }
1280 else
1281#endif
1282 if (!pty->get ())
1283 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1284
1383 int er; 1285 int er;
1384
1385 if (!pty.get ())
1386 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1387 1286
1388#ifndef NO_BACKSPACE_KEY 1287#ifndef NO_BACKSPACE_KEY
1389 if (key_backspace[0] && !key_backspace[1]) 1288 if (key_backspace[0] && !key_backspace[1])
1390 er = key_backspace[0]; 1289 er = key_backspace[0];
1391 else if (strcmp (key_backspace, "DEC") == 0) 1290 else if (strcmp (key_backspace, "DEC") == 0)
1393 else 1292 else
1394#endif 1293#endif
1395 er = -1; 1294 er = -1;
1396 1295
1397 rxvt_get_ttymode (&tio, er); 1296 rxvt_get_ttymode (&tio, er);
1297 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1298 pty->set_utf8_mode (enc_utf8);
1398 1299
1399 /* set initial window size */ 1300 /* set initial window size */
1400 tt_winch (); 1301 tt_winch ();
1401 1302
1402 sw_chld.start (SIGCHLD); 1303#if ENABLE_FRILLS
1304 if (rs[Rs_pty_fd])
1305 return;
1306#endif
1403 1307
1404#ifndef __QNX__
1405 /* spin off the command interpreter */ 1308 /* spin off the command interpreter */
1406 switch (cmd_pid = fork ()) 1309 switch (cmd_pid = fork ())
1407 { 1310 {
1408 case -1: 1311 case -1:
1312 {
1313 cmd_pid = 0;
1409 rxvt_fatal ("can't fork, aborting.\n"); 1314 rxvt_fatal ("can't fork, aborting.\n");
1315 }
1410 case 0: 1316 case 0:
1411 init_env (); 1317 init_env ();
1412 1318
1413 if (!pty.make_controlling_tty ()) 1319 if (!pty->make_controlling_tty ())
1414 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1320 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1415 else 1321 else
1416 { 1322 {
1417 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1323 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1418 dup2 (pty.tty, STDIN_FILENO); 1324 dup2 (pty->tty, STDIN_FILENO);
1419 dup2 (pty.tty, STDOUT_FILENO); 1325 dup2 (pty->tty, STDOUT_FILENO);
1420 dup2 (pty.tty, STDERR_FILENO); 1326 dup2 (pty->tty, STDERR_FILENO);
1421 1327
1422 // close all our file handles that we do no longer need 1328 // close all our file handles that we do no longer need
1423 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1329 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1424 { 1330 {
1425 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1331 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1426 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1332 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1427 } 1333 }
1428 1334
1429 run_child (argv); 1335 run_child (argv);
1430 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1336 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1431 } 1337 }
1432 1338
1433 _exit (EXIT_FAILURE); 1339 _exit (EXIT_FAILURE);
1434 1340
1435 default: 1341 default:
1436 { 1342 if (!option (Opt_utmpInhibit))
1437#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1343 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1438 int fdstdin;
1439 1344
1440 fdstdin = dup (STDIN_FILENO); 1345 pty->close_tty ();
1441 dup2 (pty.tty, STDIN_FILENO);
1442#endif
1443 1346
1444#ifdef UTMP_SUPPORT 1347 child_ev.start (cmd_pid);
1445 privileged_utmp (SAVE);
1446#endif
1447 1348
1448#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1349 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1449
1450 dup2 (fdstdin, STDIN_FILENO);
1451 close (fdstdin);
1452#endif
1453 }
1454
1455 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1456 break; 1350 break;
1457 } 1351 }
1458#else /* __QNX__ uses qnxspawn () */
1459 fchmod (pty.tty, 0622);
1460 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1461 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1462
1463 if (run_child (argv) == -1)
1464 exit (EXIT_FAILURE);
1465#endif
1466} 1352}
1467 1353
1468/* ------------------------------------------------------------------------- * 1354/* ------------------------------------------------------------------------- *
1469 * CHILD PROCESS OPERATIONS * 1355 * CHILD PROCESS OPERATIONS *
1470 * ------------------------------------------------------------------------- */ 1356 * ------------------------------------------------------------------------- */
1475int 1361int
1476rxvt_term::run_child (const char *const *argv) 1362rxvt_term::run_child (const char *const *argv)
1477{ 1363{
1478 char *login; 1364 char *login;
1479 1365
1480 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1481
1482 if (options & Opt_console) 1366 if (option (Opt_console))
1483 { /* be virtual console, fail silently */ 1367 { /* be virtual console, fail silently */
1484#ifdef TIOCCONS 1368#ifdef TIOCCONS
1485 unsigned int on = 1; 1369 unsigned int on = 1;
1486 1370
1487 ioctl (STDIN_FILENO, TIOCCONS, &on); 1371 ioctl (STDIN_FILENO, TIOCCONS, &on);
1514 // unblock signals (signals are blocked by iom.C 1398 // unblock signals (signals are blocked by iom.C
1515 sigset_t ss; 1399 sigset_t ss;
1516 sigemptyset (&ss); 1400 sigemptyset (&ss);
1517 sigprocmask (SIG_SETMASK, &ss, 0); 1401 sigprocmask (SIG_SETMASK, &ss, 0);
1518 1402
1519#ifndef __QNX__
1520 /* command interpreter path */ 1403 /* command interpreter path */
1521 if (argv != NULL) 1404 if (argv != NULL)
1522 { 1405 {
1523# ifdef DEBUG_CMD 1406# ifdef DEBUG_CMD
1524 int i; 1407 int i;
1530 execvp (argv[0], (char *const *)argv); 1413 execvp (argv[0], (char *const *)argv);
1531 /* no error message: STDERR is closed! */ 1414 /* no error message: STDERR is closed! */
1532 } 1415 }
1533 else 1416 else
1534 { 1417 {
1535 const char *argv0, *shell; 1418 const char *argv0, *shell;
1536 1419
1537 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1420 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1538 shell = "/bin/sh"; 1421 shell = "/bin/sh";
1539 1422
1540 argv0 = (const char *)rxvt_r_basename (shell); 1423 argv0 = (const char *)rxvt_r_basename (shell);
1541 1424
1542 if (options & Opt_loginShell) 1425 if (option (Opt_loginShell))
1543 { 1426 {
1544 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1427 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1545 1428
1546 login[0] = '-'; 1429 login[0] = '-';
1547 strcpy (&login[1], argv0); 1430 strcpy (&login[1], argv0);
1548 argv0 = login; 1431 argv0 = login;
1549 } 1432 }
1433
1550 execlp (shell, argv0, NULL); 1434 execlp (shell, argv0, NULL);
1551 /* no error message: STDERR is closed! */ 1435 /* no error message: STDERR is closed! */
1552 } 1436 }
1553 1437
1554#else /* __QNX__ uses qnxspawn () */
1555
1556 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1557 char *command = NULL, fullcommand[_MAX_PATH];
1558 char **arg_v, *arg_a[2] = { NULL, NULL };
1559
1560 if (argv != NULL)
1561 {
1562 if (access (argv[0], X_OK) == -1)
1563 {
1564 if (strchr (argv[0], '/') == NULL)
1565 {
1566 searchenv (argv[0], "PATH", fullcommand);
1567
1568 if (fullcommand[0] != '\0')
1569 command = fullcommand;
1570 }
1571
1572 if (access (command, X_OK) == -1)
1573 return -1;
1574 }
1575 else
1576 command = argv[0];
1577
1578 arg_v = argv;
1579 }
1580 else
1581 {
1582 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1583 command = "/bin/sh";
1584
1585 arg_a[0] = my_basename (command);
1586
1587 if (options & Opt_loginShell)
1588 {
1589 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1590
1591 login[0] = '-';
1592 strcpy (&login[1], arg_a[0]);
1593 arg_a[0] = login;
1594 }
1595
1596 arg_v = arg_a;
1597 }
1598
1599 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1600 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1601 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1602 command, arg_v, environ, iov_a, 0);
1603 if (login)
1604 free (login);
1605
1606 pty.close_tty ();
1607 return pty.pty;
1608#endif
1609
1610 return -1; 1438 return -1;
1611} 1439}
1612 1440
1613/*----------------------- end-of-file (C source) -----------------------*/ 1441/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines