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

Diff Legend

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