… | |
… | |
309 | #endif |
309 | #endif |
310 | set (display); |
310 | set (display); |
311 | |
311 | |
312 | extract_resources (); |
312 | extract_resources (); |
313 | |
313 | |
|
|
314 | free (r_argv); |
|
|
315 | |
314 | for (int i = NUM_RESOURCES; i--; ) |
316 | for (int i = NUM_RESOURCES; i--; ) |
315 | if (rs [i] == resval_undef) |
317 | if (rs [i] == resval_undef) |
316 | rs [i] = 0; |
318 | rs [i] = 0; |
317 | |
|
|
318 | free (r_argv); |
|
|
319 | |
319 | |
320 | #if ENABLE_PERL |
320 | #if ENABLE_PERL |
321 | if (!rs[Rs_perl_ext_1]) |
321 | if (!rs[Rs_perl_ext_1]) |
322 | rs[Rs_perl_ext_1] = "default"; |
322 | rs[Rs_perl_ext_1] = "default"; |
323 | |
323 | |
… | |
… | |
488 | val = rxvt_network_display (rs[Rs_display_name]); |
488 | val = rxvt_network_display (rs[Rs_display_name]); |
489 | rs[Rs_display_name] = (const char *)val; |
489 | rs[Rs_display_name] = (const char *)val; |
490 | |
490 | |
491 | if (val == NULL) |
491 | if (val == NULL) |
492 | #endif /* DISPLAY_IS_IP */ |
492 | #endif /* DISPLAY_IS_IP */ |
493 | val = XDisplayString (xdisp); |
493 | val = XDisplayString (dpy); |
494 | |
494 | |
495 | if (rs[Rs_display_name] == NULL) |
495 | if (rs[Rs_display_name] == NULL) |
496 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
496 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
497 | |
497 | |
498 | i = strlen (val); |
498 | i = strlen (val); |
… | |
… | |
694 | #ifndef NO_CURSORCOLOR |
694 | #ifndef NO_CURSORCOLOR |
695 | case Color_cursor2: |
695 | case Color_cursor2: |
696 | #endif |
696 | #endif |
697 | case Color_pointer_fg: |
697 | case Color_pointer_fg: |
698 | name = rs[Rs_color + Color_fg]; |
698 | name = rs[Rs_color + Color_fg]; |
699 | xcol = pix_colors[Color_fg]; |
699 | xcol.set (this, name); |
700 | break; |
700 | break; |
701 | default: |
701 | default: |
702 | name = rs[Rs_color + Color_bg]; |
702 | name = rs[Rs_color + Color_bg]; |
703 | xcol = pix_colors[Color_bg]; |
703 | xcol.set (this, name); |
704 | break; |
704 | break; |
705 | } |
705 | } |
706 | } |
706 | } |
707 | } |
707 | } |
708 | |
708 | |
709 | pix_colors[i] = xcol; |
709 | pix_colors[i] = xcol; |
710 | rs[Rs_color + i] = name; |
710 | rs[Rs_color + i] = name; |
711 | } |
711 | } |
712 | |
712 | |
713 | #ifdef OFF_FOCUS_FADING |
|
|
714 | if (rs[Rs_fade]) |
|
|
715 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
|
|
716 | { |
|
|
717 | rgba c; |
|
|
718 | pix_colors[Color_fade].get (c); |
|
|
719 | pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c); |
|
|
720 | } |
|
|
721 | #endif |
|
|
722 | |
|
|
723 | if (depth <= 2) |
713 | if (depth <= 2) |
724 | { |
714 | { |
725 | 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); |
726 | 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); |
727 | 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); |
728 | } |
718 | } |
729 | |
719 | |
730 | /* |
720 | /* |
731 | * get scrollBar shadow colors |
721 | * get scrollBar shadow colors |
732 | * |
722 | * |
733 | * The calculations of topShadow/bottomShadow values are adapted |
723 | * The calculations of topShadow/bottomShadow values are adapted |
734 | * from the fvwm window manager. |
724 | * from the fvwm window manager. |
735 | */ |
725 | */ |
736 | #ifdef KEEP_SCROLLCOLOR |
726 | #ifdef KEEP_SCROLLCOLOR |
737 | |
|
|
738 | if (depth <= 2) |
727 | if (depth <= 2) |
739 | { |
728 | { |
740 | /* Monochrome */ |
729 | /* Monochrome */ |
741 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
730 | alias_color (Color_scroll, Color_fg); |
742 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
731 | alias_color (Color_topShadow, Color_bg); |
743 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
732 | alias_color (Color_bottomShadow, Color_bg); |
744 | } |
733 | } |
745 | else |
734 | else |
746 | { |
735 | { |
747 | rxvt_color xcol[2]; |
736 | pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); |
748 | /* xcol[0] == white |
|
|
749 | * xcol[1] == top shadow |
|
|
750 | * xcol[2] == bot shadow */ |
|
|
751 | |
737 | |
752 | xcol[1] = pix_colors[Color_scroll]; |
|
|
753 | xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC)); |
|
|
754 | |
|
|
755 | rgba c0, c1; |
738 | rgba cscroll; |
756 | |
739 | pix_colors [Color_scroll].get (cscroll); |
757 | xcol[0].get (c0); |
|
|
758 | xcol[1].get (c1); |
|
|
759 | |
|
|
760 | xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]); |
|
|
761 | |
740 | |
762 | /* topShadowColor */ |
741 | /* topShadowColor */ |
763 | if (!xcol[1].set (this, |
742 | if (!pix_colors[Color_topShadow].set (this, |
764 | rgba ( |
743 | rgba ( |
765 | 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), |
766 | 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), |
767 | 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), |
768 | c1.a) // pa1 vs. pa0: arbitrary |
747 | cscroll.a) |
769 | )); |
748 | )) |
770 | xcol[1] = pix_colors[Color_White]; |
749 | alias_color (Color_topShadow, Color_White); |
771 | |
|
|
772 | pix_colors[Color_topShadow] = xcol[1]; |
|
|
773 | } |
750 | } |
774 | #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 |
775 | } |
762 | } |
776 | |
763 | |
777 | /*----------------------------------------------------------------------*/ |
764 | /*----------------------------------------------------------------------*/ |
778 | /* color aliases, fg/bg bright-bold */ |
765 | /* color aliases, fg/bg bright-bold */ |
779 | void |
766 | void |
… | |
… | |
818 | |
805 | |
819 | if (rsmod |
806 | if (rsmod |
820 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
807 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
821 | requestedmeta = rsmod[3] - '0'; |
808 | requestedmeta = rsmod[3] - '0'; |
822 | |
809 | |
823 | map = XGetModifierMapping (xdisp); |
810 | map = XGetModifierMapping (dpy); |
824 | kc = map->modifiermap; |
811 | kc = map->modifiermap; |
825 | |
812 | |
826 | for (i = 1; i < 6; i++) |
813 | for (i = 1; i < 6; i++) |
827 | { |
814 | { |
828 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
815 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
… | |
… | |
830 | for (j = map->max_keypermod; j--; k++) |
817 | for (j = map->max_keypermod; j--; k++) |
831 | { |
818 | { |
832 | if (kc[k] == 0) |
819 | if (kc[k] == 0) |
833 | break; |
820 | break; |
834 | |
821 | |
835 | switch (XKeycodeToKeysym (xdisp, kc[k], 0)) |
822 | switch (XKeycodeToKeysym (dpy, kc[k], 0)) |
836 | { |
823 | { |
837 | case XK_Num_Lock: |
824 | case XK_Num_Lock: |
838 | ModNumLockMask = modmasks[i - 1]; |
825 | ModNumLockMask = modmasks[i - 1]; |
839 | continue; |
826 | continue; |
840 | |
827 | |
… | |
… | |
896 | #endif |
883 | #endif |
897 | XGCValues gcvalue; |
884 | XGCValues gcvalue; |
898 | XSetWindowAttributes attributes; |
885 | XSetWindowAttributes attributes; |
899 | Window top, parent; |
886 | Window top, parent; |
900 | |
887 | |
901 | dLocal (Display *, xdisp); |
888 | dLocal (Display *, dpy); |
902 | |
889 | |
903 | /* grab colors before netscape does */ |
890 | /* grab colors before netscape does */ |
904 | Get_Colours (); |
891 | Get_Colours (); |
905 | |
892 | |
906 | if (!set_fonts ()) |
893 | if (!set_fonts ()) |
… | |
… | |
911 | attributes.override_redirect = !!OPTION (Opt_override_redirect); |
898 | attributes.override_redirect = !!OPTION (Opt_override_redirect); |
912 | |
899 | |
913 | #if ENABLE_FRILLS |
900 | #if ENABLE_FRILLS |
914 | if (OPTION (Opt_borderLess)) |
901 | if (OPTION (Opt_borderLess)) |
915 | { |
902 | { |
916 | if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) |
903 | if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) |
917 | { |
904 | { |
918 | /* 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");*/ |
919 | attributes.override_redirect = true; |
906 | attributes.override_redirect = true; |
920 | mwmhints.flags = 0; |
907 | mwmhints.flags = 0; |
921 | } |
908 | } |
… | |
… | |
934 | { |
921 | { |
935 | XWindowAttributes wattr; |
922 | XWindowAttributes wattr; |
936 | |
923 | |
937 | parent = strtol (rs[Rs_embed], 0, 0); |
924 | parent = strtol (rs[Rs_embed], 0, 0); |
938 | |
925 | |
939 | if (!XGetWindowAttributes (xdisp, parent, &wattr)) |
926 | if (!XGetWindowAttributes (dpy, parent, &wattr)) |
940 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
927 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
941 | |
928 | |
942 | window_calc (wattr.width, wattr.height); |
929 | window_calc (wattr.width, wattr.height); |
943 | } |
930 | } |
944 | #endif |
931 | #endif |
… | |
… | |
948 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
935 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
949 | attributes.background_pixel = pix_colors_focused [Color_border]; |
936 | attributes.background_pixel = pix_colors_focused [Color_border]; |
950 | attributes.border_pixel = pix_colors_focused [Color_border]; |
937 | attributes.border_pixel = pix_colors_focused [Color_border]; |
951 | attributes.colormap = cmap; |
938 | attributes.colormap = cmap; |
952 | |
939 | |
953 | top = XCreateWindow (xdisp, parent, |
940 | top = XCreateWindow (dpy, parent, |
954 | szHint.x, szHint.y, |
941 | szHint.x, szHint.y, |
955 | szHint.width, szHint.height, |
942 | szHint.width, szHint.height, |
956 | ext_bwidth, |
943 | ext_bwidth, |
957 | depth, InputOutput, visual, |
944 | depth, InputOutput, visual, |
958 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
945 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
… | |
… | |
972 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
959 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
973 | wmHint.input = True; |
960 | wmHint.input = True; |
974 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
961 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
975 | wmHint.window_group = top; |
962 | wmHint.window_group = top; |
976 | |
963 | |
977 | XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, |
964 | XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, |
978 | &szHint, &wmHint, &classHint); |
965 | &szHint, &wmHint, &classHint); |
979 | |
966 | |
980 | #if ENABLE_FRILLS |
967 | #if ENABLE_FRILLS |
981 | if (mwmhints.flags) |
968 | if (mwmhints.flags) |
982 | 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, |
983 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
970 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
984 | #endif |
971 | #endif |
985 | |
972 | |
986 | Atom protocols[] = { |
973 | Atom protocols[] = { |
987 | xa[XA_WM_DELETE_WINDOW], |
974 | xa[XA_WM_DELETE_WINDOW], |
988 | #if ENABLE_EWMH |
975 | #if ENABLE_EWMH |
989 | xa[XA_NET_WM_PING], |
976 | xa[XA_NET_WM_PING], |
990 | #endif |
977 | #endif |
991 | }; |
978 | }; |
992 | |
979 | |
993 | XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
980 | XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
994 | |
981 | |
995 | #if ENABLE_FRILLS |
982 | #if ENABLE_FRILLS |
996 | if (rs[Rs_transient_for]) |
983 | if (rs[Rs_transient_for]) |
997 | XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
984 | XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
998 | #endif |
985 | #endif |
999 | |
986 | |
1000 | #if ENABLE_EWMH |
987 | #if ENABLE_EWMH |
1001 | long pid = getpid (); |
988 | long pid = getpid (); |
1002 | |
989 | |
1003 | XChangeProperty (xdisp, top, |
990 | XChangeProperty (dpy, top, |
1004 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
991 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
1005 | PropModeReplace, (unsigned char *)&pid, 1); |
992 | PropModeReplace, (unsigned char *)&pid, 1); |
1006 | |
993 | |
1007 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
994 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
1008 | #endif |
995 | #endif |
1009 | |
996 | |
1010 | XSelectInput (xdisp, top, |
997 | XSelectInput (dpy, top, |
1011 | KeyPressMask |
998 | KeyPressMask |
1012 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
999 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1013 | | KeyReleaseMask |
1000 | | KeyReleaseMask |
1014 | #endif |
1001 | #endif |
1015 | | FocusChangeMask | VisibilityChangeMask |
1002 | | FocusChangeMask | VisibilityChangeMask |
1016 | | ExposureMask | StructureNotifyMask); |
1003 | | ExposureMask | StructureNotifyMask); |
1017 | |
1004 | |
1018 | termwin_ev.start (display, top); |
1005 | termwin_ev.start (display, top); |
1019 | |
1006 | |
1020 | /* 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 */ |
1021 | TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); |
1008 | TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); |
1022 | |
1009 | |
1023 | #ifdef HAVE_SCROLLBARS |
1010 | #ifdef HAVE_SCROLLBARS |
1024 | /* cursor scrollBar: Black-on-White */ |
1011 | /* cursor scrollBar: Black-on-White */ |
1025 | leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); |
1012 | leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr); |
1026 | #endif |
1013 | #endif |
1027 | |
1014 | |
1028 | /* the vt window */ |
1015 | /* the vt window */ |
1029 | vt = XCreateSimpleWindow (xdisp, top, |
1016 | vt = XCreateSimpleWindow (dpy, top, |
1030 | window_vt_x, window_vt_y, |
1017 | window_vt_x, window_vt_y, |
1031 | width, height, |
1018 | width, height, |
1032 | 0, |
1019 | 0, |
1033 | pix_colors_focused[Color_fg], |
1020 | pix_colors_focused[Color_fg], |
1034 | pix_colors_focused[Color_bg]); |
1021 | pix_colors_focused[Color_bg]); |
1035 | |
1022 | |
1036 | attributes.bit_gravity = NorthWestGravity; |
1023 | attributes.bit_gravity = NorthWestGravity; |
1037 | XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); |
1024 | XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); |
1038 | |
1025 | |
1039 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1026 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1040 | |
1027 | |
1041 | if (OPTION (Opt_pointerBlank)) |
1028 | if (OPTION (Opt_pointerBlank)) |
1042 | vt_emask |= PointerMotionMask; |
1029 | vt_emask |= PointerMotionMask; |
… | |
… | |
1067 | /* graphics context for the vt window */ |
1054 | /* graphics context for the vt window */ |
1068 | gcvalue.foreground = pix_colors[Color_fg]; |
1055 | gcvalue.foreground = pix_colors[Color_fg]; |
1069 | gcvalue.background = pix_colors[Color_bg]; |
1056 | gcvalue.background = pix_colors[Color_bg]; |
1070 | gcvalue.graphics_exposures = 1; |
1057 | gcvalue.graphics_exposures = 1; |
1071 | |
1058 | |
1072 | gc = XCreateGC (xdisp, vt, |
1059 | gc = XCreateGC (dpy, vt, |
1073 | GCForeground | GCBackground | GCGraphicsExposures, |
1060 | GCForeground | GCBackground | GCGraphicsExposures, |
1074 | &gcvalue); |
1061 | &gcvalue); |
1075 | |
1062 | |
1076 | drawable = new rxvt_drawable (this, vt); |
1063 | drawable = new rxvt_drawable (this, vt); |
1077 | |
1064 | |
1078 | #ifdef RXVT_SCROLLBAR |
1065 | #ifdef RXVT_SCROLLBAR |
1079 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1066 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1080 | topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1067 | topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
1081 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1068 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1082 | botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1069 | botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
1083 | gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; |
1070 | gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; |
1084 | scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1071 | scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
1085 | #endif |
1072 | #endif |
1086 | |
1073 | |
1087 | #ifdef OFF_FOCUS_FADING |
1074 | #ifdef OFF_FOCUS_FADING |
1088 | // initially we are in unfocused state |
1075 | // initially we are in unfocused state |
1089 | if (rs[Rs_fade]) |
1076 | if (rs[Rs_fade]) |