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.129 by root, Mon Jan 2 22:23:26 2006 UTC vs.
Revision 1.162 by root, Tue Jan 31 16:19:16 2006 UTC

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

Diff Legend

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