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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines