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

Diff Legend

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