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.144 by root, Tue Jan 17 11:02:10 2006 UTC vs.
Revision 1.165 by root, Tue Jan 31 19:11:43 2006 UTC

… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 57# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 59# endif
60 /* high-intensity colors */ 60 /* high-intensity colors */
61# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 63# else
64 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 65# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "rgb:00/00/00",
176#endif
177 };
178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif 176#endif
216 }; 177 };
217 178
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
182 pix_colors = //
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 186#endif
225 pix_colors = pix_colors_focused;
226
227 if (pix_colors == NULL)
228 return false;
229 187
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 pixmap = None; 189 pixmap = None;
232#endif 190#endif
233 191
234 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS; 194 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 195 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 196 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 197 ncol = 80;
241 nrow = 24; 198 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
245 saveLines = SAVELINES; 202 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 203 numpix_colors = TOTAL_COLORS;
247 204
248 refresh_limit = 1; 205 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 207
252 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
253#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
254 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
255 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 50;
… …
341 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
342 298
343 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
344 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]);
345 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
346 extract_resources (); 311 extract_resources ();
347 312
348 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
349 327
350 /* 328 /*
351 * set any defaults not already set 329 * set any defaults not already set
352 */ 330 */
353 if (cmd_argv && cmd_argv[0]) 331 if (cmd_argv && cmd_argv[0])
… …
443 /* this is how xterm implements reverseVideo */ 421 /* this is how xterm implements reverseVideo */
444 if (OPTION (Opt_reverseVideo)) 422 if (OPTION (Opt_reverseVideo))
445 { 423 {
446 if (!rs[Rs_color + Color_fg]) 424 if (!rs[Rs_color + Color_fg])
447 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 425 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
426
448 if (!rs[Rs_color + Color_bg]) 427 if (!rs[Rs_color + Color_bg])
449 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 428 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
450 } 429 }
451#endif 430#endif
452 431
… …
504 val = rxvt_network_display (rs[Rs_display_name]); 483 val = rxvt_network_display (rs[Rs_display_name]);
505 rs[Rs_display_name] = (const char *)val; 484 rs[Rs_display_name] = (const char *)val;
506 485
507 if (val == NULL) 486 if (val == NULL)
508#endif /* DISPLAY_IS_IP */ 487#endif /* DISPLAY_IS_IP */
509 val = XDisplayString (display->display); 488 val = XDisplayString (xdisp);
510 489
511 if (rs[Rs_display_name] == NULL) 490 if (rs[Rs_display_name] == NULL)
512 rs[Rs_display_name] = val; /* use broken `:0' value */ 491 rs[Rs_display_name] = val; /* use broken `:0' value */
513 492
514 i = strlen (val); 493 i = strlen (val);
515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 494 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
516 495
517 sprintf (env_display, "DISPLAY=%s", val); 496 sprintf (env_display, "DISPLAY=%s", val);
518 497
519 /* avoiding the math library: 498 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
520 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
521 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
522 ;
523 max_it (i, 1);
524 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
525
526 sprintf (env_windowid, "WINDOWID=%u",
527 (unsigned int)parent[0]);
528 499
529 /* add entries to the environment: 500 /* add entries to the environment:
530 * @ DISPLAY: in case we started with -display 501 * @ DISPLAY: in case we started with -display
531 * @ WINDOWID: X window id number of the window 502 * @ WINDOWID: X window id number of the window
532 * @ COLORTERM: terminal sub-name and also indicates its color 503 * @ COLORTERM: terminal sub-name and also indicates its color
… …
534 * @ TERMINFO: path to terminfo directory 505 * @ TERMINFO: path to terminfo directory
535 * @ COLORFGBG: fg;bg color codes 506 * @ COLORFGBG: fg;bg color codes
536 */ 507 */
537 putenv (env_display); 508 putenv (env_display);
538 putenv (env_windowid); 509 putenv (env_windowid);
510
539 if (env_colorfgbg) 511 if (env_colorfgbg)
540 putenv (env_colorfgbg); 512 putenv (env_colorfgbg);
541 513
542#ifdef RXVT_TERMINFO 514#ifdef RXVT_TERMINFO
543 putenv ("TERMINFO=" RXVT_TERMINFO); 515 putenv ("TERMINFO=" RXVT_TERMINFO);
544#endif 516#endif
545 517
546 if (display->depth <= 2) 518 if (depth <= 2)
547 putenv ("COLORTERM=" COLORTERMENV "-mono"); 519 putenv ("COLORTERM=" COLORTERMENV "-mono");
548 else 520 else
549 putenv ("COLORTERM=" COLORTERMENVFULL); 521 putenv ("COLORTERM=" COLORTERMENVFULL);
550 522
551 if (rs[Rs_term_name] != NULL) 523 if (rs[Rs_term_name] != NULL)
… …
682 654
683#ifdef OFF_FOCUS_FADING 655#ifdef OFF_FOCUS_FADING
684 pix_colors = pix_colors_focused; 656 pix_colors = pix_colors_focused;
685#endif 657#endif
686 658
687 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 659 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
688 { 660 {
661 const char *name = rs[Rs_color + i];
662
663 if (!name)
664 continue;
665
689 rxvt_color xcol; 666 rxvt_color xcol;
690 667
691 if (!rs[Rs_color + i]) 668 if (!set_color (xcol, name))
692 continue;
693
694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
695 { 669 {
696#ifndef XTERM_REVERSE_VIDEO 670#ifndef XTERM_REVERSE_VIDEO
697 if (i < 2 && OPTION (Opt_reverseVideo)) 671 if (i < 2 && OPTION (Opt_reverseVideo))
698 rs[Rs_color + i] = def_colorName[!i]; 672 name = def_colorName [1 - i];
699 else 673 else
700#endif 674#endif
701 rs[Rs_color + i] = def_colorName[i]; 675 name = def_colorName [i];
702 676
703 if (!rs[Rs_color + i]) 677 if (!name)
704 continue; 678 continue;
705 679
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 680 if (!set_color (xcol, name))
707 { 681 {
708 switch (i) 682 switch (i)
709 { 683 {
710 case Color_fg: 684 case Color_fg:
711 case Color_bg: 685 case Color_bg:
712 /* fatal: need bg/fg color */
713 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 686 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
714 /* NOTREACHED */ 687 name = "";
715 break; 688 break;
716#ifndef NO_CURSORCOLOR 689#ifndef NO_CURSORCOLOR
717 case Color_cursor2: 690 case Color_cursor2:
718 xcol = pix_colors[Color_fg]; 691#endif
719 break;
720#endif /* ! NO_CURSORCOLOR */
721 case Color_pointer_fg: 692 case Color_pointer_fg:
693 name = rs[Rs_color + Color_fg];
722 xcol = pix_colors[Color_fg]; 694 xcol = pix_colors[Color_fg];
723 break; 695 break;
724 default: 696 default:
697 name = rs[Rs_color + Color_bg];
725 xcol = pix_colors[Color_bg]; /* None */ 698 xcol = pix_colors[Color_bg];
726 break; 699 break;
727 } 700 }
728 } 701 }
729 } 702 }
730 703
731 pix_colors[i] = xcol; 704 pix_colors[i] = xcol;
732 SET_PIXCOLOR (i); 705 rs[Rs_color + i] = name;
733 } 706 }
734 707
735#ifdef OFF_FOCUS_FADING 708#ifdef OFF_FOCUS_FADING
736 if (rs[Rs_fade]) 709 if (rs[Rs_fade])
737 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 710 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
738 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 }
739#endif 716#endif
740 717
741 if (display->depth <= 2) 718 if (depth <= 2)
742 { 719 {
743 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];
744 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];
745 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];
746 } 723 }
… …
751 * The calculations of topShadow/bottomShadow values are adapted 728 * The calculations of topShadow/bottomShadow values are adapted
752 * from the fvwm window manager. 729 * from the fvwm window manager.
753 */ 730 */
754#ifdef KEEP_SCROLLCOLOR 731#ifdef KEEP_SCROLLCOLOR
755 732
756 if (display->depth <= 2) 733 if (depth <= 2)
757 { 734 {
758 /* Monochrome */ 735 /* Monochrome */
759 pix_colors[Color_scroll] = pix_colors[Color_fg]; 736 pix_colors[Color_scroll] = pix_colors[Color_fg];
760 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 737 pix_colors[Color_topShadow] = pix_colors[Color_bg];
761 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 738 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
766 /* xcol[0] == white 743 /* xcol[0] == white
767 * xcol[1] == top shadow 744 * xcol[1] == top shadow
768 * xcol[2] == bot shadow */ 745 * xcol[2] == bot shadow */
769 746
770 xcol[1] = pix_colors[Color_scroll]; 747 xcol[1] = pix_colors[Color_scroll];
771 xcol[0].set (display, 65535, 65535, 65535); 748 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
772 749
773 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 750 rgba c0, c1;
774 751
775 xcol[0].get (display, pr0, pg0, pb0); 752 xcol[0].get (this, c0);
776 xcol[1].get (display, pr1, pg1, pb1); 753 xcol[1].get (this, c1);
777 754
778 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 755 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
779 756
780 /* topShadowColor */ 757 /* topShadowColor */
781 if (!xcol[1].set (display, 758 if (!xcol[1].set (this,
759 rgba (
782 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 760 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
783 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 761 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
784 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 ));
785 xcol[1] = pix_colors[Color_White]; 765 xcol[1] = pix_colors[Color_White];
786 766
787 pix_colors[Color_topShadow] = xcol[1]; 767 pix_colors[Color_topShadow] = xcol[1];
788 } 768 }
789#endif /* KEEP_SCROLLCOLOR */ 769#endif /* KEEP_SCROLLCOLOR */
… …
833 813
834 if (rsmod 814 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 815 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 816 requestedmeta = rsmod[3] - '0';
837 817
838 map = XGetModifierMapping (display->display); 818 map = XGetModifierMapping (xdisp);
839 kc = map->modifiermap; 819 kc = map->modifiermap;
840 820
841 for (i = 1; i < 6; i++) 821 for (i = 1; i < 6; i++)
842 { 822 {
843 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 823 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
845 for (j = map->max_keypermod; j--; k++) 825 for (j = map->max_keypermod; j--; k++)
846 { 826 {
847 if (kc[k] == 0) 827 if (kc[k] == 0)
848 break; 828 break;
849 829
850 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 830 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
851 { 831 {
852 case XK_Num_Lock: 832 case XK_Num_Lock:
853 ModNumLockMask = modmasks[i - 1]; 833 ModNumLockMask = modmasks[i - 1];
854 continue; 834 continue;
855 835
… …
905rxvt_term::create_windows (int argc, const char *const *argv) 885rxvt_term::create_windows (int argc, const char *const *argv)
906{ 886{
907 XClassHint classHint; 887 XClassHint classHint;
908 XWMHints wmHint; 888 XWMHints wmHint;
909#if ENABLE_FRILLS 889#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 890 MWMHints mwmhints;
912#endif 891#endif
913 XGCValues gcvalue; 892 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 893 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 894 Window top, parent;
917 dDisp;
918 895
919#ifdef USING_W11LIB 896 dLocal (Display *, xdisp);
920 /* enable W11 callbacks */
921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
922#endif
923 897
924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 898 /* grab colors before netscape does */
925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 899 Get_Colours ();
926 900
927 if (OPTION (Opt_transparent)) 901 if (!set_fonts ())
928 { 902 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 903
930 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 904 parent = display->root;
931 } 905
906 attributes.override_redirect = !!OPTION (Opt_override_redirect);
932 907
933#if ENABLE_FRILLS 908#if ENABLE_FRILLS
934 if (OPTION (Opt_borderLess)) 909 if (OPTION (Opt_borderLess))
935 { 910 {
936 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 911 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
937
938 if (prop == None)
939 { 912 {
940 /* 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");*/
941#ifdef PREFER_24BIT
942 attributes.override_redirect = TRUE; 914 attributes.override_redirect = true;
943#endif
944 mwmhints.flags = 0; 915 mwmhints.flags = 0;
945 } 916 }
946 else 917 else
947 { 918 {
948 mwmhints.flags = MWM_HINTS_DECORATIONS; 919 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
951 } 922 }
952 else 923 else
953 mwmhints.flags = 0; 924 mwmhints.flags = 0;
954#endif 925#endif
955 926
956 /* grab colors before netscape does */
957 Get_Colours ();
958
959 if (!set_fonts ())
960 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
961
962 parent = DefaultRootWindow (disp);
963
964#if ENABLE_XEMBED 927#if ENABLE_XEMBED
965 if (rs[Rs_embed]) 928 if (rs[Rs_embed])
966 { 929 {
967 XWindowAttributes wattr; 930 XWindowAttributes wattr;
968 931
969 parent = strtol (rs[Rs_embed], 0, 0); 932 parent = strtol (rs[Rs_embed], 0, 0);
970 933
971 if (!XGetWindowAttributes (disp, parent, &wattr)) 934 if (!XGetWindowAttributes (xdisp, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 935 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973 936
974 window_calc (wattr.width, wattr.height); 937 window_calc (wattr.width, wattr.height);
975 } 938 }
976#endif 939#endif
977 940
978 window_calc (0, 0); 941 window_calc (0, 0);
979 942
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 943 /* sub-window placement & size in rxvt_resize_subwindows () */
981#ifdef PREFER_24BIT
982 attributes.background_pixel = pix_colors_focused[Color_border]; 944 attributes.background_pixel = pix_colors_focused [Color_border];
983 attributes.border_pixel = pix_colors_focused[Color_border]; 945 attributes.border_pixel = pix_colors_focused [Color_border];
984 attributes.colormap = display->cmap; 946 attributes.colormap = cmap;
947
985 top = XCreateWindow (disp, parent, 948 top = XCreateWindow (xdisp, parent,
986 szHint.x, szHint.y, 949 szHint.x, szHint.y,
987 szHint.width, szHint.height, 950 szHint.width, szHint.height,
988 ext_bwidth, 951 ext_bwidth,
989 display->depth, InputOutput, 952 depth, InputOutput, visual,
990 display->visual,
991 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 953 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
992#else 954 &attributes);
993 top = XCreateSimpleWindow (disp, parent,
994 szHint.x, szHint.y,
995 szHint.width, szHint.height,
996 ext_bwidth,
997 pix_colors_focused[Color_border],
998 pix_colors_focused[Color_border]);
999#endif
1000 955
1001 this->parent[0] = top; 956 this->parent[0] = top;
1002 957
1003 old_width = szHint.width; 958 old_width = szHint.width;
1004 old_height = szHint.height; 959 old_height = szHint.height;
1005 960
1006 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 961 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1007 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 962 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1008 963
1009 classHint.res_name = (char *)rs[Rs_name]; 964 classHint.res_name = (char *)rs[Rs_name];
1010 classHint.res_class = (char *)RESCLASS; 965 classHint.res_class = (char *)RESCLASS;
1011 966
1012 wmHint.flags = InputHint | StateHint | WindowGroupHint; 967 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1013 wmHint.input = True; 968 wmHint.input = True;
1014 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 969 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1015 wmHint.window_group = top; 970 wmHint.window_group = top;
1016 971
1017 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 972 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1018 &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
1019 980
1020 Atom protocols[] = { 981 Atom protocols[] = {
1021 xa[XA_WM_DELETE_WINDOW], 982 xa[XA_WM_DELETE_WINDOW],
1022#if ENABLE_EWMH 983#if ENABLE_EWMH
1023 xa[XA_NET_WM_PING], 984 xa[XA_NET_WM_PING],
1024#endif 985#endif
1025 }; 986 };
1026 987
1027 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 988 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1028 989
1029#if ENABLE_FRILLS 990#if ENABLE_FRILLS
1030 if (rs[Rs_transient_for]) 991 if (rs[Rs_transient_for])
1031 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 992 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1032#endif 993#endif
1033 994
1034#if ENABLE_EWMH 995#if ENABLE_EWMH
1035 long pid = getpid (); 996 long pid = getpid ();
1036 997
1037 XChangeProperty (disp, top, 998 XChangeProperty (xdisp, top,
1038 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 999 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1039 PropModeReplace, (unsigned char *)&pid, 1); 1000 PropModeReplace, (unsigned char *)&pid, 1);
1040 1001
1041 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1002 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1042#endif 1003#endif
1043 1004
1044 XSelectInput (disp, top, 1005 XSelectInput (xdisp, top,
1045 KeyPressMask 1006 KeyPressMask
1046#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1007#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1047 | KeyReleaseMask 1008 | KeyReleaseMask
1048#endif 1009#endif
1049 | FocusChangeMask | VisibilityChangeMask 1010 | FocusChangeMask | VisibilityChangeMask
1050 | ExposureMask | StructureNotifyMask); 1011 | ExposureMask | StructureNotifyMask);
1051 1012
1052 termwin_ev.start (display, top); 1013 termwin_ev.start (display, top);
1053 1014
1054#if ENABLE_FRILLS
1055 if (mwmhints.flags)
1056 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1057 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1058#endif
1059
1060 /* 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 */
1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1016 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1062 1017
1063#ifdef HAVE_SCROLLBARS 1018#ifdef HAVE_SCROLLBARS
1064 /* cursor scrollBar: Black-on-White */ 1019 /* cursor scrollBar: Black-on-White */
1065 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1020 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1066#endif 1021#endif
1067 1022
1068 /* the vt window */ 1023 /* the vt window */
1069 vt = XCreateSimpleWindow (disp, top, 1024 vt = XCreateSimpleWindow (xdisp, top,
1070 window_vt_x,
1071 window_vt_y, 1025 window_vt_x, window_vt_y,
1072 width,
1073 height, 1026 width, height,
1074 0, 1027 0,
1075 pix_colors_focused[Color_fg], 1028 pix_colors_focused[Color_fg],
1076 pix_colors_focused[Color_bg]); 1029 pix_colors_focused[Color_bg]);
1077#ifdef DEBUG_X
1078 XStoreName (disp, vt, "vt window");
1079#endif
1080 1030
1081 attributes.bit_gravity = NorthWestGravity; 1031 attributes.bit_gravity = NorthWestGravity;
1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1032 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1083 1033
1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1034 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1085 1035
1086 if (OPTION (Opt_pointerBlank)) 1036 if (OPTION (Opt_pointerBlank))
1087 vt_emask |= PointerMotionMask; 1037 vt_emask |= PointerMotionMask;
… …
1092 1042
1093 vt_ev.start (display, vt); 1043 vt_ev.start (display, vt);
1094 1044
1095#ifdef XPM_BACKGROUND 1045#ifdef XPM_BACKGROUND
1096 if (rs[Rs_backgroundPixmap] != NULL 1046 if (rs[Rs_backgroundPixmap] != NULL
1097 && ! OPTION (Opt_transparent)) 1047 && !OPTION (Opt_transparent))
1098 { 1048 {
1099 const char *p = rs[Rs_backgroundPixmap]; 1049 const char *p = rs[Rs_backgroundPixmap];
1100 1050
1101 if ((p = strchr (p, ';')) != NULL) 1051 if ((p = strchr (p, ';')) != NULL)
1102 { 1052 {
… …
1108 scr_touch (true); 1058 scr_touch (true);
1109 } 1059 }
1110#endif 1060#endif
1111 1061
1112 /* graphics context for the vt window */ 1062 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1063 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1064 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1065 gcvalue.graphics_exposures = 1;
1066
1116 gc = XCreateGC (disp, vt, 1067 gc = XCreateGC (xdisp, vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1068 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1069 &gcvalue);
1119 1070
1120 drawable = new rxvt_drawable (display, vt); 1071 drawable = new rxvt_drawable (this, vt);
1121 1072
1122#ifdef RXVT_SCROLLBAR 1073#ifdef RXVT_SCROLLBAR
1123 gcvalue.foreground = pix_colors[Color_topShadow]; 1074 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1075 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1076 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1077 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1078 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1079 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1129#endif 1080#endif
1130 1081
1131#ifdef OFF_FOCUS_FADING 1082#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1083 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1084 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1085 pix_colors = pix_colors_unfocused;
1135#endif 1086#endif
1136 1087
1137 pointer_unblank (); 1088 pointer_unblank ();
1138 scr_recolour (); 1089 scr_recolour ();
1139
1140#if ENABLE_XEMBED
1141 if (rs[Rs_embed])
1142 {
1143 long info[2] = { 0, XEMBED_MAPPED };
1144
1145 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1146 32, PropModeReplace, (unsigned char *)&info, 2);
1147 }
1148#endif
1149} 1090}
1150 1091
1151/* ------------------------------------------------------------------------- * 1092/* ------------------------------------------------------------------------- *
1152 * GET TTY CURRENT STATE * 1093 * GET TTY CURRENT STATE *
1153 * ------------------------------------------------------------------------- */ 1094 * ------------------------------------------------------------------------- */
… …
1370rxvt_term::run_command (const char *const *argv) 1311rxvt_term::run_command (const char *const *argv)
1371{ 1312{
1372#if ENABLE_FRILLS 1313#if ENABLE_FRILLS
1373 if (rs[Rs_pty_fd]) 1314 if (rs[Rs_pty_fd])
1374 { 1315 {
1375 pty.pty = atoi (rs[Rs_pty_fd]); 1316 pty->pty = atoi (rs[Rs_pty_fd]);
1376 1317
1377 if (pty.pty >= 0) 1318 if (pty->pty >= 0)
1378 { 1319 {
1379 if (getfd_hook) 1320 if (getfd_hook)
1380 pty.pty = (*getfd_hook) (pty.pty); 1321 pty->pty = (*getfd_hook) (pty->pty);
1381 1322
1382 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1323 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1383 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1324 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1384 } 1325 }
1385 } 1326 }
1386 else 1327 else
1387#endif 1328#endif
1388 if (!pty.get ()) 1329 if (!pty->get ())
1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1330 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390 1331
1391 pty.set_utf8_mode (enc_utf8); 1332 pty->set_utf8_mode (enc_utf8);
1392 1333
1393 /* set initial window size */ 1334 /* set initial window size */
1394 tt_winch (); 1335 tt_winch ();
1395 1336
1396 int er; 1337 int er;
… …
1420 rxvt_fatal ("can't fork, aborting.\n"); 1361 rxvt_fatal ("can't fork, aborting.\n");
1421 } 1362 }
1422 case 0: 1363 case 0:
1423 init_env (); 1364 init_env ();
1424 1365
1425 if (!pty.make_controlling_tty ()) 1366 if (!pty->make_controlling_tty ())
1426 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1367 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1427 else 1368 else
1428 { 1369 {
1429 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1370 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1430 dup2 (pty.tty, STDIN_FILENO); 1371 dup2 (pty->tty, STDIN_FILENO);
1431 dup2 (pty.tty, STDOUT_FILENO); 1372 dup2 (pty->tty, STDOUT_FILENO);
1432 dup2 (pty.tty, STDERR_FILENO); 1373 dup2 (pty->tty, STDERR_FILENO);
1433 1374
1434 // close all our file handles that we do no longer need 1375 // close all our file handles that we do no longer need
1435 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1376 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1436 { 1377 {
1437 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1378 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1438 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1379 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1439 } 1380 }
1440 1381
1441 run_child (argv); 1382 run_child (argv);
1442 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1383 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1443 } 1384 }
1444 1385
1445 _exit (EXIT_FAILURE); 1386 _exit (EXIT_FAILURE);
1446 1387
1447 default: 1388 default:
1448 { 1389 if (!OPTION (Opt_utmpInhibit))
1449#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1390 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1450 int fdstdin;
1451 1391
1452 fdstdin = dup (STDIN_FILENO); 1392 pty->close_tty ();
1453 dup2 (pty.tty, STDIN_FILENO);
1454#endif
1455 1393
1456#ifdef UTMP_SUPPORT 1394 child_ev.start (cmd_pid);
1457 privileged_utmp (SAVE);
1458#endif
1459 1395
1460#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1396 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1461
1462 dup2 (fdstdin, STDIN_FILENO);
1463 close (fdstdin);
1464#endif
1465 }
1466
1467 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1468 break; 1397 break;
1469 } 1398 }
1470} 1399}
1471 1400
1472/* ------------------------------------------------------------------------- * 1401/* ------------------------------------------------------------------------- *

Diff Legend

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