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.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
303 xa = display->xa;
304
305#if XFT
306 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0));
308 else
309#endif
310 set (display);
311
302 extract_resources (); 312 extract_resources ();
303 313
304 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;
305 319
306#if ENABLE_PERL 320#if ENABLE_PERL
307 if (!rs[Rs_perl_ext_1]) 321 if (!rs[Rs_perl_ext_1])
308 rs[Rs_perl_ext_1] = "default"; 322 rs[Rs_perl_ext_1] = "default";
309 323
… …
412 /* this is how xterm implements reverseVideo */ 426 /* this is how xterm implements reverseVideo */
413 if (OPTION (Opt_reverseVideo)) 427 if (OPTION (Opt_reverseVideo))
414 { 428 {
415 if (!rs[Rs_color + Color_fg]) 429 if (!rs[Rs_color + Color_fg])
416 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 430 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431
417 if (!rs[Rs_color + Color_bg]) 432 if (!rs[Rs_color + Color_bg])
418 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 433 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
419 } 434 }
420#endif 435#endif
421 436
… …
473 val = rxvt_network_display (rs[Rs_display_name]); 488 val = rxvt_network_display (rs[Rs_display_name]);
474 rs[Rs_display_name] = (const char *)val; 489 rs[Rs_display_name] = (const char *)val;
475 490
476 if (val == NULL) 491 if (val == NULL)
477#endif /* DISPLAY_IS_IP */ 492#endif /* DISPLAY_IS_IP */
478 val = XDisplayString (display->display); 493 val = XDisplayString (dpy);
479 494
480 if (rs[Rs_display_name] == NULL) 495 if (rs[Rs_display_name] == NULL)
481 rs[Rs_display_name] = val; /* use broken `:0' value */ 496 rs[Rs_display_name] = val; /* use broken `:0' value */
482 497
483 i = strlen (val); 498 i = strlen (val);
… …
503 518
504#ifdef RXVT_TERMINFO 519#ifdef RXVT_TERMINFO
505 putenv ("TERMINFO=" RXVT_TERMINFO); 520 putenv ("TERMINFO=" RXVT_TERMINFO);
506#endif 521#endif
507 522
508 if (display->depth <= 2) 523 if (depth <= 2)
509 putenv ("COLORTERM=" COLORTERMENV "-mono"); 524 putenv ("COLORTERM=" COLORTERMENV "-mono");
510 else 525 else
511 putenv ("COLORTERM=" COLORTERMENVFULL); 526 putenv ("COLORTERM=" COLORTERMENVFULL);
512 527
513 if (rs[Rs_term_name] != NULL) 528 if (rs[Rs_term_name] != NULL)
… …
644 659
645#ifdef OFF_FOCUS_FADING 660#ifdef OFF_FOCUS_FADING
646 pix_colors = pix_colors_focused; 661 pix_colors = pix_colors_focused;
647#endif 662#endif
648 663
649 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 664 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
650 { 665 {
666 const char *name = rs[Rs_color + i];
667
668 if (!name)
669 continue;
670
651 rxvt_color xcol; 671 rxvt_color xcol;
652 672
653 if (!rs[Rs_color + i]) 673 if (!set_color (xcol, name))
654 continue;
655
656 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
657 { 674 {
658#ifndef XTERM_REVERSE_VIDEO 675#ifndef XTERM_REVERSE_VIDEO
659 if (i < 2 && OPTION (Opt_reverseVideo)) 676 if (i < 2 && OPTION (Opt_reverseVideo))
660 rs[Rs_color + i] = def_colorName[!i]; 677 name = def_colorName [1 - i];
661 else 678 else
662#endif 679#endif
663 rs[Rs_color + i] = def_colorName[i]; 680 name = def_colorName [i];
664 681
665 if (!rs[Rs_color + i]) 682 if (!name)
666 continue; 683 continue;
667 684
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 685 if (!set_color (xcol, name))
669 { 686 {
670 switch (i) 687 switch (i)
671 { 688 {
672 case Color_fg: 689 case Color_fg:
673 case Color_bg: 690 case Color_bg:
674 /* fatal: need bg/fg color */
675 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 691 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
676 /* NOTREACHED */ 692 name = "";
677 break; 693 break;
678#ifndef NO_CURSORCOLOR 694#ifndef NO_CURSORCOLOR
679 case Color_cursor2: 695 case Color_cursor2:
680 xcol = pix_colors[Color_fg]; 696#endif
681 break;
682#endif /* ! NO_CURSORCOLOR */
683 case Color_pointer_fg: 697 case Color_pointer_fg:
684 xcol = pix_colors[Color_fg]; 698 name = rs[Rs_color + Color_fg];
699 xcol.set (this, name);
685 break; 700 break;
686 default: 701 default:
687 xcol = pix_colors[Color_bg]; /* None */ 702 name = rs[Rs_color + Color_bg];
703 xcol.set (this, name);
688 break; 704 break;
689 } 705 }
690 } 706 }
691 } 707 }
692 708
693 pix_colors[i] = xcol; 709 pix_colors[i] = xcol;
694 SET_PIXCOLOR (i); 710 rs[Rs_color + i] = name;
695 }
696
697#ifdef OFF_FOCUS_FADING
698 if (rs[Rs_fade])
699 for (i = 0; i < (display->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]);
701#endif
702
703 if (display->depth <= 2)
704 { 711 }
712
713 if (depth <= 2)
714 {
705 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);
706 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);
707 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);
708 } 718 }
709 719
710 /* 720 /*
711 * get scrollBar shadow colors 721 * get scrollBar shadow colors
712 * 722 *
713 * The calculations of topShadow/bottomShadow values are adapted 723 * The calculations of topShadow/bottomShadow values are adapted
714 * from the fvwm window manager. 724 * from the fvwm window manager.
715 */ 725 */
716#ifdef KEEP_SCROLLCOLOR 726#ifdef KEEP_SCROLLCOLOR
717
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 alias_color (Color_scroll, Color_fg);
722 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 731 alias_color (Color_topShadow, Color_bg);
723 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 732 alias_color (Color_bottomShadow, Color_bg);
724 } 733 }
725 else 734 else
726 { 735 {
727 rxvt_color xcol[2]; 736 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
728 /* xcol[0] == white
729 * xcol[1] == top shadow
730 * xcol[2] == bot shadow */
731 737
732 xcol[1] = pix_colors[Color_scroll]; 738 rgba cscroll;
733 xcol[0].set (display, 65535, 65535, 65535); 739 pix_colors [Color_scroll].get (cscroll);
734
735 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
736
737 xcol[0].get (display, pr0, pg0, pb0);
738 xcol[1].get (display, pr1, pg1, pb1);
739
740 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
741 740
742 /* topShadowColor */ 741 /* topShadowColor */
743 if (!xcol[1].set (display, 742 if (!pix_colors[Color_topShadow].set (this,
744 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 743 rgba (
745 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 744 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
746 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 745 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
747 xcol[1] = pix_colors[Color_White]; 746 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
748 747 cscroll.a)
749 pix_colors[Color_topShadow] = xcol[1]; 748 ))
749 alias_color (Color_topShadow, Color_White);
750 } 750 }
751#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
752} 762}
753 763
754/*----------------------------------------------------------------------*/ 764/*----------------------------------------------------------------------*/
755/* color aliases, fg/bg bright-bold */ 765/* color aliases, fg/bg bright-bold */
756void 766void
… …
795 805
796 if (rsmod 806 if (rsmod
797 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 807 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
798 requestedmeta = rsmod[3] - '0'; 808 requestedmeta = rsmod[3] - '0';
799 809
800 map = XGetModifierMapping (display->display); 810 map = XGetModifierMapping (dpy);
801 kc = map->modifiermap; 811 kc = map->modifiermap;
802 812
803 for (i = 1; i < 6; i++) 813 for (i = 1; i < 6; i++)
804 { 814 {
805 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 815 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
807 for (j = map->max_keypermod; j--; k++) 817 for (j = map->max_keypermod; j--; k++)
808 { 818 {
809 if (kc[k] == 0) 819 if (kc[k] == 0)
810 break; 820 break;
811 821
812 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 822 switch (XKeycodeToKeysym (dpy, kc[k], 0))
813 { 823 {
814 case XK_Num_Lock: 824 case XK_Num_Lock:
815 ModNumLockMask = modmasks[i - 1]; 825 ModNumLockMask = modmasks[i - 1];
816 continue; 826 continue;
817 827
… …
872 MWMHints mwmhints; 882 MWMHints mwmhints;
873#endif 883#endif
874 XGCValues gcvalue; 884 XGCValues gcvalue;
875 XSetWindowAttributes attributes; 885 XSetWindowAttributes attributes;
876 Window top, parent; 886 Window top, parent;
877 dDisp;
878 887
879 xa = display->xa; 888 dLocal (Display *, dpy);
880 889
881 /* grab colors before netscape does */ 890 /* grab colors before netscape does */
882 Get_Colours (); 891 Get_Colours ();
883 892
884 if (!set_fonts ()) 893 if (!set_fonts ())
… …
889 attributes.override_redirect = !!OPTION (Opt_override_redirect); 898 attributes.override_redirect = !!OPTION (Opt_override_redirect);
890 899
891#if ENABLE_FRILLS 900#if ENABLE_FRILLS
892 if (OPTION (Opt_borderLess)) 901 if (OPTION (Opt_borderLess))
893 { 902 {
894 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 903 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
895 { 904 {
896 /* 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");*/
897 attributes.override_redirect = TRUE; 906 attributes.override_redirect = true;
898 mwmhints.flags = 0; 907 mwmhints.flags = 0;
899 } 908 }
900 else 909 else
901 { 910 {
902 mwmhints.flags = MWM_HINTS_DECORATIONS; 911 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
912 { 921 {
913 XWindowAttributes wattr; 922 XWindowAttributes wattr;
914 923
915 parent = strtol (rs[Rs_embed], 0, 0); 924 parent = strtol (rs[Rs_embed], 0, 0);
916 925
917 if (!XGetWindowAttributes (disp, parent, &wattr)) 926 if (!XGetWindowAttributes (dpy, parent, &wattr))
918 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 927 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
919 928
920 window_calc (wattr.width, wattr.height); 929 window_calc (wattr.width, wattr.height);
921 } 930 }
922#endif 931#endif
923 932
924 window_calc (0, 0); 933 window_calc (0, 0);
925 934
926 /* sub-window placement & size in rxvt_resize_subwindows () */ 935 /* sub-window placement & size in rxvt_resize_subwindows () */
927 attributes.background_pixel = pix_colors_focused[Color_border]; 936 attributes.background_pixel = pix_colors_focused [Color_border];
928 attributes.border_pixel = pix_colors_focused[Color_border]; 937 attributes.border_pixel = pix_colors_focused [Color_border];
929 attributes.colormap = display->cmap; 938 attributes.colormap = cmap;
930 939
931 top = XCreateWindow (disp, parent, 940 top = XCreateWindow (dpy, parent,
932 szHint.x, szHint.y, 941 szHint.x, szHint.y,
933 szHint.width, szHint.height, 942 szHint.width, szHint.height,
934 ext_bwidth, 943 ext_bwidth,
935 display->depth, InputOutput, 944 depth, InputOutput, visual,
936 display->visual,
937 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 945 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
938 &attributes); 946 &attributes);
939 947
940 this->parent[0] = top; 948 this->parent[0] = top;
941 949
… …
951 wmHint.flags = InputHint | StateHint | WindowGroupHint; 959 wmHint.flags = InputHint | StateHint | WindowGroupHint;
952 wmHint.input = True; 960 wmHint.input = True;
953 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
954 wmHint.window_group = top; 962 wmHint.window_group = top;
955 963
956 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 964 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
957 &szHint, &wmHint, &classHint); 965 &szHint, &wmHint, &classHint);
958 966
959#if ENABLE_FRILLS 967#if ENABLE_FRILLS
960 if (mwmhints.flags) 968 if (mwmhints.flags)
961 XChangeProperty (disp, 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,
962 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 970 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
963#endif 971#endif
964 972
965 Atom protocols[] = { 973 Atom protocols[] = {
966 xa[XA_WM_DELETE_WINDOW], 974 xa[XA_WM_DELETE_WINDOW],
967#if ENABLE_EWMH 975#if ENABLE_EWMH
968 xa[XA_NET_WM_PING], 976 xa[XA_NET_WM_PING],
969#endif 977#endif
970 }; 978 };
971 979
972 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 980 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
973 981
974#if ENABLE_FRILLS 982#if ENABLE_FRILLS
975 if (rs[Rs_transient_for]) 983 if (rs[Rs_transient_for])
976 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 984 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
977#endif 985#endif
978 986
979#if ENABLE_EWMH 987#if ENABLE_EWMH
980 long pid = getpid (); 988 long pid = getpid ();
981 989
982 XChangeProperty (disp, top, 990 XChangeProperty (dpy, top,
983 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 991 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
984 PropModeReplace, (unsigned char *)&pid, 1); 992 PropModeReplace, (unsigned char *)&pid, 1);
985 993
986 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 994 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
987#endif 995#endif
988 996
989 XSelectInput (disp, top, 997 XSelectInput (dpy, top,
990 KeyPressMask 998 KeyPressMask
991#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 999#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
992 | KeyReleaseMask 1000 | KeyReleaseMask
993#endif 1001#endif
994 | FocusChangeMask | VisibilityChangeMask 1002 | FocusChangeMask | VisibilityChangeMask
995 | ExposureMask | StructureNotifyMask); 1003 | ExposureMask | StructureNotifyMask);
996 1004
997 termwin_ev.start (display, top); 1005 termwin_ev.start (display, top);
998 1006
999 /* 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 */
1000 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1008 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1001 1009
1002#ifdef HAVE_SCROLLBARS 1010#ifdef HAVE_SCROLLBARS
1003 /* cursor scrollBar: Black-on-White */ 1011 /* cursor scrollBar: Black-on-White */
1004 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1012 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1005#endif 1013#endif
1006 1014
1007 /* the vt window */ 1015 /* the vt window */
1008 vt = XCreateSimpleWindow (disp, top, 1016 vt = XCreateSimpleWindow (dpy, top,
1009 window_vt_x, window_vt_y, 1017 window_vt_x, window_vt_y,
1010 width, height, 1018 width, height,
1011 0, 1019 0,
1012 pix_colors_focused[Color_fg], 1020 pix_colors_focused[Color_fg],
1013 pix_colors_focused[Color_bg]); 1021 pix_colors_focused[Color_bg]);
1014 1022
1015 attributes.bit_gravity = NorthWestGravity; 1023 attributes.bit_gravity = NorthWestGravity;
1016 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1024 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1017 1025
1018 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1019 1027
1020 if (OPTION (Opt_pointerBlank)) 1028 if (OPTION (Opt_pointerBlank))
1021 vt_emask |= PointerMotionMask; 1029 vt_emask |= PointerMotionMask;
… …
1044#endif 1052#endif
1045 1053
1046 /* graphics context for the vt window */ 1054 /* graphics context for the vt window */
1047 gcvalue.foreground = pix_colors[Color_fg]; 1055 gcvalue.foreground = pix_colors[Color_fg];
1048 gcvalue.background = pix_colors[Color_bg]; 1056 gcvalue.background = pix_colors[Color_bg];
1049 gcvalue.graphics_exposures = 1; 1057 gcvalue.graphics_exposures = 0;
1050 1058
1051 gc = XCreateGC (disp, vt, 1059 gc = XCreateGC (dpy, vt,
1052 GCForeground | GCBackground | GCGraphicsExposures, 1060 GCForeground | GCBackground | GCGraphicsExposures,
1053 &gcvalue); 1061 &gcvalue);
1054 1062
1055 drawable = new rxvt_drawable (display, vt); 1063 drawable = new rxvt_drawable (this, vt);
1056 1064
1057#ifdef RXVT_SCROLLBAR 1065#ifdef RXVT_SCROLLBAR
1058 gcvalue.foreground = pix_colors[Color_topShadow]; 1066 gcvalue.foreground = pix_colors[Color_topShadow];
1059 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1067 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1060 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1068 gcvalue.foreground = pix_colors[Color_bottomShadow];
1061 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1069 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1062 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1070 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1063 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1071 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1064#endif 1072#endif
1065 1073
1066#ifdef OFF_FOCUS_FADING 1074#ifdef OFF_FOCUS_FADING
1067 // initially we are in unfocused state 1075 // initially we are in unfocused state
1068 if (rs[Rs_fade]) 1076 if (rs[Rs_fade])

Diff Legend

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