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.124 by root, Wed Dec 21 14:19:19 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) */
… …
256 bgPixmap.pixmap = None; 256 bgPixmap.pixmap = None;
257#endif 257#endif
258 258
259 last_bot = last_state = -1; 259 last_bot = last_state = -1;
260 260
261#ifdef MENUBAR
262 menu_readonly = 1;
263# if ! (MENUBAR_MAX > 1)
264 CurrentBar = &BarList;
265# endif /* (MENUBAR_MAX > 1) */
266#endif
267
268 return true; 261 return true;
269} 262}
270 263
271void 264void
272rxvt_term::init_secondary () 265rxvt_term::init_secondary ()
… …
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 332 rs[Rs_name] = rxvt_r_basename (argv[0]);
340 333
341 /* 334 /*
342 * Open display, get options/resources and create the window 335 * Open display, get options/resources and create the window
343 */ 336 */
337
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 339 rs[Rs_display_name] = ":0";
346 340
347 get_options (r_argc, r_argv); 341 get_options (r_argc, r_argv);
348 342
349 if (!(display = displays.get (rs[Rs_display_name]))) 343 if (!(display = displays.get (rs[Rs_display_name])))
350 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]);
351 345
352 extract_resources (); 346 extract_resources ();
347
353 free (r_argv); 348 free (r_argv);
354 349
355 /* 350 /*
356 * set any defaults not already set 351 * set any defaults not already set
357 */ 352 */
… …
369 if (!rs[Rs_iconName]) 364 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 365 rs[Rs_iconName] = rs[Rs_name];
371 } 366 }
372 367
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 368 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 saveLines = min (i, MAX_POSITIVE_INT16); 369 saveLines = min (i, MAX_SAVELINES);
375 370
376#if ENABLE_FRILLS 371#if ENABLE_FRILLS
377 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)
378 int_bwidth = min (i, MAX_POSITIVE_INT16); 373 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
379 374
380 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)
381 ext_bwidth = min (i, MAX_POSITIVE_INT16); 376 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
382 377
383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 378 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
384 lineSpace = min (i, MAX_POSITIVE_INT16); 379 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
385#endif 380#endif
386 381
387#ifdef POINTER_BLANK 382#ifdef POINTER_BLANK
388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 383 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
389 pointerBlankDelay = i; 384 pointerBlankDelay = i;
… …
391 pointerBlankDelay = 2; 386 pointerBlankDelay = 2;
392#endif 387#endif
393 388
394 /* no point having a scrollbar without having any scrollback! */ 389 /* no point having a scrollbar without having any scrollback! */
395 if (!saveLines) 390 if (!saveLines)
396 options &= ~Opt_scrollBar; 391 set_option (Opt_scrollBar, 0);
397 392
398#ifdef PRINTPIPE 393#ifdef PRINTPIPE
399 if (!rs[Rs_print_pipe]) 394 if (!rs[Rs_print_pipe])
400 rs[Rs_print_pipe] = PRINTPIPE; 395 rs[Rs_print_pipe] = PRINTPIPE;
401#endif 396#endif
… …
444 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]);
445#endif 440#endif
446 441
447#ifdef XTERM_REVERSE_VIDEO 442#ifdef XTERM_REVERSE_VIDEO
448 /* this is how xterm implements reverseVideo */ 443 /* this is how xterm implements reverseVideo */
449 if (options & Opt_reverseVideo) 444 if (OPTION (Opt_reverseVideo))
450 { 445 {
451 if (!rs[Rs_color + Color_fg]) 446 if (!rs[Rs_color + Color_fg])
452 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 447 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
453 if (!rs[Rs_color + Color_bg]) 448 if (!rs[Rs_color + Color_bg])
454 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 449 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
459 if (!rs[Rs_color + i]) 454 if (!rs[Rs_color + i])
460 rs[Rs_color + i] = def_colorName[i]; 455 rs[Rs_color + i] = def_colorName[i];
461 456
462#ifndef XTERM_REVERSE_VIDEO 457#ifndef XTERM_REVERSE_VIDEO
463 /* this is how we implement reverseVideo */ 458 /* this is how we implement reverseVideo */
464 if (options & Opt_reverseVideo) 459 if (OPTION (Opt_reverseVideo))
465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
466#endif 461#endif
467 462
468 /* convenient aliases for setting fg/bg to colors */ 463 /* convenient aliases for setting fg/bg to colors */
469 color_aliases (Color_fg); 464 color_aliases (Color_fg);
… …
576 * This should support all European type languages. 571 * This should support all European type languages.
577 */ 572 */
578void 573void
579rxvt_term::set_locale (const char *locale) 574rxvt_term::set_locale (const char *locale)
580{ 575{
576 set_environ (envv);
577
581#if HAVE_XSETLOCALE || HAVE_SETLOCALE 578#if HAVE_XSETLOCALE || HAVE_SETLOCALE
582 free (this->locale); 579 free (this->locale);
583 this->locale = setlocale (LC_CTYPE, locale); 580 this->locale = setlocale (LC_CTYPE, locale);
584 581
585 if (!this->locale) 582 if (!this->locale)
586 { 583 {
587 if (*locale) 584 if (*locale)
588 { 585 {
589 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);
590 setlocale (LC_CTYPE, ""); 587 setlocale (LC_CTYPE, "C");
591 } 588 }
592 else 589 else
593 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");
594 591
595 this->locale = ""; 592 this->locale = "C";
596 } 593 }
597 594
598 595
599 this->locale = rxvt_strdup (this->locale); 596 this->locale = rxvt_strdup (this->locale);
600 SET_LOCALE (this->locale); 597 SET_LOCALE (this->locale);
… …
615} 612}
616 613
617void 614void
618rxvt_term::init_xlocale () 615rxvt_term::init_xlocale ()
619{ 616{
617 set_environ (envv);
618
620#ifdef USE_XIM 619#ifdef USE_XIM
621 if (!locale) 620 if (!locale)
622 rxvt_warn ("setting locale failed, working without locale support.\n"); 621 rxvt_warn ("setting locale failed, working without locale support.\n");
623 else 622 else
624 { 623 {
… …
646 * Initialize the command connection. 645 * Initialize the command connection.
647 * This should be called after the X server connection is established. 646 * This should be called after the X server connection is established.
648 */ 647 */
649 648
650#ifdef META8_OPTION 649#ifdef META8_OPTION
651 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
652#endif 651#endif
653 652
654 get_ourmods (); 653 get_ourmods ();
655 654
656 if (!(options & Opt_scrollTtyOutput)) 655 if (!OPTION (Opt_scrollTtyOutput))
657 priv_modes |= PrivMode_TtyOutputInh; 656 priv_modes |= PrivMode_TtyOutputInh;
658 if (options & Opt_scrollTtyKeypress) 657 if (OPTION (Opt_scrollTtyKeypress))
659 priv_modes |= PrivMode_Keypress; 658 priv_modes |= PrivMode_Keypress;
660 if (!(options & Opt_jumpScroll)) 659 if (!OPTION (Opt_jumpScroll))
661 priv_modes |= PrivMode_smoothScroll; 660 priv_modes |= PrivMode_smoothScroll;
662 661
663#ifndef NO_BACKSPACE_KEY 662#ifndef NO_BACKSPACE_KEY
664 if (strcmp (key_backspace, "DEC") == 0) 663 if (strcmp (key_backspace, "DEC") == 0)
665 priv_modes |= PrivMode_HaveBackSpace; 664 priv_modes |= PrivMode_HaveBackSpace;
666#endif 665#endif
667 666
668 /* add value for scrollBar */ 667 /* add value for scrollBar */
669 if (scrollbar_visible ()) 668 if (scrollBar.state)
670 { 669 {
671 priv_modes |= PrivMode_scrollBar; 670 priv_modes |= PrivMode_scrollBar;
672 SavedModes |= PrivMode_scrollBar; 671 SavedModes |= PrivMode_scrollBar;
673 } 672 }
674
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 673
686 run_command (argv); 674 run_command (argv);
687} 675}
688 676
689/*----------------------------------------------------------------------*/ 677/*----------------------------------------------------------------------*/
… …
704 continue; 692 continue;
705 693
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
707 { 695 {
708#ifndef XTERM_REVERSE_VIDEO 696#ifndef XTERM_REVERSE_VIDEO
709 if (i < 2 && (options & Opt_reverseVideo)) 697 if (i < 2 && OPTION (Opt_reverseVideo))
710 rs[Rs_color + i] = def_colorName[!i]; 698 rs[Rs_color + i] = def_colorName[!i];
711 else 699 else
712#endif 700#endif
713 rs[Rs_color + i] = def_colorName[i]; 701 rs[Rs_color + i] = def_colorName[i];
714 702
… …
756 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];
757 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];
758 } 746 }
759 747
760 /* 748 /*
761 * get scrollBar/menuBar shadow colors 749 * get scrollBar shadow colors
762 * 750 *
763 * The calculations of topShadow/bottomShadow values are adapted 751 * The calculations of topShadow/bottomShadow values are adapted
764 * from the fvwm window manager. 752 * from the fvwm window manager.
765 */ 753 */
766#ifdef KEEP_SCROLLCOLOR 754#ifdef KEEP_SCROLLCOLOR
… …
811 int i = atoi (rs[Rs_color + idx]); 799 int i = atoi (rs[Rs_color + idx]);
812 800
813 if (i >= 8 && i <= 15) 801 if (i >= 8 && i <= 15)
814 { /* bright colors */ 802 { /* bright colors */
815 i -= 8; 803 i -= 8;
816#ifndef NO_BRIGHTCOLOR
817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 804 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
818 return; 805 return;
819#endif
820 } 806 }
821 807
822 if (i >= 0 && i <= 7) /* normal colors */ 808 if (i >= 0 && i <= 7) /* normal colors */
823 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 809 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
824 } 810 }
… …
923#if ENABLE_FRILLS 909#if ENABLE_FRILLS
924 Atom prop = None; 910 Atom prop = None;
925 MWMHints mwmhints; 911 MWMHints mwmhints;
926#endif 912#endif
927 XGCValues gcvalue; 913 XGCValues gcvalue;
928 long vt_emask;
929 XSetWindowAttributes attributes; 914 XSetWindowAttributes attributes;
930 XWindowAttributes gattr; 915 XWindowAttributes gattr;
931 Window top, parent; 916 Window top, parent;
932 dDisp; 917 dDisp;
933 918
… …
937#endif 922#endif
938 923
939 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
940 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
941 926
942 if (options & Opt_transparent) 927 if (OPTION (Opt_transparent))
943 { 928 {
944 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
945 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
946 } 931 }
947 932
948#if ENABLE_FRILLS 933#if ENABLE_FRILLS
949 if (options & Opt_borderLess) 934 if (OPTION (Opt_borderLess))
950 { 935 {
951 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 936 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
952 937
953 if (prop == None) 938 if (prop == None)
954 { 939 {
… …
1024 classHint.res_name = (char *)rs[Rs_name]; 1009 classHint.res_name = (char *)rs[Rs_name];
1025 classHint.res_class = (char *)RESCLASS; 1010 classHint.res_class = (char *)RESCLASS;
1026 1011
1027 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1012 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1028 wmHint.input = True; 1013 wmHint.input = True;
1029 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1014 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1030 wmHint.window_group = top; 1015 wmHint.window_group = top;
1031 1016
1032 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1017 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1033 &szHint, &wmHint, &classHint); 1018 &szHint, &wmHint, &classHint);
1034 1019
… …
1039#endif 1024#endif
1040 }; 1025 };
1041 1026
1042 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1027 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1043 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
1044#if ENABLE_EWMH 1034#if ENABLE_EWMH
1045 long pid = getpid (); 1035 long pid = getpid ();
1046 1036
1047 XChangeProperty (disp, top, 1037 XChangeProperty (disp, top,
1048 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1038 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1068#endif 1058#endif
1069 1059
1070 /* 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 */
1071 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1072 1062
1073#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1063#ifdef HAVE_SCROLLBARS
1074 /* cursor (menuBar/scrollBar): Black-on-White */ 1064 /* cursor scrollBar: Black-on-White */
1075 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1065 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1076#endif 1066#endif
1077 1067
1078 /* the vt window */ 1068 /* the vt window */
1079 vt = XCreateSimpleWindow (disp, top, 1069 vt = XCreateSimpleWindow (disp, top,
1080 window_vt_x, 1070 window_vt_x,
1081 window_vt_y, 1071 window_vt_y,
1082 TermWin_TotalWidth (), 1072 width,
1083 TermWin_TotalHeight (), 1073 height,
1084 0, 1074 0,
1085 pix_colors_focused[Color_fg], 1075 pix_colors_focused[Color_fg],
1086 pix_colors_focused[Color_bg]); 1076 pix_colors_focused[Color_bg]);
1087#ifdef DEBUG_X 1077#ifdef DEBUG_X
1088 XStoreName (disp, vt, "vt window"); 1078 XStoreName (disp, vt, "vt window");
… …
1091 attributes.bit_gravity = NorthWestGravity; 1081 attributes.bit_gravity = NorthWestGravity;
1092 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1093 1083
1094 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1095 1085
1096#ifdef POINTER_BLANK 1086 if (OPTION (Opt_pointerBlank))
1097 if (options & Opt_pointerBlank)
1098 vt_emask |= PointerMotionMask; 1087 vt_emask |= PointerMotionMask;
1099 else 1088 else
1100#endif
1101 vt_emask |= Button1MotionMask | Button3MotionMask; 1089 vt_emask |= Button1MotionMask | Button3MotionMask;
1102 1090
1103 XSelectInput (disp, vt, vt_emask); 1091 vt_select_input ();
1092
1104 vt_ev.start (display, vt); 1093 vt_ev.start (display, vt);
1105
1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1107 if (menuBar_height ())
1108 {
1109 menuBar.win = XCreateSimpleWindow (disp, top,
1110 window_vt_x, 0,
1111 TermWin_TotalWidth (),
1112 menuBar_TotalHeight (),
1113 0,
1114 pix_colors_focused[Color_fg],
1115 pix_colors_focused[Color_scroll]);
1116
1117#ifdef DEBUG_X
1118 XStoreName (disp, menuBar.win, "menubar");
1119#endif
1120
1121 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1122
1123 XDefineCursor (disp, menuBar.win,
1124 XCreateFontCursor (disp, XC_left_ptr));
1125
1126 XSelectInput (disp, menuBar.win,
1127 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1128 menubar_ev.start (display, menuBar.win);
1129 }
1130#endif
1131 1094
1132#ifdef XPM_BACKGROUND 1095#ifdef XPM_BACKGROUND
1133 if (rs[Rs_backgroundPixmap] != NULL 1096 if (rs[Rs_backgroundPixmap] != NULL
1134 && ! (options & Opt_transparent)) 1097 && ! OPTION (Opt_transparent))
1135 { 1098 {
1136 const char *p = rs[Rs_backgroundPixmap]; 1099 const char *p = rs[Rs_backgroundPixmap];
1137 1100
1138 if ((p = strchr (p, ';')) != NULL) 1101 if ((p = strchr (p, ';')) != NULL)
1139 { 1102 {
… …
1154 GCForeground | GCBackground | GCGraphicsExposures, 1117 GCForeground | GCBackground | GCGraphicsExposures,
1155 &gcvalue); 1118 &gcvalue);
1156 1119
1157 drawable = new rxvt_drawable (display, vt); 1120 drawable = new rxvt_drawable (display, vt);
1158 1121
1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1122#ifdef RXVT_SCROLLBAR
1160 gcvalue.foreground = pix_colors[Color_topShadow]; 1123 gcvalue.foreground = pix_colors[Color_topShadow];
1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1124 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1162 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1125 gcvalue.foreground = pix_colors[Color_bottomShadow];
1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1126 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1195 /* 1158 /*
1196 * standard System V termios interface 1159 * standard System V termios interface
1197 */ 1160 */
1198 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1161 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1199 { 1162 {
1200 /* 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
1201 tio->c_cc[VINTR] = CINTR; 1167 tio->c_cc[VINTR] = CINTR;
1202 tio->c_cc[VQUIT] = CQUIT; 1168 tio->c_cc[VQUIT] = CQUIT;
1203 tio->c_cc[VERASE] = CERASE; 1169 tio->c_cc[VERASE] = CERASE;
1170#ifdef VERASE2
1171 tio->c_cc[VERASE2] = CERASE2;
1172#endif
1204 tio->c_cc[VKILL] = CKILL; 1173 tio->c_cc[VKILL] = CKILL;
1205 tio->c_cc[VSTART] = CSTART; 1174 tio->c_cc[VSTART] = CSTART;
1206 tio->c_cc[VSTOP] = CSTOP; 1175 tio->c_cc[VSTOP] = CSTOP;
1207 tio->c_cc[VSUSP] = CSUSP; 1176 tio->c_cc[VSUSP] = CSUSP;
1208# ifdef VDSUSP 1177# ifdef VDSUSP
… …
1402{ 1371{
1403#if ENABLE_FRILLS 1372#if ENABLE_FRILLS
1404 if (rs[Rs_pty_fd]) 1373 if (rs[Rs_pty_fd])
1405 { 1374 {
1406 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
1407 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 }
1408 } 1385 }
1409 else 1386 else
1410#endif 1387#endif
1411 if (!pty.get ()) 1388 if (!pty.get ())
1412 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1432#if ENABLE_FRILLS 1409#if ENABLE_FRILLS
1433 if (rs[Rs_pty_fd]) 1410 if (rs[Rs_pty_fd])
1434 return; 1411 return;
1435#endif 1412#endif
1436 1413
1437#ifndef __QNX__
1438 /* spin off the command interpreter */ 1414 /* spin off the command interpreter */
1439 switch (cmd_pid = fork ()) 1415 switch (cmd_pid = fork ())
1440 { 1416 {
1441 case -1: 1417 case -1:
1442 { 1418 {
… …
1489 } 1465 }
1490 1466
1491 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ 1467 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1492 break; 1468 break;
1493 } 1469 }
1494#else /* __QNX__ uses qnxspawn () */
1495 fchmod (pty.tty, 0622);
1496 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1497 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1498
1499 if (run_child (argv) == -1)
1500 exit (EXIT_FAILURE);
1501#endif
1502} 1470}
1503 1471
1504/* ------------------------------------------------------------------------- * 1472/* ------------------------------------------------------------------------- *
1505 * CHILD PROCESS OPERATIONS * 1473 * CHILD PROCESS OPERATIONS *
1506 * ------------------------------------------------------------------------- */ 1474 * ------------------------------------------------------------------------- */
… …
1513{ 1481{
1514 char *login; 1482 char *login;
1515 1483
1516 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1484 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1517 1485
1518 if (options & Opt_console) 1486 if (OPTION (Opt_console))
1519 { /* be virtual console, fail silently */ 1487 { /* be virtual console, fail silently */
1520#ifdef TIOCCONS 1488#ifdef TIOCCONS
1521 unsigned int on = 1; 1489 unsigned int on = 1;
1522 1490
1523 ioctl (STDIN_FILENO, TIOCCONS, &on); 1491 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1550 // unblock signals (signals are blocked by iom.C 1518 // unblock signals (signals are blocked by iom.C
1551 sigset_t ss; 1519 sigset_t ss;
1552 sigemptyset (&ss); 1520 sigemptyset (&ss);
1553 sigprocmask (SIG_SETMASK, &ss, 0); 1521 sigprocmask (SIG_SETMASK, &ss, 0);
1554 1522
1555#ifndef __QNX__
1556 /* command interpreter path */ 1523 /* command interpreter path */
1557 if (argv != NULL) 1524 if (argv != NULL)
1558 { 1525 {
1559# ifdef DEBUG_CMD 1526# ifdef DEBUG_CMD
1560 int i; 1527 int i;
… …
1566 execvp (argv[0], (char *const *)argv); 1533 execvp (argv[0], (char *const *)argv);
1567 /* no error message: STDERR is closed! */ 1534 /* no error message: STDERR is closed! */
1568 } 1535 }
1569 else 1536 else
1570 { 1537 {
1571 const char *argv0, *shell; 1538 const char *argv0, *shell;
1572 1539
1573 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1540 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1574 shell = "/bin/sh"; 1541 shell = "/bin/sh";
1575 1542
1576 argv0 = (const char *)rxvt_r_basename (shell); 1543 argv0 = (const char *)rxvt_r_basename (shell);
1577 1544
1578 if (options & Opt_loginShell) 1545 if (OPTION (Opt_loginShell))
1579 { 1546 {
1580 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1547 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1581 1548
1582 login[0] = '-'; 1549 login[0] = '-';
1583 strcpy (&login[1], argv0); 1550 strcpy (&login[1], argv0);
1584 argv0 = login; 1551 argv0 = login;
1585 } 1552 }
1553
1586 execlp (shell, argv0, NULL); 1554 execlp (shell, argv0, NULL);
1587 /* no error message: STDERR is closed! */ 1555 /* no error message: STDERR is closed! */
1588 } 1556 }
1589 1557
1590#else /* __QNX__ uses qnxspawn () */
1591
1592 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1593 char *command = NULL, fullcommand[_MAX_PATH];
1594 char **arg_v, *arg_a[2] = { NULL, NULL };
1595
1596 if (argv != NULL)
1597 {
1598 if (access (argv[0], X_OK) == -1)
1599 {
1600 if (strchr (argv[0], '/') == NULL)
1601 {
1602 searchenv (argv[0], "PATH", fullcommand);
1603
1604 if (fullcommand[0] != '\0')
1605 command = fullcommand;
1606 }
1607
1608 if (access (command, X_OK) == -1)
1609 return -1;
1610 }
1611 else
1612 command = argv[0];
1613
1614 arg_v = argv;
1615 }
1616 else
1617 {
1618 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1619 command = "/bin/sh";
1620
1621 arg_a[0] = my_basename (command);
1622
1623 if (options & Opt_loginShell)
1624 {
1625 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1626
1627 login[0] = '-';
1628 strcpy (&login[1], arg_a[0]);
1629 arg_a[0] = login;
1630 }
1631
1632 arg_v = arg_a;
1633 }
1634
1635 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1636 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1637 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1638 command, arg_v, environ, iov_a, 0);
1639 if (login)
1640 free (login);
1641
1642 pty.close_tty ();
1643 return pty.pty;
1644#endif
1645
1646 return -1; 1558 return -1;
1647} 1559}
1648 1560
1649/*----------------------- end-of-file (C source) -----------------------*/ 1561/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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