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.142 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.179 by root, Sat Jan 20 12:29:35 2007 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++)
… …
348 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
349 298
350 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
351 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
352 301
302 // using a local pointer decreases code size a lot
303 xa = display->xa;
304
305 set (display);
353 extract_resources (); 306 extract_resources ();
354 307
308#if XFT
309 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif
312
355 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
356 331
357 /* 332 /*
358 * set any defaults not already set 333 * set any defaults not already set
359 */ 334 */
360 if (cmd_argv && cmd_argv[0]) 335 if (cmd_argv && cmd_argv[0])
… …
450 /* this is how xterm implements reverseVideo */ 425 /* this is how xterm implements reverseVideo */
451 if (OPTION (Opt_reverseVideo)) 426 if (OPTION (Opt_reverseVideo))
452 { 427 {
453 if (!rs[Rs_color + Color_fg]) 428 if (!rs[Rs_color + Color_fg])
454 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 429 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430
455 if (!rs[Rs_color + Color_bg]) 431 if (!rs[Rs_color + Color_bg])
456 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 432 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
457 } 433 }
458#endif 434#endif
459 435
… …
511 val = rxvt_network_display (rs[Rs_display_name]); 487 val = rxvt_network_display (rs[Rs_display_name]);
512 rs[Rs_display_name] = (const char *)val; 488 rs[Rs_display_name] = (const char *)val;
513 489
514 if (val == NULL) 490 if (val == NULL)
515#endif /* DISPLAY_IS_IP */ 491#endif /* DISPLAY_IS_IP */
516 val = XDisplayString (display->display); 492 val = XDisplayString (dpy);
517 493
518 if (rs[Rs_display_name] == NULL) 494 if (rs[Rs_display_name] == NULL)
519 rs[Rs_display_name] = val; /* use broken `:0' value */ 495 rs[Rs_display_name] = val; /* use broken `:0' value */
520 496
521 i = strlen (val); 497 i = strlen (val);
522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
523 499
524 sprintf (env_display, "DISPLAY=%s", val); 500 sprintf (env_display, "DISPLAY=%s", val);
525 501
526 /* avoiding the math library: 502 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 503
536 /* add entries to the environment: 504 /* add entries to the environment:
537 * @ DISPLAY: in case we started with -display 505 * @ DISPLAY: in case we started with -display
538 * @ WINDOWID: X window id number of the window 506 * @ WINDOWID: X window id number of the window
539 * @ COLORTERM: terminal sub-name and also indicates its color 507 * @ COLORTERM: terminal sub-name and also indicates its color
… …
541 * @ TERMINFO: path to terminfo directory 509 * @ TERMINFO: path to terminfo directory
542 * @ COLORFGBG: fg;bg color codes 510 * @ COLORFGBG: fg;bg color codes
543 */ 511 */
544 putenv (env_display); 512 putenv (env_display);
545 putenv (env_windowid); 513 putenv (env_windowid);
514
546 if (env_colorfgbg) 515 if (env_colorfgbg)
547 putenv (env_colorfgbg); 516 putenv (env_colorfgbg);
548 517
549#ifdef RXVT_TERMINFO 518#ifdef RXVT_TERMINFO
550 putenv ("TERMINFO=" RXVT_TERMINFO); 519 putenv ("TERMINFO=" RXVT_TERMINFO);
551#endif 520#endif
552 521
553 if (display->depth <= 2) 522 if (depth <= 2)
554 putenv ("COLORTERM=" COLORTERMENV "-mono"); 523 putenv ("COLORTERM=" COLORTERMENV "-mono");
555 else 524 else
556 putenv ("COLORTERM=" COLORTERMENVFULL); 525 putenv ("COLORTERM=" COLORTERMENVFULL);
557 526
558 if (rs[Rs_term_name] != NULL) 527 if (rs[Rs_term_name] != NULL)
… …
670 if (strcmp (key_backspace, "DEC") == 0) 639 if (strcmp (key_backspace, "DEC") == 0)
671 priv_modes |= PrivMode_HaveBackSpace; 640 priv_modes |= PrivMode_HaveBackSpace;
672#endif 641#endif
673 642
674 /* add value for scrollBar */ 643 /* add value for scrollBar */
675 if (scrollbar_visible ()) 644 if (scrollBar.state)
676 { 645 {
677 priv_modes |= PrivMode_scrollBar; 646 priv_modes |= PrivMode_scrollBar;
678 SavedModes |= PrivMode_scrollBar; 647 SavedModes |= PrivMode_scrollBar;
679 }
680
681 if (menubar_visible ())
682 {
683 priv_modes |= PrivMode_menuBar;
684 SavedModes |= PrivMode_menuBar;
685 } 648 }
686 649
687 run_command (argv); 650 run_command (argv);
688} 651}
689 652
… …
695 658
696#ifdef OFF_FOCUS_FADING 659#ifdef OFF_FOCUS_FADING
697 pix_colors = pix_colors_focused; 660 pix_colors = pix_colors_focused;
698#endif 661#endif
699 662
700 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
701 { 664 {
665 const char *name = rs[Rs_color + i];
666
667 if (!name)
668 continue;
669
702 rxvt_color xcol; 670 rxvt_color xcol;
703 671
704 if (!rs[Rs_color + i]) 672 if (!set_color (xcol, name))
705 continue;
706
707 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
708 { 673 {
709#ifndef XTERM_REVERSE_VIDEO 674#ifndef XTERM_REVERSE_VIDEO
710 if (i < 2 && OPTION (Opt_reverseVideo)) 675 if (i < 2 && OPTION (Opt_reverseVideo))
711 rs[Rs_color + i] = def_colorName[!i]; 676 name = def_colorName [1 - i];
712 else 677 else
713#endif 678#endif
714 rs[Rs_color + i] = def_colorName[i]; 679 name = def_colorName [i];
715 680
716 if (!rs[Rs_color + i]) 681 if (!name)
717 continue; 682 continue;
718 683
719 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 684 if (!set_color (xcol, name))
720 { 685 {
721 switch (i) 686 switch (i)
722 { 687 {
723 case Color_fg: 688 case Color_fg:
724 case Color_bg: 689 case Color_bg:
725 /* fatal: need bg/fg color */
726 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 690 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
727 /* NOTREACHED */ 691 name = "";
728 break; 692 break;
729#ifndef NO_CURSORCOLOR 693#ifndef NO_CURSORCOLOR
730 case Color_cursor2: 694 case Color_cursor2:
731 xcol = pix_colors[Color_fg]; 695#endif
732 break;
733#endif /* ! NO_CURSORCOLOR */
734 case Color_pointer_fg: 696 case Color_pointer_fg:
735 xcol = pix_colors[Color_fg]; 697 name = rs[Rs_color + Color_fg];
698 xcol.set (this, name);
736 break; 699 break;
737 default: 700 default:
738 xcol = pix_colors[Color_bg]; /* None */ 701 name = rs[Rs_color + Color_bg];
702 xcol.set (this, name);
739 break; 703 break;
740 } 704 }
741 } 705 }
742 } 706 }
743 707
744 pix_colors[i] = xcol; 708 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i); 709 rs[Rs_color + i] = name;
746 }
747
748#ifdef OFF_FOCUS_FADING
749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
751 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
752#endif
753
754 if (display->depth <= 2)
755 { 710 }
711
712 if (depth <= 2)
713 {
756 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);
757 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);
758 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);
759 } 717 }
760 718
761 /* 719 /*
762 * get scrollBar/menuBar shadow colors 720 * get scrollBar shadow colors
763 * 721 *
764 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
765 * from the fvwm window manager. 723 * from the fvwm window manager.
766 */ 724 */
767#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
768
769 if (display->depth <= 2) 726 if (depth <= 2)
770 { 727 {
771 /* Monochrome */ 728 /* Monochrome */
772 pix_colors[Color_scroll] = pix_colors[Color_fg]; 729 alias_color (Color_scroll, Color_fg);
773 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 730 alias_color (Color_topShadow, Color_bg);
774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 731 alias_color (Color_bottomShadow, Color_bg);
775 } 732 }
776 else 733 else
777 { 734 {
778 rxvt_color xcol[2]; 735 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
779 /* xcol[0] == white
780 * xcol[1] == top shadow
781 * xcol[2] == bot shadow */
782 736
783 xcol[1] = pix_colors[Color_scroll]; 737 rgba cscroll;
784 xcol[0].set (display, 65535, 65535, 65535); 738 pix_colors [Color_scroll].get (cscroll);
785
786 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
787
788 xcol[0].get (display, pr0, pg0, pb0);
789 xcol[1].get (display, pr1, pg1, pb1);
790
791 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
792 739
793 /* topShadowColor */ 740 /* topShadowColor */
794 if (!xcol[1].set (display, 741 if (!pix_colors[Color_topShadow].set (this,
795 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 742 rgba (
796 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 743 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
797 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 744 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
798 xcol[1] = pix_colors[Color_White]; 745 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
799 746 cscroll.a)
800 pix_colors[Color_topShadow] = xcol[1]; 747 ))
748 alias_color (Color_topShadow, Color_White);
801 } 749 }
802#endif /* KEEP_SCROLLCOLOR */ 750#endif /* KEEP_SCROLLCOLOR */
751
752#ifdef OFF_FOCUS_FADING
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754 update_fade_color (i);
755#endif
803} 756}
804 757
805/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
806/* color aliases, fg/bg bright-bold */ 759/* color aliases, fg/bg bright-bold */
807void 760void
… …
846 799
847 if (rsmod 800 if (rsmod
848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 801 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849 requestedmeta = rsmod[3] - '0'; 802 requestedmeta = rsmod[3] - '0';
850 803
851 map = XGetModifierMapping (display->display); 804 map = XGetModifierMapping (dpy);
852 kc = map->modifiermap; 805 kc = map->modifiermap;
853 806
854 for (i = 1; i < 6; i++) 807 for (i = 1; i < 6; i++)
855 { 808 {
856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 809 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
858 for (j = map->max_keypermod; j--; k++) 811 for (j = map->max_keypermod; j--; k++)
859 { 812 {
860 if (kc[k] == 0) 813 if (kc[k] == 0)
861 break; 814 break;
862 815
863 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 816 switch (XKeycodeToKeysym (dpy, kc[k], 0))
864 { 817 {
865 case XK_Num_Lock: 818 case XK_Num_Lock:
866 ModNumLockMask = modmasks[i - 1]; 819 ModNumLockMask = modmasks[i - 1];
867 continue; 820 continue;
868 821
… …
918rxvt_term::create_windows (int argc, const char *const *argv) 871rxvt_term::create_windows (int argc, const char *const *argv)
919{ 872{
920 XClassHint classHint; 873 XClassHint classHint;
921 XWMHints wmHint; 874 XWMHints wmHint;
922#if ENABLE_FRILLS 875#if ENABLE_FRILLS
923 Atom prop = None;
924 MWMHints mwmhints; 876 MWMHints mwmhints;
925#endif 877#endif
926 XGCValues gcvalue; 878 XGCValues gcvalue;
927 XSetWindowAttributes attributes; 879 XSetWindowAttributes attributes;
928 XWindowAttributes gattr;
929 Window top, parent; 880 Window top, parent;
930 dDisp;
931 881
932#ifdef USING_W11LIB 882 dLocal (Display *, dpy);
933 /* enable W11 callbacks */
934 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif
936 883
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 884 /* grab colors before netscape does */
938 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 885 Get_Colours ();
939 886
940 if (OPTION (Opt_transparent)) 887 if (!set_fonts ())
941 { 888 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 889
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 890 parent = display->root;
944 } 891
892 attributes.override_redirect = !!OPTION (Opt_override_redirect);
945 893
946#if ENABLE_FRILLS 894#if ENABLE_FRILLS
947 if (OPTION (Opt_borderLess)) 895 if (OPTION (Opt_borderLess))
948 { 896 {
949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
950
951 if (prop == None)
952 { 898 {
953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
954#ifdef PREFER_24BIT
955 attributes.override_redirect = TRUE; 900 attributes.override_redirect = true;
956#endif
957 mwmhints.flags = 0; 901 mwmhints.flags = 0;
958 } 902 }
959 else 903 else
960 { 904 {
961 mwmhints.flags = MWM_HINTS_DECORATIONS; 905 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
964 } 908 }
965 else 909 else
966 mwmhints.flags = 0; 910 mwmhints.flags = 0;
967#endif 911#endif
968 912
969 /* grab colors before netscape does */
970 Get_Colours ();
971
972 if (!set_fonts ())
973 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
974
975 parent = DefaultRootWindow (disp);
976
977#if ENABLE_XEMBED 913#if ENABLE_XEMBED
978 if (rs[Rs_embed]) 914 if (rs[Rs_embed])
979 { 915 {
980 XWindowAttributes wattr; 916 XWindowAttributes wattr;
981 917
982 parent = strtol (rs[Rs_embed], 0, 0); 918 parent = strtol (rs[Rs_embed], 0, 0);
983 919
984 if (!XGetWindowAttributes (disp, parent, &wattr)) 920 if (!XGetWindowAttributes (dpy, parent, &wattr))
985 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 921 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986 922
987 window_calc (wattr.width, wattr.height); 923 window_calc (wattr.width, wattr.height);
988 } 924 }
989#endif 925#endif
990 926
991 window_calc (0, 0); 927 window_calc (0, 0);
992 928
993 /* sub-window placement & size in rxvt_resize_subwindows () */ 929 /* sub-window placement & size in rxvt_resize_subwindows () */
994#ifdef PREFER_24BIT
995 attributes.background_pixel = pix_colors_focused[Color_border]; 930 attributes.background_pixel = pix_colors_focused [Color_border];
996 attributes.border_pixel = pix_colors_focused[Color_border]; 931 attributes.border_pixel = pix_colors_focused [Color_border];
997 attributes.colormap = display->cmap; 932 attributes.colormap = cmap;
933
998 top = XCreateWindow (disp, parent, 934 top = XCreateWindow (dpy, parent,
999 szHint.x, szHint.y, 935 szHint.x, szHint.y,
1000 szHint.width, szHint.height, 936 szHint.width, szHint.height,
1001 ext_bwidth, 937 ext_bwidth,
1002 display->depth, InputOutput, 938 depth, InputOutput, visual,
1003 display->visual,
1004 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 939 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1005#else 940 &attributes);
1006 top = XCreateSimpleWindow (disp, parent,
1007 szHint.x, szHint.y,
1008 szHint.width, szHint.height,
1009 ext_bwidth,
1010 pix_colors_focused[Color_border],
1011 pix_colors_focused[Color_border]);
1012#endif
1013 941
1014 this->parent[0] = top; 942 this->parent[0] = top;
1015 943
1016 old_width = szHint.width; 944 old_width = szHint.width;
1017 old_height = szHint.height; 945 old_height = szHint.height;
1018 946
1019 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 947 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1020 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 948 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1021 949
1022 classHint.res_name = (char *)rs[Rs_name]; 950 classHint.res_name = (char *)rs[Rs_name];
1023 classHint.res_class = (char *)RESCLASS; 951 classHint.res_class = (char *)RESCLASS;
1024 952
1025 wmHint.flags = InputHint | StateHint | WindowGroupHint; 953 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1026 wmHint.input = True; 954 wmHint.input = True;
1027 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1028 wmHint.window_group = top; 956 wmHint.window_group = top;
1029 957
1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1031 &szHint, &wmHint, &classHint); 959 &szHint, &wmHint, &classHint);
960
961#if ENABLE_FRILLS
962 if (mwmhints.flags)
963 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
964 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
965#endif
1032 966
1033 Atom protocols[] = { 967 Atom protocols[] = {
1034 xa[XA_WM_DELETE_WINDOW], 968 xa[XA_WM_DELETE_WINDOW],
1035#if ENABLE_EWMH 969#if ENABLE_EWMH
1036 xa[XA_NET_WM_PING], 970 xa[XA_NET_WM_PING],
1037#endif 971#endif
1038 }; 972 };
1039 973
1040 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 974 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1041 975
1042#if ENABLE_FRILLS 976#if ENABLE_FRILLS
1043 if (rs[Rs_transient_for]) 977 if (rs[Rs_transient_for])
1044 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 978 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1045#endif 979#endif
1046 980
1047#if ENABLE_EWMH 981#if ENABLE_EWMH
1048 long pid = getpid (); 982 long pid = getpid ();
1049 983
1050 XChangeProperty (disp, top, 984 XChangeProperty (dpy, top,
1051 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 985 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1052 PropModeReplace, (unsigned char *)&pid, 1); 986 PropModeReplace, (unsigned char *)&pid, 1);
1053 987
1054 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 988 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1055#endif 989#endif
1056 990
1057 XSelectInput (disp, top, 991 XSelectInput (dpy, top,
1058 KeyPressMask 992 KeyPressMask
1059#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 993#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1060 | KeyReleaseMask 994 | KeyReleaseMask
1061#endif 995#endif
1062 | FocusChangeMask | VisibilityChangeMask 996 | FocusChangeMask | VisibilityChangeMask
1063 | ExposureMask | StructureNotifyMask); 997 | ExposureMask | StructureNotifyMask);
1064 998
1065 termwin_ev.start (display, top); 999 termwin_ev.start (display, top);
1066 1000
1067#if ENABLE_FRILLS
1068 if (mwmhints.flags)
1069 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1070 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1071#endif
1072
1073 /* vt cursor: Black-on-White is standard, but this is more popular */ 1001 /* vt cursor: Black-on-White is standard, but this is more popular */
1074 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1002 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1075 1003
1076#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1004#ifdef HAVE_SCROLLBARS
1077 /* cursor (menuBar/scrollBar): Black-on-White */ 1005 /* cursor scrollBar: Black-on-White */
1078 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1006 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1079#endif 1007#endif
1080 1008
1081 /* the vt window */ 1009 /* the vt window */
1082 vt = XCreateSimpleWindow (disp, top, 1010 vt = XCreateSimpleWindow (dpy, top,
1083 window_vt_x,
1084 window_vt_y, 1011 window_vt_x, window_vt_y,
1085 width,
1086 height, 1012 width, height,
1087 0, 1013 0,
1088 pix_colors_focused[Color_fg], 1014 pix_colors_focused[Color_fg],
1089 pix_colors_focused[Color_bg]); 1015 pix_colors_focused[Color_bg]);
1090#ifdef DEBUG_X
1091 XStoreName (disp, vt, "vt window");
1092#endif
1093 1016
1094 attributes.bit_gravity = NorthWestGravity; 1017 attributes.bit_gravity = NorthWestGravity;
1095 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1096 1019
1097 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1098 1021
1099 if (OPTION (Opt_pointerBlank)) 1022 if (OPTION (Opt_pointerBlank))
1100 vt_emask |= PointerMotionMask; 1023 vt_emask |= PointerMotionMask;
… …
1103 1026
1104 vt_select_input (); 1027 vt_select_input ();
1105 1028
1106 vt_ev.start (display, vt); 1029 vt_ev.start (display, vt);
1107 1030
1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1109 if (menuBar_height ())
1110 {
1111 menuBar.win = XCreateSimpleWindow (disp, top,
1112 window_vt_x, 0,
1113 width,
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
1134#ifdef XPM_BACKGROUND 1031#ifdef XPM_BACKGROUND
1135 if (rs[Rs_backgroundPixmap] != NULL 1032 if (rs[Rs_backgroundPixmap] != NULL
1136 && ! OPTION (Opt_transparent)) 1033 && !OPTION (Opt_transparent))
1137 { 1034 {
1138 const char *p = rs[Rs_backgroundPixmap]; 1035 const char *p = rs[Rs_backgroundPixmap];
1139 1036
1140 if ((p = strchr (p, ';')) != NULL) 1037 if ((p = strchr (p, ';')) != NULL)
1141 { 1038 {
… …
1147 scr_touch (true); 1044 scr_touch (true);
1148 } 1045 }
1149#endif 1046#endif
1150 1047
1151 /* graphics context for the vt window */ 1048 /* graphics context for the vt window */
1152 gcvalue.foreground = pix_colors[Color_fg]; 1049 gcvalue.foreground = pix_colors[Color_fg];
1153 gcvalue.background = pix_colors[Color_bg]; 1050 gcvalue.background = pix_colors[Color_bg];
1154 gcvalue.graphics_exposures = 1; 1051 gcvalue.graphics_exposures = 0;
1052
1155 gc = XCreateGC (disp, vt, 1053 gc = XCreateGC (dpy, vt,
1156 GCForeground | GCBackground | GCGraphicsExposures, 1054 GCForeground | GCBackground | GCGraphicsExposures,
1157 &gcvalue); 1055 &gcvalue);
1158 1056
1159 drawable = new rxvt_drawable (display, vt); 1057 drawable = new rxvt_drawable (this, vt);
1160 1058
1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1059#ifdef RXVT_SCROLLBAR
1162 gcvalue.foreground = pix_colors[Color_topShadow]; 1060 gcvalue.foreground = pix_colors[Color_topShadow];
1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1061 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1164 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1062 gcvalue.foreground = pix_colors[Color_bottomShadow];
1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1063 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1064 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1167 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1065 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1168#endif 1066#endif
1169 1067
1170#ifdef OFF_FOCUS_FADING 1068#ifdef OFF_FOCUS_FADING
1171 // initially we are in unfocused state 1069 // initially we are in unfocused state
1172 if (rs[Rs_fade]) 1070 if (rs[Rs_fade])
1173 pix_colors = pix_colors_unfocused; 1071 pix_colors = pix_colors_unfocused;
1174#endif 1072#endif
1175 1073
1176 pointer_unblank (); 1074 pointer_unblank ();
1177 scr_recolour (); 1075 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} 1076}
1189 1077
1190/* ------------------------------------------------------------------------- * 1078/* ------------------------------------------------------------------------- *
1191 * GET TTY CURRENT STATE * 1079 * GET TTY CURRENT STATE *
1192 * ------------------------------------------------------------------------- */ 1080 * ------------------------------------------------------------------------- */
1193void 1081void
1194rxvt_get_ttymode (ttymode_t *tio, int erase) 1082rxvt_get_ttymode (ttymode_t *tio, int erase)
1195{ 1083{
1196#ifdef HAVE_TERMIOS_H
1197 /* 1084 /*
1198 * standard System V termios interface 1085 * standard System V termios interface
1199 */ 1086 */
1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1087 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1201 { 1088 {
… …
1268 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1155 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1269# if defined (ECHOCTL) && defined (ECHOKE) 1156# if defined (ECHOCTL) && defined (ECHOKE)
1270 | ECHOCTL | ECHOKE 1157 | ECHOCTL | ECHOKE
1271# endif 1158# endif
1272 | ECHOE | ECHOK); 1159 | ECHOE | ECHOK);
1273# else /* HAVE_TERMIOS_H */
1274
1275 /*
1276 * sgtty interface
1277 */
1278
1279 /* get parameters -- gtty */
1280 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1281 {
1282 tio->sg.sg_erase = CERASE; /* ^H */
1283 tio->sg.sg_kill = CKILL; /* ^U */
1284 }
1285
1286 if (erase != -1)
1287 tio->sg.sg_erase = (char)erase;
1288
1289 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1290
1291 /* get special characters */
1292 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1293 {
1294 tio->tc.t_intrc = CINTR; /* ^C */
1295 tio->tc.t_quitc = CQUIT; /* ^\ */
1296 tio->tc.t_startc = CSTART; /* ^Q */
1297 tio->tc.t_stopc = CSTOP; /* ^S */
1298 tio->tc.t_eofc = CEOF; /* ^D */
1299 tio->tc.t_brkc = -1;
1300 }
1301
1302 /* get local special chars */
1303 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1304 {
1305 tio->lc.t_suspc = CSUSP; /* ^Z */
1306 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1307 tio->lc.t_rprntc = CRPRNT; /* ^R */
1308 tio->lc.t_flushc = CFLUSH; /* ^O */
1309 tio->lc.t_werasc = CWERASE; /* ^W */
1310 tio->lc.t_lnextc = CLNEXT; /* ^V */
1311 }
1312 /* get line discipline */
1313 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1314# ifdef NTTYDISC
1315 tio->line = NTTYDISC;
1316# endif /* NTTYDISC */
1317
1318 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1319#endif /* HAVE_TERMIOS_H */
1320 1160
1321 /* 1161 /*
1322 * Debugging 1162 * Debugging
1323 */ 1163 */
1324#ifdef DEBUG_TTYMODE 1164#ifdef DEBUG_TTYMODE
… …
1409rxvt_term::run_command (const char *const *argv) 1249rxvt_term::run_command (const char *const *argv)
1410{ 1250{
1411#if ENABLE_FRILLS 1251#if ENABLE_FRILLS
1412 if (rs[Rs_pty_fd]) 1252 if (rs[Rs_pty_fd])
1413 { 1253 {
1414 pty.pty = atoi (rs[Rs_pty_fd]); 1254 pty->pty = atoi (rs[Rs_pty_fd]);
1415 1255
1416 if (pty.pty >= 0) 1256 if (pty->pty >= 0)
1417 { 1257 {
1418 if (getfd_hook) 1258 if (getfd_hook)
1419 pty.pty = (*getfd_hook) (pty.pty); 1259 pty->pty = (*getfd_hook) (pty->pty);
1420 1260
1421 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1261 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1422 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1262 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1423 } 1263 }
1424 } 1264 }
1425 else 1265 else
1426#endif 1266#endif
1427 if (!pty.get ()) 1267 if (!pty->get ())
1428 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1268 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1429
1430 pty.set_utf8_mode (enc_utf8);
1431
1432 /* set initial window size */
1433 tt_winch ();
1434 1269
1435 int er; 1270 int er;
1436 1271
1437#ifndef NO_BACKSPACE_KEY 1272#ifndef NO_BACKSPACE_KEY
1438 if (key_backspace[0] && !key_backspace[1]) 1273 if (key_backspace[0] && !key_backspace[1])
… …
1442 else 1277 else
1443#endif 1278#endif
1444 er = -1; 1279 er = -1;
1445 1280
1446 rxvt_get_ttymode (&tio, er); 1281 rxvt_get_ttymode (&tio, er);
1282 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1283 pty->set_utf8_mode (enc_utf8);
1284
1285 /* set initial window size */
1286 tt_winch ();
1447 1287
1448#if ENABLE_FRILLS 1288#if ENABLE_FRILLS
1449 if (rs[Rs_pty_fd]) 1289 if (rs[Rs_pty_fd])
1450 return; 1290 return;
1451#endif 1291#endif
1452 1292
1453#ifndef __QNX__
1454 /* spin off the command interpreter */ 1293 /* spin off the command interpreter */
1455 switch (cmd_pid = fork ()) 1294 switch (cmd_pid = fork ())
1456 { 1295 {
1457 case -1: 1296 case -1:
1458 { 1297 {
… …
1460 rxvt_fatal ("can't fork, aborting.\n"); 1299 rxvt_fatal ("can't fork, aborting.\n");
1461 } 1300 }
1462 case 0: 1301 case 0:
1463 init_env (); 1302 init_env ();
1464 1303
1465 if (!pty.make_controlling_tty ()) 1304 if (!pty->make_controlling_tty ())
1466 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1305 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1467 else 1306 else
1468 { 1307 {
1469 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1308 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1470 dup2 (pty.tty, STDIN_FILENO); 1309 dup2 (pty->tty, STDIN_FILENO);
1471 dup2 (pty.tty, STDOUT_FILENO); 1310 dup2 (pty->tty, STDOUT_FILENO);
1472 dup2 (pty.tty, STDERR_FILENO); 1311 dup2 (pty->tty, STDERR_FILENO);
1473 1312
1474 // close all our file handles that we do no longer need 1313 // close all our file handles that we do no longer need
1475 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1314 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1476 { 1315 {
1477 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1316 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1478 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1317 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1479 } 1318 }
1480 1319
1481 run_child (argv); 1320 run_child (argv);
1482 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1321 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1483 } 1322 }
1484 1323
1485 _exit (EXIT_FAILURE); 1324 _exit (EXIT_FAILURE);
1486 1325
1487 default: 1326 default:
1488 { 1327 if (!OPTION (Opt_utmpInhibit))
1489#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1328 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1490 int fdstdin;
1491 1329
1492 fdstdin = dup (STDIN_FILENO); 1330 pty->close_tty ();
1493 dup2 (pty.tty, STDIN_FILENO);
1494#endif
1495 1331
1496#ifdef UTMP_SUPPORT 1332 child_ev.start (cmd_pid);
1497 privileged_utmp (SAVE);
1498#endif
1499 1333
1500#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1334 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1501
1502 dup2 (fdstdin, STDIN_FILENO);
1503 close (fdstdin);
1504#endif
1505 }
1506
1507 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1508 break; 1335 break;
1509 } 1336 }
1510#else /* __QNX__ uses qnxspawn () */
1511 fchmod (pty.tty, 0622);
1512 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1513 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1514
1515 if (run_child (argv) == -1)
1516 exit (EXIT_FAILURE);
1517#endif
1518} 1337}
1519 1338
1520/* ------------------------------------------------------------------------- * 1339/* ------------------------------------------------------------------------- *
1521 * CHILD PROCESS OPERATIONS * 1340 * CHILD PROCESS OPERATIONS *
1522 * ------------------------------------------------------------------------- */ 1341 * ------------------------------------------------------------------------- */
… …
1526 */ 1345 */
1527int 1346int
1528rxvt_term::run_child (const char *const *argv) 1347rxvt_term::run_child (const char *const *argv)
1529{ 1348{
1530 char *login; 1349 char *login;
1531
1532 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1533 1350
1534 if (OPTION (Opt_console)) 1351 if (OPTION (Opt_console))
1535 { /* be virtual console, fail silently */ 1352 { /* be virtual console, fail silently */
1536#ifdef TIOCCONS 1353#ifdef TIOCCONS
1537 unsigned int on = 1; 1354 unsigned int on = 1;
… …
1566 // unblock signals (signals are blocked by iom.C 1383 // unblock signals (signals are blocked by iom.C
1567 sigset_t ss; 1384 sigset_t ss;
1568 sigemptyset (&ss); 1385 sigemptyset (&ss);
1569 sigprocmask (SIG_SETMASK, &ss, 0); 1386 sigprocmask (SIG_SETMASK, &ss, 0);
1570 1387
1571#ifndef __QNX__
1572 /* command interpreter path */ 1388 /* command interpreter path */
1573 if (argv != NULL) 1389 if (argv != NULL)
1574 { 1390 {
1575# ifdef DEBUG_CMD 1391# ifdef DEBUG_CMD
1576 int i; 1392 int i;
… …
1602 1418
1603 execlp (shell, argv0, NULL); 1419 execlp (shell, argv0, NULL);
1604 /* no error message: STDERR is closed! */ 1420 /* no error message: STDERR is closed! */
1605 } 1421 }
1606 1422
1607#else /* __QNX__ uses qnxspawn () */
1608
1609 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1610 char *command = NULL, fullcommand[_MAX_PATH];
1611 char **arg_v, *arg_a[2] = { NULL, NULL };
1612
1613 if (argv != NULL)
1614 {
1615 if (access (argv[0], X_OK) == -1)
1616 {
1617 if (strchr (argv[0], '/') == NULL)
1618 {
1619 searchenv (argv[0], "PATH", fullcommand);
1620
1621 if (fullcommand[0] != '\0')
1622 command = fullcommand;
1623 }
1624
1625 if (access (command, X_OK) == -1)
1626 return -1;
1627 }
1628 else
1629 command = argv[0];
1630
1631 arg_v = argv;
1632 }
1633 else
1634 {
1635 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1636 command = "/bin/sh";
1637
1638 arg_a[0] = my_basename (command);
1639
1640 if (OPTION (Opt_loginShell))
1641 {
1642 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1643
1644 login[0] = '-';
1645 strcpy (&login[1], arg_a[0]);
1646 arg_a[0] = login;
1647 }
1648
1649 arg_v = arg_a;
1650 }
1651
1652 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1653 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1654 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1655 command, arg_v, environ, iov_a, 0);
1656 if (login)
1657 free (login);
1658
1659 pty.close_tty ();
1660 return pty.pty;
1661#endif
1662
1663 return -1; 1423 return -1;
1664} 1424}
1665 1425
1666/*----------------------- end-of-file (C source) -----------------------*/ 1426/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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