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.160 by root, Mon Jan 30 19:46:13 2006 UTC vs.
Revision 1.173 by root, Wed Jul 5 20:31:48 2006 UTC

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

Diff Legend

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