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.155 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.159 by root, Mon Jan 30 02:21:20 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 ()
… …
296 296
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
302 xa = display->xa;
303
304#if ENABLE_FRILLS
305 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0));
307 else
308#endif
309 set (display);
301 310
302 extract_resources (); 311 extract_resources ();
303 312
304 free (r_argv); 313 free (r_argv);
305 314
… …
473 val = rxvt_network_display (rs[Rs_display_name]); 482 val = rxvt_network_display (rs[Rs_display_name]);
474 rs[Rs_display_name] = (const char *)val; 483 rs[Rs_display_name] = (const char *)val;
475 484
476 if (val == NULL) 485 if (val == NULL)
477#endif /* DISPLAY_IS_IP */ 486#endif /* DISPLAY_IS_IP */
478 val = XDisplayString (display->display); 487 val = XDisplayString (xdisp);
479 488
480 if (rs[Rs_display_name] == NULL) 489 if (rs[Rs_display_name] == NULL)
481 rs[Rs_display_name] = val; /* use broken `:0' value */ 490 rs[Rs_display_name] = val; /* use broken `:0' value */
482 491
483 i = strlen (val); 492 i = strlen (val);
… …
503 512
504#ifdef RXVT_TERMINFO 513#ifdef RXVT_TERMINFO
505 putenv ("TERMINFO=" RXVT_TERMINFO); 514 putenv ("TERMINFO=" RXVT_TERMINFO);
506#endif 515#endif
507 516
508 if (display->depth <= 2) 517 if (depth <= 2)
509 putenv ("COLORTERM=" COLORTERMENV "-mono"); 518 putenv ("COLORTERM=" COLORTERMENV "-mono");
510 else 519 else
511 putenv ("COLORTERM=" COLORTERMENVFULL); 520 putenv ("COLORTERM=" COLORTERMENVFULL);
512 521
513 if (rs[Rs_term_name] != NULL) 522 if (rs[Rs_term_name] != NULL)
… …
644 653
645#ifdef OFF_FOCUS_FADING 654#ifdef OFF_FOCUS_FADING
646 pix_colors = pix_colors_focused; 655 pix_colors = pix_colors_focused;
647#endif 656#endif
648 657
649 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
650 { 659 {
651 rxvt_color xcol; 660 rxvt_color xcol;
652 661
653 if (!rs[Rs_color + i]) 662 if (!rs[Rs_color + i])
654 continue; 663 continue;
… …
694 SET_PIXCOLOR (i); 703 SET_PIXCOLOR (i);
695 } 704 }
696 705
697#ifdef OFF_FOCUS_FADING 706#ifdef OFF_FOCUS_FADING
698 if (rs[Rs_fade]) 707 if (rs[Rs_fade])
699 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 708 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
700 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
701#endif 710#endif
702 711
703 if (display->depth <= 2) 712 if (depth <= 2)
704 { 713 {
705 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
706 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 715 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
707 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 716 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
708 } 717 }
… …
713 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
714 * from the fvwm window manager. 723 * from the fvwm window manager.
715 */ 724 */
716#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
717 726
718 if (display->depth <= 2) 727 if (depth <= 2)
719 { 728 {
720 /* Monochrome */ 729 /* Monochrome */
721 pix_colors[Color_scroll] = pix_colors[Color_fg]; 730 pix_colors[Color_scroll] = pix_colors[Color_fg];
722 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 731 pix_colors[Color_topShadow] = pix_colors[Color_bg];
723 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
728 /* xcol[0] == white 737 /* xcol[0] == white
729 * xcol[1] == top shadow 738 * xcol[1] == top shadow
730 * xcol[2] == bot shadow */ 739 * xcol[2] == bot shadow */
731 740
732 xcol[1] = pix_colors[Color_scroll]; 741 xcol[1] = pix_colors[Color_scroll];
733 xcol[0].set (display, 65535, 65535, 65535); 742 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC));
734 743
735 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 744 rxvt_rgba c0, c1;
736 745
737 xcol[0].get (display, pr0, pg0, pb0); 746 xcol[0].get (this, c0);
738 xcol[1].get (display, pr1, pg1, pb1); 747 xcol[1].get (this, c1);
739 748
740 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
741 750
742 /* topShadowColor */ 751 /* topShadowColor */
743 if (!xcol[1].set (display, 752 if (!xcol[1].set (this,
753 rxvt_rgba (
744 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 754 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
745 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 755 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
746 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 756 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
757 c1.a) // pa1 vs. pa0: arbitrary
758 ));
747 xcol[1] = pix_colors[Color_White]; 759 xcol[1] = pix_colors[Color_White];
748 760
749 pix_colors[Color_topShadow] = xcol[1]; 761 pix_colors[Color_topShadow] = xcol[1];
750 } 762 }
751#endif /* KEEP_SCROLLCOLOR */ 763#endif /* KEEP_SCROLLCOLOR */
… …
795 807
796 if (rsmod 808 if (rsmod
797 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
798 requestedmeta = rsmod[3] - '0'; 810 requestedmeta = rsmod[3] - '0';
799 811
800 map = XGetModifierMapping (display->display); 812 map = XGetModifierMapping (xdisp);
801 kc = map->modifiermap; 813 kc = map->modifiermap;
802 814
803 for (i = 1; i < 6; i++) 815 for (i = 1; i < 6; i++)
804 { 816 {
805 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
807 for (j = map->max_keypermod; j--; k++) 819 for (j = map->max_keypermod; j--; k++)
808 { 820 {
809 if (kc[k] == 0) 821 if (kc[k] == 0)
810 break; 822 break;
811 823
812 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 824 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
813 { 825 {
814 case XK_Num_Lock: 826 case XK_Num_Lock:
815 ModNumLockMask = modmasks[i - 1]; 827 ModNumLockMask = modmasks[i - 1];
816 continue; 828 continue;
817 829
… …
872 MWMHints mwmhints; 884 MWMHints mwmhints;
873#endif 885#endif
874 XGCValues gcvalue; 886 XGCValues gcvalue;
875 XSetWindowAttributes attributes; 887 XSetWindowAttributes attributes;
876 Window top, parent; 888 Window top, parent;
877 dDisp;
878 889
879 xa = display->xa; 890 dLocal (Display *, xdisp);
880 891
881 /* grab colors before netscape does */ 892 /* grab colors before netscape does */
882 Get_Colours (); 893 Get_Colours ();
883 894
884 if (!set_fonts ()) 895 if (!set_fonts ())
… …
889 attributes.override_redirect = !!OPTION (Opt_override_redirect); 900 attributes.override_redirect = !!OPTION (Opt_override_redirect);
890 901
891#if ENABLE_FRILLS 902#if ENABLE_FRILLS
892 if (OPTION (Opt_borderLess)) 903 if (OPTION (Opt_borderLess))
893 { 904 {
894 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 905 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
895 { 906 {
896 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 907 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
897 attributes.override_redirect = TRUE; 908 attributes.override_redirect = true;
898 mwmhints.flags = 0; 909 mwmhints.flags = 0;
899 } 910 }
900 else 911 else
901 { 912 {
902 mwmhints.flags = MWM_HINTS_DECORATIONS; 913 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
912 { 923 {
913 XWindowAttributes wattr; 924 XWindowAttributes wattr;
914 925
915 parent = strtol (rs[Rs_embed], 0, 0); 926 parent = strtol (rs[Rs_embed], 0, 0);
916 927
917 if (!XGetWindowAttributes (disp, parent, &wattr)) 928 if (!XGetWindowAttributes (xdisp, parent, &wattr))
918 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 929 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
919 930
920 window_calc (wattr.width, wattr.height); 931 window_calc (wattr.width, wattr.height);
921 } 932 }
922#endif 933#endif
923 934
924 window_calc (0, 0); 935 window_calc (0, 0);
925 936
926 /* sub-window placement & size in rxvt_resize_subwindows () */ 937 /* sub-window placement & size in rxvt_resize_subwindows () */
927 attributes.background_pixel = pix_colors_focused[Color_border]; 938 attributes.background_pixel = pix_colors_focused [Color_border];
928 attributes.border_pixel = pix_colors_focused[Color_border]; 939 attributes.border_pixel = pix_colors_focused [Color_border];
929 attributes.colormap = display->cmap; 940 attributes.colormap = cmap;
930 941
931 top = XCreateWindow (disp, parent, 942 top = XCreateWindow (xdisp, parent,
932 szHint.x, szHint.y, 943 szHint.x, szHint.y,
933 szHint.width, szHint.height, 944 szHint.width, szHint.height,
934 ext_bwidth, 945 ext_bwidth,
935 display->depth, InputOutput, 946 depth, InputOutput, visual,
936 display->visual,
937 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 947 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
938 &attributes); 948 &attributes);
939 949
940 this->parent[0] = top; 950 this->parent[0] = top;
941 951
… …
951 wmHint.flags = InputHint | StateHint | WindowGroupHint; 961 wmHint.flags = InputHint | StateHint | WindowGroupHint;
952 wmHint.input = True; 962 wmHint.input = True;
953 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 963 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
954 wmHint.window_group = top; 964 wmHint.window_group = top;
955 965
956 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 966 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
957 &szHint, &wmHint, &classHint); 967 &szHint, &wmHint, &classHint);
958 968
959#if ENABLE_FRILLS 969#if ENABLE_FRILLS
960 if (mwmhints.flags) 970 if (mwmhints.flags)
961 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 971 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
962 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 972 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
963#endif 973#endif
964 974
965 Atom protocols[] = { 975 Atom protocols[] = {
966 xa[XA_WM_DELETE_WINDOW], 976 xa[XA_WM_DELETE_WINDOW],
967#if ENABLE_EWMH 977#if ENABLE_EWMH
968 xa[XA_NET_WM_PING], 978 xa[XA_NET_WM_PING],
969#endif 979#endif
970 }; 980 };
971 981
972 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 982 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
973 983
974#if ENABLE_FRILLS 984#if ENABLE_FRILLS
975 if (rs[Rs_transient_for]) 985 if (rs[Rs_transient_for])
976 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 986 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
977#endif 987#endif
978 988
979#if ENABLE_EWMH 989#if ENABLE_EWMH
980 long pid = getpid (); 990 long pid = getpid ();
981 991
982 XChangeProperty (disp, top, 992 XChangeProperty (xdisp, top,
983 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 993 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
984 PropModeReplace, (unsigned char *)&pid, 1); 994 PropModeReplace, (unsigned char *)&pid, 1);
985 995
986 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 996 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
987#endif 997#endif
988 998
989 XSelectInput (disp, top, 999 XSelectInput (xdisp, top,
990 KeyPressMask 1000 KeyPressMask
991#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
992 | KeyReleaseMask 1002 | KeyReleaseMask
993#endif 1003#endif
994 | FocusChangeMask | VisibilityChangeMask 1004 | FocusChangeMask | VisibilityChangeMask
995 | ExposureMask | StructureNotifyMask); 1005 | ExposureMask | StructureNotifyMask);
996 1006
997 termwin_ev.start (display, top); 1007 termwin_ev.start (display, top);
998 1008
999 /* vt cursor: Black-on-White is standard, but this is more popular */ 1009 /* vt cursor: Black-on-White is standard, but this is more popular */
1000 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1010 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1001 1011
1002#ifdef HAVE_SCROLLBARS 1012#ifdef HAVE_SCROLLBARS
1003 /* cursor scrollBar: Black-on-White */ 1013 /* cursor scrollBar: Black-on-White */
1004 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1014 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1005#endif 1015#endif
1006 1016
1007 /* the vt window */ 1017 /* the vt window */
1008 vt = XCreateSimpleWindow (disp, top, 1018 vt = XCreateSimpleWindow (xdisp, top,
1009 window_vt_x, window_vt_y, 1019 window_vt_x, window_vt_y,
1010 width, height, 1020 width, height,
1011 0, 1021 0,
1012 pix_colors_focused[Color_fg], 1022 pix_colors_focused[Color_fg],
1013 pix_colors_focused[Color_bg]); 1023 pix_colors_focused[Color_bg]);
1014 1024
1015 attributes.bit_gravity = NorthWestGravity; 1025 attributes.bit_gravity = NorthWestGravity;
1016 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1026 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1017 1027
1018 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1028 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1019 1029
1020 if (OPTION (Opt_pointerBlank)) 1030 if (OPTION (Opt_pointerBlank))
1021 vt_emask |= PointerMotionMask; 1031 vt_emask |= PointerMotionMask;
… …
1046 /* graphics context for the vt window */ 1056 /* graphics context for the vt window */
1047 gcvalue.foreground = pix_colors[Color_fg]; 1057 gcvalue.foreground = pix_colors[Color_fg];
1048 gcvalue.background = pix_colors[Color_bg]; 1058 gcvalue.background = pix_colors[Color_bg];
1049 gcvalue.graphics_exposures = 1; 1059 gcvalue.graphics_exposures = 1;
1050 1060
1051 gc = XCreateGC (disp, vt, 1061 gc = XCreateGC (xdisp, vt,
1052 GCForeground | GCBackground | GCGraphicsExposures, 1062 GCForeground | GCBackground | GCGraphicsExposures,
1053 &gcvalue); 1063 &gcvalue);
1054 1064
1055 drawable = new rxvt_drawable (display, vt); 1065 drawable = new rxvt_drawable (this, vt);
1056 1066
1057#ifdef RXVT_SCROLLBAR 1067#ifdef RXVT_SCROLLBAR
1058 gcvalue.foreground = pix_colors[Color_topShadow]; 1068 gcvalue.foreground = pix_colors[Color_topShadow];
1059 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1069 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1060 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1070 gcvalue.foreground = pix_colors[Color_bottomShadow];
1061 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1071 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1062 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1072 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1063 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1073 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1064#endif 1074#endif
1065 1075
1066#ifdef OFF_FOCUS_FADING 1076#ifdef OFF_FOCUS_FADING
1067 // initially we are in unfocused state 1077 // initially we are in unfocused state
1068 if (rs[Rs_fade]) 1078 if (rs[Rs_fade])

Diff Legend

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