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

Diff Legend

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