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.119 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.144 by root, Tue Jan 17 11:02:10 2006 UTC

… …
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.
… …
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 "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38 38
39#include <limits>
40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
43 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
45 /* low-intensity colors */ 47 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
47#ifndef NO_BRIGHTCOLOR
48 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
49 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
50 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
51 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
52 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
216 }; 216 };
217 217
218bool 218bool
219rxvt_term::init_vars () 219rxvt_term::init_vars ()
220{ 220{
221 sw_term.start (SIGTERM);
222 sw_int.start (SIGINT);
223
224 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
225#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
226 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
227#endif 224#endif
228 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
229 226
230 if (pix_colors == NULL) 227 if (pix_colors == NULL)
231 return false; 228 return false;
232 229
233#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
234 TermWin.pixmap = None; 231 pixmap = None;
235#endif 232#endif
236 233
237 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
238 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
239 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
240 want_refresh = 1; 237 want_refresh = 1;
241 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
242 TermWin.focus = 0; 239 focus = 0;
243 TermWin.ncol = 80; 240 ncol = 80;
244 TermWin.nrow = 24; 241 nrow = 24;
245 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 int_bwidth = INTERNALBORDERWIDTH;
246 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 243 ext_bwidth = EXTERNALBORDERWIDTH;
247 TermWin.lineSpace = LINESPACE; 244 lineSpace = LINESPACE;
248 TermWin.saveLines = SAVELINES; 245 saveLines = SAVELINES;
249 numpix_colors = TOTAL_COLORS; 246 numpix_colors = TOTAL_COLORS;
250 247
251 refresh_limit = 1; 248 refresh_limit = 1;
252 refresh_type = SLOW_REFRESH; 249 refresh_type = SLOW_REFRESH;
253 prev_nrow = prev_ncol = 0; 250 prev_nrow = prev_ncol = 0;
… …
258 bgPixmap.x = bgPixmap.y = 50; 255 bgPixmap.x = bgPixmap.y = 50;
259 bgPixmap.pixmap = None; 256 bgPixmap.pixmap = None;
260#endif 257#endif
261 258
262 last_bot = last_state = -1; 259 last_bot = last_state = -1;
263
264#ifdef MENUBAR
265 menu_readonly = 1;
266# if ! (MENUBAR_MAX > 1)
267 CurrentBar = &BarList;
268# endif /* (MENUBAR_MAX > 1) */
269#endif
270 260
271 return true; 261 return true;
272} 262}
273 263
274void 264void
… …
342 rs[Rs_name] = rxvt_r_basename (argv[0]); 332 rs[Rs_name] = rxvt_r_basename (argv[0]);
343 333
344 /* 334 /*
345 * Open display, get options/resources and create the window 335 * Open display, get options/resources and create the window
346 */ 336 */
337
347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
348 rs[Rs_display_name] = ":0"; 339 rs[Rs_display_name] = ":0";
349 340
350 get_options (r_argc, r_argv); 341 get_options (r_argc, r_argv);
351 342
352 if (!(display = displays.get (rs[Rs_display_name]))) 343 if (!(display = displays.get (rs[Rs_display_name])))
353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
354 345
355 extract_resources (); 346 extract_resources ();
347
356 free (r_argv); 348 free (r_argv);
357 349
358 /* 350 /*
359 * set any defaults not already set 351 * set any defaults not already set
360 */ 352 */
… …
372 if (!rs[Rs_iconName]) 364 if (!rs[Rs_iconName])
373 rs[Rs_iconName] = rs[Rs_name]; 365 rs[Rs_iconName] = rs[Rs_name];
374 } 366 }
375 367
376 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 368 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
377 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 369 saveLines = min (i, MAX_SAVELINES);
378 370
379#if ENABLE_FRILLS 371#if ENABLE_FRILLS
380 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 372 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
381 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 373 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
374
382 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 375 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
383 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 376 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
377
384 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 378 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
385 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 379 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
386#endif 380#endif
387 381
388#ifdef POINTER_BLANK 382#ifdef POINTER_BLANK
389 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 383 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
390 pointerBlankDelay = i; 384 pointerBlankDelay = i;
391 else 385 else
392 pointerBlankDelay = 2; 386 pointerBlankDelay = 2;
393#endif 387#endif
394 388
395 /* no point having a scrollbar without having any scrollback! */ 389 /* no point having a scrollbar without having any scrollback! */
396 if (!TermWin.saveLines) 390 if (!saveLines)
397 options &= ~Opt_scrollBar; 391 set_option (Opt_scrollBar, 0);
398 392
399#ifdef PRINTPIPE 393#ifdef PRINTPIPE
400 if (!rs[Rs_print_pipe]) 394 if (!rs[Rs_print_pipe])
401 rs[Rs_print_pipe] = PRINTPIPE; 395 rs[Rs_print_pipe] = PRINTPIPE;
402#endif 396#endif
… …
445 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 439 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
446#endif 440#endif
447 441
448#ifdef XTERM_REVERSE_VIDEO 442#ifdef XTERM_REVERSE_VIDEO
449 /* this is how xterm implements reverseVideo */ 443 /* this is how xterm implements reverseVideo */
450 if (options & Opt_reverseVideo) 444 if (OPTION (Opt_reverseVideo))
451 { 445 {
452 if (!rs[Rs_color + Color_fg]) 446 if (!rs[Rs_color + Color_fg])
453 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 447 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
454 if (!rs[Rs_color + Color_bg]) 448 if (!rs[Rs_color + Color_bg])
455 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 449 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
460 if (!rs[Rs_color + i]) 454 if (!rs[Rs_color + i])
461 rs[Rs_color + i] = def_colorName[i]; 455 rs[Rs_color + i] = def_colorName[i];
462 456
463#ifndef XTERM_REVERSE_VIDEO 457#ifndef XTERM_REVERSE_VIDEO
464 /* this is how we implement reverseVideo */ 458 /* this is how we implement reverseVideo */
465 if (options & Opt_reverseVideo) 459 if (OPTION (Opt_reverseVideo))
466 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
467#endif 461#endif
468 462
469 /* convenient aliases for setting fg/bg to colors */ 463 /* convenient aliases for setting fg/bg to colors */
470 color_aliases (Color_fg); 464 color_aliases (Color_fg);
471 color_aliases (Color_bg); 465 color_aliases (Color_bg);
… …
521 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
522 516
523 sprintf (env_display, "DISPLAY=%s", val); 517 sprintf (env_display, "DISPLAY=%s", val);
524 518
525 /* avoiding the math library: 519 /* avoiding the math library:
526 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 520 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
527 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 521 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
528 ; 522 ;
529 MAX_IT (i, 1); 523 max_it (i, 1);
530 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 524 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
531 525
532 sprintf (env_windowid, "WINDOWID=%u", 526 sprintf (env_windowid, "WINDOWID=%u",
533 (unsigned int)TermWin.parent[0]); 527 (unsigned int)parent[0]);
534 528
535 /* add entries to the environment: 529 /* add entries to the environment:
536 * @ DISPLAY: in case we started with -display 530 * @ DISPLAY: in case we started with -display
537 * @ WINDOWID: X window id number of the window 531 * @ WINDOWID: X window id number of the window
538 * @ COLORTERM: terminal sub-name and also indicates its color 532 * @ COLORTERM: terminal sub-name and also indicates its color
… …
577 * This should support all European type languages. 571 * This should support all European type languages.
578 */ 572 */
579void 573void
580rxvt_term::set_locale (const char *locale) 574rxvt_term::set_locale (const char *locale)
581{ 575{
576 set_environ (envv);
577
582#if HAVE_XSETLOCALE || HAVE_SETLOCALE 578#if HAVE_XSETLOCALE || HAVE_SETLOCALE
583 free (this->locale); 579 free (this->locale);
584 this->locale = setlocale (LC_CTYPE, locale); 580 this->locale = setlocale (LC_CTYPE, locale);
585 581
586 if (!this->locale) 582 if (!this->locale)
587 { 583 {
588 if (*locale) 584 if (*locale)
589 { 585 {
590 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 586 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
591 setlocale (LC_CTYPE, ""); 587 setlocale (LC_CTYPE, "C");
592 } 588 }
593 else 589 else
594 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 590 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
595 591
596 this->locale = ""; 592 this->locale = "C";
597 } 593 }
598 594
599 595
600 this->locale = rxvt_strdup (this->locale); 596 this->locale = rxvt_strdup (this->locale);
601 SET_LOCALE (this->locale); 597 SET_LOCALE (this->locale);
… …
616} 612}
617 613
618void 614void
619rxvt_term::init_xlocale () 615rxvt_term::init_xlocale ()
620{ 616{
617 set_environ (envv);
618
621#ifdef USE_XIM 619#ifdef USE_XIM
622 if (!locale) 620 if (!locale)
623 rxvt_warn ("setting locale failed, working without locale support.\n"); 621 rxvt_warn ("setting locale failed, working without locale support.\n");
624 else 622 else
625 { 623 {
… …
647 * Initialize the command connection. 645 * Initialize the command connection.
648 * This should be called after the X server connection is established. 646 * This should be called after the X server connection is established.
649 */ 647 */
650 648
651#ifdef META8_OPTION 649#ifdef META8_OPTION
652 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
653#endif 651#endif
654 652
655 get_ourmods (); 653 get_ourmods ();
656 654
657 if (!(options & Opt_scrollTtyOutput)) 655 if (!OPTION (Opt_scrollTtyOutput))
658 priv_modes |= PrivMode_TtyOutputInh; 656 priv_modes |= PrivMode_TtyOutputInh;
659 if (options & Opt_scrollTtyKeypress) 657 if (OPTION (Opt_scrollTtyKeypress))
660 priv_modes |= PrivMode_Keypress; 658 priv_modes |= PrivMode_Keypress;
661 if (!(options & Opt_jumpScroll)) 659 if (!OPTION (Opt_jumpScroll))
662 priv_modes |= PrivMode_smoothScroll; 660 priv_modes |= PrivMode_smoothScroll;
663 661
664#ifndef NO_BACKSPACE_KEY 662#ifndef NO_BACKSPACE_KEY
665 if (strcmp (key_backspace, "DEC") == 0) 663 if (strcmp (key_backspace, "DEC") == 0)
666 priv_modes |= PrivMode_HaveBackSpace; 664 priv_modes |= PrivMode_HaveBackSpace;
667#endif 665#endif
668 666
669 /* add value for scrollBar */ 667 /* add value for scrollBar */
670 if (scrollbar_visible ()) 668 if (scrollBar.state)
671 { 669 {
672 priv_modes |= PrivMode_scrollBar; 670 priv_modes |= PrivMode_scrollBar;
673 SavedModes |= PrivMode_scrollBar; 671 SavedModes |= PrivMode_scrollBar;
674 } 672 }
675
676 if (menubar_visible ())
677 {
678 priv_modes |= PrivMode_menuBar;
679 SavedModes |= PrivMode_menuBar;
680 }
681
682#ifdef CURSOR_BLINK
683 if (options & Opt_cursorBlink)
684 (void)gettimeofday (&lastcursorchange, NULL);
685#endif
686 673
687 run_command (argv); 674 run_command (argv);
688} 675}
689 676
690/*----------------------------------------------------------------------*/ 677/*----------------------------------------------------------------------*/
… …
705 continue; 692 continue;
706 693
707 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
708 { 695 {
709#ifndef XTERM_REVERSE_VIDEO 696#ifndef XTERM_REVERSE_VIDEO
710 if (i < 2 && (options & Opt_reverseVideo)) 697 if (i < 2 && OPTION (Opt_reverseVideo))
711 rs[Rs_color + i] = def_colorName[!i]; 698 rs[Rs_color + i] = def_colorName[!i];
712 else 699 else
713#endif 700#endif
714 rs[Rs_color + i] = def_colorName[i]; 701 rs[Rs_color + i] = def_colorName[i];
715 702
… …
757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 744 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
758 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 745 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
759 } 746 }
760 747
761 /* 748 /*
762 * get scrollBar/menuBar shadow colors 749 * get scrollBar shadow colors
763 * 750 *
764 * The calculations of topShadow/bottomShadow values are adapted 751 * The calculations of topShadow/bottomShadow values are adapted
765 * from the fvwm window manager. 752 * from the fvwm window manager.
766 */ 753 */
767#ifdef KEEP_SCROLLCOLOR 754#ifdef KEEP_SCROLLCOLOR
… …
812 int i = atoi (rs[Rs_color + idx]); 799 int i = atoi (rs[Rs_color + idx]);
813 800
814 if (i >= 8 && i <= 15) 801 if (i >= 8 && i <= 15)
815 { /* bright colors */ 802 { /* bright colors */
816 i -= 8; 803 i -= 8;
817#ifndef NO_BRIGHTCOLOR
818 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 804 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
819 return; 805 return;
820#endif
821 } 806 }
822 807
823 if (i >= 0 && i <= 7) /* normal colors */ 808 if (i >= 0 && i <= 7) /* normal colors */
824 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 809 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
825 } 810 }
… …
924#if ENABLE_FRILLS 909#if ENABLE_FRILLS
925 Atom prop = None; 910 Atom prop = None;
926 MWMHints mwmhints; 911 MWMHints mwmhints;
927#endif 912#endif
928 XGCValues gcvalue; 913 XGCValues gcvalue;
929 long vt_emask;
930 XSetWindowAttributes attributes; 914 XSetWindowAttributes attributes;
931 XWindowAttributes gattr; 915 XWindowAttributes gattr;
932 Window top, parent; 916 Window top, parent;
933 dDisp; 917 dDisp;
934 918
… …
938#endif 922#endif
939 923
940 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
941 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
942 926
943 if (options & Opt_transparent) 927 if (OPTION (Opt_transparent))
944 { 928 {
945 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
946 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
947 } 931 }
948 932
949#if ENABLE_FRILLS 933#if ENABLE_FRILLS
950 if (options & Opt_borderLess) 934 if (OPTION (Opt_borderLess))
951 { 935 {
952 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 936 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
953 937
954 if (prop == None) 938 if (prop == None)
955 { 939 {
… …
987 if (!XGetWindowAttributes (disp, parent, &wattr)) 971 if (!XGetWindowAttributes (disp, parent, &wattr))
988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
989 973
990 window_calc (wattr.width, wattr.height); 974 window_calc (wattr.width, wattr.height);
991 } 975 }
992
993#endif 976#endif
977
994 window_calc (0, 0); 978 window_calc (0, 0);
995 979
996 /* sub-window placement & size in rxvt_resize_subwindows () */ 980 /* sub-window placement & size in rxvt_resize_subwindows () */
997#ifdef PREFER_24BIT 981#ifdef PREFER_24BIT
998 attributes.background_pixel = pix_colors_focused[Color_border]; 982 attributes.background_pixel = pix_colors_focused[Color_border];
999 attributes.border_pixel = pix_colors_focused[Color_border]; 983 attributes.border_pixel = pix_colors_focused[Color_border];
1000 attributes.colormap = display->cmap; 984 attributes.colormap = display->cmap;
1001 top = XCreateWindow (disp, parent, 985 top = XCreateWindow (disp, parent,
1002 szHint.x, szHint.y, 986 szHint.x, szHint.y,
1003 szHint.width, szHint.height, 987 szHint.width, szHint.height,
1004 TermWin.ext_bwidth, 988 ext_bwidth,
1005 display->depth, InputOutput, 989 display->depth, InputOutput,
1006 display->visual, 990 display->visual,
1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 991 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1008#else 992#else
1009 top = XCreateSimpleWindow (disp, parent, 993 top = XCreateSimpleWindow (disp, parent,
1010 szHint.x, szHint.y, 994 szHint.x, szHint.y,
1011 szHint.width, szHint.height, 995 szHint.width, szHint.height,
1012 TermWin.ext_bwidth, 996 ext_bwidth,
1013 pix_colors_focused[Color_border], 997 pix_colors_focused[Color_border],
1014 pix_colors_focused[Color_border]); 998 pix_colors_focused[Color_border]);
1015#endif 999#endif
1016 1000
1017 TermWin.parent[0] = top; 1001 this->parent[0] = top;
1018 1002
1019 old_width = szHint.width; 1003 old_width = szHint.width;
1020 old_height = szHint.height; 1004 old_height = szHint.height;
1021 1005
1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1006 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1025 classHint.res_name = (char *)rs[Rs_name]; 1009 classHint.res_name = (char *)rs[Rs_name];
1026 classHint.res_class = (char *)RESCLASS; 1010 classHint.res_class = (char *)RESCLASS;
1027 1011
1028 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1012 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1029 wmHint.input = True; 1013 wmHint.input = True;
1030 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1014 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1031 wmHint.window_group = top; 1015 wmHint.window_group = top;
1032 1016
1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1017 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1034 &szHint, &wmHint, &classHint); 1018 &szHint, &wmHint, &classHint);
1035 1019
… …
1040#endif 1024#endif
1041 }; 1025 };
1042 1026
1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1027 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1044 1028
1029#if ENABLE_FRILLS
1030 if (rs[Rs_transient_for])
1031 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1032#endif
1033
1045#if ENABLE_EWMH 1034#if ENABLE_EWMH
1046 long pid = getpid (); 1035 long pid = getpid ();
1047 1036
1048 XChangeProperty (disp, top, 1037 XChangeProperty (disp, top,
1049 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1038 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1069#endif 1058#endif
1070 1059
1071 /* vt cursor: Black-on-White is standard, but this is more popular */ 1060 /* vt cursor: Black-on-White is standard, but this is more popular */
1072 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1073 1062
1074#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1063#ifdef HAVE_SCROLLBARS
1075 /* cursor (menuBar/scrollBar): Black-on-White */ 1064 /* cursor scrollBar: Black-on-White */
1076 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1065 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1077#endif 1066#endif
1078 1067
1079 /* the vt window */ 1068 /* the vt window */
1080 TermWin.vt = XCreateSimpleWindow (disp, top, 1069 vt = XCreateSimpleWindow (disp, top,
1081 window_vt_x, 1070 window_vt_x,
1082 window_vt_y, 1071 window_vt_y,
1083 TermWin_TotalWidth (), 1072 width,
1084 TermWin_TotalHeight (), 1073 height,
1085 0, 1074 0,
1086 pix_colors_focused[Color_fg], 1075 pix_colors_focused[Color_fg],
1087 pix_colors_focused[Color_bg]); 1076 pix_colors_focused[Color_bg]);
1088#ifdef DEBUG_X 1077#ifdef DEBUG_X
1089 XStoreName (disp, TermWin.vt, "vt window"); 1078 XStoreName (disp, vt, "vt window");
1090#endif 1079#endif
1091 1080
1092 attributes.bit_gravity = NorthWestGravity; 1081 attributes.bit_gravity = NorthWestGravity;
1093 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1094 1083
1095 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1096 1085
1097#ifdef POINTER_BLANK 1086 if (OPTION (Opt_pointerBlank))
1098 if (options & Opt_pointerBlank)
1099 vt_emask |= PointerMotionMask; 1087 vt_emask |= PointerMotionMask;
1100 else 1088 else
1101#endif
1102 vt_emask |= Button1MotionMask | Button3MotionMask; 1089 vt_emask |= Button1MotionMask | Button3MotionMask;
1103 1090
1104 XSelectInput (disp, TermWin.vt, vt_emask); 1091 vt_select_input ();
1092
1105 vt_ev.start (display, TermWin.vt); 1093 vt_ev.start (display, vt);
1106
1107#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1108 if (menuBar_height ())
1109 {
1110 menuBar.win = XCreateSimpleWindow (disp, top,
1111 window_vt_x, 0,
1112 TermWin_TotalWidth (),
1113 menuBar_TotalHeight (),
1114 0,
1115 pix_colors_focused[Color_fg],
1116 pix_colors_focused[Color_scroll]);
1117
1118#ifdef DEBUG_X
1119 XStoreName (disp, menuBar.win, "menubar");
1120#endif
1121
1122 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1123
1124 XDefineCursor (disp, menuBar.win,
1125 XCreateFontCursor (disp, XC_left_ptr));
1126
1127 XSelectInput (disp, menuBar.win,
1128 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1129 menubar_ev.start (display, menuBar.win);
1130 }
1131#endif
1132 1094
1133#ifdef XPM_BACKGROUND 1095#ifdef XPM_BACKGROUND
1134 if (rs[Rs_backgroundPixmap] != NULL 1096 if (rs[Rs_backgroundPixmap] != NULL
1135 && ! (options & Opt_transparent)) 1097 && ! OPTION (Opt_transparent))
1136 { 1098 {
1137 const char *p = rs[Rs_backgroundPixmap]; 1099 const char *p = rs[Rs_backgroundPixmap];
1138 1100
1139 if ((p = strchr (p, ';')) != NULL) 1101 if ((p = strchr (p, ';')) != NULL)
1140 { 1102 {
… …
1149 1111
1150 /* graphics context for the vt window */ 1112 /* graphics context for the vt window */
1151 gcvalue.foreground = pix_colors[Color_fg]; 1113 gcvalue.foreground = pix_colors[Color_fg];
1152 gcvalue.background = pix_colors[Color_bg]; 1114 gcvalue.background = pix_colors[Color_bg];
1153 gcvalue.graphics_exposures = 1; 1115 gcvalue.graphics_exposures = 1;
1154 TermWin.gc = XCreateGC (disp, TermWin.vt, 1116 gc = XCreateGC (disp, vt,
1155 GCForeground | GCBackground | GCGraphicsExposures, 1117 GCForeground | GCBackground | GCGraphicsExposures,
1156 &gcvalue); 1118 &gcvalue);
1157 1119
1158 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1120 drawable = new rxvt_drawable (display, vt);
1159 1121
1160#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1122#ifdef RXVT_SCROLLBAR
1161 gcvalue.foreground = pix_colors[Color_topShadow]; 1123 gcvalue.foreground = pix_colors[Color_topShadow];
1162 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1124 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1163 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1125 gcvalue.foreground = pix_colors[Color_bottomShadow];
1164 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1126 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1165 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1166 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1128 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1167#endif 1129#endif
1168 1130
1169#ifdef OFF_FOCUS_FADING 1131#ifdef OFF_FOCUS_FADING
1170 // initially we are in unfocused state 1132 // initially we are in unfocused state
1171 if (rs[Rs_fade]) 1133 if (rs[Rs_fade])
… …
1196 /* 1158 /*
1197 * standard System V termios interface 1159 * standard System V termios interface
1198 */ 1160 */
1199 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1161 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1200 { 1162 {
1201 /* return error - use system defaults */ 1163 // return error - use system defaults,
1164 // where possible, and zero elsewhere
1165 memset (tio, 0, sizeof (ttymode_t));
1166
1202 tio->c_cc[VINTR] = CINTR; 1167 tio->c_cc[VINTR] = CINTR;
1203 tio->c_cc[VQUIT] = CQUIT; 1168 tio->c_cc[VQUIT] = CQUIT;
1204 tio->c_cc[VERASE] = CERASE; 1169 tio->c_cc[VERASE] = CERASE;
1170#ifdef VERASE2
1171 tio->c_cc[VERASE2] = CERASE2;
1172#endif
1205 tio->c_cc[VKILL] = CKILL; 1173 tio->c_cc[VKILL] = CKILL;
1206 tio->c_cc[VSTART] = CSTART; 1174 tio->c_cc[VSTART] = CSTART;
1207 tio->c_cc[VSTOP] = CSTOP; 1175 tio->c_cc[VSTOP] = CSTOP;
1208 tio->c_cc[VSUSP] = CSUSP; 1176 tio->c_cc[VSUSP] = CSUSP;
1209# ifdef VDSUSP 1177# ifdef VDSUSP
1210
1211 tio->c_cc[VDSUSP] = CDSUSP; 1178 tio->c_cc[VDSUSP] = CDSUSP;
1212# endif 1179# endif
1213# ifdef VREPRINT 1180# ifdef VREPRINT
1214
1215 tio->c_cc[VREPRINT] = CRPRNT; 1181 tio->c_cc[VREPRINT] = CRPRNT;
1216# endif 1182# endif
1217# ifdef VDISCRD 1183# ifdef VDISCRD
1218
1219 tio->c_cc[VDISCRD] = CFLUSH; 1184 tio->c_cc[VDISCRD] = CFLUSH;
1220# endif 1185# endif
1221# ifdef VWERSE 1186# ifdef VWERSE
1222
1223 tio->c_cc[VWERSE] = CWERASE; 1187 tio->c_cc[VWERSE] = CWERASE;
1224# endif 1188# endif
1225# ifdef VLNEXT 1189# ifdef VLNEXT
1226
1227 tio->c_cc[VLNEXT] = CLNEXT; 1190 tio->c_cc[VLNEXT] = CLNEXT;
1228# endif 1191# endif
1229
1230 } 1192 }
1193
1231 tio->c_cc[VEOF] = CEOF; 1194 tio->c_cc[VEOF] = CEOF;
1232 tio->c_cc[VEOL] = VDISABLE; 1195 tio->c_cc[VEOL] = VDISABLE;
1233# ifdef VEOL2 1196# ifdef VEOL2
1234
1235 tio->c_cc[VEOL2] = VDISABLE; 1197 tio->c_cc[VEOL2] = VDISABLE;
1236# endif 1198# endif
1237# ifdef VSWTC 1199# ifdef VSWTC
1238
1239 tio->c_cc[VSWTC] = VDISABLE; 1200 tio->c_cc[VSWTC] = VDISABLE;
1240# endif 1201# endif
1241# ifdef VSWTCH 1202# ifdef VSWTCH
1242
1243 tio->c_cc[VSWTCH] = VDISABLE; 1203 tio->c_cc[VSWTCH] = VDISABLE;
1244# endif 1204# endif
1245# if VMIN != VEOF 1205# if VMIN != VEOF
1246
1247 tio->c_cc[VMIN] = 1; 1206 tio->c_cc[VMIN] = 1;
1248# endif 1207# endif
1249# if VTIME != VEOL 1208# if VTIME != VEOL
1250
1251 tio->c_cc[VTIME] = 0; 1209 tio->c_cc[VTIME] = 0;
1252# endif 1210# endif
1253 1211
1254 if (erase != -1) 1212 if (erase != -1)
1255 tio->c_cc[VERASE] = (char)erase; 1213 tio->c_cc[VERASE] = (char)erase;
… …
1283 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1241 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1284 { 1242 {
1285 tio->sg.sg_erase = CERASE; /* ^H */ 1243 tio->sg.sg_erase = CERASE; /* ^H */
1286 tio->sg.sg_kill = CKILL; /* ^U */ 1244 tio->sg.sg_kill = CKILL; /* ^U */
1287 } 1245 }
1246
1288 if (erase != -1) 1247 if (erase != -1)
1289 tio->sg.sg_erase = (char)erase; 1248 tio->sg.sg_erase = (char)erase;
1290 1249
1291 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1250 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1292 1251
… …
1298 tio->tc.t_startc = CSTART; /* ^Q */ 1257 tio->tc.t_startc = CSTART; /* ^Q */
1299 tio->tc.t_stopc = CSTOP; /* ^S */ 1258 tio->tc.t_stopc = CSTOP; /* ^S */
1300 tio->tc.t_eofc = CEOF; /* ^D */ 1259 tio->tc.t_eofc = CEOF; /* ^D */
1301 tio->tc.t_brkc = -1; 1260 tio->tc.t_brkc = -1;
1302 } 1261 }
1262
1303 /* get local special chars */ 1263 /* get local special chars */
1304 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1264 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1305 { 1265 {
1306 tio->lc.t_suspc = CSUSP; /* ^Z */ 1266 tio->lc.t_suspc = CSUSP; /* ^Z */
1307 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1267 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1311 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1271 tio->lc.t_lnextc = CLNEXT; /* ^V */
1312 } 1272 }
1313 /* get line discipline */ 1273 /* get line discipline */
1314 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1274 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1315# ifdef NTTYDISC 1275# ifdef NTTYDISC
1316
1317 tio->line = NTTYDISC; 1276 tio->line = NTTYDISC;
1318# endif /* NTTYDISC */ 1277# endif /* NTTYDISC */
1319 1278
1320 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1279 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1321#endif /* HAVE_TERMIOS_H */ 1280#endif /* HAVE_TERMIOS_H */
… …
1344 FOO (IGNCR, "IGNCR"); 1303 FOO (IGNCR, "IGNCR");
1345 FOO (ICRNL, "ICRNL"); 1304 FOO (ICRNL, "ICRNL");
1346 FOO (IXON, "IXON"); 1305 FOO (IXON, "IXON");
1347 FOO (IXOFF, "IXOFF"); 1306 FOO (IXOFF, "IXOFF");
1348# ifdef IUCLC 1307# ifdef IUCLC
1349
1350 FOO (IUCLC, "IUCLC"); 1308 FOO (IUCLC, "IUCLC");
1351# endif 1309# endif
1352# ifdef IXANY 1310# ifdef IXANY
1353
1354 FOO (IXANY, "IXANY"); 1311 FOO (IXANY, "IXANY");
1355# endif 1312# endif
1356# ifdef IMAXBEL 1313# ifdef IMAXBEL
1357
1358 FOO (IMAXBEL, "IMAXBEL"); 1314 FOO (IMAXBEL, "IMAXBEL");
1359# endif 1315# endif
1360 1316
1361 fprintf (stderr, "\n"); 1317 fprintf (stderr, "\n");
1362 1318
… …
1369 FOO (VERASE, "VERASE"); 1325 FOO (VERASE, "VERASE");
1370 FOO (VKILL, "VKILL"); 1326 FOO (VKILL, "VKILL");
1371 FOO (VEOF, "VEOF"); 1327 FOO (VEOF, "VEOF");
1372 FOO (VEOL, "VEOL"); 1328 FOO (VEOL, "VEOL");
1373# ifdef VEOL2 1329# ifdef VEOL2
1374
1375 FOO (VEOL2, "VEOL2"); 1330 FOO (VEOL2, "VEOL2");
1376# endif 1331# endif
1377# ifdef VSWTC 1332# ifdef VSWTC
1378
1379 FOO (VSWTC, "VSWTC"); 1333 FOO (VSWTC, "VSWTC");
1380# endif 1334# endif
1381# ifdef VSWTCH 1335# ifdef VSWTCH
1382
1383 FOO (VSWTCH, "VSWTCH"); 1336 FOO (VSWTCH, "VSWTCH");
1384# endif 1337# endif
1385
1386 FOO (VSTART, "VSTART"); 1338 FOO (VSTART, "VSTART");
1387 FOO (VSTOP, "VSTOP"); 1339 FOO (VSTOP, "VSTOP");
1388 FOO (VSUSP, "VSUSP"); 1340 FOO (VSUSP, "VSUSP");
1389# ifdef VDSUSP 1341# ifdef VDSUSP
1390
1391 FOO (VDSUSP, "VDSUSP"); 1342 FOO (VDSUSP, "VDSUSP");
1392# endif 1343# endif
1393# ifdef VREPRINT 1344# ifdef VREPRINT
1394
1395 FOO (VREPRINT, "VREPRINT"); 1345 FOO (VREPRINT, "VREPRINT");
1396# endif 1346# endif
1397# ifdef VDISCRD 1347# ifdef VDISCRD
1398
1399 FOO (VDISCRD, "VDISCRD"); 1348 FOO (VDISCRD, "VDISCRD");
1400# endif 1349# endif
1401# ifdef VWERSE 1350# ifdef VWERSE
1402
1403 FOO (VWERSE, "VWERSE"); 1351 FOO (VWERSE, "VWERSE");
1404# endif 1352# endif
1405# ifdef VLNEXT 1353# ifdef VLNEXT
1406
1407 FOO (VLNEXT, "VLNEXT"); 1354 FOO (VLNEXT, "VLNEXT");
1408# endif 1355# endif
1409 1356
1410 fprintf (stderr, "\n"); 1357 fprintf (stderr, "\n");
1411# undef FOO 1358# undef FOO
… …
1424{ 1371{
1425#if ENABLE_FRILLS 1372#if ENABLE_FRILLS
1426 if (rs[Rs_pty_fd]) 1373 if (rs[Rs_pty_fd])
1427 { 1374 {
1428 pty.pty = atoi (rs[Rs_pty_fd]); 1375 pty.pty = atoi (rs[Rs_pty_fd]);
1376
1377 if (pty.pty >= 0)
1378 {
1379 if (getfd_hook)
1380 pty.pty = (*getfd_hook) (pty.pty);
1381
1429 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1382 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1383 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1384 }
1430 } 1385 }
1431 else 1386 else
1432#endif 1387#endif
1433 if (!pty.get ()) 1388 if (!pty.get ())
1434 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1454#if ENABLE_FRILLS 1409#if ENABLE_FRILLS
1455 if (rs[Rs_pty_fd]) 1410 if (rs[Rs_pty_fd])
1456 return; 1411 return;
1457#endif 1412#endif
1458 1413
1459 sw_chld.start (SIGCHLD);
1460
1461#ifndef __QNX__
1462 /* spin off the command interpreter */ 1414 /* spin off the command interpreter */
1463 switch (cmd_pid = fork ()) 1415 switch (cmd_pid = fork ())
1464 { 1416 {
1465 case -1: 1417 case -1:
1466 { 1418 {
… …
1513 } 1465 }
1514 1466
1515 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ 1467 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1516 break; 1468 break;
1517 } 1469 }
1518#else /* __QNX__ uses qnxspawn () */
1519 fchmod (pty.tty, 0622);
1520 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1521 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1522
1523 if (run_child (argv) == -1)
1524 exit (EXIT_FAILURE);
1525#endif
1526} 1470}
1527 1471
1528/* ------------------------------------------------------------------------- * 1472/* ------------------------------------------------------------------------- *
1529 * CHILD PROCESS OPERATIONS * 1473 * CHILD PROCESS OPERATIONS *
1530 * ------------------------------------------------------------------------- */ 1474 * ------------------------------------------------------------------------- */
… …
1537{ 1481{
1538 char *login; 1482 char *login;
1539 1483
1540 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1484 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1541 1485
1542 if (options & Opt_console) 1486 if (OPTION (Opt_console))
1543 { /* be virtual console, fail silently */ 1487 { /* be virtual console, fail silently */
1544#ifdef TIOCCONS 1488#ifdef TIOCCONS
1545 unsigned int on = 1; 1489 unsigned int on = 1;
1546 1490
1547 ioctl (STDIN_FILENO, TIOCCONS, &on); 1491 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1574 // unblock signals (signals are blocked by iom.C 1518 // unblock signals (signals are blocked by iom.C
1575 sigset_t ss; 1519 sigset_t ss;
1576 sigemptyset (&ss); 1520 sigemptyset (&ss);
1577 sigprocmask (SIG_SETMASK, &ss, 0); 1521 sigprocmask (SIG_SETMASK, &ss, 0);
1578 1522
1579#ifndef __QNX__
1580 /* command interpreter path */ 1523 /* command interpreter path */
1581 if (argv != NULL) 1524 if (argv != NULL)
1582 { 1525 {
1583# ifdef DEBUG_CMD 1526# ifdef DEBUG_CMD
1584 int i; 1527 int i;
… …
1590 execvp (argv[0], (char *const *)argv); 1533 execvp (argv[0], (char *const *)argv);
1591 /* no error message: STDERR is closed! */ 1534 /* no error message: STDERR is closed! */
1592 } 1535 }
1593 else 1536 else
1594 { 1537 {
1595 const char *argv0, *shell; 1538 const char *argv0, *shell;
1596 1539
1597 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1540 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1598 shell = "/bin/sh"; 1541 shell = "/bin/sh";
1599 1542
1600 argv0 = (const char *)rxvt_r_basename (shell); 1543 argv0 = (const char *)rxvt_r_basename (shell);
1601 1544
1602 if (options & Opt_loginShell) 1545 if (OPTION (Opt_loginShell))
1603 { 1546 {
1604 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1547 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1605 1548
1606 login[0] = '-'; 1549 login[0] = '-';
1607 strcpy (&login[1], argv0); 1550 strcpy (&login[1], argv0);
1608 argv0 = login; 1551 argv0 = login;
1609 } 1552 }
1553
1610 execlp (shell, argv0, NULL); 1554 execlp (shell, argv0, NULL);
1611 /* no error message: STDERR is closed! */ 1555 /* no error message: STDERR is closed! */
1612 } 1556 }
1613 1557
1614#else /* __QNX__ uses qnxspawn () */
1615
1616 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1617 char *command = NULL, fullcommand[_MAX_PATH];
1618 char **arg_v, *arg_a[2] = { NULL, NULL };
1619
1620 if (argv != NULL)
1621 {
1622 if (access (argv[0], X_OK) == -1)
1623 {
1624 if (strchr (argv[0], '/') == NULL)
1625 {
1626 searchenv (argv[0], "PATH", fullcommand);
1627
1628 if (fullcommand[0] != '\0')
1629 command = fullcommand;
1630 }
1631
1632 if (access (command, X_OK) == -1)
1633 return -1;
1634 }
1635 else
1636 command = argv[0];
1637
1638 arg_v = argv;
1639 }
1640 else
1641 {
1642 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1643 command = "/bin/sh";
1644
1645 arg_a[0] = my_basename (command);
1646
1647 if (options & Opt_loginShell)
1648 {
1649 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1650
1651 login[0] = '-';
1652 strcpy (&login[1], arg_a[0]);
1653 arg_a[0] = login;
1654 }
1655
1656 arg_v = arg_a;
1657 }
1658
1659 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1660 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1661 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1662 command, arg_v, environ, iov_a, 0);
1663 if (login)
1664 free (login);
1665
1666 pty.close_tty ();
1667 return pty.pty;
1668#endif
1669
1670 return -1; 1558 return -1;
1671} 1559}
1672 1560
1673/*----------------------- end-of-file (C source) -----------------------*/ 1561/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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