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.158 by root, Sun Jan 29 20:51:28 2006 UTC vs.
Revision 1.170 by root, Sat Feb 18 15:24:39 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 ()
… …
297 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
298 298
299 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
300 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 301
302 // using a local pointer decreases code size a lot
302 xa = display->xa; 303 xa = display->xa;
303 304
304#if ENABLE_FRILLS 305#if XFT
305 if (rs[Rs_depth]) 306 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 307 set (display, strtol (rs[Rs_depth], 0, 0));
307 else 308 else
308#endif 309#endif
309 set (display); 310 set (display);
310 311
311 extract_resources (); 312 extract_resources ();
312 313
313 free (r_argv); 314 free (r_argv);
315
316 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef)
318 rs [i] = 0;
314 319
315#if ENABLE_PERL 320#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 321 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 322 rs[Rs_perl_ext_1] = "default";
318 323
… …
421 /* this is how xterm implements reverseVideo */ 426 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 427 if (OPTION (Opt_reverseVideo))
423 { 428 {
424 if (!rs[Rs_color + Color_fg]) 429 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 430 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431
426 if (!rs[Rs_color + Color_bg]) 432 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 433 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 434 }
429#endif 435#endif
430 436
… …
482 val = rxvt_network_display (rs[Rs_display_name]); 488 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 489 rs[Rs_display_name] = (const char *)val;
484 490
485 if (val == NULL) 491 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 492#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 493 val = XDisplayString (dpy);
488 494
489 if (rs[Rs_display_name] == NULL) 495 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 496 rs[Rs_display_name] = val; /* use broken `:0' value */
491 497
492 i = strlen (val); 498 i = strlen (val);
… …
655 pix_colors = pix_colors_focused; 661 pix_colors = pix_colors_focused;
656#endif 662#endif
657 663
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 664 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 665 {
666 const char *name = rs[Rs_color + i];
667
668 if (!name)
669 continue;
670
660 rxvt_color xcol; 671 rxvt_color xcol;
661 672
662 if (!rs[Rs_color + i]) 673 if (!set_color (xcol, name))
663 continue;
664
665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
666 { 674 {
667#ifndef XTERM_REVERSE_VIDEO 675#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 676 if (i < 2 && OPTION (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 677 name = def_colorName [1 - i];
670 else 678 else
671#endif 679#endif
672 rs[Rs_color + i] = def_colorName[i]; 680 name = def_colorName [i];
673 681
674 if (!rs[Rs_color + i]) 682 if (!name)
675 continue; 683 continue;
676 684
677 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 685 if (!set_color (xcol, name))
678 { 686 {
679 switch (i) 687 switch (i)
680 { 688 {
681 case Color_fg: 689 case Color_fg:
682 case Color_bg: 690 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 691 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
685 /* NOTREACHED */ 692 name = "";
686 break; 693 break;
687#ifndef NO_CURSORCOLOR 694#ifndef NO_CURSORCOLOR
688 case Color_cursor2: 695 case Color_cursor2:
689 xcol = pix_colors[Color_fg]; 696#endif
690 break;
691#endif /* ! NO_CURSORCOLOR */
692 case Color_pointer_fg: 697 case Color_pointer_fg:
693 xcol = pix_colors[Color_fg]; 698 name = rs[Rs_color + Color_fg];
699 xcol.set (this, name);
694 break; 700 break;
695 default: 701 default:
696 xcol = pix_colors[Color_bg]; /* None */ 702 name = rs[Rs_color + Color_bg];
703 xcol.set (this, name);
697 break; 704 break;
698 } 705 }
699 } 706 }
700 } 707 }
701 708
702 pix_colors[i] = xcol; 709 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i); 710 rs[Rs_color + i] = name;
704 } 711 }
705
706#ifdef OFF_FOCUS_FADING
707 if (rs[Rs_fade])
708 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
710#endif
711 712
712 if (depth <= 2) 713 if (depth <= 2)
713 { 714 {
714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 715 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
715 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 716 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
716 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 717 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
717 } 718 }
718 719
719 /* 720 /*
720 * get scrollBar shadow colors 721 * get scrollBar shadow colors
721 * 722 *
722 * The calculations of topShadow/bottomShadow values are adapted 723 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 724 * from the fvwm window manager.
724 */ 725 */
725#ifdef KEEP_SCROLLCOLOR 726#ifdef KEEP_SCROLLCOLOR
726
727 if (depth <= 2) 727 if (depth <= 2)
728 { 728 {
729 /* Monochrome */ 729 /* Monochrome */
730 pix_colors[Color_scroll] = pix_colors[Color_fg]; 730 alias_color (Color_scroll, Color_fg);
731 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 731 alias_color (Color_topShadow, Color_bg);
732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 732 alias_color (Color_bottomShadow, Color_bg);
733 } 733 }
734 else 734 else
735 { 735 {
736 rxvt_color xcol[2]; 736 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
737 /* xcol[0] == white
738 * xcol[1] == top shadow
739 * xcol[2] == bot shadow */
740 737
741 xcol[1] = pix_colors[Color_scroll]; 738 rgba cscroll;
742 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 739 pix_colors [Color_scroll].get (cscroll);
743
744 rxvt_rgba c0, c1;
745
746 xcol[0].get (this, c0);
747 xcol[1].get (this, c1);
748
749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
750 740
751 /* topShadowColor */ 741 /* topShadowColor */
752 if (!xcol[1].set (this, 742 if (!pix_colors[Color_topShadow].set (this,
753 rxvt_rgba ( 743 rgba (
754 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 744 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
755 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 745 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
756 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 746 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 c1.a) // pa1 vs. pa0: arbitrary 747 cscroll.a)
758 )); 748 ))
759 xcol[1] = pix_colors[Color_White]; 749 alias_color (Color_topShadow, Color_White);
760
761 pix_colors[Color_topShadow] = xcol[1];
762 } 750 }
763#endif /* KEEP_SCROLLCOLOR */ 751#endif /* KEEP_SCROLLCOLOR */
752
753#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 {
757 rgba c;
758 pix_colors [Color_fade].get (c);
759 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
760 }
761#endif
764} 762}
765 763
766/*----------------------------------------------------------------------*/ 764/*----------------------------------------------------------------------*/
767/* color aliases, fg/bg bright-bold */ 765/* color aliases, fg/bg bright-bold */
768void 766void
… …
807 805
808 if (rsmod 806 if (rsmod
809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 807 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810 requestedmeta = rsmod[3] - '0'; 808 requestedmeta = rsmod[3] - '0';
811 809
812 map = XGetModifierMapping (xdisp); 810 map = XGetModifierMapping (dpy);
813 kc = map->modifiermap; 811 kc = map->modifiermap;
814 812
815 for (i = 1; i < 6; i++) 813 for (i = 1; i < 6; i++)
816 { 814 {
817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 815 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
819 for (j = map->max_keypermod; j--; k++) 817 for (j = map->max_keypermod; j--; k++)
820 { 818 {
821 if (kc[k] == 0) 819 if (kc[k] == 0)
822 break; 820 break;
823 821
824 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 822 switch (XKeycodeToKeysym (dpy, kc[k], 0))
825 { 823 {
826 case XK_Num_Lock: 824 case XK_Num_Lock:
827 ModNumLockMask = modmasks[i - 1]; 825 ModNumLockMask = modmasks[i - 1];
828 continue; 826 continue;
829 827
… …
885#endif 883#endif
886 XGCValues gcvalue; 884 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 885 XSetWindowAttributes attributes;
888 Window top, parent; 886 Window top, parent;
889 887
890 dLocal (Display *, xdisp); 888 dLocal (Display *, dpy);
891 889
892 /* grab colors before netscape does */ 890 /* grab colors before netscape does */
893 Get_Colours (); 891 Get_Colours ();
894 892
895 if (!set_fonts ()) 893 if (!set_fonts ())
… …
900 attributes.override_redirect = !!OPTION (Opt_override_redirect); 898 attributes.override_redirect = !!OPTION (Opt_override_redirect);
901 899
902#if ENABLE_FRILLS 900#if ENABLE_FRILLS
903 if (OPTION (Opt_borderLess)) 901 if (OPTION (Opt_borderLess))
904 { 902 {
905 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 903 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
906 { 904 {
907 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
908 attributes.override_redirect = true; 906 attributes.override_redirect = true;
909 mwmhints.flags = 0; 907 mwmhints.flags = 0;
910 } 908 }
… …
923 { 921 {
924 XWindowAttributes wattr; 922 XWindowAttributes wattr;
925 923
926 parent = strtol (rs[Rs_embed], 0, 0); 924 parent = strtol (rs[Rs_embed], 0, 0);
927 925
928 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 926 if (!XGetWindowAttributes (dpy, parent, &wattr))
929 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 927 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
930 928
931 window_calc (wattr.width, wattr.height); 929 window_calc (wattr.width, wattr.height);
932 } 930 }
933#endif 931#endif
… …
937 /* sub-window placement & size in rxvt_resize_subwindows () */ 935 /* sub-window placement & size in rxvt_resize_subwindows () */
938 attributes.background_pixel = pix_colors_focused [Color_border]; 936 attributes.background_pixel = pix_colors_focused [Color_border];
939 attributes.border_pixel = pix_colors_focused [Color_border]; 937 attributes.border_pixel = pix_colors_focused [Color_border];
940 attributes.colormap = cmap; 938 attributes.colormap = cmap;
941 939
942 top = XCreateWindow (xdisp, parent, 940 top = XCreateWindow (dpy, parent,
943 szHint.x, szHint.y, 941 szHint.x, szHint.y,
944 szHint.width, szHint.height, 942 szHint.width, szHint.height,
945 ext_bwidth, 943 ext_bwidth,
946 depth, InputOutput, visual, 944 depth, InputOutput, visual,
947 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 945 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
961 wmHint.flags = InputHint | StateHint | WindowGroupHint; 959 wmHint.flags = InputHint | StateHint | WindowGroupHint;
962 wmHint.input = True; 960 wmHint.input = True;
963 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
964 wmHint.window_group = top; 962 wmHint.window_group = top;
965 963
966 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 964 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
967 &szHint, &wmHint, &classHint); 965 &szHint, &wmHint, &classHint);
968 966
969#if ENABLE_FRILLS 967#if ENABLE_FRILLS
970 if (mwmhints.flags) 968 if (mwmhints.flags)
971 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 969 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
972 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 970 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
973#endif 971#endif
974 972
975 Atom protocols[] = { 973 Atom protocols[] = {
976 xa[XA_WM_DELETE_WINDOW], 974 xa[XA_WM_DELETE_WINDOW],
977#if ENABLE_EWMH 975#if ENABLE_EWMH
978 xa[XA_NET_WM_PING], 976 xa[XA_NET_WM_PING],
979#endif 977#endif
980 }; 978 };
981 979
982 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 980 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
983 981
984#if ENABLE_FRILLS 982#if ENABLE_FRILLS
985 if (rs[Rs_transient_for]) 983 if (rs[Rs_transient_for])
986 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 984 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
987#endif 985#endif
988 986
989#if ENABLE_EWMH 987#if ENABLE_EWMH
990 long pid = getpid (); 988 long pid = getpid ();
991 989
992 XChangeProperty (xdisp, top, 990 XChangeProperty (dpy, top,
993 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 991 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
994 PropModeReplace, (unsigned char *)&pid, 1); 992 PropModeReplace, (unsigned char *)&pid, 1);
995 993
996 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 994 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
997#endif 995#endif
998 996
999 XSelectInput (xdisp, top, 997 XSelectInput (dpy, top,
1000 KeyPressMask 998 KeyPressMask
1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 999#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1002 | KeyReleaseMask 1000 | KeyReleaseMask
1003#endif 1001#endif
1004 | FocusChangeMask | VisibilityChangeMask 1002 | FocusChangeMask | VisibilityChangeMask
1005 | ExposureMask | StructureNotifyMask); 1003 | ExposureMask | StructureNotifyMask);
1006 1004
1007 termwin_ev.start (display, top); 1005 termwin_ev.start (display, top);
1008 1006
1009 /* vt cursor: Black-on-White is standard, but this is more popular */ 1007 /* vt cursor: Black-on-White is standard, but this is more popular */
1010 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1008 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1011 1009
1012#ifdef HAVE_SCROLLBARS 1010#ifdef HAVE_SCROLLBARS
1013 /* cursor scrollBar: Black-on-White */ 1011 /* cursor scrollBar: Black-on-White */
1014 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1012 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1015#endif 1013#endif
1016 1014
1017 /* the vt window */ 1015 /* the vt window */
1018 vt = XCreateSimpleWindow (xdisp, top, 1016 vt = XCreateSimpleWindow (dpy, top,
1019 window_vt_x, window_vt_y, 1017 window_vt_x, window_vt_y,
1020 width, height, 1018 width, height,
1021 0, 1019 0,
1022 pix_colors_focused[Color_fg], 1020 pix_colors_focused[Color_fg],
1023 pix_colors_focused[Color_bg]); 1021 pix_colors_focused[Color_bg]);
1024 1022
1025 attributes.bit_gravity = NorthWestGravity; 1023 attributes.bit_gravity = NorthWestGravity;
1026 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1024 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1027 1025
1028 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1029 1027
1030 if (OPTION (Opt_pointerBlank)) 1028 if (OPTION (Opt_pointerBlank))
1031 vt_emask |= PointerMotionMask; 1029 vt_emask |= PointerMotionMask;
… …
1054#endif 1052#endif
1055 1053
1056 /* graphics context for the vt window */ 1054 /* graphics context for the vt window */
1057 gcvalue.foreground = pix_colors[Color_fg]; 1055 gcvalue.foreground = pix_colors[Color_fg];
1058 gcvalue.background = pix_colors[Color_bg]; 1056 gcvalue.background = pix_colors[Color_bg];
1059 gcvalue.graphics_exposures = 1; 1057 gcvalue.graphics_exposures = 0;
1060 1058
1061 gc = XCreateGC (xdisp, vt, 1059 gc = XCreateGC (dpy, vt,
1062 GCForeground | GCBackground | GCGraphicsExposures, 1060 GCForeground | GCBackground | GCGraphicsExposures,
1063 &gcvalue); 1061 &gcvalue);
1064 1062
1065 drawable = new rxvt_drawable (this, vt); 1063 drawable = new rxvt_drawable (this, vt);
1066 1064
1067#ifdef RXVT_SCROLLBAR 1065#ifdef RXVT_SCROLLBAR
1068 gcvalue.foreground = pix_colors[Color_topShadow]; 1066 gcvalue.foreground = pix_colors[Color_topShadow];
1069 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1067 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1070 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1068 gcvalue.foreground = pix_colors[Color_bottomShadow];
1071 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1069 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1070 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1073 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1071 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074#endif 1072#endif
1075 1073
1076#ifdef OFF_FOCUS_FADING 1074#ifdef OFF_FOCUS_FADING
1077 // initially we are in unfocused state 1075 // initially we are in unfocused state
1078 if (rs[Rs_fade]) 1076 if (rs[Rs_fade])

Diff Legend

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