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.153 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.163 by root, Tue Jan 31 16:57:35 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 176#endif
177 }; 177 };
178 178
179bool 179bool
180rxvt_term::init_vars () 180rxvt_term::init_vars ()
181{ 181{
182 pix_colors = //
182 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
183#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
184 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
185#endif 186#endif
186 pix_colors = pix_colors_focused;
187
188 if (pix_colors == NULL)
189 return false;
190 187
191#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
192 pixmap = None; 189 pixmap = None;
193#endif 190#endif
194 191
195 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
196 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
197 options = DEFAULT_OPTIONS; 194 options = DEFAULT_OPTIONS;
198 want_refresh = 1; 195 want_refresh = 1;
199 priv_modes = SavedModes = PrivMode_Default; 196 priv_modes = SavedModes = PrivMode_Default;
200 focus = 0;
201 ncol = 80; 197 ncol = 80;
202 nrow = 24; 198 nrow = 24;
203 int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
204 ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
205 lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
206 saveLines = SAVELINES; 202 saveLines = SAVELINES;
207 numpix_colors = TOTAL_COLORS; 203 numpix_colors = TOTAL_COLORS;
208 204
209 refresh_limit = 1; 205 refresh_limit = 1;
210 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
211 prev_nrow = prev_ncol = 0;
212 207
213 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
214#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
215 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
216 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 50;
… …
301 296
302 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
303 298
304 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
305 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]);
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);
306 310
307 extract_resources (); 311 extract_resources ();
308 312
309 free (r_argv); 313 free (r_argv);
310 314
… …
478 val = rxvt_network_display (rs[Rs_display_name]); 482 val = rxvt_network_display (rs[Rs_display_name]);
479 rs[Rs_display_name] = (const char *)val; 483 rs[Rs_display_name] = (const char *)val;
480 484
481 if (val == NULL) 485 if (val == NULL)
482#endif /* DISPLAY_IS_IP */ 486#endif /* DISPLAY_IS_IP */
483 val = XDisplayString (display->display); 487 val = XDisplayString (xdisp);
484 488
485 if (rs[Rs_display_name] == NULL) 489 if (rs[Rs_display_name] == NULL)
486 rs[Rs_display_name] = val; /* use broken `:0' value */ 490 rs[Rs_display_name] = val; /* use broken `:0' value */
487 491
488 i = strlen (val); 492 i = strlen (val);
489 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
490 494
491 sprintf (env_display, "DISPLAY=%s", val); 495 sprintf (env_display, "DISPLAY=%s", val);
492 496
493 /* avoiding the math library: 497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
494 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
495 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
496 ;
497 max_it (i, 1);
498 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
499
500 sprintf (env_windowid, "WINDOWID=%u",
501 (unsigned int)parent[0]);
502 498
503 /* add entries to the environment: 499 /* add entries to the environment:
504 * @ DISPLAY: in case we started with -display 500 * @ DISPLAY: in case we started with -display
505 * @ WINDOWID: X window id number of the window 501 * @ WINDOWID: X window id number of the window
506 * @ COLORTERM: terminal sub-name and also indicates its color 502 * @ COLORTERM: terminal sub-name and also indicates its color
… …
508 * @ TERMINFO: path to terminfo directory 504 * @ TERMINFO: path to terminfo directory
509 * @ COLORFGBG: fg;bg color codes 505 * @ COLORFGBG: fg;bg color codes
510 */ 506 */
511 putenv (env_display); 507 putenv (env_display);
512 putenv (env_windowid); 508 putenv (env_windowid);
509
513 if (env_colorfgbg) 510 if (env_colorfgbg)
514 putenv (env_colorfgbg); 511 putenv (env_colorfgbg);
515 512
516#ifdef RXVT_TERMINFO 513#ifdef RXVT_TERMINFO
517 putenv ("TERMINFO=" RXVT_TERMINFO); 514 putenv ("TERMINFO=" RXVT_TERMINFO);
518#endif 515#endif
519 516
520 if (display->depth <= 2) 517 if (depth <= 2)
521 putenv ("COLORTERM=" COLORTERMENV "-mono"); 518 putenv ("COLORTERM=" COLORTERMENV "-mono");
522 else 519 else
523 putenv ("COLORTERM=" COLORTERMENVFULL); 520 putenv ("COLORTERM=" COLORTERMENVFULL);
524 521
525 if (rs[Rs_term_name] != NULL) 522 if (rs[Rs_term_name] != NULL)
… …
656 653
657#ifdef OFF_FOCUS_FADING 654#ifdef OFF_FOCUS_FADING
658 pix_colors = pix_colors_focused; 655 pix_colors = pix_colors_focused;
659#endif 656#endif
660 657
661 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
662 { 659 {
663 rxvt_color xcol; 660 rxvt_color xcol;
664 661
665 if (!rs[Rs_color + i]) 662 if (!rs[Rs_color + i])
666 continue; 663 continue;
667 664
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 665 if (!set_color (xcol, rs[Rs_color + i]))
669 { 666 {
670#ifndef XTERM_REVERSE_VIDEO 667#ifndef XTERM_REVERSE_VIDEO
671 if (i < 2 && OPTION (Opt_reverseVideo)) 668 if (i < 2 && OPTION (Opt_reverseVideo))
672 rs[Rs_color + i] = def_colorName[!i]; 669 rs[Rs_color + i] = def_colorName[!i];
673 else 670 else
… …
675 rs[Rs_color + i] = def_colorName[i]; 672 rs[Rs_color + i] = def_colorName[i];
676 673
677 if (!rs[Rs_color + i]) 674 if (!rs[Rs_color + i])
678 continue; 675 continue;
679 676
680 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 677 if (!set_color (xcol, rs[Rs_color + i]))
681 { 678 {
682 switch (i) 679 switch (i)
683 { 680 {
684 case Color_fg: 681 case Color_fg:
685 case Color_bg: 682 case Color_bg:
686 /* fatal: need bg/fg color */ 683 /* fatal: need bg/fg color */
687 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 684 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
688 /* NOTREACHED */
689 break; 685 break;
690#ifndef NO_CURSORCOLOR 686#ifndef NO_CURSORCOLOR
691 case Color_cursor2: 687 case Color_cursor2:
692 xcol = pix_colors[Color_fg]; 688 xcol = pix_colors[Color_fg];
693 break; 689 break;
… …
706 SET_PIXCOLOR (i); 702 SET_PIXCOLOR (i);
707 } 703 }
708 704
709#ifdef OFF_FOCUS_FADING 705#ifdef OFF_FOCUS_FADING
710 if (rs[Rs_fade]) 706 if (rs[Rs_fade])
711 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 707 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
712 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 708 {
709 rxvt_rgba c;
710 pix_colors[Color_fade].get (this, c);
711 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
712 }
713#endif 713#endif
714 714
715 if (display->depth <= 2) 715 if (depth <= 2)
716 { 716 {
717 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];
718 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];
719 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];
720 } 720 }
… …
725 * The calculations of topShadow/bottomShadow values are adapted 725 * The calculations of topShadow/bottomShadow values are adapted
726 * from the fvwm window manager. 726 * from the fvwm window manager.
727 */ 727 */
728#ifdef KEEP_SCROLLCOLOR 728#ifdef KEEP_SCROLLCOLOR
729 729
730 if (display->depth <= 2) 730 if (depth <= 2)
731 { 731 {
732 /* Monochrome */ 732 /* Monochrome */
733 pix_colors[Color_scroll] = pix_colors[Color_fg]; 733 pix_colors[Color_scroll] = pix_colors[Color_fg];
734 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 734 pix_colors[Color_topShadow] = pix_colors[Color_bg];
735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
740 /* xcol[0] == white 740 /* xcol[0] == white
741 * xcol[1] == top shadow 741 * xcol[1] == top shadow
742 * xcol[2] == bot shadow */ 742 * xcol[2] == bot shadow */
743 743
744 xcol[1] = pix_colors[Color_scroll]; 744 xcol[1] = pix_colors[Color_scroll];
745 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));
746 746
747 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 747 rxvt_rgba c0, c1;
748 748
749 xcol[0].get (display, pr0, pg0, pb0); 749 xcol[0].get (this, c0);
750 xcol[1].get (display, pr1, pg1, pb1); 750 xcol[1].get (this, c1);
751 751
752 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 752 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
753 753
754 /* topShadowColor */ 754 /* topShadowColor */
755 if (!xcol[1].set (display, 755 if (!xcol[1].set (this,
756 rxvt_rgba (
756 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 757 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
757 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 758 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
758 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 ));
759 xcol[1] = pix_colors[Color_White]; 762 xcol[1] = pix_colors[Color_White];
760 763
761 pix_colors[Color_topShadow] = xcol[1]; 764 pix_colors[Color_topShadow] = xcol[1];
762 } 765 }
763#endif /* KEEP_SCROLLCOLOR */ 766#endif /* KEEP_SCROLLCOLOR */
… …
807 810
808 if (rsmod 811 if (rsmod
809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810 requestedmeta = rsmod[3] - '0'; 813 requestedmeta = rsmod[3] - '0';
811 814
812 map = XGetModifierMapping (display->display); 815 map = XGetModifierMapping (xdisp);
813 kc = map->modifiermap; 816 kc = map->modifiermap;
814 817
815 for (i = 1; i < 6; i++) 818 for (i = 1; i < 6; i++)
816 { 819 {
817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
819 for (j = map->max_keypermod; j--; k++) 822 for (j = map->max_keypermod; j--; k++)
820 { 823 {
821 if (kc[k] == 0) 824 if (kc[k] == 0)
822 break; 825 break;
823 826
824 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 827 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
825 { 828 {
826 case XK_Num_Lock: 829 case XK_Num_Lock:
827 ModNumLockMask = modmasks[i - 1]; 830 ModNumLockMask = modmasks[i - 1];
828 continue; 831 continue;
829 832
… …
884 MWMHints mwmhints; 887 MWMHints mwmhints;
885#endif 888#endif
886 XGCValues gcvalue; 889 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 890 XSetWindowAttributes attributes;
888 Window top, parent; 891 Window top, parent;
889 dDisp;
890 892
891 xa = display->xa; 893 dLocal (Display *, xdisp);
892 894
893 /* grab colors before netscape does */ 895 /* grab colors before netscape does */
894 Get_Colours (); 896 Get_Colours ();
895 897
896 if (!set_fonts ()) 898 if (!set_fonts ())
… …
901 attributes.override_redirect = !!OPTION (Opt_override_redirect); 903 attributes.override_redirect = !!OPTION (Opt_override_redirect);
902 904
903#if ENABLE_FRILLS 905#if ENABLE_FRILLS
904 if (OPTION (Opt_borderLess)) 906 if (OPTION (Opt_borderLess))
905 { 907 {
906 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 908 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
907 { 909 {
908 /* 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");*/
909 attributes.override_redirect = TRUE; 911 attributes.override_redirect = true;
910 mwmhints.flags = 0; 912 mwmhints.flags = 0;
911 } 913 }
912 else 914 else
913 { 915 {
914 mwmhints.flags = MWM_HINTS_DECORATIONS; 916 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
924 { 926 {
925 XWindowAttributes wattr; 927 XWindowAttributes wattr;
926 928
927 parent = strtol (rs[Rs_embed], 0, 0); 929 parent = strtol (rs[Rs_embed], 0, 0);
928 930
929 if (!XGetWindowAttributes (disp, parent, &wattr)) 931 if (!XGetWindowAttributes (xdisp, parent, &wattr))
930 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
931 933
932 window_calc (wattr.width, wattr.height); 934 window_calc (wattr.width, wattr.height);
933 } 935 }
934#endif 936#endif
935 937
936 window_calc (0, 0); 938 window_calc (0, 0);
937 939
938 /* sub-window placement & size in rxvt_resize_subwindows () */ 940 /* sub-window placement & size in rxvt_resize_subwindows () */
939 attributes.background_pixel = pix_colors_focused[Color_border]; 941 attributes.background_pixel = pix_colors_focused [Color_border];
940 attributes.border_pixel = pix_colors_focused[Color_border]; 942 attributes.border_pixel = pix_colors_focused [Color_border];
941 attributes.colormap = display->cmap; 943 attributes.colormap = cmap;
942 944
943 top = XCreateWindow (disp, parent, 945 top = XCreateWindow (xdisp, parent,
944 szHint.x, szHint.y, 946 szHint.x, szHint.y,
945 szHint.width, szHint.height, 947 szHint.width, szHint.height,
946 ext_bwidth, 948 ext_bwidth,
947 display->depth, InputOutput, 949 depth, InputOutput, visual,
948 display->visual,
949 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
950 &attributes); 951 &attributes);
951 952
952 this->parent[0] = top; 953 this->parent[0] = top;
953 954
… …
963 wmHint.flags = InputHint | StateHint | WindowGroupHint; 964 wmHint.flags = InputHint | StateHint | WindowGroupHint;
964 wmHint.input = True; 965 wmHint.input = True;
965 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 966 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
966 wmHint.window_group = top; 967 wmHint.window_group = top;
967 968
968 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 969 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
969 &szHint, &wmHint, &classHint); 970 &szHint, &wmHint, &classHint);
970 971
971#if ENABLE_FRILLS 972#if ENABLE_FRILLS
972 if (mwmhints.flags) 973 if (mwmhints.flags)
973 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 974 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
975#endif 976#endif
976 977
977 Atom protocols[] = { 978 Atom protocols[] = {
978 xa[XA_WM_DELETE_WINDOW], 979 xa[XA_WM_DELETE_WINDOW],
979#if ENABLE_EWMH 980#if ENABLE_EWMH
980 xa[XA_NET_WM_PING], 981 xa[XA_NET_WM_PING],
981#endif 982#endif
982 }; 983 };
983 984
984 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 985 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
985 986
986#if ENABLE_FRILLS 987#if ENABLE_FRILLS
987 if (rs[Rs_transient_for]) 988 if (rs[Rs_transient_for])
988 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 989 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
989#endif 990#endif
990 991
991#if ENABLE_EWMH 992#if ENABLE_EWMH
992 long pid = getpid (); 993 long pid = getpid ();
993 994
994 XChangeProperty (disp, top, 995 XChangeProperty (xdisp, top,
995 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 996 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
996 PropModeReplace, (unsigned char *)&pid, 1); 997 PropModeReplace, (unsigned char *)&pid, 1);
997 998
998 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
999#endif 1000#endif
1000 1001
1001 XSelectInput (disp, top, 1002 XSelectInput (xdisp, top,
1002 KeyPressMask 1003 KeyPressMask
1003#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1004 | KeyReleaseMask 1005 | KeyReleaseMask
1005#endif 1006#endif
1006 | FocusChangeMask | VisibilityChangeMask 1007 | FocusChangeMask | VisibilityChangeMask
1007 | ExposureMask | StructureNotifyMask); 1008 | ExposureMask | StructureNotifyMask);
1008 1009
1009 termwin_ev.start (display, top); 1010 termwin_ev.start (display, top);
1010 1011
1011 /* 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 */
1012 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1013 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1013 1014
1014#ifdef HAVE_SCROLLBARS 1015#ifdef HAVE_SCROLLBARS
1015 /* cursor scrollBar: Black-on-White */ 1016 /* cursor scrollBar: Black-on-White */
1016 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1017 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1017#endif 1018#endif
1018 1019
1019 /* the vt window */ 1020 /* the vt window */
1020 vt = XCreateSimpleWindow (disp, top, 1021 vt = XCreateSimpleWindow (xdisp, top,
1021 window_vt_x, window_vt_y, 1022 window_vt_x, window_vt_y,
1022 width, height, 1023 width, height,
1023 0, 1024 0,
1024 pix_colors_focused[Color_fg], 1025 pix_colors_focused[Color_fg],
1025 pix_colors_focused[Color_bg]); 1026 pix_colors_focused[Color_bg]);
1026 1027
1027 attributes.bit_gravity = NorthWestGravity; 1028 attributes.bit_gravity = NorthWestGravity;
1028 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1029 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1029 1030
1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1031 1032
1032 if (OPTION (Opt_pointerBlank)) 1033 if (OPTION (Opt_pointerBlank))
1033 vt_emask |= PointerMotionMask; 1034 vt_emask |= PointerMotionMask;
… …
1038 1039
1039 vt_ev.start (display, vt); 1040 vt_ev.start (display, vt);
1040 1041
1041#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
1042 if (rs[Rs_backgroundPixmap] != NULL 1043 if (rs[Rs_backgroundPixmap] != NULL
1043 && ! OPTION (Opt_transparent)) 1044 && !OPTION (Opt_transparent))
1044 { 1045 {
1045 const char *p = rs[Rs_backgroundPixmap]; 1046 const char *p = rs[Rs_backgroundPixmap];
1046 1047
1047 if ((p = strchr (p, ';')) != NULL) 1048 if ((p = strchr (p, ';')) != NULL)
1048 { 1049 {
… …
1058 /* graphics context for the vt window */ 1059 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1060 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1061 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 1; 1062 gcvalue.graphics_exposures = 1;
1062 1063
1063 gc = XCreateGC (disp, vt, 1064 gc = XCreateGC (xdisp, vt,
1064 GCForeground | GCBackground | GCGraphicsExposures, 1065 GCForeground | GCBackground | GCGraphicsExposures,
1065 &gcvalue); 1066 &gcvalue);
1066 1067
1067 drawable = new rxvt_drawable (display, vt); 1068 drawable = new rxvt_drawable (this, vt);
1068 1069
1069#ifdef RXVT_SCROLLBAR 1070#ifdef RXVT_SCROLLBAR
1070 gcvalue.foreground = pix_colors[Color_topShadow]; 1071 gcvalue.foreground = pix_colors[Color_topShadow];
1071 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1072 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1073 gcvalue.foreground = pix_colors[Color_bottomShadow];
1073 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1074 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1074 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1075 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1075 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1076 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1076#endif 1077#endif
1077 1078
1078#ifdef OFF_FOCUS_FADING 1079#ifdef OFF_FOCUS_FADING
1079 // initially we are in unfocused state 1080 // initially we are in unfocused state
1080 if (rs[Rs_fade]) 1081 if (rs[Rs_fade])

Diff Legend

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