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.149 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.162 by root, Tue Jan 31 16:19:16 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])
… …
504 val = rxvt_network_display (rs[Rs_display_name]); 482 val = rxvt_network_display (rs[Rs_display_name]);
505 rs[Rs_display_name] = (const char *)val; 483 rs[Rs_display_name] = (const char *)val;
506 484
507 if (val == NULL) 485 if (val == NULL)
508#endif /* DISPLAY_IS_IP */ 486#endif /* DISPLAY_IS_IP */
509 val = XDisplayString (display->display); 487 val = XDisplayString (xdisp);
510 488
511 if (rs[Rs_display_name] == NULL) 489 if (rs[Rs_display_name] == NULL)
512 rs[Rs_display_name] = val; /* use broken `:0' value */ 490 rs[Rs_display_name] = val; /* use broken `:0' value */
513 491
514 i = strlen (val); 492 i = strlen (val);
515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
516 494
517 sprintf (env_display, "DISPLAY=%s", val); 495 sprintf (env_display, "DISPLAY=%s", val);
518 496
519 /* avoiding the math library: 497 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 498
529 /* add entries to the environment: 499 /* add entries to the environment:
530 * @ DISPLAY: in case we started with -display 500 * @ DISPLAY: in case we started with -display
531 * @ WINDOWID: X window id number of the window 501 * @ WINDOWID: X window id number of the window
532 * @ COLORTERM: terminal sub-name and also indicates its color 502 * @ COLORTERM: terminal sub-name and also indicates its color
… …
534 * @ TERMINFO: path to terminfo directory 504 * @ TERMINFO: path to terminfo directory
535 * @ COLORFGBG: fg;bg color codes 505 * @ COLORFGBG: fg;bg color codes
536 */ 506 */
537 putenv (env_display); 507 putenv (env_display);
538 putenv (env_windowid); 508 putenv (env_windowid);
509
539 if (env_colorfgbg) 510 if (env_colorfgbg)
540 putenv (env_colorfgbg); 511 putenv (env_colorfgbg);
541 512
542#ifdef RXVT_TERMINFO 513#ifdef RXVT_TERMINFO
543 putenv ("TERMINFO=" RXVT_TERMINFO); 514 putenv ("TERMINFO=" RXVT_TERMINFO);
544#endif 515#endif
545 516
546 if (display->depth <= 2) 517 if (depth <= 2)
547 putenv ("COLORTERM=" COLORTERMENV "-mono"); 518 putenv ("COLORTERM=" COLORTERMENV "-mono");
548 else 519 else
549 putenv ("COLORTERM=" COLORTERMENVFULL); 520 putenv ("COLORTERM=" COLORTERMENVFULL);
550 521
551 if (rs[Rs_term_name] != NULL) 522 if (rs[Rs_term_name] != NULL)
… …
682 653
683#ifdef OFF_FOCUS_FADING 654#ifdef OFF_FOCUS_FADING
684 pix_colors = pix_colors_focused; 655 pix_colors = pix_colors_focused;
685#endif 656#endif
686 657
687 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
688 { 659 {
689 rxvt_color xcol; 660 rxvt_color xcol;
690 661
691 if (!rs[Rs_color + i]) 662 if (!rs[Rs_color + i])
692 continue; 663 continue;
693 664
694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 665 if (!set_color (xcol, rs[Rs_color + i]))
695 { 666 {
696#ifndef XTERM_REVERSE_VIDEO 667#ifndef XTERM_REVERSE_VIDEO
697 if (i < 2 && OPTION (Opt_reverseVideo)) 668 if (i < 2 && OPTION (Opt_reverseVideo))
698 rs[Rs_color + i] = def_colorName[!i]; 669 rs[Rs_color + i] = def_colorName[!i];
699 else 670 else
… …
701 rs[Rs_color + i] = def_colorName[i]; 672 rs[Rs_color + i] = def_colorName[i];
702 673
703 if (!rs[Rs_color + i]) 674 if (!rs[Rs_color + i])
704 continue; 675 continue;
705 676
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 677 if (!set_color (xcol, rs[Rs_color + i]))
707 { 678 {
708 switch (i) 679 switch (i)
709 { 680 {
710 case Color_fg: 681 case Color_fg:
711 case Color_bg: 682 case Color_bg:
712 /* fatal: need bg/fg color */ 683 /* fatal: need bg/fg color */
713 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 684 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
714 /* NOTREACHED */
715 break; 685 break;
716#ifndef NO_CURSORCOLOR 686#ifndef NO_CURSORCOLOR
717 case Color_cursor2: 687 case Color_cursor2:
718 xcol = pix_colors[Color_fg]; 688 xcol = pix_colors[Color_fg];
719 break; 689 break;
… …
732 SET_PIXCOLOR (i); 702 SET_PIXCOLOR (i);
733 } 703 }
734 704
735#ifdef OFF_FOCUS_FADING 705#ifdef OFF_FOCUS_FADING
736 if (rs[Rs_fade]) 706 if (rs[Rs_fade])
737 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 707 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
708 {
709 rxvt_rgba c;
710 pix_colors[Color_fade].get (this, c);
738 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 711 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), c);
712 }
739#endif 713#endif
740 714
741 if (display->depth <= 2) 715 if (depth <= 2)
742 { 716 {
743 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 717 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
744 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 718 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
745 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
746 } 720 }
… …
751 * The calculations of topShadow/bottomShadow values are adapted 725 * The calculations of topShadow/bottomShadow values are adapted
752 * from the fvwm window manager. 726 * from the fvwm window manager.
753 */ 727 */
754#ifdef KEEP_SCROLLCOLOR 728#ifdef KEEP_SCROLLCOLOR
755 729
756 if (display->depth <= 2) 730 if (depth <= 2)
757 { 731 {
758 /* Monochrome */ 732 /* Monochrome */
759 pix_colors[Color_scroll] = pix_colors[Color_fg]; 733 pix_colors[Color_scroll] = pix_colors[Color_fg];
760 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 734 pix_colors[Color_topShadow] = pix_colors[Color_bg];
761 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
766 /* xcol[0] == white 740 /* xcol[0] == white
767 * xcol[1] == top shadow 741 * xcol[1] == top shadow
768 * xcol[2] == bot shadow */ 742 * xcol[2] == bot shadow */
769 743
770 xcol[1] = pix_colors[Color_scroll]; 744 xcol[1] = pix_colors[Color_scroll];
771 xcol[0].set (display, 65535, 65535, 65535); 745 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC));
772 746
773 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 747 rxvt_rgba c0, c1;
774 748
775 xcol[0].get (display, pr0, pg0, pb0); 749 xcol[0].get (this, c0);
776 xcol[1].get (display, pr1, pg1, pb1); 750 xcol[1].get (this, c1);
777 751
778 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 752 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
779 753
780 /* topShadowColor */ 754 /* topShadowColor */
781 if (!xcol[1].set (display, 755 if (!xcol[1].set (this,
756 rxvt_rgba (
782 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 757 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
783 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 758 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
784 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 759 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
760 c1.a) // pa1 vs. pa0: arbitrary
761 ));
785 xcol[1] = pix_colors[Color_White]; 762 xcol[1] = pix_colors[Color_White];
786 763
787 pix_colors[Color_topShadow] = xcol[1]; 764 pix_colors[Color_topShadow] = xcol[1];
788 } 765 }
789#endif /* KEEP_SCROLLCOLOR */ 766#endif /* KEEP_SCROLLCOLOR */
… …
833 810
834 if (rsmod 811 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 813 requestedmeta = rsmod[3] - '0';
837 814
838 map = XGetModifierMapping (display->display); 815 map = XGetModifierMapping (xdisp);
839 kc = map->modifiermap; 816 kc = map->modifiermap;
840 817
841 for (i = 1; i < 6; i++) 818 for (i = 1; i < 6; i++)
842 { 819 {
843 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
845 for (j = map->max_keypermod; j--; k++) 822 for (j = map->max_keypermod; j--; k++)
846 { 823 {
847 if (kc[k] == 0) 824 if (kc[k] == 0)
848 break; 825 break;
849 826
850 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 827 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
851 { 828 {
852 case XK_Num_Lock: 829 case XK_Num_Lock:
853 ModNumLockMask = modmasks[i - 1]; 830 ModNumLockMask = modmasks[i - 1];
854 continue; 831 continue;
855 832
… …
905rxvt_term::create_windows (int argc, const char *const *argv) 882rxvt_term::create_windows (int argc, const char *const *argv)
906{ 883{
907 XClassHint classHint; 884 XClassHint classHint;
908 XWMHints wmHint; 885 XWMHints wmHint;
909#if ENABLE_FRILLS 886#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 887 MWMHints mwmhints;
912#endif 888#endif
913 XGCValues gcvalue; 889 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 890 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 891 Window top, parent;
917 dDisp;
918 892
919#ifdef USING_W11LIB 893 dLocal (Display *, xdisp);
920 /* enable W11 callbacks */
921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
922#endif
923
924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
926
927 if (OPTION (Opt_transparent))
928 {
929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
931 }
932 894
933 /* grab colors before netscape does */ 895 /* grab colors before netscape does */
934 Get_Colours (); 896 Get_Colours ();
935 897
936 if (!set_fonts ()) 898 if (!set_fonts ())
937 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 899 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
938 900
939 parent = DefaultRootWindow (disp); 901 parent = display->root;
940 902
941 attributes.override_redirect = !!OPTION (Opt_override_redirect); 903 attributes.override_redirect = !!OPTION (Opt_override_redirect);
942 904
943#if ENABLE_FRILLS 905#if ENABLE_FRILLS
944 if (OPTION (Opt_borderLess)) 906 if (OPTION (Opt_borderLess))
945 { 907 {
946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 908 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
947
948 if (prop == None)
949 { 909 {
950 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
951 attributes.override_redirect = TRUE; 911 attributes.override_redirect = true;
952 mwmhints.flags = 0; 912 mwmhints.flags = 0;
953 } 913 }
954 else 914 else
955 { 915 {
956 mwmhints.flags = MWM_HINTS_DECORATIONS; 916 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
966 { 926 {
967 XWindowAttributes wattr; 927 XWindowAttributes wattr;
968 928
969 parent = strtol (rs[Rs_embed], 0, 0); 929 parent = strtol (rs[Rs_embed], 0, 0);
970 930
971 if (!XGetWindowAttributes (disp, parent, &wattr)) 931 if (!XGetWindowAttributes (xdisp, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973 933
974 window_calc (wattr.width, wattr.height); 934 window_calc (wattr.width, wattr.height);
975 } 935 }
976#endif 936#endif
977 937
978 window_calc (0, 0); 938 window_calc (0, 0);
979 939
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 940 /* sub-window placement & size in rxvt_resize_subwindows () */
981 attributes.background_pixel = pix_colors_focused[Color_border]; 941 attributes.background_pixel = pix_colors_focused [Color_border];
982 attributes.border_pixel = pix_colors_focused[Color_border]; 942 attributes.border_pixel = pix_colors_focused [Color_border];
983 attributes.colormap = display->cmap; 943 attributes.colormap = cmap;
944
984 top = XCreateWindow (disp, parent, 945 top = XCreateWindow (xdisp, parent,
985 szHint.x, szHint.y, 946 szHint.x, szHint.y,
986 szHint.width, szHint.height, 947 szHint.width, szHint.height,
987 ext_bwidth, 948 ext_bwidth,
988 display->depth, InputOutput, 949 depth, InputOutput, visual,
989 display->visual,
990 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
991 &attributes); 951 &attributes);
992 952
993 this->parent[0] = top; 953 this->parent[0] = top;
994 954
995 old_width = szHint.width; 955 old_width = szHint.width;
996 old_height = szHint.height; 956 old_height = szHint.height;
997 957
998 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 958 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
999 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 959 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1000 960
1001 classHint.res_name = (char *)rs[Rs_name]; 961 classHint.res_name = (char *)rs[Rs_name];
1002 classHint.res_class = (char *)RESCLASS; 962 classHint.res_class = (char *)RESCLASS;
1003 963
1004 wmHint.flags = InputHint | StateHint | WindowGroupHint; 964 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1005 wmHint.input = True; 965 wmHint.input = True;
1006 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 966 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1007 wmHint.window_group = top; 967 wmHint.window_group = top;
1008 968
1009 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 969 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1010 &szHint, &wmHint, &classHint); 970 &szHint, &wmHint, &classHint);
971
972#if ENABLE_FRILLS
973 if (mwmhints.flags)
974 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
976#endif
1011 977
1012 Atom protocols[] = { 978 Atom protocols[] = {
1013 xa[XA_WM_DELETE_WINDOW], 979 xa[XA_WM_DELETE_WINDOW],
1014#if ENABLE_EWMH 980#if ENABLE_EWMH
1015 xa[XA_NET_WM_PING], 981 xa[XA_NET_WM_PING],
1016#endif 982#endif
1017 }; 983 };
1018 984
1019 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 985 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1020 986
1021#if ENABLE_FRILLS 987#if ENABLE_FRILLS
1022 if (rs[Rs_transient_for]) 988 if (rs[Rs_transient_for])
1023 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 989 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1024#endif 990#endif
1025 991
1026#if ENABLE_EWMH 992#if ENABLE_EWMH
1027 long pid = getpid (); 993 long pid = getpid ();
1028 994
1029 XChangeProperty (disp, top, 995 XChangeProperty (xdisp, top,
1030 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 996 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1031 PropModeReplace, (unsigned char *)&pid, 1); 997 PropModeReplace, (unsigned char *)&pid, 1);
1032 998
1033 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1034#endif 1000#endif
1035 1001
1036 XSelectInput (disp, top, 1002 XSelectInput (xdisp, top,
1037 KeyPressMask 1003 KeyPressMask
1038#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1039 | KeyReleaseMask 1005 | KeyReleaseMask
1040#endif 1006#endif
1041 | FocusChangeMask | VisibilityChangeMask 1007 | FocusChangeMask | VisibilityChangeMask
1042 | ExposureMask | StructureNotifyMask); 1008 | ExposureMask | StructureNotifyMask);
1043 1009
1044 termwin_ev.start (display, top); 1010 termwin_ev.start (display, top);
1045 1011
1046#if ENABLE_FRILLS
1047 if (mwmhints.flags)
1048 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1049 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1050#endif
1051
1052 /* vt cursor: Black-on-White is standard, but this is more popular */ 1012 /* vt cursor: Black-on-White is standard, but this is more popular */
1053 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1013 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1054 1014
1055#ifdef HAVE_SCROLLBARS 1015#ifdef HAVE_SCROLLBARS
1056 /* cursor scrollBar: Black-on-White */ 1016 /* cursor scrollBar: Black-on-White */
1057 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1017 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1058#endif 1018#endif
1059 1019
1060 /* the vt window */ 1020 /* the vt window */
1061 vt = XCreateSimpleWindow (disp, top, 1021 vt = XCreateSimpleWindow (xdisp, top,
1062 window_vt_x,
1063 window_vt_y, 1022 window_vt_x, window_vt_y,
1064 width,
1065 height, 1023 width, height,
1066 0, 1024 0,
1067 pix_colors_focused[Color_fg], 1025 pix_colors_focused[Color_fg],
1068 pix_colors_focused[Color_bg]); 1026 pix_colors_focused[Color_bg]);
1069#ifdef DEBUG_X
1070 XStoreName (disp, vt, "vt window");
1071#endif
1072 1027
1073 attributes.bit_gravity = NorthWestGravity; 1028 attributes.bit_gravity = NorthWestGravity;
1074 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1029 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1075 1030
1076 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1077 1032
1078 if (OPTION (Opt_pointerBlank)) 1033 if (OPTION (Opt_pointerBlank))
1079 vt_emask |= PointerMotionMask; 1034 vt_emask |= PointerMotionMask;
… …
1084 1039
1085 vt_ev.start (display, vt); 1040 vt_ev.start (display, vt);
1086 1041
1087#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
1088 if (rs[Rs_backgroundPixmap] != NULL 1043 if (rs[Rs_backgroundPixmap] != NULL
1089 && ! OPTION (Opt_transparent)) 1044 && !OPTION (Opt_transparent))
1090 { 1045 {
1091 const char *p = rs[Rs_backgroundPixmap]; 1046 const char *p = rs[Rs_backgroundPixmap];
1092 1047
1093 if ((p = strchr (p, ';')) != NULL) 1048 if ((p = strchr (p, ';')) != NULL)
1094 { 1049 {
… …
1100 scr_touch (true); 1055 scr_touch (true);
1101 } 1056 }
1102#endif 1057#endif
1103 1058
1104 /* graphics context for the vt window */ 1059 /* graphics context for the vt window */
1105 gcvalue.foreground = pix_colors[Color_fg]; 1060 gcvalue.foreground = pix_colors[Color_fg];
1106 gcvalue.background = pix_colors[Color_bg]; 1061 gcvalue.background = pix_colors[Color_bg];
1107 gcvalue.graphics_exposures = 1; 1062 gcvalue.graphics_exposures = 1;
1063
1108 gc = XCreateGC (disp, vt, 1064 gc = XCreateGC (xdisp, vt,
1109 GCForeground | GCBackground | GCGraphicsExposures, 1065 GCForeground | GCBackground | GCGraphicsExposures,
1110 &gcvalue); 1066 &gcvalue);
1111 1067
1112 drawable = new rxvt_drawable (display, vt); 1068 drawable = new rxvt_drawable (this, vt);
1113 1069
1114#ifdef RXVT_SCROLLBAR 1070#ifdef RXVT_SCROLLBAR
1115 gcvalue.foreground = pix_colors[Color_topShadow]; 1071 gcvalue.foreground = pix_colors[Color_topShadow];
1116 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1072 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1117 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1073 gcvalue.foreground = pix_colors[Color_bottomShadow];
1118 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1074 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1119 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1075 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1120 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1076 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1121#endif 1077#endif
1122 1078
1123#ifdef OFF_FOCUS_FADING 1079#ifdef OFF_FOCUS_FADING
1124 // initially we are in unfocused state 1080 // initially we are in unfocused state
1125 if (rs[Rs_fade]) 1081 if (rs[Rs_fade])
1126 pix_colors = pix_colors_unfocused; 1082 pix_colors = pix_colors_unfocused;
1127#endif 1083#endif
1128 1084
1129 pointer_unblank (); 1085 pointer_unblank ();
1130 scr_recolour (); 1086 scr_recolour ();
1131
1132#if ENABLE_XEMBED
1133 if (rs[Rs_embed])
1134 {
1135 long info[2] = { 0, XEMBED_MAPPED };
1136
1137 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1138 32, PropModeReplace, (unsigned char *)&info, 2);
1139 }
1140#endif
1141} 1087}
1142 1088
1143/* ------------------------------------------------------------------------- * 1089/* ------------------------------------------------------------------------- *
1144 * GET TTY CURRENT STATE * 1090 * GET TTY CURRENT STATE *
1145 * ------------------------------------------------------------------------- */ 1091 * ------------------------------------------------------------------------- */
… …
1435 } 1381 }
1436 1382
1437 _exit (EXIT_FAILURE); 1383 _exit (EXIT_FAILURE);
1438 1384
1439 default: 1385 default:
1440#if UTMP_SUPPORT
1441 if (!OPTION (Opt_utmpInhibit)) 1386 if (!OPTION (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1387 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1443#endif
1444 1388
1445 pty->close_tty (); 1389 pty->close_tty ();
1446 1390
1447 child_ev.start (cmd_pid); 1391 child_ev.start (cmd_pid);
1448 1392

Diff Legend

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