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

Diff Legend

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