… | |
… | |
297 | get_options (r_argc, r_argv); |
297 | get_options (r_argc, r_argv); |
298 | |
298 | |
299 | if (!(display = displays.get (rs[Rs_display_name]))) |
299 | if (!(display = displays.get (rs[Rs_display_name]))) |
300 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
300 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
301 | |
301 | |
|
|
302 | // using a local pointer decreases code size a lot |
302 | xa = display->xa; |
303 | xa = display->xa; |
303 | |
304 | |
304 | #if ENABLE_FRILLS |
305 | #if XFT |
305 | if (rs[Rs_depth]) |
306 | if (rs[Rs_depth]) |
306 | set (display, strtol (rs[Rs_depth], 0, 0)); |
307 | set (display, strtol (rs[Rs_depth], 0, 0)); |
307 | else |
308 | else |
308 | #endif |
309 | #endif |
309 | set (display); |
310 | set (display); |
310 | |
311 | |
311 | extract_resources (); |
312 | extract_resources (); |
312 | |
313 | |
313 | 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; |
314 | |
319 | |
315 | #if ENABLE_PERL |
320 | #if ENABLE_PERL |
316 | if (!rs[Rs_perl_ext_1]) |
321 | if (!rs[Rs_perl_ext_1]) |
317 | rs[Rs_perl_ext_1] = "default"; |
322 | rs[Rs_perl_ext_1] = "default"; |
318 | |
323 | |
… | |
… | |
421 | /* this is how xterm implements reverseVideo */ |
426 | /* this is how xterm implements reverseVideo */ |
422 | if (OPTION (Opt_reverseVideo)) |
427 | if (OPTION (Opt_reverseVideo)) |
423 | { |
428 | { |
424 | if (!rs[Rs_color + Color_fg]) |
429 | if (!rs[Rs_color + Color_fg]) |
425 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
430 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
|
|
431 | |
426 | if (!rs[Rs_color + Color_bg]) |
432 | if (!rs[Rs_color + Color_bg]) |
427 | rs[Rs_color + Color_bg] = def_colorName[Color_fg]; |
433 | rs[Rs_color + Color_bg] = def_colorName[Color_fg]; |
428 | } |
434 | } |
429 | #endif |
435 | #endif |
430 | |
436 | |
… | |
… | |
482 | val = rxvt_network_display (rs[Rs_display_name]); |
488 | val = rxvt_network_display (rs[Rs_display_name]); |
483 | rs[Rs_display_name] = (const char *)val; |
489 | rs[Rs_display_name] = (const char *)val; |
484 | |
490 | |
485 | if (val == NULL) |
491 | if (val == NULL) |
486 | #endif /* DISPLAY_IS_IP */ |
492 | #endif /* DISPLAY_IS_IP */ |
487 | val = XDisplayString (xdisp); |
493 | val = XDisplayString (dpy); |
488 | |
494 | |
489 | if (rs[Rs_display_name] == NULL) |
495 | if (rs[Rs_display_name] == NULL) |
490 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
496 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
491 | |
497 | |
492 | i = strlen (val); |
498 | i = strlen (val); |
… | |
… | |
655 | pix_colors = pix_colors_focused; |
661 | pix_colors = pix_colors_focused; |
656 | #endif |
662 | #endif |
657 | |
663 | |
658 | for (i = 0; i < (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]) |
|
|
663 | continue; |
|
|
664 | |
|
|
665 | if (!set_color (xcol, rs[Rs_color + i])) |
673 | if (!set_color (xcol, name)) |
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 (!set_color (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_warn ("unable to get foreground/background colour, continuing.\n"); |
691 | rxvt_warn ("unable to get foreground/background colour, continuing.\n"); |
|
|
692 | name = ""; |
685 | break; |
693 | break; |
686 | #ifndef NO_CURSORCOLOR |
694 | #ifndef NO_CURSORCOLOR |
687 | case Color_cursor2: |
695 | case Color_cursor2: |
688 | xcol = pix_colors[Color_fg]; |
696 | #endif |
689 | break; |
|
|
690 | #endif /* ! NO_CURSORCOLOR */ |
|
|
691 | case Color_pointer_fg: |
697 | case Color_pointer_fg: |
692 | xcol = pix_colors[Color_fg]; |
698 | name = rs[Rs_color + Color_fg]; |
|
|
699 | xcol.set (this, name); |
693 | break; |
700 | break; |
694 | default: |
701 | default: |
695 | xcol = pix_colors[Color_bg]; /* None */ |
702 | name = rs[Rs_color + Color_bg]; |
|
|
703 | xcol.set (this, name); |
696 | break; |
704 | break; |
697 | } |
705 | } |
698 | } |
706 | } |
699 | } |
707 | } |
700 | |
708 | |
701 | pix_colors[i] = xcol; |
709 | pix_colors[i] = xcol; |
702 | SET_PIXCOLOR (i); |
710 | rs[Rs_color + i] = name; |
703 | } |
711 | } |
704 | |
|
|
705 | #ifdef OFF_FOCUS_FADING |
|
|
706 | if (rs[Rs_fade]) |
|
|
707 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
|
|
708 | pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
|
|
709 | #endif |
|
|
710 | |
712 | |
711 | if (depth <= 2) |
713 | if (depth <= 2) |
712 | { |
714 | { |
713 | 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); |
714 | 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); |
715 | 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); |
716 | } |
718 | } |
717 | |
719 | |
718 | /* |
720 | /* |
719 | * get scrollBar shadow colors |
721 | * get scrollBar shadow colors |
720 | * |
722 | * |
721 | * The calculations of topShadow/bottomShadow values are adapted |
723 | * The calculations of topShadow/bottomShadow values are adapted |
722 | * from the fvwm window manager. |
724 | * from the fvwm window manager. |
723 | */ |
725 | */ |
724 | #ifdef KEEP_SCROLLCOLOR |
726 | #ifdef KEEP_SCROLLCOLOR |
725 | |
|
|
726 | if (depth <= 2) |
727 | if (depth <= 2) |
727 | { |
728 | { |
728 | /* Monochrome */ |
729 | /* Monochrome */ |
729 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
730 | alias_color (Color_scroll, Color_fg); |
730 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
731 | alias_color (Color_topShadow, Color_bg); |
731 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
732 | alias_color (Color_bottomShadow, Color_bg); |
732 | } |
733 | } |
733 | else |
734 | else |
734 | { |
735 | { |
735 | rxvt_color xcol[2]; |
736 | pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); |
736 | /* xcol[0] == white |
|
|
737 | * xcol[1] == top shadow |
|
|
738 | * xcol[2] == bot shadow */ |
|
|
739 | |
737 | |
740 | xcol[1] = pix_colors[Color_scroll]; |
738 | rgba cscroll; |
741 | xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); |
739 | pix_colors [Color_scroll].get (cscroll); |
742 | |
|
|
743 | rxvt_rgba c0, c1; |
|
|
744 | |
|
|
745 | xcol[0].get (this, c0); |
|
|
746 | xcol[1].get (this, c1); |
|
|
747 | |
|
|
748 | pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50); |
|
|
749 | |
740 | |
750 | /* topShadowColor */ |
741 | /* topShadowColor */ |
751 | if (!xcol[1].set (this, |
742 | if (!pix_colors[Color_topShadow].set (this, |
752 | rxvt_rgba ( |
743 | rgba ( |
753 | min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), |
744 | min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), |
754 | min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), |
745 | min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), |
755 | min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), |
746 | min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), |
756 | c1.a) // pa1 vs. pa0: arbitrary |
747 | cscroll.a) |
757 | )); |
748 | )) |
758 | xcol[1] = pix_colors[Color_White]; |
749 | alias_color (Color_topShadow, Color_White); |
759 | |
|
|
760 | pix_colors[Color_topShadow] = xcol[1]; |
|
|
761 | } |
750 | } |
762 | #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 |
763 | } |
762 | } |
764 | |
763 | |
765 | /*----------------------------------------------------------------------*/ |
764 | /*----------------------------------------------------------------------*/ |
766 | /* color aliases, fg/bg bright-bold */ |
765 | /* color aliases, fg/bg bright-bold */ |
767 | void |
766 | void |
… | |
… | |
806 | |
805 | |
807 | if (rsmod |
806 | if (rsmod |
808 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
807 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
809 | requestedmeta = rsmod[3] - '0'; |
808 | requestedmeta = rsmod[3] - '0'; |
810 | |
809 | |
811 | map = XGetModifierMapping (xdisp); |
810 | map = XGetModifierMapping (dpy); |
812 | kc = map->modifiermap; |
811 | kc = map->modifiermap; |
813 | |
812 | |
814 | for (i = 1; i < 6; i++) |
813 | for (i = 1; i < 6; i++) |
815 | { |
814 | { |
816 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
815 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
… | |
… | |
818 | for (j = map->max_keypermod; j--; k++) |
817 | for (j = map->max_keypermod; j--; k++) |
819 | { |
818 | { |
820 | if (kc[k] == 0) |
819 | if (kc[k] == 0) |
821 | break; |
820 | break; |
822 | |
821 | |
823 | switch (XKeycodeToKeysym (xdisp, kc[k], 0)) |
822 | switch (XKeycodeToKeysym (dpy, kc[k], 0)) |
824 | { |
823 | { |
825 | case XK_Num_Lock: |
824 | case XK_Num_Lock: |
826 | ModNumLockMask = modmasks[i - 1]; |
825 | ModNumLockMask = modmasks[i - 1]; |
827 | continue; |
826 | continue; |
828 | |
827 | |
… | |
… | |
884 | #endif |
883 | #endif |
885 | XGCValues gcvalue; |
884 | XGCValues gcvalue; |
886 | XSetWindowAttributes attributes; |
885 | XSetWindowAttributes attributes; |
887 | Window top, parent; |
886 | Window top, parent; |
888 | |
887 | |
889 | dLocal (Display *, xdisp); |
888 | dLocal (Display *, dpy); |
890 | |
889 | |
891 | /* grab colors before netscape does */ |
890 | /* grab colors before netscape does */ |
892 | Get_Colours (); |
891 | Get_Colours (); |
893 | |
892 | |
894 | if (!set_fonts ()) |
893 | if (!set_fonts ()) |
… | |
… | |
899 | attributes.override_redirect = !!OPTION (Opt_override_redirect); |
898 | attributes.override_redirect = !!OPTION (Opt_override_redirect); |
900 | |
899 | |
901 | #if ENABLE_FRILLS |
900 | #if ENABLE_FRILLS |
902 | if (OPTION (Opt_borderLess)) |
901 | if (OPTION (Opt_borderLess)) |
903 | { |
902 | { |
904 | if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) |
903 | if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) |
905 | { |
904 | { |
906 | /* 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");*/ |
907 | attributes.override_redirect = true; |
906 | attributes.override_redirect = true; |
908 | mwmhints.flags = 0; |
907 | mwmhints.flags = 0; |
909 | } |
908 | } |
… | |
… | |
922 | { |
921 | { |
923 | XWindowAttributes wattr; |
922 | XWindowAttributes wattr; |
924 | |
923 | |
925 | parent = strtol (rs[Rs_embed], 0, 0); |
924 | parent = strtol (rs[Rs_embed], 0, 0); |
926 | |
925 | |
927 | if (!XGetWindowAttributes (xdisp, parent, &wattr)) |
926 | if (!XGetWindowAttributes (dpy, parent, &wattr)) |
928 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
927 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
929 | |
928 | |
930 | window_calc (wattr.width, wattr.height); |
929 | window_calc (wattr.width, wattr.height); |
931 | } |
930 | } |
932 | #endif |
931 | #endif |
… | |
… | |
936 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
935 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
937 | attributes.background_pixel = pix_colors_focused [Color_border]; |
936 | attributes.background_pixel = pix_colors_focused [Color_border]; |
938 | attributes.border_pixel = pix_colors_focused [Color_border]; |
937 | attributes.border_pixel = pix_colors_focused [Color_border]; |
939 | attributes.colormap = cmap; |
938 | attributes.colormap = cmap; |
940 | |
939 | |
941 | top = XCreateWindow (xdisp, parent, |
940 | top = XCreateWindow (dpy, parent, |
942 | szHint.x, szHint.y, |
941 | szHint.x, szHint.y, |
943 | szHint.width, szHint.height, |
942 | szHint.width, szHint.height, |
944 | ext_bwidth, |
943 | ext_bwidth, |
945 | depth, InputOutput, visual, |
944 | depth, InputOutput, visual, |
946 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
945 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
… | |
… | |
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 (xdisp, 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 (xdisp, 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 (xdisp, 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 (xdisp, 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 (xdisp, 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 (xdisp, 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 (xdisp, 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 (xdisp, 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 (xdisp, 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 (xdisp, 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 (xdisp, 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 (this, 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 (xdisp, 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 (xdisp, vt, GCForeground, &gcvalue); |
1069 | botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
1071 | gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; |
1070 | gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; |
1072 | scrollbarGC = XCreateGC (xdisp, 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]) |