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.173 by root, Wed Jul 5 20:31:48 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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
… …
309 int i, r_argc; 258 int i, r_argc;
310 char *val; 259 char *val;
311 const char **cmd_argv, **r_argv; 260 const char **cmd_argv, **r_argv;
312 261
313 /* 262 /*
314 * Look for -exec option. Find => split and make cmd_argv[] of command args 263 * Look for -e option. Find => split and make cmd_argv[] of command args
315 */ 264 */
316 for (r_argc = 0; r_argc < argc; r_argc++) 265 for (r_argc = 0; r_argc < argc; r_argc++)
317 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 266 if (!strcmp (argv[r_argc], "-e"))
318 break; 267 break;
319 268
320 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
321 270
322 for (i = 0; i < r_argc; i++) 271 for (i = 0; i < r_argc; i++)
… …
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 // using a local pointer decreases code size a lot
303 xa = display->xa;
304
305 set (display);
355 extract_resources (); 306 extract_resources ();
356 } 307
308#if XFT
309 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif
357 312
358 free (r_argv); 313 free (r_argv);
314
315 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef)
317 rs [i] = 0;
318
319#if ENABLE_PERL
320 if (!rs[Rs_perl_ext_1])
321 rs[Rs_perl_ext_1] = "default";
322
323 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
324 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
325 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
326 {
327 rxvt_perl.init (this);
328 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
329 }
330#endif
359 331
360 /* 332 /*
361 * set any defaults not already set 333 * set any defaults not already set
362 */ 334 */
363 if (cmd_argv && cmd_argv[0]) 335 if (cmd_argv && cmd_argv[0])
… …
453 /* this is how xterm implements reverseVideo */ 425 /* this is how xterm implements reverseVideo */
454 if (OPTION (Opt_reverseVideo)) 426 if (OPTION (Opt_reverseVideo))
455 { 427 {
456 if (!rs[Rs_color + Color_fg]) 428 if (!rs[Rs_color + Color_fg])
457 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 429 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430
458 if (!rs[Rs_color + Color_bg]) 431 if (!rs[Rs_color + Color_bg])
459 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 432 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
460 } 433 }
461#endif 434#endif
462 435
… …
514 val = rxvt_network_display (rs[Rs_display_name]); 487 val = rxvt_network_display (rs[Rs_display_name]);
515 rs[Rs_display_name] = (const char *)val; 488 rs[Rs_display_name] = (const char *)val;
516 489
517 if (val == NULL) 490 if (val == NULL)
518#endif /* DISPLAY_IS_IP */ 491#endif /* DISPLAY_IS_IP */
519 val = XDisplayString (display->display); 492 val = XDisplayString (dpy);
520 493
521 if (rs[Rs_display_name] == NULL) 494 if (rs[Rs_display_name] == NULL)
522 rs[Rs_display_name] = val; /* use broken `:0' value */ 495 rs[Rs_display_name] = val; /* use broken `:0' value */
523 496
524 i = strlen (val); 497 i = strlen (val);
525 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
526 499
527 sprintf (env_display, "DISPLAY=%s", val); 500 sprintf (env_display, "DISPLAY=%s", val);
528 501
529 /* avoiding the math library: 502 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 503
539 /* add entries to the environment: 504 /* add entries to the environment:
540 * @ DISPLAY: in case we started with -display 505 * @ DISPLAY: in case we started with -display
541 * @ WINDOWID: X window id number of the window 506 * @ WINDOWID: X window id number of the window
542 * @ COLORTERM: terminal sub-name and also indicates its color 507 * @ COLORTERM: terminal sub-name and also indicates its color
… …
544 * @ TERMINFO: path to terminfo directory 509 * @ TERMINFO: path to terminfo directory
545 * @ COLORFGBG: fg;bg color codes 510 * @ COLORFGBG: fg;bg color codes
546 */ 511 */
547 putenv (env_display); 512 putenv (env_display);
548 putenv (env_windowid); 513 putenv (env_windowid);
514
549 if (env_colorfgbg) 515 if (env_colorfgbg)
550 putenv (env_colorfgbg); 516 putenv (env_colorfgbg);
551 517
552#ifdef RXVT_TERMINFO 518#ifdef RXVT_TERMINFO
553 putenv ("TERMINFO=" RXVT_TERMINFO); 519 putenv ("TERMINFO=" RXVT_TERMINFO);
554#endif 520#endif
555 521
556 if (display->depth <= 2) 522 if (depth <= 2)
557 putenv ("COLORTERM=" COLORTERMENV "-mono"); 523 putenv ("COLORTERM=" COLORTERMENV "-mono");
558 else 524 else
559 putenv ("COLORTERM=" COLORTERMENVFULL); 525 putenv ("COLORTERM=" COLORTERMENVFULL);
560 526
561 if (rs[Rs_term_name] != NULL) 527 if (rs[Rs_term_name] != NULL)
… …
581 * This should support all European type languages. 547 * This should support all European type languages.
582 */ 548 */
583void 549void
584rxvt_term::set_locale (const char *locale) 550rxvt_term::set_locale (const char *locale)
585{ 551{
586 TEMP_ENV; 552 set_environ (envv);
587 553
588#if HAVE_XSETLOCALE || HAVE_SETLOCALE 554#if HAVE_XSETLOCALE || HAVE_SETLOCALE
589 free (this->locale); 555 free (this->locale);
590 this->locale = setlocale (LC_CTYPE, locale); 556 this->locale = setlocale (LC_CTYPE, locale);
591 557
… …
622} 588}
623 589
624void 590void
625rxvt_term::init_xlocale () 591rxvt_term::init_xlocale ()
626{ 592{
627 TEMP_ENV; 593 set_environ (envv);
628 594
629#ifdef USE_XIM 595#ifdef USE_XIM
630 if (!locale) 596 if (!locale)
631 rxvt_warn ("setting locale failed, working without locale support.\n"); 597 rxvt_warn ("setting locale failed, working without locale support.\n");
632 else 598 else
… …
673 if (strcmp (key_backspace, "DEC") == 0) 639 if (strcmp (key_backspace, "DEC") == 0)
674 priv_modes |= PrivMode_HaveBackSpace; 640 priv_modes |= PrivMode_HaveBackSpace;
675#endif 641#endif
676 642
677 /* add value for scrollBar */ 643 /* add value for scrollBar */
678 if (scrollbar_visible ()) 644 if (scrollBar.state)
679 { 645 {
680 priv_modes |= PrivMode_scrollBar; 646 priv_modes |= PrivMode_scrollBar;
681 SavedModes |= PrivMode_scrollBar; 647 SavedModes |= PrivMode_scrollBar;
682 }
683
684 if (menubar_visible ())
685 {
686 priv_modes |= PrivMode_menuBar;
687 SavedModes |= PrivMode_menuBar;
688 } 648 }
689 649
690 run_command (argv); 650 run_command (argv);
691} 651}
692 652
… …
698 658
699#ifdef OFF_FOCUS_FADING 659#ifdef OFF_FOCUS_FADING
700 pix_colors = pix_colors_focused; 660 pix_colors = pix_colors_focused;
701#endif 661#endif
702 662
703 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
704 { 664 {
665 const char *name = rs[Rs_color + i];
666
667 if (!name)
668 continue;
669
705 rxvt_color xcol; 670 rxvt_color xcol;
706 671
707 if (!rs[Rs_color + i]) 672 if (!set_color (xcol, name))
708 continue;
709
710 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
711 { 673 {
712#ifndef XTERM_REVERSE_VIDEO 674#ifndef XTERM_REVERSE_VIDEO
713 if (i < 2 && OPTION (Opt_reverseVideo)) 675 if (i < 2 && OPTION (Opt_reverseVideo))
714 rs[Rs_color + i] = def_colorName[!i]; 676 name = def_colorName [1 - i];
715 else 677 else
716#endif 678#endif
717 rs[Rs_color + i] = def_colorName[i]; 679 name = def_colorName [i];
718 680
719 if (!rs[Rs_color + i]) 681 if (!name)
720 continue; 682 continue;
721 683
722 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 684 if (!set_color (xcol, name))
723 { 685 {
724 switch (i) 686 switch (i)
725 { 687 {
726 case Color_fg: 688 case Color_fg:
727 case Color_bg: 689 case Color_bg:
728 /* fatal: need bg/fg color */
729 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 690 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
730 /* NOTREACHED */ 691 name = "";
731 break; 692 break;
732#ifndef NO_CURSORCOLOR 693#ifndef NO_CURSORCOLOR
733 case Color_cursor2: 694 case Color_cursor2:
734 xcol = pix_colors[Color_fg]; 695#endif
735 break;
736#endif /* ! NO_CURSORCOLOR */
737 case Color_pointer_fg: 696 case Color_pointer_fg:
738 xcol = pix_colors[Color_fg]; 697 name = rs[Rs_color + Color_fg];
698 xcol.set (this, name);
739 break; 699 break;
740 default: 700 default:
741 xcol = pix_colors[Color_bg]; /* None */ 701 name = rs[Rs_color + Color_bg];
702 xcol.set (this, name);
742 break; 703 break;
743 } 704 }
744 } 705 }
745 } 706 }
746 707
747 pix_colors[i] = xcol; 708 pix_colors[i] = xcol;
748 SET_PIXCOLOR (i); 709 rs[Rs_color + i] = name;
749 }
750
751#ifdef OFF_FOCUS_FADING
752 if (rs[Rs_fade])
753 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
754 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
755#endif
756
757 if (display->depth <= 2)
758 { 710 }
711
712 if (depth <= 2)
713 {
759 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 714 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
760 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 715 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
761 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 716 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
762 } 717 }
763 718
764 /* 719 /*
765 * get scrollBar/menuBar shadow colors 720 * get scrollBar shadow colors
766 * 721 *
767 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
768 * from the fvwm window manager. 723 * from the fvwm window manager.
769 */ 724 */
770#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
771
772 if (display->depth <= 2) 726 if (depth <= 2)
773 { 727 {
774 /* Monochrome */ 728 /* Monochrome */
775 pix_colors[Color_scroll] = pix_colors[Color_fg]; 729 alias_color (Color_scroll, Color_fg);
776 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 730 alias_color (Color_topShadow, Color_bg);
777 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 731 alias_color (Color_bottomShadow, Color_bg);
778 } 732 }
779 else 733 else
780 { 734 {
781 rxvt_color xcol[2]; 735 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
782 /* xcol[0] == white
783 * xcol[1] == top shadow
784 * xcol[2] == bot shadow */
785 736
786 xcol[1] = pix_colors[Color_scroll]; 737 rgba cscroll;
787 xcol[0].set (display, 65535, 65535, 65535); 738 pix_colors [Color_scroll].get (cscroll);
788
789 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
790
791 xcol[0].get (display, pr0, pg0, pb0);
792 xcol[1].get (display, pr1, pg1, pb1);
793
794 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
795 739
796 /* topShadowColor */ 740 /* topShadowColor */
797 if (!xcol[1].set (display, 741 if (!pix_colors[Color_topShadow].set (this,
798 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 742 rgba (
799 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 743 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
800 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 744 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
801 xcol[1] = pix_colors[Color_White]; 745 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
802 746 cscroll.a)
803 pix_colors[Color_topShadow] = xcol[1]; 747 ))
748 alias_color (Color_topShadow, Color_White);
804 } 749 }
805#endif /* KEEP_SCROLLCOLOR */ 750#endif /* KEEP_SCROLLCOLOR */
751
752#ifdef OFF_FOCUS_FADING
753 if (rs[Rs_fade])
754 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
755 {
756 rgba c;
757 pix_colors [Color_fade].get (c);
758 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
759 }
760#endif
806} 761}
807 762
808/*----------------------------------------------------------------------*/ 763/*----------------------------------------------------------------------*/
809/* color aliases, fg/bg bright-bold */ 764/* color aliases, fg/bg bright-bold */
810void 765void
… …
849 804
850 if (rsmod 805 if (rsmod
851 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 806 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
852 requestedmeta = rsmod[3] - '0'; 807 requestedmeta = rsmod[3] - '0';
853 808
854 map = XGetModifierMapping (display->display); 809 map = XGetModifierMapping (dpy);
855 kc = map->modifiermap; 810 kc = map->modifiermap;
856 811
857 for (i = 1; i < 6; i++) 812 for (i = 1; i < 6; i++)
858 { 813 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 814 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
861 for (j = map->max_keypermod; j--; k++) 816 for (j = map->max_keypermod; j--; k++)
862 { 817 {
863 if (kc[k] == 0) 818 if (kc[k] == 0)
864 break; 819 break;
865 820
866 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 821 switch (XKeycodeToKeysym (dpy, kc[k], 0))
867 { 822 {
868 case XK_Num_Lock: 823 case XK_Num_Lock:
869 ModNumLockMask = modmasks[i - 1]; 824 ModNumLockMask = modmasks[i - 1];
870 continue; 825 continue;
871 826
… …
921rxvt_term::create_windows (int argc, const char *const *argv) 876rxvt_term::create_windows (int argc, const char *const *argv)
922{ 877{
923 XClassHint classHint; 878 XClassHint classHint;
924 XWMHints wmHint; 879 XWMHints wmHint;
925#if ENABLE_FRILLS 880#if ENABLE_FRILLS
926 Atom prop = None;
927 MWMHints mwmhints; 881 MWMHints mwmhints;
928#endif 882#endif
929 XGCValues gcvalue; 883 XGCValues gcvalue;
930 long vt_emask;
931 XSetWindowAttributes attributes; 884 XSetWindowAttributes attributes;
932 XWindowAttributes gattr;
933 Window top, parent; 885 Window top, parent;
934 dDisp;
935 886
936#ifdef USING_W11LIB 887 dLocal (Display *, dpy);
937 /* enable W11 callbacks */
938 W11AddEventHandler (disp, rxvt_W11_process_x_event);
939#endif
940 888
941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 889 /* grab colors before netscape does */
942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 890 Get_Colours ();
943 891
944 if (OPTION (Opt_transparent)) 892 if (!set_fonts ())
945 { 893 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 894
947 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 895 parent = display->root;
948 } 896
897 attributes.override_redirect = !!OPTION (Opt_override_redirect);
949 898
950#if ENABLE_FRILLS 899#if ENABLE_FRILLS
951 if (OPTION (Opt_borderLess)) 900 if (OPTION (Opt_borderLess))
952 { 901 {
953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 902 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
954
955 if (prop == None)
956 { 903 {
957 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 904 /* 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; 905 attributes.override_redirect = true;
960#endif
961 mwmhints.flags = 0; 906 mwmhints.flags = 0;
962 } 907 }
963 else 908 else
964 { 909 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 910 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
968 } 913 }
969 else 914 else
970 mwmhints.flags = 0; 915 mwmhints.flags = 0;
971#endif 916#endif
972 917
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 918#if ENABLE_XEMBED
982 if (rs[Rs_embed]) 919 if (rs[Rs_embed])
983 { 920 {
984 XWindowAttributes wattr; 921 XWindowAttributes wattr;
985 922
986 parent = strtol (rs[Rs_embed], 0, 0); 923 parent = strtol (rs[Rs_embed], 0, 0);
987 924
988 if (!XGetWindowAttributes (disp, parent, &wattr)) 925 if (!XGetWindowAttributes (dpy, parent, &wattr))
989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 926 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
990 927
991 window_calc (wattr.width, wattr.height); 928 window_calc (wattr.width, wattr.height);
992 } 929 }
993#endif 930#endif
994 931
995 window_calc (0, 0); 932 window_calc (0, 0);
996 933
997 /* sub-window placement & size in rxvt_resize_subwindows () */ 934 /* sub-window placement & size in rxvt_resize_subwindows () */
998#ifdef PREFER_24BIT
999 attributes.background_pixel = pix_colors_focused[Color_border]; 935 attributes.background_pixel = pix_colors_focused [Color_border];
1000 attributes.border_pixel = pix_colors_focused[Color_border]; 936 attributes.border_pixel = pix_colors_focused [Color_border];
1001 attributes.colormap = display->cmap; 937 attributes.colormap = cmap;
938
1002 top = XCreateWindow (disp, parent, 939 top = XCreateWindow (dpy, parent,
1003 szHint.x, szHint.y, 940 szHint.x, szHint.y,
1004 szHint.width, szHint.height, 941 szHint.width, szHint.height,
1005 ext_bwidth, 942 ext_bwidth,
1006 display->depth, InputOutput, 943 depth, InputOutput, visual,
1007 display->visual,
1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 944 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1009#else 945 &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 946
1018 this->parent[0] = top; 947 this->parent[0] = top;
1019 948
1020 old_width = szHint.width; 949 old_width = szHint.width;
1021 old_height = szHint.height; 950 old_height = szHint.height;
1022 951
1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 952 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1024 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 953 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1025 954
1026 classHint.res_name = (char *)rs[Rs_name]; 955 classHint.res_name = (char *)rs[Rs_name];
1027 classHint.res_class = (char *)RESCLASS; 956 classHint.res_class = (char *)RESCLASS;
1028 957
1029 wmHint.flags = InputHint | StateHint | WindowGroupHint; 958 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1030 wmHint.input = True; 959 wmHint.input = True;
1031 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1032 wmHint.window_group = top; 961 wmHint.window_group = top;
1033 962
1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 963 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1035 &szHint, &wmHint, &classHint); 964 &szHint, &wmHint, &classHint);
965
966#if ENABLE_FRILLS
967 if (mwmhints.flags)
968 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
969 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
970#endif
1036 971
1037 Atom protocols[] = { 972 Atom protocols[] = {
1038 xa[XA_WM_DELETE_WINDOW], 973 xa[XA_WM_DELETE_WINDOW],
1039#if ENABLE_EWMH 974#if ENABLE_EWMH
1040 xa[XA_NET_WM_PING], 975 xa[XA_NET_WM_PING],
1041#endif 976#endif
1042 }; 977 };
1043 978
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 979 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045 980
1046#if ENABLE_FRILLS 981#if ENABLE_FRILLS
1047 if (rs[Rs_transient_for]) 982 if (rs[Rs_transient_for])
1048 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 983 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1049#endif 984#endif
1050 985
1051#if ENABLE_EWMH 986#if ENABLE_EWMH
1052 long pid = getpid (); 987 long pid = getpid ();
1053 988
1054 XChangeProperty (disp, top, 989 XChangeProperty (dpy, top,
1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 990 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1056 PropModeReplace, (unsigned char *)&pid, 1); 991 PropModeReplace, (unsigned char *)&pid, 1);
1057 992
1058 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 993 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1059#endif 994#endif
1060 995
1061 XSelectInput (disp, top, 996 XSelectInput (dpy, top,
1062 KeyPressMask 997 KeyPressMask
1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 998#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1064 | KeyReleaseMask 999 | KeyReleaseMask
1065#endif 1000#endif
1066 | FocusChangeMask | VisibilityChangeMask 1001 | FocusChangeMask | VisibilityChangeMask
1067 | ExposureMask | StructureNotifyMask); 1002 | ExposureMask | StructureNotifyMask);
1068 1003
1069 termwin_ev.start (display, top); 1004 termwin_ev.start (display, top);
1070 1005
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 */ 1006 /* vt cursor: Black-on-White is standard, but this is more popular */
1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1007 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1079 1008
1080#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1009#ifdef HAVE_SCROLLBARS
1081 /* cursor (menuBar/scrollBar): Black-on-White */ 1010 /* cursor scrollBar: Black-on-White */
1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1011 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1083#endif 1012#endif
1084 1013
1085 /* the vt window */ 1014 /* the vt window */
1086 vt = XCreateSimpleWindow (disp, top, 1015 vt = XCreateSimpleWindow (dpy, top,
1087 window_vt_x,
1088 window_vt_y, 1016 window_vt_x, window_vt_y,
1089 width,
1090 height, 1017 width, height,
1091 0, 1018 0,
1092 pix_colors_focused[Color_fg], 1019 pix_colors_focused[Color_fg],
1093 pix_colors_focused[Color_bg]); 1020 pix_colors_focused[Color_bg]);
1094#ifdef DEBUG_X
1095 XStoreName (disp, vt, "vt window");
1096#endif
1097 1021
1098 attributes.bit_gravity = NorthWestGravity; 1022 attributes.bit_gravity = NorthWestGravity;
1099 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1023 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1100 1024
1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1102 1026
1103 if (OPTION (Opt_pointerBlank) 1027 if (OPTION (Opt_pointerBlank))
1104#ifdef ENABLE_PERL
1105 || perl.self
1106#endif
1107 )
1108 vt_emask |= PointerMotionMask; 1028 vt_emask |= PointerMotionMask;
1109 else 1029 else
1110 vt_emask |= Button1MotionMask | Button3MotionMask; 1030 vt_emask |= Button1MotionMask | Button3MotionMask;
1111 1031
1112 XSelectInput (disp, vt, vt_emask); 1032 vt_select_input ();
1033
1113 vt_ev.start (display, vt); 1034 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 1035
1141#ifdef XPM_BACKGROUND 1036#ifdef XPM_BACKGROUND
1142 if (rs[Rs_backgroundPixmap] != NULL 1037 if (rs[Rs_backgroundPixmap] != NULL
1143 && ! OPTION (Opt_transparent)) 1038 && !OPTION (Opt_transparent))
1144 { 1039 {
1145 const char *p = rs[Rs_backgroundPixmap]; 1040 const char *p = rs[Rs_backgroundPixmap];
1146 1041
1147 if ((p = strchr (p, ';')) != NULL) 1042 if ((p = strchr (p, ';')) != NULL)
1148 { 1043 {
… …
1154 scr_touch (true); 1049 scr_touch (true);
1155 } 1050 }
1156#endif 1051#endif
1157 1052
1158 /* graphics context for the vt window */ 1053 /* graphics context for the vt window */
1159 gcvalue.foreground = pix_colors[Color_fg]; 1054 gcvalue.foreground = pix_colors[Color_fg];
1160 gcvalue.background = pix_colors[Color_bg]; 1055 gcvalue.background = pix_colors[Color_bg];
1161 gcvalue.graphics_exposures = 1; 1056 gcvalue.graphics_exposures = 0;
1057
1162 gc = XCreateGC (disp, vt, 1058 gc = XCreateGC (dpy, vt,
1163 GCForeground | GCBackground | GCGraphicsExposures, 1059 GCForeground | GCBackground | GCGraphicsExposures,
1164 &gcvalue); 1060 &gcvalue);
1165 1061
1166 drawable = new rxvt_drawable (display, vt); 1062 drawable = new rxvt_drawable (this, vt);
1167 1063
1168#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1064#ifdef RXVT_SCROLLBAR
1169 gcvalue.foreground = pix_colors[Color_topShadow]; 1065 gcvalue.foreground = pix_colors[Color_topShadow];
1170 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1066 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1171 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1067 gcvalue.foreground = pix_colors[Color_bottomShadow];
1172 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1068 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1173 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1069 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1174 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1070 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1175#endif 1071#endif
1176 1072
1177#ifdef OFF_FOCUS_FADING 1073#ifdef OFF_FOCUS_FADING
1178 // initially we are in unfocused state 1074 // initially we are in unfocused state
1179 if (rs[Rs_fade]) 1075 if (rs[Rs_fade])
1180 pix_colors = pix_colors_unfocused; 1076 pix_colors = pix_colors_unfocused;
1181#endif 1077#endif
1182 1078
1183 pointer_unblank (); 1079 pointer_unblank ();
1184 scr_recolour (); 1080 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} 1081}
1196 1082
1197/* ------------------------------------------------------------------------- * 1083/* ------------------------------------------------------------------------- *
1198 * GET TTY CURRENT STATE * 1084 * GET TTY CURRENT STATE *
1199 * ------------------------------------------------------------------------- */ 1085 * ------------------------------------------------------------------------- */
… …
1413 * the slave. 1299 * the slave.
1414 */ 1300 */
1415void 1301void
1416rxvt_term::run_command (const char *const *argv) 1302rxvt_term::run_command (const char *const *argv)
1417{ 1303{
1418 TEMP_ENV; // not very temporary...
1419
1420#if ENABLE_FRILLS 1304#if ENABLE_FRILLS
1421 if (rs[Rs_pty_fd]) 1305 if (rs[Rs_pty_fd])
1422 { 1306 {
1423 pty.pty = atoi (rs[Rs_pty_fd]); 1307 pty->pty = atoi (rs[Rs_pty_fd]);
1424 1308
1425 if (pty.pty >= 0) 1309 if (pty->pty >= 0)
1426 { 1310 {
1427 if (getfd_hook) 1311 if (getfd_hook)
1428 pty.pty = (*getfd_hook) (pty.pty); 1312 pty->pty = (*getfd_hook) (pty->pty);
1429 1313
1430 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1314 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1431 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1315 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1432 } 1316 }
1433 } 1317 }
1434 else 1318 else
1435#endif 1319#endif
1436 if (!pty.get ()) 1320 if (!pty->get ())
1437 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1438 1322
1439 pty.set_utf8_mode (enc_utf8); 1323 pty->set_utf8_mode (enc_utf8);
1440 1324
1441 /* set initial window size */ 1325 /* set initial window size */
1442 tt_winch (); 1326 tt_winch ();
1443 1327
1444 int er; 1328 int er;
… …
1457#if ENABLE_FRILLS 1341#if ENABLE_FRILLS
1458 if (rs[Rs_pty_fd]) 1342 if (rs[Rs_pty_fd])
1459 return; 1343 return;
1460#endif 1344#endif
1461 1345
1462#ifndef __QNX__
1463 /* spin off the command interpreter */ 1346 /* spin off the command interpreter */
1464 switch (cmd_pid = fork ()) 1347 switch (cmd_pid = fork ())
1465 { 1348 {
1466 case -1: 1349 case -1:
1467 { 1350 {
… …
1469 rxvt_fatal ("can't fork, aborting.\n"); 1352 rxvt_fatal ("can't fork, aborting.\n");
1470 } 1353 }
1471 case 0: 1354 case 0:
1472 init_env (); 1355 init_env ();
1473 1356
1474 if (!pty.make_controlling_tty ()) 1357 if (!pty->make_controlling_tty ())
1475 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1358 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1476 else 1359 else
1477 { 1360 {
1478 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1361 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1479 dup2 (pty.tty, STDIN_FILENO); 1362 dup2 (pty->tty, STDIN_FILENO);
1480 dup2 (pty.tty, STDOUT_FILENO); 1363 dup2 (pty->tty, STDOUT_FILENO);
1481 dup2 (pty.tty, STDERR_FILENO); 1364 dup2 (pty->tty, STDERR_FILENO);
1482 1365
1483 // close all our file handles that we do no longer need 1366 // close all our file handles that we do no longer need
1484 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1367 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1485 { 1368 {
1486 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1369 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1487 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1370 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1488 } 1371 }
1489 1372
1490 run_child (argv); 1373 run_child (argv);
1491 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1374 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1492 } 1375 }
1493 1376
1494 _exit (EXIT_FAILURE); 1377 _exit (EXIT_FAILURE);
1495 1378
1496 default: 1379 default:
1497 { 1380 if (!OPTION (Opt_utmpInhibit))
1498#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1381 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1499 int fdstdin;
1500 1382
1501 fdstdin = dup (STDIN_FILENO); 1383 pty->close_tty ();
1502 dup2 (pty.tty, STDIN_FILENO);
1503#endif
1504 1384
1505#ifdef UTMP_SUPPORT 1385 child_ev.start (cmd_pid);
1506 privileged_utmp (SAVE);
1507#endif
1508 1386
1509#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1387 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; 1388 break;
1518 } 1389 }
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} 1390}
1528 1391
1529/* ------------------------------------------------------------------------- * 1392/* ------------------------------------------------------------------------- *
1530 * CHILD PROCESS OPERATIONS * 1393 * CHILD PROCESS OPERATIONS *
1531 * ------------------------------------------------------------------------- */ 1394 * ------------------------------------------------------------------------- */
… …
1575 // unblock signals (signals are blocked by iom.C 1438 // unblock signals (signals are blocked by iom.C
1576 sigset_t ss; 1439 sigset_t ss;
1577 sigemptyset (&ss); 1440 sigemptyset (&ss);
1578 sigprocmask (SIG_SETMASK, &ss, 0); 1441 sigprocmask (SIG_SETMASK, &ss, 0);
1579 1442
1580#ifndef __QNX__
1581 /* command interpreter path */ 1443 /* command interpreter path */
1582 if (argv != NULL) 1444 if (argv != NULL)
1583 { 1445 {
1584# ifdef DEBUG_CMD 1446# ifdef DEBUG_CMD
1585 int i; 1447 int i;
… …
1611 1473
1612 execlp (shell, argv0, NULL); 1474 execlp (shell, argv0, NULL);
1613 /* no error message: STDERR is closed! */ 1475 /* no error message: STDERR is closed! */
1614 } 1476 }
1615 1477
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; 1478 return -1;
1673} 1479}
1674 1480
1675/*----------------------- end-of-file (C source) -----------------------*/ 1481/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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