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.154 by root, Wed Jan 25 02:45:36 2006 UTC vs.
Revision 1.162 by root, Tue Jan 31 16:19:16 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 ()
… …
192 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS; 194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 195 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 196 priv_modes = SavedModes = PrivMode_Default;
197 focus = 0;
198 ncol = 80; 197 ncol = 80;
199 nrow = 24; 198 nrow = 24;
200 int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
201 ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
202 lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
203 saveLines = SAVELINES; 202 saveLines = SAVELINES;
204 numpix_colors = TOTAL_COLORS; 203 numpix_colors = TOTAL_COLORS;
205 204
206 refresh_limit = 1; 205 refresh_limit = 1;
207 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
208 prev_nrow = prev_ncol = 0;
209 207
210 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
211#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
212 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
213 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 50;
… …
298 296
299 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
300 298
301 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
302 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 XFT
305 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0));
307 else
308#endif
309 set (display);
303 310
304 extract_resources (); 311 extract_resources ();
305 312
306 free (r_argv); 313 free (r_argv);
307 314
… …
475 val = rxvt_network_display (rs[Rs_display_name]); 482 val = rxvt_network_display (rs[Rs_display_name]);
476 rs[Rs_display_name] = (const char *)val; 483 rs[Rs_display_name] = (const char *)val;
477 484
478 if (val == NULL) 485 if (val == NULL)
479#endif /* DISPLAY_IS_IP */ 486#endif /* DISPLAY_IS_IP */
480 val = XDisplayString (display->display); 487 val = XDisplayString (xdisp);
481 488
482 if (rs[Rs_display_name] == NULL) 489 if (rs[Rs_display_name] == NULL)
483 rs[Rs_display_name] = val; /* use broken `:0' value */ 490 rs[Rs_display_name] = val; /* use broken `:0' value */
484 491
485 i = strlen (val); 492 i = strlen (val);
486 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
487 494
488 sprintf (env_display, "DISPLAY=%s", val); 495 sprintf (env_display, "DISPLAY=%s", val);
489 496
490 /* avoiding the math library: 497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
491 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
492 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
493 ;
494 max_it (i, 1);
495 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
496
497 sprintf (env_windowid, "WINDOWID=%u",
498 (unsigned int)parent[0]);
499 498
500 /* add entries to the environment: 499 /* add entries to the environment:
501 * @ DISPLAY: in case we started with -display 500 * @ DISPLAY: in case we started with -display
502 * @ WINDOWID: X window id number of the window 501 * @ WINDOWID: X window id number of the window
503 * @ COLORTERM: terminal sub-name and also indicates its color 502 * @ COLORTERM: terminal sub-name and also indicates its color
… …
505 * @ TERMINFO: path to terminfo directory 504 * @ TERMINFO: path to terminfo directory
506 * @ COLORFGBG: fg;bg color codes 505 * @ COLORFGBG: fg;bg color codes
507 */ 506 */
508 putenv (env_display); 507 putenv (env_display);
509 putenv (env_windowid); 508 putenv (env_windowid);
509
510 if (env_colorfgbg) 510 if (env_colorfgbg)
511 putenv (env_colorfgbg); 511 putenv (env_colorfgbg);
512 512
513#ifdef RXVT_TERMINFO 513#ifdef RXVT_TERMINFO
514 putenv ("TERMINFO=" RXVT_TERMINFO); 514 putenv ("TERMINFO=" RXVT_TERMINFO);
515#endif 515#endif
516 516
517 if (display->depth <= 2) 517 if (depth <= 2)
518 putenv ("COLORTERM=" COLORTERMENV "-mono"); 518 putenv ("COLORTERM=" COLORTERMENV "-mono");
519 else 519 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 520 putenv ("COLORTERM=" COLORTERMENVFULL);
521 521
522 if (rs[Rs_term_name] != NULL) 522 if (rs[Rs_term_name] != NULL)
… …
653 653
654#ifdef OFF_FOCUS_FADING 654#ifdef OFF_FOCUS_FADING
655 pix_colors = pix_colors_focused; 655 pix_colors = pix_colors_focused;
656#endif 656#endif
657 657
658 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 659 {
660 rxvt_color xcol; 660 rxvt_color xcol;
661 661
662 if (!rs[Rs_color + i]) 662 if (!rs[Rs_color + i])
663 continue; 663 continue;
664 664
665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 665 if (!set_color (xcol, rs[Rs_color + i]))
666 { 666 {
667#ifndef XTERM_REVERSE_VIDEO 667#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 668 if (i < 2 && OPTION (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 669 rs[Rs_color + i] = def_colorName[!i];
670 else 670 else
… …
672 rs[Rs_color + i] = def_colorName[i]; 672 rs[Rs_color + i] = def_colorName[i];
673 673
674 if (!rs[Rs_color + i]) 674 if (!rs[Rs_color + i])
675 continue; 675 continue;
676 676
677 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 677 if (!set_color (xcol, rs[Rs_color + i]))
678 { 678 {
679 switch (i) 679 switch (i)
680 { 680 {
681 case Color_fg: 681 case Color_fg:
682 case Color_bg: 682 case Color_bg:
683 /* fatal: need bg/fg color */ 683 /* fatal: need bg/fg color */
684 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 684 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
685 /* NOTREACHED */
686 break; 685 break;
687#ifndef NO_CURSORCOLOR 686#ifndef NO_CURSORCOLOR
688 case Color_cursor2: 687 case Color_cursor2:
689 xcol = pix_colors[Color_fg]; 688 xcol = pix_colors[Color_fg];
690 break; 689 break;
… …
703 SET_PIXCOLOR (i); 702 SET_PIXCOLOR (i);
704 } 703 }
705 704
706#ifdef OFF_FOCUS_FADING 705#ifdef OFF_FOCUS_FADING
707 if (rs[Rs_fade]) 706 if (rs[Rs_fade])
708 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 707 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
708 {
709 rxvt_rgba c;
710 pix_colors[Color_fade].get (this, c);
709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 711 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), c);
712 }
710#endif 713#endif
711 714
712 if (display->depth <= 2) 715 if (depth <= 2)
713 { 716 {
714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 717 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
715 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 718 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
716 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
717 } 720 }
… …
722 * The calculations of topShadow/bottomShadow values are adapted 725 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 726 * from the fvwm window manager.
724 */ 727 */
725#ifdef KEEP_SCROLLCOLOR 728#ifdef KEEP_SCROLLCOLOR
726 729
727 if (display->depth <= 2) 730 if (depth <= 2)
728 { 731 {
729 /* Monochrome */ 732 /* Monochrome */
730 pix_colors[Color_scroll] = pix_colors[Color_fg]; 733 pix_colors[Color_scroll] = pix_colors[Color_fg];
731 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 734 pix_colors[Color_topShadow] = pix_colors[Color_bg];
732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
737 /* xcol[0] == white 740 /* xcol[0] == white
738 * xcol[1] == top shadow 741 * xcol[1] == top shadow
739 * xcol[2] == bot shadow */ 742 * xcol[2] == bot shadow */
740 743
741 xcol[1] = pix_colors[Color_scroll]; 744 xcol[1] = pix_colors[Color_scroll];
742 xcol[0].set (display, 65535, 65535, 65535); 745 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC));
743 746
744 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 747 rxvt_rgba c0, c1;
745 748
746 xcol[0].get (display, pr0, pg0, pb0); 749 xcol[0].get (this, c0);
747 xcol[1].get (display, pr1, pg1, pb1); 750 xcol[1].get (this, c1);
748 751
749 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 752 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
750 753
751 /* topShadowColor */ 754 /* topShadowColor */
752 if (!xcol[1].set (display, 755 if (!xcol[1].set (this,
756 rxvt_rgba (
753 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 757 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
754 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 758 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
755 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 759 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
760 c1.a) // pa1 vs. pa0: arbitrary
761 ));
756 xcol[1] = pix_colors[Color_White]; 762 xcol[1] = pix_colors[Color_White];
757 763
758 pix_colors[Color_topShadow] = xcol[1]; 764 pix_colors[Color_topShadow] = xcol[1];
759 } 765 }
760#endif /* KEEP_SCROLLCOLOR */ 766#endif /* KEEP_SCROLLCOLOR */
… …
804 810
805 if (rsmod 811 if (rsmod
806 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
807 requestedmeta = rsmod[3] - '0'; 813 requestedmeta = rsmod[3] - '0';
808 814
809 map = XGetModifierMapping (display->display); 815 map = XGetModifierMapping (xdisp);
810 kc = map->modifiermap; 816 kc = map->modifiermap;
811 817
812 for (i = 1; i < 6; i++) 818 for (i = 1; i < 6; i++)
813 { 819 {
814 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
816 for (j = map->max_keypermod; j--; k++) 822 for (j = map->max_keypermod; j--; k++)
817 { 823 {
818 if (kc[k] == 0) 824 if (kc[k] == 0)
819 break; 825 break;
820 826
821 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 827 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
822 { 828 {
823 case XK_Num_Lock: 829 case XK_Num_Lock:
824 ModNumLockMask = modmasks[i - 1]; 830 ModNumLockMask = modmasks[i - 1];
825 continue; 831 continue;
826 832
… …
881 MWMHints mwmhints; 887 MWMHints mwmhints;
882#endif 888#endif
883 XGCValues gcvalue; 889 XGCValues gcvalue;
884 XSetWindowAttributes attributes; 890 XSetWindowAttributes attributes;
885 Window top, parent; 891 Window top, parent;
886 dDisp;
887 892
888 xa = display->xa; 893 dLocal (Display *, xdisp);
889 894
890 /* grab colors before netscape does */ 895 /* grab colors before netscape does */
891 Get_Colours (); 896 Get_Colours ();
892 897
893 if (!set_fonts ()) 898 if (!set_fonts ())
… …
898 attributes.override_redirect = !!OPTION (Opt_override_redirect); 903 attributes.override_redirect = !!OPTION (Opt_override_redirect);
899 904
900#if ENABLE_FRILLS 905#if ENABLE_FRILLS
901 if (OPTION (Opt_borderLess)) 906 if (OPTION (Opt_borderLess))
902 { 907 {
903 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 908 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
904 { 909 {
905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
906 attributes.override_redirect = TRUE; 911 attributes.override_redirect = true;
907 mwmhints.flags = 0; 912 mwmhints.flags = 0;
908 } 913 }
909 else 914 else
910 { 915 {
911 mwmhints.flags = MWM_HINTS_DECORATIONS; 916 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
921 { 926 {
922 XWindowAttributes wattr; 927 XWindowAttributes wattr;
923 928
924 parent = strtol (rs[Rs_embed], 0, 0); 929 parent = strtol (rs[Rs_embed], 0, 0);
925 930
926 if (!XGetWindowAttributes (disp, parent, &wattr)) 931 if (!XGetWindowAttributes (xdisp, parent, &wattr))
927 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
928 933
929 window_calc (wattr.width, wattr.height); 934 window_calc (wattr.width, wattr.height);
930 } 935 }
931#endif 936#endif
932 937
933 window_calc (0, 0); 938 window_calc (0, 0);
934 939
935 /* sub-window placement & size in rxvt_resize_subwindows () */ 940 /* sub-window placement & size in rxvt_resize_subwindows () */
936 attributes.background_pixel = pix_colors_focused[Color_border]; 941 attributes.background_pixel = pix_colors_focused [Color_border];
937 attributes.border_pixel = pix_colors_focused[Color_border]; 942 attributes.border_pixel = pix_colors_focused [Color_border];
938 attributes.colormap = display->cmap; 943 attributes.colormap = cmap;
939 944
940 top = XCreateWindow (disp, parent, 945 top = XCreateWindow (xdisp, parent,
941 szHint.x, szHint.y, 946 szHint.x, szHint.y,
942 szHint.width, szHint.height, 947 szHint.width, szHint.height,
943 ext_bwidth, 948 ext_bwidth,
944 display->depth, InputOutput, 949 depth, InputOutput, visual,
945 display->visual,
946 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
947 &attributes); 951 &attributes);
948 952
949 this->parent[0] = top; 953 this->parent[0] = top;
950 954
… …
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 964 wmHint.flags = InputHint | StateHint | WindowGroupHint;
961 wmHint.input = True; 965 wmHint.input = True;
962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 966 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 967 wmHint.window_group = top;
964 968
965 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 969 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 970 &szHint, &wmHint, &classHint);
967 971
968#if ENABLE_FRILLS 972#if ENABLE_FRILLS
969 if (mwmhints.flags) 973 if (mwmhints.flags)
970 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 974 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
972#endif 976#endif
973 977
974 Atom protocols[] = { 978 Atom protocols[] = {
975 xa[XA_WM_DELETE_WINDOW], 979 xa[XA_WM_DELETE_WINDOW],
976#if ENABLE_EWMH 980#if ENABLE_EWMH
977 xa[XA_NET_WM_PING], 981 xa[XA_NET_WM_PING],
978#endif 982#endif
979 }; 983 };
980 984
981 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 985 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
982 986
983#if ENABLE_FRILLS 987#if ENABLE_FRILLS
984 if (rs[Rs_transient_for]) 988 if (rs[Rs_transient_for])
985 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 989 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
986#endif 990#endif
987 991
988#if ENABLE_EWMH 992#if ENABLE_EWMH
989 long pid = getpid (); 993 long pid = getpid ();
990 994
991 XChangeProperty (disp, top, 995 XChangeProperty (xdisp, top,
992 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 996 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
993 PropModeReplace, (unsigned char *)&pid, 1); 997 PropModeReplace, (unsigned char *)&pid, 1);
994 998
995 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
996#endif 1000#endif
997 1001
998 XSelectInput (disp, top, 1002 XSelectInput (xdisp, top,
999 KeyPressMask 1003 KeyPressMask
1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1001 | KeyReleaseMask 1005 | KeyReleaseMask
1002#endif 1006#endif
1003 | FocusChangeMask | VisibilityChangeMask 1007 | FocusChangeMask | VisibilityChangeMask
1004 | ExposureMask | StructureNotifyMask); 1008 | ExposureMask | StructureNotifyMask);
1005 1009
1006 termwin_ev.start (display, top); 1010 termwin_ev.start (display, top);
1007 1011
1008 /* vt cursor: Black-on-White is standard, but this is more popular */ 1012 /* vt cursor: Black-on-White is standard, but this is more popular */
1009 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1013 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1010 1014
1011#ifdef HAVE_SCROLLBARS 1015#ifdef HAVE_SCROLLBARS
1012 /* cursor scrollBar: Black-on-White */ 1016 /* cursor scrollBar: Black-on-White */
1013 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1017 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1014#endif 1018#endif
1015 1019
1016 /* the vt window */ 1020 /* the vt window */
1017 vt = XCreateSimpleWindow (disp, top, 1021 vt = XCreateSimpleWindow (xdisp, top,
1018 window_vt_x, window_vt_y, 1022 window_vt_x, window_vt_y,
1019 width, height, 1023 width, height,
1020 0, 1024 0,
1021 pix_colors_focused[Color_fg], 1025 pix_colors_focused[Color_fg],
1022 pix_colors_focused[Color_bg]); 1026 pix_colors_focused[Color_bg]);
1023 1027
1024 attributes.bit_gravity = NorthWestGravity; 1028 attributes.bit_gravity = NorthWestGravity;
1025 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1029 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1026 1030
1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1028 1032
1029 if (OPTION (Opt_pointerBlank)) 1033 if (OPTION (Opt_pointerBlank))
1030 vt_emask |= PointerMotionMask; 1034 vt_emask |= PointerMotionMask;
… …
1055 /* graphics context for the vt window */ 1059 /* graphics context for the vt window */
1056 gcvalue.foreground = pix_colors[Color_fg]; 1060 gcvalue.foreground = pix_colors[Color_fg];
1057 gcvalue.background = pix_colors[Color_bg]; 1061 gcvalue.background = pix_colors[Color_bg];
1058 gcvalue.graphics_exposures = 1; 1062 gcvalue.graphics_exposures = 1;
1059 1063
1060 gc = XCreateGC (disp, vt, 1064 gc = XCreateGC (xdisp, vt,
1061 GCForeground | GCBackground | GCGraphicsExposures, 1065 GCForeground | GCBackground | GCGraphicsExposures,
1062 &gcvalue); 1066 &gcvalue);
1063 1067
1064 drawable = new rxvt_drawable (display, vt); 1068 drawable = new rxvt_drawable (this, vt);
1065 1069
1066#ifdef RXVT_SCROLLBAR 1070#ifdef RXVT_SCROLLBAR
1067 gcvalue.foreground = pix_colors[Color_topShadow]; 1071 gcvalue.foreground = pix_colors[Color_topShadow];
1068 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1072 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1073 gcvalue.foreground = pix_colors[Color_bottomShadow];
1070 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1074 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1071 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1075 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1072 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1076 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1073#endif 1077#endif
1074 1078
1075#ifdef OFF_FOCUS_FADING 1079#ifdef OFF_FOCUS_FADING
1076 // initially we are in unfocused state 1080 // initially we are in unfocused state
1077 if (rs[Rs_fade]) 1081 if (rs[Rs_fade])

Diff Legend

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