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

Diff Legend

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