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.160 by root, Mon Jan 30 19:46:13 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;
655 664
656 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 665 if (!set_color (xcol, rs[Rs_color + i]))
657 { 666 {
658#ifndef XTERM_REVERSE_VIDEO 667#ifndef XTERM_REVERSE_VIDEO
659 if (i < 2 && OPTION (Opt_reverseVideo)) 668 if (i < 2 && OPTION (Opt_reverseVideo))
660 rs[Rs_color + i] = def_colorName[!i]; 669 rs[Rs_color + i] = def_colorName[!i];
661 else 670 else
… …
663 rs[Rs_color + i] = def_colorName[i]; 672 rs[Rs_color + i] = def_colorName[i];
664 673
665 if (!rs[Rs_color + i]) 674 if (!rs[Rs_color + i])
666 continue; 675 continue;
667 676
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 677 if (!set_color (xcol, rs[Rs_color + i]))
669 { 678 {
670 switch (i) 679 switch (i)
671 { 680 {
672 case Color_fg: 681 case Color_fg:
673 case Color_bg: 682 case Color_bg:
674 /* fatal: need bg/fg color */ 683 /* fatal: need bg/fg color */
675 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 684 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
676 /* NOTREACHED */
677 break; 685 break;
678#ifndef NO_CURSORCOLOR 686#ifndef NO_CURSORCOLOR
679 case Color_cursor2: 687 case Color_cursor2:
680 xcol = pix_colors[Color_fg]; 688 xcol = pix_colors[Color_fg];
681 break; 689 break;
… …
694 SET_PIXCOLOR (i); 702 SET_PIXCOLOR (i);
695 } 703 }
696 704
697#ifdef OFF_FOCUS_FADING 705#ifdef OFF_FOCUS_FADING
698 if (rs[Rs_fade]) 706 if (rs[Rs_fade])
699 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 707 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]); 708 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
701#endif 709#endif
702 710
703 if (display->depth <= 2) 711 if (depth <= 2)
704 { 712 {
705 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 713 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]; 714 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]; 715 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
708 } 716 }
… …
713 * The calculations of topShadow/bottomShadow values are adapted 721 * The calculations of topShadow/bottomShadow values are adapted
714 * from the fvwm window manager. 722 * from the fvwm window manager.
715 */ 723 */
716#ifdef KEEP_SCROLLCOLOR 724#ifdef KEEP_SCROLLCOLOR
717 725
718 if (display->depth <= 2) 726 if (depth <= 2)
719 { 727 {
720 /* Monochrome */ 728 /* Monochrome */
721 pix_colors[Color_scroll] = pix_colors[Color_fg]; 729 pix_colors[Color_scroll] = pix_colors[Color_fg];
722 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 730 pix_colors[Color_topShadow] = pix_colors[Color_bg];
723 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 731 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
728 /* xcol[0] == white 736 /* xcol[0] == white
729 * xcol[1] == top shadow 737 * xcol[1] == top shadow
730 * xcol[2] == bot shadow */ 738 * xcol[2] == bot shadow */
731 739
732 xcol[1] = pix_colors[Color_scroll]; 740 xcol[1] = pix_colors[Color_scroll];
733 xcol[0].set (display, 65535, 65535, 65535); 741 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC));
734 742
735 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 743 rxvt_rgba c0, c1;
736 744
737 xcol[0].get (display, pr0, pg0, pb0); 745 xcol[0].get (this, c0);
738 xcol[1].get (display, pr1, pg1, pb1); 746 xcol[1].get (this, c1);
739 747
740 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 748 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
741 749
742 /* topShadowColor */ 750 /* topShadowColor */
743 if (!xcol[1].set (display, 751 if (!xcol[1].set (this,
752 rxvt_rgba (
744 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 753 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
745 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 754 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
746 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 755 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
756 c1.a) // pa1 vs. pa0: arbitrary
757 ));
747 xcol[1] = pix_colors[Color_White]; 758 xcol[1] = pix_colors[Color_White];
748 759
749 pix_colors[Color_topShadow] = xcol[1]; 760 pix_colors[Color_topShadow] = xcol[1];
750 } 761 }
751#endif /* KEEP_SCROLLCOLOR */ 762#endif /* KEEP_SCROLLCOLOR */
… …
795 806
796 if (rsmod 807 if (rsmod
797 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 808 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
798 requestedmeta = rsmod[3] - '0'; 809 requestedmeta = rsmod[3] - '0';
799 810
800 map = XGetModifierMapping (display->display); 811 map = XGetModifierMapping (xdisp);
801 kc = map->modifiermap; 812 kc = map->modifiermap;
802 813
803 for (i = 1; i < 6; i++) 814 for (i = 1; i < 6; i++)
804 { 815 {
805 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 816 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
807 for (j = map->max_keypermod; j--; k++) 818 for (j = map->max_keypermod; j--; k++)
808 { 819 {
809 if (kc[k] == 0) 820 if (kc[k] == 0)
810 break; 821 break;
811 822
812 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 823 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
813 { 824 {
814 case XK_Num_Lock: 825 case XK_Num_Lock:
815 ModNumLockMask = modmasks[i - 1]; 826 ModNumLockMask = modmasks[i - 1];
816 continue; 827 continue;
817 828
… …
872 MWMHints mwmhints; 883 MWMHints mwmhints;
873#endif 884#endif
874 XGCValues gcvalue; 885 XGCValues gcvalue;
875 XSetWindowAttributes attributes; 886 XSetWindowAttributes attributes;
876 Window top, parent; 887 Window top, parent;
877 dDisp;
878 888
879 xa = display->xa; 889 dLocal (Display *, xdisp);
880 890
881 /* grab colors before netscape does */ 891 /* grab colors before netscape does */
882 Get_Colours (); 892 Get_Colours ();
883 893
884 if (!set_fonts ()) 894 if (!set_fonts ())
… …
889 attributes.override_redirect = !!OPTION (Opt_override_redirect); 899 attributes.override_redirect = !!OPTION (Opt_override_redirect);
890 900
891#if ENABLE_FRILLS 901#if ENABLE_FRILLS
892 if (OPTION (Opt_borderLess)) 902 if (OPTION (Opt_borderLess))
893 { 903 {
894 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 904 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
895 { 905 {
896 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
897 attributes.override_redirect = TRUE; 907 attributes.override_redirect = true;
898 mwmhints.flags = 0; 908 mwmhints.flags = 0;
899 } 909 }
900 else 910 else
901 { 911 {
902 mwmhints.flags = MWM_HINTS_DECORATIONS; 912 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
912 { 922 {
913 XWindowAttributes wattr; 923 XWindowAttributes wattr;
914 924
915 parent = strtol (rs[Rs_embed], 0, 0); 925 parent = strtol (rs[Rs_embed], 0, 0);
916 926
917 if (!XGetWindowAttributes (disp, parent, &wattr)) 927 if (!XGetWindowAttributes (xdisp, parent, &wattr))
918 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 928 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
919 929
920 window_calc (wattr.width, wattr.height); 930 window_calc (wattr.width, wattr.height);
921 } 931 }
922#endif 932#endif
923 933
924 window_calc (0, 0); 934 window_calc (0, 0);
925 935
926 /* sub-window placement & size in rxvt_resize_subwindows () */ 936 /* sub-window placement & size in rxvt_resize_subwindows () */
927 attributes.background_pixel = pix_colors_focused[Color_border]; 937 attributes.background_pixel = pix_colors_focused [Color_border];
928 attributes.border_pixel = pix_colors_focused[Color_border]; 938 attributes.border_pixel = pix_colors_focused [Color_border];
929 attributes.colormap = display->cmap; 939 attributes.colormap = cmap;
930 940
931 top = XCreateWindow (disp, parent, 941 top = XCreateWindow (xdisp, parent,
932 szHint.x, szHint.y, 942 szHint.x, szHint.y,
933 szHint.width, szHint.height, 943 szHint.width, szHint.height,
934 ext_bwidth, 944 ext_bwidth,
935 display->depth, InputOutput, 945 depth, InputOutput, visual,
936 display->visual,
937 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 946 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
938 &attributes); 947 &attributes);
939 948
940 this->parent[0] = top; 949 this->parent[0] = top;
941 950
… …
951 wmHint.flags = InputHint | StateHint | WindowGroupHint; 960 wmHint.flags = InputHint | StateHint | WindowGroupHint;
952 wmHint.input = True; 961 wmHint.input = True;
953 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
954 wmHint.window_group = top; 963 wmHint.window_group = top;
955 964
956 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 965 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
957 &szHint, &wmHint, &classHint); 966 &szHint, &wmHint, &classHint);
958 967
959#if ENABLE_FRILLS 968#if ENABLE_FRILLS
960 if (mwmhints.flags) 969 if (mwmhints.flags)
961 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 970 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
962 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
963#endif 972#endif
964 973
965 Atom protocols[] = { 974 Atom protocols[] = {
966 xa[XA_WM_DELETE_WINDOW], 975 xa[XA_WM_DELETE_WINDOW],
967#if ENABLE_EWMH 976#if ENABLE_EWMH
968 xa[XA_NET_WM_PING], 977 xa[XA_NET_WM_PING],
969#endif 978#endif
970 }; 979 };
971 980
972 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 981 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
973 982
974#if ENABLE_FRILLS 983#if ENABLE_FRILLS
975 if (rs[Rs_transient_for]) 984 if (rs[Rs_transient_for])
976 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 985 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
977#endif 986#endif
978 987
979#if ENABLE_EWMH 988#if ENABLE_EWMH
980 long pid = getpid (); 989 long pid = getpid ();
981 990
982 XChangeProperty (disp, top, 991 XChangeProperty (xdisp, top,
983 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 992 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
984 PropModeReplace, (unsigned char *)&pid, 1); 993 PropModeReplace, (unsigned char *)&pid, 1);
985 994
986 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 995 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
987#endif 996#endif
988 997
989 XSelectInput (disp, top, 998 XSelectInput (xdisp, top,
990 KeyPressMask 999 KeyPressMask
991#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
992 | KeyReleaseMask 1001 | KeyReleaseMask
993#endif 1002#endif
994 | FocusChangeMask | VisibilityChangeMask 1003 | FocusChangeMask | VisibilityChangeMask
995 | ExposureMask | StructureNotifyMask); 1004 | ExposureMask | StructureNotifyMask);
996 1005
997 termwin_ev.start (display, top); 1006 termwin_ev.start (display, top);
998 1007
999 /* vt cursor: Black-on-White is standard, but this is more popular */ 1008 /* vt cursor: Black-on-White is standard, but this is more popular */
1000 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1009 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1001 1010
1002#ifdef HAVE_SCROLLBARS 1011#ifdef HAVE_SCROLLBARS
1003 /* cursor scrollBar: Black-on-White */ 1012 /* cursor scrollBar: Black-on-White */
1004 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1013 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1005#endif 1014#endif
1006 1015
1007 /* the vt window */ 1016 /* the vt window */
1008 vt = XCreateSimpleWindow (disp, top, 1017 vt = XCreateSimpleWindow (xdisp, top,
1009 window_vt_x, window_vt_y, 1018 window_vt_x, window_vt_y,
1010 width, height, 1019 width, height,
1011 0, 1020 0,
1012 pix_colors_focused[Color_fg], 1021 pix_colors_focused[Color_fg],
1013 pix_colors_focused[Color_bg]); 1022 pix_colors_focused[Color_bg]);
1014 1023
1015 attributes.bit_gravity = NorthWestGravity; 1024 attributes.bit_gravity = NorthWestGravity;
1016 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1025 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1017 1026
1018 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1019 1028
1020 if (OPTION (Opt_pointerBlank)) 1029 if (OPTION (Opt_pointerBlank))
1021 vt_emask |= PointerMotionMask; 1030 vt_emask |= PointerMotionMask;
… …
1046 /* graphics context for the vt window */ 1055 /* graphics context for the vt window */
1047 gcvalue.foreground = pix_colors[Color_fg]; 1056 gcvalue.foreground = pix_colors[Color_fg];
1048 gcvalue.background = pix_colors[Color_bg]; 1057 gcvalue.background = pix_colors[Color_bg];
1049 gcvalue.graphics_exposures = 1; 1058 gcvalue.graphics_exposures = 1;
1050 1059
1051 gc = XCreateGC (disp, vt, 1060 gc = XCreateGC (xdisp, vt,
1052 GCForeground | GCBackground | GCGraphicsExposures, 1061 GCForeground | GCBackground | GCGraphicsExposures,
1053 &gcvalue); 1062 &gcvalue);
1054 1063
1055 drawable = new rxvt_drawable (display, vt); 1064 drawable = new rxvt_drawable (this, vt);
1056 1065
1057#ifdef RXVT_SCROLLBAR 1066#ifdef RXVT_SCROLLBAR
1058 gcvalue.foreground = pix_colors[Color_topShadow]; 1067 gcvalue.foreground = pix_colors[Color_topShadow];
1059 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1068 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1060 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1069 gcvalue.foreground = pix_colors[Color_bottomShadow];
1061 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1070 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1062 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1071 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1063 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1072 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1064#endif 1073#endif
1065 1074
1066#ifdef OFF_FOCUS_FADING 1075#ifdef OFF_FOCUS_FADING
1067 // initially we are in unfocused state 1076 // initially we are in unfocused state
1068 if (rs[Rs_fade]) 1077 if (rs[Rs_fade])

Diff Legend

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