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.139 by root, Wed Jan 11 03:13:26 2006 UTC vs.
Revision 1.162 by root, Tue Jan 31 16:19:16 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);
310
355 extract_resources (); 311 extract_resources ();
356 }
357 312
358 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
359 327
360 /* 328 /*
361 * set any defaults not already set 329 * set any defaults not already set
362 */ 330 */
363 if (cmd_argv && cmd_argv[0]) 331 if (cmd_argv && cmd_argv[0])
… …
514 val = rxvt_network_display (rs[Rs_display_name]); 482 val = rxvt_network_display (rs[Rs_display_name]);
515 rs[Rs_display_name] = (const char *)val; 483 rs[Rs_display_name] = (const char *)val;
516 484
517 if (val == NULL) 485 if (val == NULL)
518#endif /* DISPLAY_IS_IP */ 486#endif /* DISPLAY_IS_IP */
519 val = XDisplayString (display->display); 487 val = XDisplayString (xdisp);
520 488
521 if (rs[Rs_display_name] == NULL) 489 if (rs[Rs_display_name] == NULL)
522 rs[Rs_display_name] = val; /* use broken `:0' value */ 490 rs[Rs_display_name] = val; /* use broken `:0' value */
523 491
524 i = strlen (val); 492 i = strlen (val);
525 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
526 494
527 sprintf (env_display, "DISPLAY=%s", val); 495 sprintf (env_display, "DISPLAY=%s", val);
528 496
529 /* avoiding the math library: 497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
530 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
531 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
532 ;
533 max_it (i, 1);
534 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
535
536 sprintf (env_windowid, "WINDOWID=%u",
537 (unsigned int)parent[0]);
538 498
539 /* add entries to the environment: 499 /* add entries to the environment:
540 * @ DISPLAY: in case we started with -display 500 * @ DISPLAY: in case we started with -display
541 * @ WINDOWID: X window id number of the window 501 * @ WINDOWID: X window id number of the window
542 * @ COLORTERM: terminal sub-name and also indicates its color 502 * @ COLORTERM: terminal sub-name and also indicates its color
… …
544 * @ TERMINFO: path to terminfo directory 504 * @ TERMINFO: path to terminfo directory
545 * @ COLORFGBG: fg;bg color codes 505 * @ COLORFGBG: fg;bg color codes
546 */ 506 */
547 putenv (env_display); 507 putenv (env_display);
548 putenv (env_windowid); 508 putenv (env_windowid);
509
549 if (env_colorfgbg) 510 if (env_colorfgbg)
550 putenv (env_colorfgbg); 511 putenv (env_colorfgbg);
551 512
552#ifdef RXVT_TERMINFO 513#ifdef RXVT_TERMINFO
553 putenv ("TERMINFO=" RXVT_TERMINFO); 514 putenv ("TERMINFO=" RXVT_TERMINFO);
554#endif 515#endif
555 516
556 if (display->depth <= 2) 517 if (depth <= 2)
557 putenv ("COLORTERM=" COLORTERMENV "-mono"); 518 putenv ("COLORTERM=" COLORTERMENV "-mono");
558 else 519 else
559 putenv ("COLORTERM=" COLORTERMENVFULL); 520 putenv ("COLORTERM=" COLORTERMENVFULL);
560 521
561 if (rs[Rs_term_name] != NULL) 522 if (rs[Rs_term_name] != NULL)
… …
581 * This should support all European type languages. 542 * This should support all European type languages.
582 */ 543 */
583void 544void
584rxvt_term::set_locale (const char *locale) 545rxvt_term::set_locale (const char *locale)
585{ 546{
586 TEMP_ENV; 547 set_environ (envv);
587 548
588#if HAVE_XSETLOCALE || HAVE_SETLOCALE 549#if HAVE_XSETLOCALE || HAVE_SETLOCALE
589 free (this->locale); 550 free (this->locale);
590 this->locale = setlocale (LC_CTYPE, locale); 551 this->locale = setlocale (LC_CTYPE, locale);
591 552
… …
622} 583}
623 584
624void 585void
625rxvt_term::init_xlocale () 586rxvt_term::init_xlocale ()
626{ 587{
627 TEMP_ENV; 588 set_environ (envv);
628 589
629#ifdef USE_XIM 590#ifdef USE_XIM
630 if (!locale) 591 if (!locale)
631 rxvt_warn ("setting locale failed, working without locale support.\n"); 592 rxvt_warn ("setting locale failed, working without locale support.\n");
632 else 593 else
… …
673 if (strcmp (key_backspace, "DEC") == 0) 634 if (strcmp (key_backspace, "DEC") == 0)
674 priv_modes |= PrivMode_HaveBackSpace; 635 priv_modes |= PrivMode_HaveBackSpace;
675#endif 636#endif
676 637
677 /* add value for scrollBar */ 638 /* add value for scrollBar */
678 if (scrollbar_visible ()) 639 if (scrollBar.state)
679 { 640 {
680 priv_modes |= PrivMode_scrollBar; 641 priv_modes |= PrivMode_scrollBar;
681 SavedModes |= PrivMode_scrollBar; 642 SavedModes |= PrivMode_scrollBar;
682 }
683
684 if (menubar_visible ())
685 {
686 priv_modes |= PrivMode_menuBar;
687 SavedModes |= PrivMode_menuBar;
688 } 643 }
689 644
690 run_command (argv); 645 run_command (argv);
691} 646}
692 647
… …
698 653
699#ifdef OFF_FOCUS_FADING 654#ifdef OFF_FOCUS_FADING
700 pix_colors = pix_colors_focused; 655 pix_colors = pix_colors_focused;
701#endif 656#endif
702 657
703 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
704 { 659 {
705 rxvt_color xcol; 660 rxvt_color xcol;
706 661
707 if (!rs[Rs_color + i]) 662 if (!rs[Rs_color + i])
708 continue; 663 continue;
709 664
710 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 665 if (!set_color (xcol, rs[Rs_color + i]))
711 { 666 {
712#ifndef XTERM_REVERSE_VIDEO 667#ifndef XTERM_REVERSE_VIDEO
713 if (i < 2 && OPTION (Opt_reverseVideo)) 668 if (i < 2 && OPTION (Opt_reverseVideo))
714 rs[Rs_color + i] = def_colorName[!i]; 669 rs[Rs_color + i] = def_colorName[!i];
715 else 670 else
… …
717 rs[Rs_color + i] = def_colorName[i]; 672 rs[Rs_color + i] = def_colorName[i];
718 673
719 if (!rs[Rs_color + i]) 674 if (!rs[Rs_color + i])
720 continue; 675 continue;
721 676
722 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 677 if (!set_color (xcol, rs[Rs_color + i]))
723 { 678 {
724 switch (i) 679 switch (i)
725 { 680 {
726 case Color_fg: 681 case Color_fg:
727 case Color_bg: 682 case Color_bg:
728 /* fatal: need bg/fg color */ 683 /* fatal: need bg/fg color */
729 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 684 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
730 /* NOTREACHED */
731 break; 685 break;
732#ifndef NO_CURSORCOLOR 686#ifndef NO_CURSORCOLOR
733 case Color_cursor2: 687 case Color_cursor2:
734 xcol = pix_colors[Color_fg]; 688 xcol = pix_colors[Color_fg];
735 break; 689 break;
… …
748 SET_PIXCOLOR (i); 702 SET_PIXCOLOR (i);
749 } 703 }
750 704
751#ifdef OFF_FOCUS_FADING 705#ifdef OFF_FOCUS_FADING
752 if (rs[Rs_fade]) 706 if (rs[Rs_fade])
753 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 707 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
708 {
709 rxvt_rgba c;
710 pix_colors[Color_fade].get (this, c);
754 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 711 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), c);
712 }
755#endif 713#endif
756 714
757 if (display->depth <= 2) 715 if (depth <= 2)
758 { 716 {
759 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 717 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
760 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 718 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
761 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
762 } 720 }
763 721
764 /* 722 /*
765 * get scrollBar/menuBar shadow colors 723 * get scrollBar shadow colors
766 * 724 *
767 * The calculations of topShadow/bottomShadow values are adapted 725 * The calculations of topShadow/bottomShadow values are adapted
768 * from the fvwm window manager. 726 * from the fvwm window manager.
769 */ 727 */
770#ifdef KEEP_SCROLLCOLOR 728#ifdef KEEP_SCROLLCOLOR
771 729
772 if (display->depth <= 2) 730 if (depth <= 2)
773 { 731 {
774 /* Monochrome */ 732 /* Monochrome */
775 pix_colors[Color_scroll] = pix_colors[Color_fg]; 733 pix_colors[Color_scroll] = pix_colors[Color_fg];
776 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 734 pix_colors[Color_topShadow] = pix_colors[Color_bg];
777 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
782 /* xcol[0] == white 740 /* xcol[0] == white
783 * xcol[1] == top shadow 741 * xcol[1] == top shadow
784 * xcol[2] == bot shadow */ 742 * xcol[2] == bot shadow */
785 743
786 xcol[1] = pix_colors[Color_scroll]; 744 xcol[1] = pix_colors[Color_scroll];
787 xcol[0].set (display, 65535, 65535, 65535); 745 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC));
788 746
789 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 747 rxvt_rgba c0, c1;
790 748
791 xcol[0].get (display, pr0, pg0, pb0); 749 xcol[0].get (this, c0);
792 xcol[1].get (display, pr1, pg1, pb1); 750 xcol[1].get (this, c1);
793 751
794 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 752 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
795 753
796 /* topShadowColor */ 754 /* topShadowColor */
797 if (!xcol[1].set (display, 755 if (!xcol[1].set (this,
756 rxvt_rgba (
798 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 757 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
799 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 758 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
800 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 759 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
760 c1.a) // pa1 vs. pa0: arbitrary
761 ));
801 xcol[1] = pix_colors[Color_White]; 762 xcol[1] = pix_colors[Color_White];
802 763
803 pix_colors[Color_topShadow] = xcol[1]; 764 pix_colors[Color_topShadow] = xcol[1];
804 } 765 }
805#endif /* KEEP_SCROLLCOLOR */ 766#endif /* KEEP_SCROLLCOLOR */
… …
849 810
850 if (rsmod 811 if (rsmod
851 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
852 requestedmeta = rsmod[3] - '0'; 813 requestedmeta = rsmod[3] - '0';
853 814
854 map = XGetModifierMapping (display->display); 815 map = XGetModifierMapping (xdisp);
855 kc = map->modifiermap; 816 kc = map->modifiermap;
856 817
857 for (i = 1; i < 6; i++) 818 for (i = 1; i < 6; i++)
858 { 819 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
861 for (j = map->max_keypermod; j--; k++) 822 for (j = map->max_keypermod; j--; k++)
862 { 823 {
863 if (kc[k] == 0) 824 if (kc[k] == 0)
864 break; 825 break;
865 826
866 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 827 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
867 { 828 {
868 case XK_Num_Lock: 829 case XK_Num_Lock:
869 ModNumLockMask = modmasks[i - 1]; 830 ModNumLockMask = modmasks[i - 1];
870 continue; 831 continue;
871 832
… …
921rxvt_term::create_windows (int argc, const char *const *argv) 882rxvt_term::create_windows (int argc, const char *const *argv)
922{ 883{
923 XClassHint classHint; 884 XClassHint classHint;
924 XWMHints wmHint; 885 XWMHints wmHint;
925#if ENABLE_FRILLS 886#if ENABLE_FRILLS
926 Atom prop = None;
927 MWMHints mwmhints; 887 MWMHints mwmhints;
928#endif 888#endif
929 XGCValues gcvalue; 889 XGCValues gcvalue;
930 long vt_emask;
931 XSetWindowAttributes attributes; 890 XSetWindowAttributes attributes;
932 XWindowAttributes gattr;
933 Window top, parent; 891 Window top, parent;
934 dDisp;
935 892
936#ifdef USING_W11LIB 893 dLocal (Display *, xdisp);
937 /* enable W11 callbacks */
938 W11AddEventHandler (disp, rxvt_W11_process_x_event);
939#endif
940 894
941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 895 /* grab colors before netscape does */
942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 896 Get_Colours ();
943 897
944 if (OPTION (Opt_transparent)) 898 if (!set_fonts ())
945 { 899 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 900
947 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 901 parent = display->root;
948 } 902
903 attributes.override_redirect = !!OPTION (Opt_override_redirect);
949 904
950#if ENABLE_FRILLS 905#if ENABLE_FRILLS
951 if (OPTION (Opt_borderLess)) 906 if (OPTION (Opt_borderLess))
952 { 907 {
953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 908 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
954
955 if (prop == None)
956 { 909 {
957 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
958#ifdef PREFER_24BIT
959 attributes.override_redirect = TRUE; 911 attributes.override_redirect = true;
960#endif
961 mwmhints.flags = 0; 912 mwmhints.flags = 0;
962 } 913 }
963 else 914 else
964 { 915 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 916 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
968 } 919 }
969 else 920 else
970 mwmhints.flags = 0; 921 mwmhints.flags = 0;
971#endif 922#endif
972 923
973 /* grab colors before netscape does */
974 Get_Colours ();
975
976 if (!set_fonts ())
977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978
979 parent = DefaultRootWindow (disp);
980
981#if ENABLE_XEMBED 924#if ENABLE_XEMBED
982 if (rs[Rs_embed]) 925 if (rs[Rs_embed])
983 { 926 {
984 XWindowAttributes wattr; 927 XWindowAttributes wattr;
985 928
986 parent = strtol (rs[Rs_embed], 0, 0); 929 parent = strtol (rs[Rs_embed], 0, 0);
987 930
988 if (!XGetWindowAttributes (disp, parent, &wattr)) 931 if (!XGetWindowAttributes (xdisp, parent, &wattr))
989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
990 933
991 window_calc (wattr.width, wattr.height); 934 window_calc (wattr.width, wattr.height);
992 } 935 }
993#endif 936#endif
994 937
995 window_calc (0, 0); 938 window_calc (0, 0);
996 939
997 /* sub-window placement & size in rxvt_resize_subwindows () */ 940 /* sub-window placement & size in rxvt_resize_subwindows () */
998#ifdef PREFER_24BIT
999 attributes.background_pixel = pix_colors_focused[Color_border]; 941 attributes.background_pixel = pix_colors_focused [Color_border];
1000 attributes.border_pixel = pix_colors_focused[Color_border]; 942 attributes.border_pixel = pix_colors_focused [Color_border];
1001 attributes.colormap = display->cmap; 943 attributes.colormap = cmap;
944
1002 top = XCreateWindow (disp, parent, 945 top = XCreateWindow (xdisp, parent,
1003 szHint.x, szHint.y, 946 szHint.x, szHint.y,
1004 szHint.width, szHint.height, 947 szHint.width, szHint.height,
1005 ext_bwidth, 948 ext_bwidth,
1006 display->depth, InputOutput, 949 depth, InputOutput, visual,
1007 display->visual,
1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1009#else 951 &attributes);
1010 top = XCreateSimpleWindow (disp, parent,
1011 szHint.x, szHint.y,
1012 szHint.width, szHint.height,
1013 ext_bwidth,
1014 pix_colors_focused[Color_border],
1015 pix_colors_focused[Color_border]);
1016#endif
1017 952
1018 this->parent[0] = top; 953 this->parent[0] = top;
1019 954
1020 old_width = szHint.width; 955 old_width = szHint.width;
1021 old_height = szHint.height; 956 old_height = szHint.height;
1022 957
1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 958 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1024 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 959 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1025 960
1026 classHint.res_name = (char *)rs[Rs_name]; 961 classHint.res_name = (char *)rs[Rs_name];
1027 classHint.res_class = (char *)RESCLASS; 962 classHint.res_class = (char *)RESCLASS;
1028 963
1029 wmHint.flags = InputHint | StateHint | WindowGroupHint; 964 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1030 wmHint.input = True; 965 wmHint.input = True;
1031 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 966 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1032 wmHint.window_group = top; 967 wmHint.window_group = top;
1033 968
1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 969 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1035 &szHint, &wmHint, &classHint); 970 &szHint, &wmHint, &classHint);
971
972#if ENABLE_FRILLS
973 if (mwmhints.flags)
974 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
976#endif
1036 977
1037 Atom protocols[] = { 978 Atom protocols[] = {
1038 xa[XA_WM_DELETE_WINDOW], 979 xa[XA_WM_DELETE_WINDOW],
1039#if ENABLE_EWMH 980#if ENABLE_EWMH
1040 xa[XA_NET_WM_PING], 981 xa[XA_NET_WM_PING],
1041#endif 982#endif
1042 }; 983 };
1043 984
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 985 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045 986
1046#if ENABLE_FRILLS 987#if ENABLE_FRILLS
1047 if (rs[Rs_transient_for]) 988 if (rs[Rs_transient_for])
1048 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 989 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1049#endif 990#endif
1050 991
1051#if ENABLE_EWMH 992#if ENABLE_EWMH
1052 long pid = getpid (); 993 long pid = getpid ();
1053 994
1054 XChangeProperty (disp, top, 995 XChangeProperty (xdisp, top,
1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 996 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1056 PropModeReplace, (unsigned char *)&pid, 1); 997 PropModeReplace, (unsigned char *)&pid, 1);
1057 998
1058 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1059#endif 1000#endif
1060 1001
1061 XSelectInput (disp, top, 1002 XSelectInput (xdisp, top,
1062 KeyPressMask 1003 KeyPressMask
1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1064 | KeyReleaseMask 1005 | KeyReleaseMask
1065#endif 1006#endif
1066 | FocusChangeMask | VisibilityChangeMask 1007 | FocusChangeMask | VisibilityChangeMask
1067 | ExposureMask | StructureNotifyMask); 1008 | ExposureMask | StructureNotifyMask);
1068 1009
1069 termwin_ev.start (display, top); 1010 termwin_ev.start (display, top);
1070 1011
1071#if ENABLE_FRILLS
1072 if (mwmhints.flags)
1073 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1074 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1075#endif
1076
1077 /* vt cursor: Black-on-White is standard, but this is more popular */ 1012 /* vt cursor: Black-on-White is standard, but this is more popular */
1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1013 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1079 1014
1080#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1015#ifdef HAVE_SCROLLBARS
1081 /* cursor (menuBar/scrollBar): Black-on-White */ 1016 /* cursor scrollBar: Black-on-White */
1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1017 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1083#endif 1018#endif
1084 1019
1085 /* the vt window */ 1020 /* the vt window */
1086 vt = XCreateSimpleWindow (disp, top, 1021 vt = XCreateSimpleWindow (xdisp, top,
1087 window_vt_x,
1088 window_vt_y, 1022 window_vt_x, window_vt_y,
1089 width,
1090 height, 1023 width, height,
1091 0, 1024 0,
1092 pix_colors_focused[Color_fg], 1025 pix_colors_focused[Color_fg],
1093 pix_colors_focused[Color_bg]); 1026 pix_colors_focused[Color_bg]);
1094#ifdef DEBUG_X
1095 XStoreName (disp, vt, "vt window");
1096#endif
1097 1027
1098 attributes.bit_gravity = NorthWestGravity; 1028 attributes.bit_gravity = NorthWestGravity;
1099 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1029 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1100 1030
1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1102 1032
1103 if (OPTION (Opt_pointerBlank) 1033 if (OPTION (Opt_pointerBlank))
1104#ifdef ENABLE_PERL
1105 || perl.self
1106#endif
1107 )
1108 vt_emask |= PointerMotionMask; 1034 vt_emask |= PointerMotionMask;
1109 else 1035 else
1110 vt_emask |= Button1MotionMask | Button3MotionMask; 1036 vt_emask |= Button1MotionMask | Button3MotionMask;
1111 1037
1112 XSelectInput (disp, vt, vt_emask); 1038 vt_select_input ();
1039
1113 vt_ev.start (display, vt); 1040 vt_ev.start (display, vt);
1114
1115#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1116 if (menuBar_height ())
1117 {
1118 menuBar.win = XCreateSimpleWindow (disp, top,
1119 window_vt_x, 0,
1120 width,
1121 menuBar_TotalHeight (),
1122 0,
1123 pix_colors_focused[Color_fg],
1124 pix_colors_focused[Color_scroll]);
1125
1126#ifdef DEBUG_X
1127 XStoreName (disp, menuBar.win, "menubar");
1128#endif
1129
1130 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1131
1132 XDefineCursor (disp, menuBar.win,
1133 XCreateFontCursor (disp, XC_left_ptr));
1134
1135 XSelectInput (disp, menuBar.win,
1136 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1137 menubar_ev.start (display, menuBar.win);
1138 }
1139#endif
1140 1041
1141#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
1142 if (rs[Rs_backgroundPixmap] != NULL 1043 if (rs[Rs_backgroundPixmap] != NULL
1143 && ! OPTION (Opt_transparent)) 1044 && !OPTION (Opt_transparent))
1144 { 1045 {
1145 const char *p = rs[Rs_backgroundPixmap]; 1046 const char *p = rs[Rs_backgroundPixmap];
1146 1047
1147 if ((p = strchr (p, ';')) != NULL) 1048 if ((p = strchr (p, ';')) != NULL)
1148 { 1049 {
… …
1154 scr_touch (true); 1055 scr_touch (true);
1155 } 1056 }
1156#endif 1057#endif
1157 1058
1158 /* graphics context for the vt window */ 1059 /* graphics context for the vt window */
1159 gcvalue.foreground = pix_colors[Color_fg]; 1060 gcvalue.foreground = pix_colors[Color_fg];
1160 gcvalue.background = pix_colors[Color_bg]; 1061 gcvalue.background = pix_colors[Color_bg];
1161 gcvalue.graphics_exposures = 1; 1062 gcvalue.graphics_exposures = 1;
1063
1162 gc = XCreateGC (disp, vt, 1064 gc = XCreateGC (xdisp, vt,
1163 GCForeground | GCBackground | GCGraphicsExposures, 1065 GCForeground | GCBackground | GCGraphicsExposures,
1164 &gcvalue); 1066 &gcvalue);
1165 1067
1166 drawable = new rxvt_drawable (display, vt); 1068 drawable = new rxvt_drawable (this, vt);
1167 1069
1168#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1070#ifdef RXVT_SCROLLBAR
1169 gcvalue.foreground = pix_colors[Color_topShadow]; 1071 gcvalue.foreground = pix_colors[Color_topShadow];
1170 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1072 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1171 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1073 gcvalue.foreground = pix_colors[Color_bottomShadow];
1172 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1074 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1173 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1075 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1174 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1076 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1175#endif 1077#endif
1176 1078
1177#ifdef OFF_FOCUS_FADING 1079#ifdef OFF_FOCUS_FADING
1178 // initially we are in unfocused state 1080 // initially we are in unfocused state
1179 if (rs[Rs_fade]) 1081 if (rs[Rs_fade])
1180 pix_colors = pix_colors_unfocused; 1082 pix_colors = pix_colors_unfocused;
1181#endif 1083#endif
1182 1084
1183 pointer_unblank (); 1085 pointer_unblank ();
1184 scr_recolour (); 1086 scr_recolour ();
1185
1186#if ENABLE_XEMBED
1187 if (rs[Rs_embed])
1188 {
1189 long info[2] = { 0, XEMBED_MAPPED };
1190
1191 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1192 32, PropModeReplace, (unsigned char *)&info, 2);
1193 }
1194#endif
1195} 1087}
1196 1088
1197/* ------------------------------------------------------------------------- * 1089/* ------------------------------------------------------------------------- *
1198 * GET TTY CURRENT STATE * 1090 * GET TTY CURRENT STATE *
1199 * ------------------------------------------------------------------------- */ 1091 * ------------------------------------------------------------------------- */
… …
1413 * the slave. 1305 * the slave.
1414 */ 1306 */
1415void 1307void
1416rxvt_term::run_command (const char *const *argv) 1308rxvt_term::run_command (const char *const *argv)
1417{ 1309{
1418 TEMP_ENV; // not very temporary...
1419
1420#if ENABLE_FRILLS 1310#if ENABLE_FRILLS
1421 if (rs[Rs_pty_fd]) 1311 if (rs[Rs_pty_fd])
1422 { 1312 {
1423 pty.pty = atoi (rs[Rs_pty_fd]); 1313 pty->pty = atoi (rs[Rs_pty_fd]);
1424 1314
1425 if (pty.pty >= 0) 1315 if (pty->pty >= 0)
1426 { 1316 {
1427 if (getfd_hook) 1317 if (getfd_hook)
1428 pty.pty = (*getfd_hook) (pty.pty); 1318 pty->pty = (*getfd_hook) (pty->pty);
1429 1319
1430 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1320 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1431 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1321 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1432 } 1322 }
1433 } 1323 }
1434 else 1324 else
1435#endif 1325#endif
1436 if (!pty.get ()) 1326 if (!pty->get ())
1437 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1327 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1438 1328
1439 pty.set_utf8_mode (enc_utf8); 1329 pty->set_utf8_mode (enc_utf8);
1440 1330
1441 /* set initial window size */ 1331 /* set initial window size */
1442 tt_winch (); 1332 tt_winch ();
1443 1333
1444 int er; 1334 int er;
… …
1457#if ENABLE_FRILLS 1347#if ENABLE_FRILLS
1458 if (rs[Rs_pty_fd]) 1348 if (rs[Rs_pty_fd])
1459 return; 1349 return;
1460#endif 1350#endif
1461 1351
1462#ifndef __QNX__
1463 /* spin off the command interpreter */ 1352 /* spin off the command interpreter */
1464 switch (cmd_pid = fork ()) 1353 switch (cmd_pid = fork ())
1465 { 1354 {
1466 case -1: 1355 case -1:
1467 { 1356 {
… …
1469 rxvt_fatal ("can't fork, aborting.\n"); 1358 rxvt_fatal ("can't fork, aborting.\n");
1470 } 1359 }
1471 case 0: 1360 case 0:
1472 init_env (); 1361 init_env ();
1473 1362
1474 if (!pty.make_controlling_tty ()) 1363 if (!pty->make_controlling_tty ())
1475 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1364 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1476 else 1365 else
1477 { 1366 {
1478 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1367 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1479 dup2 (pty.tty, STDIN_FILENO); 1368 dup2 (pty->tty, STDIN_FILENO);
1480 dup2 (pty.tty, STDOUT_FILENO); 1369 dup2 (pty->tty, STDOUT_FILENO);
1481 dup2 (pty.tty, STDERR_FILENO); 1370 dup2 (pty->tty, STDERR_FILENO);
1482 1371
1483 // close all our file handles that we do no longer need 1372 // close all our file handles that we do no longer need
1484 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1373 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1485 { 1374 {
1486 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1375 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1487 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1376 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1488 } 1377 }
1489 1378
1490 run_child (argv); 1379 run_child (argv);
1491 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1380 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1492 } 1381 }
1493 1382
1494 _exit (EXIT_FAILURE); 1383 _exit (EXIT_FAILURE);
1495 1384
1496 default: 1385 default:
1497 { 1386 if (!OPTION (Opt_utmpInhibit))
1498#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1387 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1499 int fdstdin;
1500 1388
1501 fdstdin = dup (STDIN_FILENO); 1389 pty->close_tty ();
1502 dup2 (pty.tty, STDIN_FILENO);
1503#endif
1504 1390
1505#ifdef UTMP_SUPPORT 1391 child_ev.start (cmd_pid);
1506 privileged_utmp (SAVE);
1507#endif
1508 1392
1509#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1393 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1510
1511 dup2 (fdstdin, STDIN_FILENO);
1512 close (fdstdin);
1513#endif
1514 }
1515
1516 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1517 break; 1394 break;
1518 } 1395 }
1519#else /* __QNX__ uses qnxspawn () */
1520 fchmod (pty.tty, 0622);
1521 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1522 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1523
1524 if (run_child (argv) == -1)
1525 exit (EXIT_FAILURE);
1526#endif
1527} 1396}
1528 1397
1529/* ------------------------------------------------------------------------- * 1398/* ------------------------------------------------------------------------- *
1530 * CHILD PROCESS OPERATIONS * 1399 * CHILD PROCESS OPERATIONS *
1531 * ------------------------------------------------------------------------- */ 1400 * ------------------------------------------------------------------------- */
… …
1575 // unblock signals (signals are blocked by iom.C 1444 // unblock signals (signals are blocked by iom.C
1576 sigset_t ss; 1445 sigset_t ss;
1577 sigemptyset (&ss); 1446 sigemptyset (&ss);
1578 sigprocmask (SIG_SETMASK, &ss, 0); 1447 sigprocmask (SIG_SETMASK, &ss, 0);
1579 1448
1580#ifndef __QNX__
1581 /* command interpreter path */ 1449 /* command interpreter path */
1582 if (argv != NULL) 1450 if (argv != NULL)
1583 { 1451 {
1584# ifdef DEBUG_CMD 1452# ifdef DEBUG_CMD
1585 int i; 1453 int i;
… …
1611 1479
1612 execlp (shell, argv0, NULL); 1480 execlp (shell, argv0, NULL);
1613 /* no error message: STDERR is closed! */ 1481 /* no error message: STDERR is closed! */
1614 } 1482 }
1615 1483
1616#else /* __QNX__ uses qnxspawn () */
1617
1618 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1619 char *command = NULL, fullcommand[_MAX_PATH];
1620 char **arg_v, *arg_a[2] = { NULL, NULL };
1621
1622 if (argv != NULL)
1623 {
1624 if (access (argv[0], X_OK) == -1)
1625 {
1626 if (strchr (argv[0], '/') == NULL)
1627 {
1628 searchenv (argv[0], "PATH", fullcommand);
1629
1630 if (fullcommand[0] != '\0')
1631 command = fullcommand;
1632 }
1633
1634 if (access (command, X_OK) == -1)
1635 return -1;
1636 }
1637 else
1638 command = argv[0];
1639
1640 arg_v = argv;
1641 }
1642 else
1643 {
1644 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1645 command = "/bin/sh";
1646
1647 arg_a[0] = my_basename (command);
1648
1649 if (OPTION (Opt_loginShell))
1650 {
1651 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1652
1653 login[0] = '-';
1654 strcpy (&login[1], arg_a[0]);
1655 arg_a[0] = login;
1656 }
1657
1658 arg_v = arg_a;
1659 }
1660
1661 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1662 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1663 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1664 command, arg_v, environ, iov_a, 0);
1665 if (login)
1666 free (login);
1667
1668 pty.close_tty ();
1669 return pty.pty;
1670#endif
1671
1672 return -1; 1484 return -1;
1673} 1485}
1674 1486
1675/*----------------------- end-of-file (C source) -----------------------*/ 1487/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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