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

Diff Legend

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