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

Diff Legend

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