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.137 by root, Wed Jan 11 00:59:58 2006 UTC vs.
Revision 1.165 by root, Tue Jan 31 19:11:43 2006 UTC

… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 57# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 59# endif
60 /* high-intensity colors */ 60 /* high-intensity colors */
61# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 63# else
64 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 65# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "rgb:00/00/00",
176#endif
177 };
178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif 176#endif
216 }; 177 };
217 178
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
182 pix_colors = //
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 186#endif
225 pix_colors = pix_colors_focused;
226
227 if (pix_colors == NULL)
228 return false;
229 187
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 pixmap = None; 189 pixmap = None;
232#endif 190#endif
233 191
234 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS; 194 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 195 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 196 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 197 ncol = 80;
241 nrow = 24; 198 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
245 saveLines = SAVELINES; 202 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 203 numpix_colors = TOTAL_COLORS;
247 204
248 refresh_limit = 1; 205 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 207
252 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
253#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
254 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
255 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 50;
256 bgPixmap.pixmap = None; 212 bgPixmap.pixmap = None;
257#endif 213#endif
258 214
259 last_bot = last_state = -1; 215 last_bot = last_state = -1;
260
261#ifdef MENUBAR
262 menu_readonly = 1;
263# if ! (MENUBAR_MAX > 1)
264 CurrentBar = &BarList;
265# endif /* (MENUBAR_MAX > 1) */
266#endif
267 216
268 return true; 217 return true;
269} 218}
270 219
271void 220void
… …
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 288 rs[Rs_name] = rxvt_r_basename (argv[0]);
340 289
341 /* 290 /*
342 * Open display, get options/resources and create the window 291 * Open display, get options/resources and create the window
343 */ 292 */
344 {
345 TEMP_ENV;
346 293
347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 294 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
348 rs[Rs_display_name] = ":0"; 295 rs[Rs_display_name] = ":0";
349 296
350 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
351 298
352 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
354 } 301
302 xa = display->xa;
303
304#if XFT
305 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0));
307 else
308#endif
309 set (display);
355 310
356 extract_resources (); 311 extract_resources ();
312
357 free (r_argv); 313 free (r_argv);
314
315#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default";
318
319 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
320 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
321 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
322 {
323 rxvt_perl.init (this);
324 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
325 }
326#endif
358 327
359 /* 328 /*
360 * set any defaults not already set 329 * set any defaults not already set
361 */ 330 */
362 if (cmd_argv && cmd_argv[0]) 331 if (cmd_argv && cmd_argv[0])
… …
452 /* this is how xterm implements reverseVideo */ 421 /* this is how xterm implements reverseVideo */
453 if (OPTION (Opt_reverseVideo)) 422 if (OPTION (Opt_reverseVideo))
454 { 423 {
455 if (!rs[Rs_color + Color_fg]) 424 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 425 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
426
457 if (!rs[Rs_color + Color_bg]) 427 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 428 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
459 } 429 }
460#endif 430#endif
461 431
… …
513 val = rxvt_network_display (rs[Rs_display_name]); 483 val = rxvt_network_display (rs[Rs_display_name]);
514 rs[Rs_display_name] = (const char *)val; 484 rs[Rs_display_name] = (const char *)val;
515 485
516 if (val == NULL) 486 if (val == NULL)
517#endif /* DISPLAY_IS_IP */ 487#endif /* DISPLAY_IS_IP */
518 val = XDisplayString (display->display); 488 val = XDisplayString (xdisp);
519 489
520 if (rs[Rs_display_name] == NULL) 490 if (rs[Rs_display_name] == NULL)
521 rs[Rs_display_name] = val; /* use broken `:0' value */ 491 rs[Rs_display_name] = val; /* use broken `:0' value */
522 492
523 i = strlen (val); 493 i = strlen (val);
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 494 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
525 495
526 sprintf (env_display, "DISPLAY=%s", val); 496 sprintf (env_display, "DISPLAY=%s", val);
527 497
528 /* avoiding the math library: 498 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
529 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
530 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
531 ;
532 max_it (i, 1);
533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
534
535 sprintf (env_windowid, "WINDOWID=%u",
536 (unsigned int)parent[0]);
537 499
538 /* add entries to the environment: 500 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 501 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 502 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 503 * @ COLORTERM: terminal sub-name and also indicates its color
… …
543 * @ TERMINFO: path to terminfo directory 505 * @ TERMINFO: path to terminfo directory
544 * @ COLORFGBG: fg;bg color codes 506 * @ COLORFGBG: fg;bg color codes
545 */ 507 */
546 putenv (env_display); 508 putenv (env_display);
547 putenv (env_windowid); 509 putenv (env_windowid);
510
548 if (env_colorfgbg) 511 if (env_colorfgbg)
549 putenv (env_colorfgbg); 512 putenv (env_colorfgbg);
550 513
551#ifdef RXVT_TERMINFO 514#ifdef RXVT_TERMINFO
552 putenv ("TERMINFO=" RXVT_TERMINFO); 515 putenv ("TERMINFO=" RXVT_TERMINFO);
553#endif 516#endif
554 517
555 if (display->depth <= 2) 518 if (depth <= 2)
556 putenv ("COLORTERM=" COLORTERMENV "-mono"); 519 putenv ("COLORTERM=" COLORTERMENV "-mono");
557 else 520 else
558 putenv ("COLORTERM=" COLORTERMENVFULL); 521 putenv ("COLORTERM=" COLORTERMENVFULL);
559 522
560 if (rs[Rs_term_name] != NULL) 523 if (rs[Rs_term_name] != NULL)
… …
580 * This should support all European type languages. 543 * This should support all European type languages.
581 */ 544 */
582void 545void
583rxvt_term::set_locale (const char *locale) 546rxvt_term::set_locale (const char *locale)
584{ 547{
585 TEMP_ENV; 548 set_environ (envv);
586 549
587#if HAVE_XSETLOCALE || HAVE_SETLOCALE 550#if HAVE_XSETLOCALE || HAVE_SETLOCALE
588 free (this->locale); 551 free (this->locale);
589 this->locale = setlocale (LC_CTYPE, locale); 552 this->locale = setlocale (LC_CTYPE, locale);
590 553
… …
621} 584}
622 585
623void 586void
624rxvt_term::init_xlocale () 587rxvt_term::init_xlocale ()
625{ 588{
626 TEMP_ENV; 589 set_environ (envv);
627 590
628#ifdef USE_XIM 591#ifdef USE_XIM
629 if (!locale) 592 if (!locale)
630 rxvt_warn ("setting locale failed, working without locale support.\n"); 593 rxvt_warn ("setting locale failed, working without locale support.\n");
631 else 594 else
… …
672 if (strcmp (key_backspace, "DEC") == 0) 635 if (strcmp (key_backspace, "DEC") == 0)
673 priv_modes |= PrivMode_HaveBackSpace; 636 priv_modes |= PrivMode_HaveBackSpace;
674#endif 637#endif
675 638
676 /* add value for scrollBar */ 639 /* add value for scrollBar */
677 if (scrollbar_visible ()) 640 if (scrollBar.state)
678 { 641 {
679 priv_modes |= PrivMode_scrollBar; 642 priv_modes |= PrivMode_scrollBar;
680 SavedModes |= PrivMode_scrollBar; 643 SavedModes |= PrivMode_scrollBar;
681 }
682
683 if (menubar_visible ())
684 {
685 priv_modes |= PrivMode_menuBar;
686 SavedModes |= PrivMode_menuBar;
687 } 644 }
688 645
689 run_command (argv); 646 run_command (argv);
690} 647}
691 648
… …
697 654
698#ifdef OFF_FOCUS_FADING 655#ifdef OFF_FOCUS_FADING
699 pix_colors = pix_colors_focused; 656 pix_colors = pix_colors_focused;
700#endif 657#endif
701 658
702 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 659 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
703 { 660 {
661 const char *name = rs[Rs_color + i];
662
663 if (!name)
664 continue;
665
704 rxvt_color xcol; 666 rxvt_color xcol;
705 667
706 if (!rs[Rs_color + i]) 668 if (!set_color (xcol, name))
707 continue;
708
709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
710 { 669 {
711#ifndef XTERM_REVERSE_VIDEO 670#ifndef XTERM_REVERSE_VIDEO
712 if (i < 2 && OPTION (Opt_reverseVideo)) 671 if (i < 2 && OPTION (Opt_reverseVideo))
713 rs[Rs_color + i] = def_colorName[!i]; 672 name = def_colorName [1 - i];
714 else 673 else
715#endif 674#endif
716 rs[Rs_color + i] = def_colorName[i]; 675 name = def_colorName [i];
717 676
718 if (!rs[Rs_color + i]) 677 if (!name)
719 continue; 678 continue;
720 679
721 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 680 if (!set_color (xcol, name))
722 { 681 {
723 switch (i) 682 switch (i)
724 { 683 {
725 case Color_fg: 684 case Color_fg:
726 case Color_bg: 685 case Color_bg:
727 /* fatal: need bg/fg color */
728 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 686 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
729 /* NOTREACHED */ 687 name = "";
730 break; 688 break;
731#ifndef NO_CURSORCOLOR 689#ifndef NO_CURSORCOLOR
732 case Color_cursor2: 690 case Color_cursor2:
733 xcol = pix_colors[Color_fg]; 691#endif
734 break;
735#endif /* ! NO_CURSORCOLOR */
736 case Color_pointer_fg: 692 case Color_pointer_fg:
693 name = rs[Rs_color + Color_fg];
737 xcol = pix_colors[Color_fg]; 694 xcol = pix_colors[Color_fg];
738 break; 695 break;
739 default: 696 default:
697 name = rs[Rs_color + Color_bg];
740 xcol = pix_colors[Color_bg]; /* None */ 698 xcol = pix_colors[Color_bg];
741 break; 699 break;
742 } 700 }
743 } 701 }
744 } 702 }
745 703
746 pix_colors[i] = xcol; 704 pix_colors[i] = xcol;
747 SET_PIXCOLOR (i); 705 rs[Rs_color + i] = name;
748 } 706 }
749 707
750#ifdef OFF_FOCUS_FADING 708#ifdef OFF_FOCUS_FADING
751 if (rs[Rs_fade]) 709 if (rs[Rs_fade])
752 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 710 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
753 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 711 {
712 rgba c;
713 pix_colors[Color_fade].get (this, c);
714 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
715 }
754#endif 716#endif
755 717
756 if (display->depth <= 2) 718 if (depth <= 2)
757 { 719 {
758 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 720 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
759 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 721 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
760 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 722 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
761 } 723 }
762 724
763 /* 725 /*
764 * get scrollBar/menuBar shadow colors 726 * get scrollBar shadow colors
765 * 727 *
766 * The calculations of topShadow/bottomShadow values are adapted 728 * The calculations of topShadow/bottomShadow values are adapted
767 * from the fvwm window manager. 729 * from the fvwm window manager.
768 */ 730 */
769#ifdef KEEP_SCROLLCOLOR 731#ifdef KEEP_SCROLLCOLOR
770 732
771 if (display->depth <= 2) 733 if (depth <= 2)
772 { 734 {
773 /* Monochrome */ 735 /* Monochrome */
774 pix_colors[Color_scroll] = pix_colors[Color_fg]; 736 pix_colors[Color_scroll] = pix_colors[Color_fg];
775 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 737 pix_colors[Color_topShadow] = pix_colors[Color_bg];
776 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 738 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
781 /* xcol[0] == white 743 /* xcol[0] == white
782 * xcol[1] == top shadow 744 * xcol[1] == top shadow
783 * xcol[2] == bot shadow */ 745 * xcol[2] == bot shadow */
784 746
785 xcol[1] = pix_colors[Color_scroll]; 747 xcol[1] = pix_colors[Color_scroll];
786 xcol[0].set (display, 65535, 65535, 65535); 748 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
787 749
788 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 750 rgba c0, c1;
789 751
790 xcol[0].get (display, pr0, pg0, pb0); 752 xcol[0].get (this, c0);
791 xcol[1].get (display, pr1, pg1, pb1); 753 xcol[1].get (this, c1);
792 754
793 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 755 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
794 756
795 /* topShadowColor */ 757 /* topShadowColor */
796 if (!xcol[1].set (display, 758 if (!xcol[1].set (this,
759 rgba (
797 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 760 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
798 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 761 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
799 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 762 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
763 c1.a) // pa1 vs. pa0: arbitrary
764 ));
800 xcol[1] = pix_colors[Color_White]; 765 xcol[1] = pix_colors[Color_White];
801 766
802 pix_colors[Color_topShadow] = xcol[1]; 767 pix_colors[Color_topShadow] = xcol[1];
803 } 768 }
804#endif /* KEEP_SCROLLCOLOR */ 769#endif /* KEEP_SCROLLCOLOR */
… …
848 813
849 if (rsmod 814 if (rsmod
850 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 815 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
851 requestedmeta = rsmod[3] - '0'; 816 requestedmeta = rsmod[3] - '0';
852 817
853 map = XGetModifierMapping (display->display); 818 map = XGetModifierMapping (xdisp);
854 kc = map->modifiermap; 819 kc = map->modifiermap;
855 820
856 for (i = 1; i < 6; i++) 821 for (i = 1; i < 6; i++)
857 { 822 {
858 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 823 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
860 for (j = map->max_keypermod; j--; k++) 825 for (j = map->max_keypermod; j--; k++)
861 { 826 {
862 if (kc[k] == 0) 827 if (kc[k] == 0)
863 break; 828 break;
864 829
865 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 830 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
866 { 831 {
867 case XK_Num_Lock: 832 case XK_Num_Lock:
868 ModNumLockMask = modmasks[i - 1]; 833 ModNumLockMask = modmasks[i - 1];
869 continue; 834 continue;
870 835
… …
920rxvt_term::create_windows (int argc, const char *const *argv) 885rxvt_term::create_windows (int argc, const char *const *argv)
921{ 886{
922 XClassHint classHint; 887 XClassHint classHint;
923 XWMHints wmHint; 888 XWMHints wmHint;
924#if ENABLE_FRILLS 889#if ENABLE_FRILLS
925 Atom prop = None;
926 MWMHints mwmhints; 890 MWMHints mwmhints;
927#endif 891#endif
928 XGCValues gcvalue; 892 XGCValues gcvalue;
929 long vt_emask;
930 XSetWindowAttributes attributes; 893 XSetWindowAttributes attributes;
931 XWindowAttributes gattr;
932 Window top, parent; 894 Window top, parent;
933 dDisp;
934 895
935#ifdef USING_W11LIB 896 dLocal (Display *, xdisp);
936 /* enable W11 callbacks */
937 W11AddEventHandler (disp, rxvt_W11_process_x_event);
938#endif
939 897
940 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 898 /* grab colors before netscape does */
941 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 899 Get_Colours ();
942 900
943 if (OPTION (Opt_transparent)) 901 if (!set_fonts ())
944 { 902 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
945 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 903
946 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 904 parent = display->root;
947 } 905
906 attributes.override_redirect = !!OPTION (Opt_override_redirect);
948 907
949#if ENABLE_FRILLS 908#if ENABLE_FRILLS
950 if (OPTION (Opt_borderLess)) 909 if (OPTION (Opt_borderLess))
951 { 910 {
952 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 911 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
953
954 if (prop == None)
955 { 912 {
956 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 913 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
957#ifdef PREFER_24BIT
958 attributes.override_redirect = TRUE; 914 attributes.override_redirect = true;
959#endif
960 mwmhints.flags = 0; 915 mwmhints.flags = 0;
961 } 916 }
962 else 917 else
963 { 918 {
964 mwmhints.flags = MWM_HINTS_DECORATIONS; 919 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
967 } 922 }
968 else 923 else
969 mwmhints.flags = 0; 924 mwmhints.flags = 0;
970#endif 925#endif
971 926
972 /* grab colors before netscape does */
973 Get_Colours ();
974
975 if (!set_fonts ())
976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977
978 parent = DefaultRootWindow (disp);
979
980#if ENABLE_XEMBED 927#if ENABLE_XEMBED
981 if (rs[Rs_embed]) 928 if (rs[Rs_embed])
982 { 929 {
983 XWindowAttributes wattr; 930 XWindowAttributes wattr;
984 931
985 parent = strtol (rs[Rs_embed], 0, 0); 932 parent = strtol (rs[Rs_embed], 0, 0);
986 933
987 if (!XGetWindowAttributes (disp, parent, &wattr)) 934 if (!XGetWindowAttributes (xdisp, parent, &wattr))
988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 935 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
989 936
990 window_calc (wattr.width, wattr.height); 937 window_calc (wattr.width, wattr.height);
991 } 938 }
992#endif 939#endif
993 940
994 window_calc (0, 0); 941 window_calc (0, 0);
995 942
996 /* sub-window placement & size in rxvt_resize_subwindows () */ 943 /* sub-window placement & size in rxvt_resize_subwindows () */
997#ifdef PREFER_24BIT
998 attributes.background_pixel = pix_colors_focused[Color_border]; 944 attributes.background_pixel = pix_colors_focused [Color_border];
999 attributes.border_pixel = pix_colors_focused[Color_border]; 945 attributes.border_pixel = pix_colors_focused [Color_border];
1000 attributes.colormap = display->cmap; 946 attributes.colormap = cmap;
947
1001 top = XCreateWindow (disp, parent, 948 top = XCreateWindow (xdisp, parent,
1002 szHint.x, szHint.y, 949 szHint.x, szHint.y,
1003 szHint.width, szHint.height, 950 szHint.width, szHint.height,
1004 ext_bwidth, 951 ext_bwidth,
1005 display->depth, InputOutput, 952 depth, InputOutput, visual,
1006 display->visual,
1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 953 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1008#else 954 &attributes);
1009 top = XCreateSimpleWindow (disp, parent,
1010 szHint.x, szHint.y,
1011 szHint.width, szHint.height,
1012 ext_bwidth,
1013 pix_colors_focused[Color_border],
1014 pix_colors_focused[Color_border]);
1015#endif
1016 955
1017 this->parent[0] = top; 956 this->parent[0] = top;
1018 957
1019 old_width = szHint.width; 958 old_width = szHint.width;
1020 old_height = szHint.height; 959 old_height = szHint.height;
1021 960
1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 961 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1023 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 962 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1024 963
1025 classHint.res_name = (char *)rs[Rs_name]; 964 classHint.res_name = (char *)rs[Rs_name];
1026 classHint.res_class = (char *)RESCLASS; 965 classHint.res_class = (char *)RESCLASS;
1027 966
1028 wmHint.flags = InputHint | StateHint | WindowGroupHint; 967 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1029 wmHint.input = True; 968 wmHint.input = True;
1030 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 969 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1031 wmHint.window_group = top; 970 wmHint.window_group = top;
1032 971
1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 972 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1034 &szHint, &wmHint, &classHint); 973 &szHint, &wmHint, &classHint);
974
975#if ENABLE_FRILLS
976 if (mwmhints.flags)
977 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
978 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
979#endif
1035 980
1036 Atom protocols[] = { 981 Atom protocols[] = {
1037 xa[XA_WM_DELETE_WINDOW], 982 xa[XA_WM_DELETE_WINDOW],
1038#if ENABLE_EWMH 983#if ENABLE_EWMH
1039 xa[XA_NET_WM_PING], 984 xa[XA_NET_WM_PING],
1040#endif 985#endif
1041 }; 986 };
1042 987
1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 988 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1044 989
1045#if ENABLE_FRILLS 990#if ENABLE_FRILLS
1046 if (rs[Rs_transient_for]) 991 if (rs[Rs_transient_for])
1047 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 992 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1048#endif 993#endif
1049 994
1050#if ENABLE_EWMH 995#if ENABLE_EWMH
1051 long pid = getpid (); 996 long pid = getpid ();
1052 997
1053 XChangeProperty (disp, top, 998 XChangeProperty (xdisp, top,
1054 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 999 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1055 PropModeReplace, (unsigned char *)&pid, 1); 1000 PropModeReplace, (unsigned char *)&pid, 1);
1056 1001
1057 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1002 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1058#endif 1003#endif
1059 1004
1060 XSelectInput (disp, top, 1005 XSelectInput (xdisp, top,
1061 KeyPressMask 1006 KeyPressMask
1062#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1007#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1063 | KeyReleaseMask 1008 | KeyReleaseMask
1064#endif 1009#endif
1065 | FocusChangeMask | VisibilityChangeMask 1010 | FocusChangeMask | VisibilityChangeMask
1066 | ExposureMask | StructureNotifyMask); 1011 | ExposureMask | StructureNotifyMask);
1067 1012
1068 termwin_ev.start (display, top); 1013 termwin_ev.start (display, top);
1069 1014
1070#if ENABLE_FRILLS
1071 if (mwmhints.flags)
1072 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1073 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1074#endif
1075
1076 /* vt cursor: Black-on-White is standard, but this is more popular */ 1015 /* vt cursor: Black-on-White is standard, but this is more popular */
1077 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1016 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1078 1017
1079#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1018#ifdef HAVE_SCROLLBARS
1080 /* cursor (menuBar/scrollBar): Black-on-White */ 1019 /* cursor scrollBar: Black-on-White */
1081 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1020 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1082#endif 1021#endif
1083 1022
1084 /* the vt window */ 1023 /* the vt window */
1085 vt = XCreateSimpleWindow (disp, top, 1024 vt = XCreateSimpleWindow (xdisp, top,
1086 window_vt_x,
1087 window_vt_y, 1025 window_vt_x, window_vt_y,
1088 width,
1089 height, 1026 width, height,
1090 0, 1027 0,
1091 pix_colors_focused[Color_fg], 1028 pix_colors_focused[Color_fg],
1092 pix_colors_focused[Color_bg]); 1029 pix_colors_focused[Color_bg]);
1093#ifdef DEBUG_X
1094 XStoreName (disp, vt, "vt window");
1095#endif
1096 1030
1097 attributes.bit_gravity = NorthWestGravity; 1031 attributes.bit_gravity = NorthWestGravity;
1098 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1032 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1099 1033
1100 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1034 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1101 1035
1102 if (OPTION (Opt_pointerBlank) 1036 if (OPTION (Opt_pointerBlank))
1103#ifdef ENABLE_PERL
1104 || perl.self
1105#endif
1106 )
1107 vt_emask |= PointerMotionMask; 1037 vt_emask |= PointerMotionMask;
1108 else 1038 else
1109 vt_emask |= Button1MotionMask | Button3MotionMask; 1039 vt_emask |= Button1MotionMask | Button3MotionMask;
1110 1040
1111 XSelectInput (disp, vt, vt_emask); 1041 vt_select_input ();
1042
1112 vt_ev.start (display, vt); 1043 vt_ev.start (display, vt);
1113
1114#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1115 if (menuBar_height ())
1116 {
1117 menuBar.win = XCreateSimpleWindow (disp, top,
1118 window_vt_x, 0,
1119 width,
1120 menuBar_TotalHeight (),
1121 0,
1122 pix_colors_focused[Color_fg],
1123 pix_colors_focused[Color_scroll]);
1124
1125#ifdef DEBUG_X
1126 XStoreName (disp, menuBar.win, "menubar");
1127#endif
1128
1129 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1130
1131 XDefineCursor (disp, menuBar.win,
1132 XCreateFontCursor (disp, XC_left_ptr));
1133
1134 XSelectInput (disp, menuBar.win,
1135 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1136 menubar_ev.start (display, menuBar.win);
1137 }
1138#endif
1139 1044
1140#ifdef XPM_BACKGROUND 1045#ifdef XPM_BACKGROUND
1141 if (rs[Rs_backgroundPixmap] != NULL 1046 if (rs[Rs_backgroundPixmap] != NULL
1142 && ! OPTION (Opt_transparent)) 1047 && !OPTION (Opt_transparent))
1143 { 1048 {
1144 const char *p = rs[Rs_backgroundPixmap]; 1049 const char *p = rs[Rs_backgroundPixmap];
1145 1050
1146 if ((p = strchr (p, ';')) != NULL) 1051 if ((p = strchr (p, ';')) != NULL)
1147 { 1052 {
… …
1153 scr_touch (true); 1058 scr_touch (true);
1154 } 1059 }
1155#endif 1060#endif
1156 1061
1157 /* graphics context for the vt window */ 1062 /* graphics context for the vt window */
1158 gcvalue.foreground = pix_colors[Color_fg]; 1063 gcvalue.foreground = pix_colors[Color_fg];
1159 gcvalue.background = pix_colors[Color_bg]; 1064 gcvalue.background = pix_colors[Color_bg];
1160 gcvalue.graphics_exposures = 1; 1065 gcvalue.graphics_exposures = 1;
1066
1161 gc = XCreateGC (disp, vt, 1067 gc = XCreateGC (xdisp, vt,
1162 GCForeground | GCBackground | GCGraphicsExposures, 1068 GCForeground | GCBackground | GCGraphicsExposures,
1163 &gcvalue); 1069 &gcvalue);
1164 1070
1165 drawable = new rxvt_drawable (display, vt); 1071 drawable = new rxvt_drawable (this, vt);
1166 1072
1167#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1073#ifdef RXVT_SCROLLBAR
1168 gcvalue.foreground = pix_colors[Color_topShadow]; 1074 gcvalue.foreground = pix_colors[Color_topShadow];
1169 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1075 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1170 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1076 gcvalue.foreground = pix_colors[Color_bottomShadow];
1171 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1077 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1172 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1078 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1173 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1079 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1174#endif 1080#endif
1175 1081
1176#ifdef OFF_FOCUS_FADING 1082#ifdef OFF_FOCUS_FADING
1177 // initially we are in unfocused state 1083 // initially we are in unfocused state
1178 if (rs[Rs_fade]) 1084 if (rs[Rs_fade])
1179 pix_colors = pix_colors_unfocused; 1085 pix_colors = pix_colors_unfocused;
1180#endif 1086#endif
1181 1087
1182 pointer_unblank (); 1088 pointer_unblank ();
1183 scr_recolour (); 1089 scr_recolour ();
1184
1185#if ENABLE_XEMBED
1186 if (rs[Rs_embed])
1187 {
1188 long info[2] = { 0, XEMBED_MAPPED };
1189
1190 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1191 32, PropModeReplace, (unsigned char *)&info, 2);
1192 }
1193#endif
1194} 1090}
1195 1091
1196/* ------------------------------------------------------------------------- * 1092/* ------------------------------------------------------------------------- *
1197 * GET TTY CURRENT STATE * 1093 * GET TTY CURRENT STATE *
1198 * ------------------------------------------------------------------------- */ 1094 * ------------------------------------------------------------------------- */
… …
1415rxvt_term::run_command (const char *const *argv) 1311rxvt_term::run_command (const char *const *argv)
1416{ 1312{
1417#if ENABLE_FRILLS 1313#if ENABLE_FRILLS
1418 if (rs[Rs_pty_fd]) 1314 if (rs[Rs_pty_fd])
1419 { 1315 {
1420 pty.pty = atoi (rs[Rs_pty_fd]); 1316 pty->pty = atoi (rs[Rs_pty_fd]);
1421 1317
1422 if (pty.pty >= 0) 1318 if (pty->pty >= 0)
1423 { 1319 {
1424 if (getfd_hook) 1320 if (getfd_hook)
1425 pty.pty = (*getfd_hook) (pty.pty); 1321 pty->pty = (*getfd_hook) (pty->pty);
1426 1322
1427 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1323 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1428 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1324 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1429 } 1325 }
1430 } 1326 }
1431 else 1327 else
1432#endif 1328#endif
1433 if (!pty.get ()) 1329 if (!pty->get ())
1434 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1330 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1435 1331
1436 pty.set_utf8_mode (enc_utf8); 1332 pty->set_utf8_mode (enc_utf8);
1437 1333
1438 /* set initial window size */ 1334 /* set initial window size */
1439 tt_winch (); 1335 tt_winch ();
1440 1336
1441 int er; 1337 int er;
… …
1454#if ENABLE_FRILLS 1350#if ENABLE_FRILLS
1455 if (rs[Rs_pty_fd]) 1351 if (rs[Rs_pty_fd])
1456 return; 1352 return;
1457#endif 1353#endif
1458 1354
1459#ifndef __QNX__
1460 /* spin off the command interpreter */ 1355 /* spin off the command interpreter */
1461 switch (cmd_pid = fork ()) 1356 switch (cmd_pid = fork ())
1462 { 1357 {
1463 case -1: 1358 case -1:
1464 { 1359 {
… …
1466 rxvt_fatal ("can't fork, aborting.\n"); 1361 rxvt_fatal ("can't fork, aborting.\n");
1467 } 1362 }
1468 case 0: 1363 case 0:
1469 init_env (); 1364 init_env ();
1470 1365
1471 if (!pty.make_controlling_tty ()) 1366 if (!pty->make_controlling_tty ())
1472 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1367 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1473 else 1368 else
1474 { 1369 {
1475 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1370 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1476 dup2 (pty.tty, STDIN_FILENO); 1371 dup2 (pty->tty, STDIN_FILENO);
1477 dup2 (pty.tty, STDOUT_FILENO); 1372 dup2 (pty->tty, STDOUT_FILENO);
1478 dup2 (pty.tty, STDERR_FILENO); 1373 dup2 (pty->tty, STDERR_FILENO);
1479 1374
1480 // close all our file handles that we do no longer need 1375 // close all our file handles that we do no longer need
1481 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1376 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1482 { 1377 {
1483 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1378 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1484 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1379 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1485 } 1380 }
1486 1381
1487 run_child (argv); 1382 run_child (argv);
1488 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1383 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1489 } 1384 }
1490 1385
1491 _exit (EXIT_FAILURE); 1386 _exit (EXIT_FAILURE);
1492 1387
1493 default: 1388 default:
1494 { 1389 if (!OPTION (Opt_utmpInhibit))
1495#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1390 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1496 int fdstdin;
1497 1391
1498 fdstdin = dup (STDIN_FILENO); 1392 pty->close_tty ();
1499 dup2 (pty.tty, STDIN_FILENO);
1500#endif
1501 1393
1502#ifdef UTMP_SUPPORT 1394 child_ev.start (cmd_pid);
1503 privileged_utmp (SAVE);
1504#endif
1505 1395
1506#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1396 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1507
1508 dup2 (fdstdin, STDIN_FILENO);
1509 close (fdstdin);
1510#endif
1511 }
1512
1513 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1514 break; 1397 break;
1515 } 1398 }
1516#else /* __QNX__ uses qnxspawn () */
1517 fchmod (pty.tty, 0622);
1518 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1519 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1520
1521 if (run_child (argv) == -1)
1522 exit (EXIT_FAILURE);
1523#endif
1524} 1399}
1525 1400
1526/* ------------------------------------------------------------------------- * 1401/* ------------------------------------------------------------------------- *
1527 * CHILD PROCESS OPERATIONS * 1402 * CHILD PROCESS OPERATIONS *
1528 * ------------------------------------------------------------------------- */ 1403 * ------------------------------------------------------------------------- */
… …
1532 */ 1407 */
1533int 1408int
1534rxvt_term::run_child (const char *const *argv) 1409rxvt_term::run_child (const char *const *argv)
1535{ 1410{
1536 char *login; 1411 char *login;
1537
1538 TEMP_ENV; // not very temporary...
1539 1412
1540 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1413 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1541 1414
1542 if (OPTION (Opt_console)) 1415 if (OPTION (Opt_console))
1543 { /* be virtual console, fail silently */ 1416 { /* be virtual console, fail silently */
… …
1574 // unblock signals (signals are blocked by iom.C 1447 // unblock signals (signals are blocked by iom.C
1575 sigset_t ss; 1448 sigset_t ss;
1576 sigemptyset (&ss); 1449 sigemptyset (&ss);
1577 sigprocmask (SIG_SETMASK, &ss, 0); 1450 sigprocmask (SIG_SETMASK, &ss, 0);
1578 1451
1579#ifndef __QNX__
1580 /* command interpreter path */ 1452 /* command interpreter path */
1581 if (argv != NULL) 1453 if (argv != NULL)
1582 { 1454 {
1583# ifdef DEBUG_CMD 1455# ifdef DEBUG_CMD
1584 int i; 1456 int i;
… …
1610 1482
1611 execlp (shell, argv0, NULL); 1483 execlp (shell, argv0, NULL);
1612 /* no error message: STDERR is closed! */ 1484 /* no error message: STDERR is closed! */
1613 } 1485 }
1614 1486
1615#else /* __QNX__ uses qnxspawn () */
1616
1617 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1618 char *command = NULL, fullcommand[_MAX_PATH];
1619 char **arg_v, *arg_a[2] = { NULL, NULL };
1620
1621 if (argv != NULL)
1622 {
1623 if (access (argv[0], X_OK) == -1)
1624 {
1625 if (strchr (argv[0], '/') == NULL)
1626 {
1627 searchenv (argv[0], "PATH", fullcommand);
1628
1629 if (fullcommand[0] != '\0')
1630 command = fullcommand;
1631 }
1632
1633 if (access (command, X_OK) == -1)
1634 return -1;
1635 }
1636 else
1637 command = argv[0];
1638
1639 arg_v = argv;
1640 }
1641 else
1642 {
1643 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1644 command = "/bin/sh";
1645
1646 arg_a[0] = my_basename (command);
1647
1648 if (OPTION (Opt_loginShell))
1649 {
1650 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1651
1652 login[0] = '-';
1653 strcpy (&login[1], arg_a[0]);
1654 arg_a[0] = login;
1655 }
1656
1657 arg_v = arg_a;
1658 }
1659
1660 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1661 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1662 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1663 command, arg_v, environ, iov_a, 0);
1664 if (login)
1665 free (login);
1666
1667 pty.close_tty ();
1668 return pty.pty;
1669#endif
1670
1671 return -1; 1487 return -1;
1672} 1488}
1673 1489
1674/*----------------------- end-of-file (C source) -----------------------*/ 1490/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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