| … | |
… | |
| 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); |
| … | |
… | |
| 805 | |
805 | |
| 806 | if (rsmod |
806 | if (rsmod |
| 807 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
807 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
| 808 | requestedmeta = rsmod[3] - '0'; |
808 | requestedmeta = rsmod[3] - '0'; |
| 809 | |
809 | |
| 810 | map = XGetModifierMapping (xdisp); |
810 | map = XGetModifierMapping (dpy); |
| 811 | kc = map->modifiermap; |
811 | kc = map->modifiermap; |
| 812 | |
812 | |
| 813 | for (i = 1; i < 6; i++) |
813 | for (i = 1; i < 6; i++) |
| 814 | { |
814 | { |
| 815 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
815 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
| … | |
… | |
| 817 | for (j = map->max_keypermod; j--; k++) |
817 | for (j = map->max_keypermod; j--; k++) |
| 818 | { |
818 | { |
| 819 | if (kc[k] == 0) |
819 | if (kc[k] == 0) |
| 820 | break; |
820 | break; |
| 821 | |
821 | |
| 822 | switch (XKeycodeToKeysym (xdisp, kc[k], 0)) |
822 | switch (XKeycodeToKeysym (dpy, kc[k], 0)) |
| 823 | { |
823 | { |
| 824 | case XK_Num_Lock: |
824 | case XK_Num_Lock: |
| 825 | ModNumLockMask = modmasks[i - 1]; |
825 | ModNumLockMask = modmasks[i - 1]; |
| 826 | continue; |
826 | continue; |
| 827 | |
827 | |
| … | |
… | |
| 883 | #endif |
883 | #endif |
| 884 | XGCValues gcvalue; |
884 | XGCValues gcvalue; |
| 885 | XSetWindowAttributes attributes; |
885 | XSetWindowAttributes attributes; |
| 886 | Window top, parent; |
886 | Window top, parent; |
| 887 | |
887 | |
| 888 | dLocal (Display *, xdisp); |
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 (xdisp, "_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 | } |
| … | |
… | |
| 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 (xdisp, 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 |
| … | |
… | |
| 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 = cmap; |
938 | attributes.colormap = cmap; |
| 939 | |
939 | |
| 940 | top = XCreateWindow (xdisp, 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 | depth, InputOutput, visual, |
944 | depth, InputOutput, visual, |
| 945 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
945 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
| … | |
… | |
| 959 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
959 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
| 960 | wmHint.input = True; |
960 | wmHint.input = True; |
| 961 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
961 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
| 962 | wmHint.window_group = top; |
962 | wmHint.window_group = top; |
| 963 | |
963 | |
| 964 | XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, |
964 | XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, |
| 965 | &szHint, &wmHint, &classHint); |
965 | &szHint, &wmHint, &classHint); |
| 966 | |
966 | |
| 967 | #if ENABLE_FRILLS |
967 | #if ENABLE_FRILLS |
| 968 | if (mwmhints.flags) |
968 | if (mwmhints.flags) |
| 969 | 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, |
| 970 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
970 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
| 971 | #endif |
971 | #endif |
| 972 | |
972 | |
| 973 | Atom protocols[] = { |
973 | Atom protocols[] = { |
| 974 | xa[XA_WM_DELETE_WINDOW], |
974 | xa[XA_WM_DELETE_WINDOW], |
| 975 | #if ENABLE_EWMH |
975 | #if ENABLE_EWMH |
| 976 | xa[XA_NET_WM_PING], |
976 | xa[XA_NET_WM_PING], |
| 977 | #endif |
977 | #endif |
| 978 | }; |
978 | }; |
| 979 | |
979 | |
| 980 | XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
980 | XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
| 981 | |
981 | |
| 982 | #if ENABLE_FRILLS |
982 | #if ENABLE_FRILLS |
| 983 | if (rs[Rs_transient_for]) |
983 | if (rs[Rs_transient_for]) |
| 984 | XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
984 | XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
| 985 | #endif |
985 | #endif |
| 986 | |
986 | |
| 987 | #if ENABLE_EWMH |
987 | #if ENABLE_EWMH |
| 988 | long pid = getpid (); |
988 | long pid = getpid (); |
| 989 | |
989 | |
| 990 | XChangeProperty (xdisp, top, |
990 | XChangeProperty (dpy, top, |
| 991 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
991 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
| 992 | PropModeReplace, (unsigned char *)&pid, 1); |
992 | PropModeReplace, (unsigned char *)&pid, 1); |
| 993 | |
993 | |
| 994 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
994 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
| 995 | #endif |
995 | #endif |
| 996 | |
996 | |
| 997 | XSelectInput (xdisp, top, |
997 | XSelectInput (dpy, top, |
| 998 | KeyPressMask |
998 | KeyPressMask |
| 999 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
999 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
| 1000 | | KeyReleaseMask |
1000 | | KeyReleaseMask |
| 1001 | #endif |
1001 | #endif |
| 1002 | | FocusChangeMask | VisibilityChangeMask |
1002 | | FocusChangeMask | VisibilityChangeMask |
| 1003 | | ExposureMask | StructureNotifyMask); |
1003 | | ExposureMask | StructureNotifyMask); |
| 1004 | |
1004 | |
| 1005 | termwin_ev.start (display, top); |
1005 | termwin_ev.start (display, top); |
| 1006 | |
1006 | |
| 1007 | /* 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 */ |
| 1008 | TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); |
1008 | TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); |
| 1009 | |
1009 | |
| 1010 | #ifdef HAVE_SCROLLBARS |
1010 | #ifdef HAVE_SCROLLBARS |
| 1011 | /* cursor scrollBar: Black-on-White */ |
1011 | /* cursor scrollBar: Black-on-White */ |
| 1012 | leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); |
1012 | leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr); |
| 1013 | #endif |
1013 | #endif |
| 1014 | |
1014 | |
| 1015 | /* the vt window */ |
1015 | /* the vt window */ |
| 1016 | vt = XCreateSimpleWindow (xdisp, top, |
1016 | vt = XCreateSimpleWindow (dpy, top, |
| 1017 | window_vt_x, window_vt_y, |
1017 | window_vt_x, window_vt_y, |
| 1018 | width, height, |
1018 | width, height, |
| 1019 | 0, |
1019 | 0, |
| 1020 | pix_colors_focused[Color_fg], |
1020 | pix_colors_focused[Color_fg], |
| 1021 | pix_colors_focused[Color_bg]); |
1021 | pix_colors_focused[Color_bg]); |
| 1022 | |
1022 | |
| 1023 | attributes.bit_gravity = NorthWestGravity; |
1023 | attributes.bit_gravity = NorthWestGravity; |
| 1024 | XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); |
1024 | XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); |
| 1025 | |
1025 | |
| 1026 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1026 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
| 1027 | |
1027 | |
| 1028 | if (OPTION (Opt_pointerBlank)) |
1028 | if (OPTION (Opt_pointerBlank)) |
| 1029 | vt_emask |= PointerMotionMask; |
1029 | vt_emask |= PointerMotionMask; |
| … | |
… | |
| 1054 | /* graphics context for the vt window */ |
1054 | /* graphics context for the vt window */ |
| 1055 | gcvalue.foreground = pix_colors[Color_fg]; |
1055 | gcvalue.foreground = pix_colors[Color_fg]; |
| 1056 | gcvalue.background = pix_colors[Color_bg]; |
1056 | gcvalue.background = pix_colors[Color_bg]; |
| 1057 | gcvalue.graphics_exposures = 1; |
1057 | gcvalue.graphics_exposures = 1; |
| 1058 | |
1058 | |
| 1059 | gc = XCreateGC (xdisp, vt, |
1059 | gc = XCreateGC (dpy, vt, |
| 1060 | GCForeground | GCBackground | GCGraphicsExposures, |
1060 | GCForeground | GCBackground | GCGraphicsExposures, |
| 1061 | &gcvalue); |
1061 | &gcvalue); |
| 1062 | |
1062 | |
| 1063 | drawable = new rxvt_drawable (this, vt); |
1063 | drawable = new rxvt_drawable (this, vt); |
| 1064 | |
1064 | |
| 1065 | #ifdef RXVT_SCROLLBAR |
1065 | #ifdef RXVT_SCROLLBAR |
| 1066 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1066 | gcvalue.foreground = pix_colors[Color_topShadow]; |
| 1067 | topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1067 | topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
| 1068 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1068 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
| 1069 | botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1069 | botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
| 1070 | gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; |
1070 | gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; |
| 1071 | scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1071 | scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
| 1072 | #endif |
1072 | #endif |
| 1073 | |
1073 | |
| 1074 | #ifdef OFF_FOCUS_FADING |
1074 | #ifdef OFF_FOCUS_FADING |
| 1075 | // initially we are in unfocused state |
1075 | // initially we are in unfocused state |
| 1076 | if (rs[Rs_fade]) |
1076 | if (rs[Rs_fade]) |
