… | |
… | |
337 | */ |
337 | */ |
338 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
338 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
339 | rs[Rs_display_name] = ":0"; |
339 | rs[Rs_display_name] = ":0"; |
340 | |
340 | |
341 | get_options (r_argc, r_argv); |
341 | get_options (r_argc, r_argv); |
342 | free (r_argv); |
|
|
343 | |
342 | |
344 | #ifdef LOCAL_X_IS_UNIX |
343 | #ifdef LOCAL_X_IS_UNIX |
345 | if (rs[Rs_display_name][0] == ':') |
344 | if (rs[Rs_display_name][0] == ':') |
346 | { |
345 | { |
347 | val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); |
346 | val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); |
… | |
… | |
354 | |
353 | |
355 | if (!display |
354 | if (!display |
356 | && ! (display = displays.get (rs[Rs_display_name]))) |
355 | && ! (display = displays.get (rs[Rs_display_name]))) |
357 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
356 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
358 | |
357 | |
359 | extract_resources (display->display, rs[Rs_name]); |
358 | extract_resources (); |
|
|
359 | free (r_argv); |
360 | |
360 | |
361 | /* |
361 | /* |
362 | * set any defaults not already set |
362 | * set any defaults not already set |
363 | */ |
363 | */ |
364 | if (cmd_argv && cmd_argv[0]) |
364 | if (cmd_argv && cmd_argv[0]) |
… | |
… | |
830 | * Use resource ``modifier'' to override the Meta modifier |
830 | * Use resource ``modifier'' to override the Meta modifier |
831 | */ |
831 | */ |
832 | void |
832 | void |
833 | rxvt_term::get_ourmods () |
833 | rxvt_term::get_ourmods () |
834 | { |
834 | { |
835 | int i, j, k; |
835 | int i, j, k; |
836 | int requestedmeta, realmeta, realalt; |
836 | int requestedmeta, realmeta, realalt; |
837 | const char *cm, *rsmod; |
837 | const char *cm, *rsmod; |
838 | XModifierKeymap *map; |
838 | XModifierKeymap *map; |
839 | KeyCode *kc; |
839 | KeyCode *kc; |
840 | const unsigned int modmasks[] = |
840 | const unsigned int modmasks[] = |
841 | { |
841 | { |
842 | Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask |
842 | Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask |
843 | }; |
843 | }; |
844 | |
844 | |
… | |
… | |
926 | #endif |
926 | #endif |
927 | XGCValues gcvalue; |
927 | XGCValues gcvalue; |
928 | long vt_emask; |
928 | long vt_emask; |
929 | XSetWindowAttributes attributes; |
929 | XSetWindowAttributes attributes; |
930 | XWindowAttributes gattr; |
930 | XWindowAttributes gattr; |
|
|
931 | dDisp; |
931 | |
932 | |
932 | #ifdef USING_W11LIB |
933 | #ifdef USING_W11LIB |
933 | /* enable W11 callbacks */ |
934 | /* enable W11 callbacks */ |
934 | W11AddEventHandler (display->display, rxvt_W11_process_x_event); |
935 | W11AddEventHandler (disp, rxvt_W11_process_x_event); |
935 | #endif |
936 | #endif |
936 | |
937 | |
937 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
938 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
938 | XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); |
939 | XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); |
939 | |
940 | |
940 | if (options & Opt_transparent) |
941 | if (options & Opt_transparent) |
941 | { |
942 | { |
942 | XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); |
943 | XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); |
943 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
944 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
944 | } |
945 | } |
945 | |
946 | |
946 | #if ENABLE_FRILLS |
947 | #if ENABLE_FRILLS |
947 | if (options & Opt_borderLess) |
948 | if (options & Opt_borderLess) |
948 | { |
949 | { |
949 | prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); |
950 | prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); |
950 | |
951 | |
951 | if (prop == None) |
952 | if (prop == None) |
952 | { |
953 | { |
953 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
954 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
954 | #ifdef PREFER_24BIT |
955 | #ifdef PREFER_24BIT |
… | |
… | |
982 | |
983 | |
983 | #ifdef PREFER_24BIT |
984 | #ifdef PREFER_24BIT |
984 | attributes.background_pixel = pix_colors_focused[Color_border]; |
985 | attributes.background_pixel = pix_colors_focused[Color_border]; |
985 | attributes.border_pixel = pix_colors_focused[Color_border]; |
986 | attributes.border_pixel = pix_colors_focused[Color_border]; |
986 | attributes.colormap = display->cmap; |
987 | attributes.colormap = display->cmap; |
987 | TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), |
988 | TermWin.parent[0] = XCreateWindow (disp, DefaultRootWindow (disp), |
988 | szHint.x, szHint.y, |
989 | szHint.x, szHint.y, |
989 | szHint.width, szHint.height, |
990 | szHint.width, szHint.height, |
990 | TermWin.ext_bwidth, |
991 | TermWin.ext_bwidth, |
991 | display->depth, InputOutput, |
992 | display->depth, InputOutput, |
992 | display->visual, |
993 | display->visual, |
993 | CWColormap | CWBackPixel | CWBorderPixel, &attributes); |
994 | CWColormap | CWBackPixel | CWBorderPixel, &attributes); |
994 | #else |
995 | #else |
995 | TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), |
996 | TermWin.parent[0] = XCreateSimpleWindow (disp, DefaultRootWindow (disp), |
996 | szHint.x, szHint.y, |
997 | szHint.x, szHint.y, |
997 | szHint.width, szHint.height, |
998 | szHint.width, szHint.height, |
998 | TermWin.ext_bwidth, |
999 | TermWin.ext_bwidth, |
999 | pix_colors_focused[Color_border], |
1000 | pix_colors_focused[Color_border], |
1000 | pix_colors_focused[Color_border]); |
1001 | pix_colors_focused[Color_border]); |
… | |
… | |
1009 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
1010 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
1010 | wmHint.input = True; |
1011 | wmHint.input = True; |
1011 | wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; |
1012 | wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; |
1012 | wmHint.window_group = TermWin.parent[0]; |
1013 | wmHint.window_group = TermWin.parent[0]; |
1013 | |
1014 | |
1014 | XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, |
1015 | XSetWMProperties (disp, TermWin.parent[0], NULL, NULL, |
1015 | (char **)argv, argc, &szHint, &wmHint, &classHint); |
1016 | (char **)argv, argc, &szHint, &wmHint, &classHint); |
1016 | |
1017 | |
1017 | /* Enable delete window protocol */ |
1018 | /* Enable delete window protocol */ |
1018 | XSetWMProtocols (display->display, TermWin.parent[0], |
1019 | XSetWMProtocols (disp, TermWin.parent[0], |
1019 | &xa[XA_WMDELETEWINDOW], 1); |
1020 | &xa[XA_WMDELETEWINDOW], 1); |
1020 | |
1021 | |
1021 | #if ENABLE_FRILLS |
1022 | #if ENABLE_FRILLS |
1022 | long pid = getpid (); |
1023 | long pid = getpid (); |
1023 | |
1024 | |
1024 | XChangeProperty (display->display, TermWin.parent[0], |
1025 | XChangeProperty (disp, TermWin.parent[0], |
1025 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
1026 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
1026 | PropModeReplace, (unsigned char *)&pid, 1); |
1027 | PropModeReplace, (unsigned char *)&pid, 1); |
1027 | #endif |
1028 | #endif |
1028 | |
1029 | |
1029 | XSelectInput (display->display, TermWin.parent[0], |
1030 | XSelectInput (disp, TermWin.parent[0], |
1030 | KeyPressMask |
1031 | KeyPressMask |
1031 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1032 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1032 | | KeyReleaseMask |
1033 | | KeyReleaseMask |
1033 | #endif |
1034 | #endif |
1034 | | FocusChangeMask | VisibilityChangeMask |
1035 | | FocusChangeMask | VisibilityChangeMask |
… | |
… | |
1036 | | StructureNotifyMask); |
1037 | | StructureNotifyMask); |
1037 | termwin_ev.start (display, TermWin.parent[0]); |
1038 | termwin_ev.start (display, TermWin.parent[0]); |
1038 | |
1039 | |
1039 | #if ENABLE_FRILLS |
1040 | #if ENABLE_FRILLS |
1040 | if (mwmhints.flags) |
1041 | if (mwmhints.flags) |
1041 | XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
1042 | XChangeProperty (disp, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
1042 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
1043 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
1043 | #endif |
1044 | #endif |
1044 | |
1045 | |
1045 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1046 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1046 | TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); |
1047 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1047 | |
1048 | |
1048 | #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) |
1049 | #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) |
1049 | /* cursor (menuBar/scrollBar): Black-on-White */ |
1050 | /* cursor (menuBar/scrollBar): Black-on-White */ |
1050 | leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); |
1051 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
1051 | #endif |
1052 | #endif |
1052 | |
1053 | |
1053 | /* the vt window */ |
1054 | /* the vt window */ |
1054 | TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], |
1055 | TermWin.vt = XCreateSimpleWindow (disp, TermWin.parent[0], |
1055 | window_vt_x, |
1056 | window_vt_x, |
1056 | window_vt_y, |
1057 | window_vt_y, |
1057 | TermWin_TotalWidth (), |
1058 | TermWin_TotalWidth (), |
1058 | TermWin_TotalHeight (), |
1059 | TermWin_TotalHeight (), |
1059 | 0, |
1060 | 0, |
1060 | pix_colors_focused[Color_fg], |
1061 | pix_colors_focused[Color_fg], |
1061 | pix_colors_focused[Color_bg]); |
1062 | pix_colors_focused[Color_bg]); |
1062 | #ifdef DEBUG_X |
1063 | #ifdef DEBUG_X |
1063 | XStoreName (display->display, TermWin.vt, "vt window"); |
1064 | XStoreName (disp, TermWin.vt, "vt window"); |
1064 | #endif |
1065 | #endif |
1065 | |
1066 | |
1066 | attributes.bit_gravity = NorthWestGravity; |
1067 | attributes.bit_gravity = NorthWestGravity; |
1067 | XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); |
1068 | XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); |
1068 | |
1069 | |
1069 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1070 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1070 | |
1071 | |
1071 | pointer_unblank (); |
1072 | pointer_unblank (); |
1072 | |
1073 | |
… | |
… | |
1075 | vt_emask |= PointerMotionMask; |
1076 | vt_emask |= PointerMotionMask; |
1076 | else |
1077 | else |
1077 | #endif |
1078 | #endif |
1078 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1079 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1079 | |
1080 | |
1080 | XSelectInput (display->display, TermWin.vt, vt_emask); |
1081 | XSelectInput (disp, TermWin.vt, vt_emask); |
1081 | vt_ev.start (display, TermWin.vt); |
1082 | vt_ev.start (display, TermWin.vt); |
1082 | |
1083 | |
1083 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
1084 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
1084 | if (menuBar_height ()) |
1085 | if (menuBar_height ()) |
1085 | { |
1086 | { |
1086 | menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], |
1087 | menuBar.win = XCreateSimpleWindow (disp, TermWin.parent[0], |
1087 | window_vt_x, 0, |
1088 | window_vt_x, 0, |
1088 | TermWin_TotalWidth (), |
1089 | TermWin_TotalWidth (), |
1089 | menuBar_TotalHeight (), |
1090 | menuBar_TotalHeight (), |
1090 | 0, |
1091 | 0, |
1091 | pix_colors_focused[Color_fg], |
1092 | pix_colors_focused[Color_fg], |
1092 | pix_colors_focused[Color_scroll]); |
1093 | pix_colors_focused[Color_scroll]); |
1093 | |
1094 | |
1094 | #ifdef DEBUG_X |
1095 | #ifdef DEBUG_X |
1095 | XStoreName (display->display, menuBar.win, "menubar"); |
1096 | XStoreName (disp, menuBar.win, "menubar"); |
1096 | #endif |
1097 | #endif |
1097 | |
1098 | |
1098 | menuBar.drawable = new rxvt_drawable (display, menuBar.win); |
1099 | menuBar.drawable = new rxvt_drawable (display, menuBar.win); |
1099 | |
1100 | |
1100 | XDefineCursor (display->display, menuBar.win, |
1101 | XDefineCursor (disp, menuBar.win, |
1101 | XCreateFontCursor (display->display, XC_left_ptr)); |
1102 | XCreateFontCursor (disp, XC_left_ptr)); |
1102 | |
1103 | |
1103 | XSelectInput (display->display, menuBar.win, |
1104 | XSelectInput (disp, menuBar.win, |
1104 | (ExposureMask | ButtonPressMask | ButtonReleaseMask |
1105 | (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask)); |
1105 | | Button1MotionMask)); |
|
|
1106 | menubar_ev.start (display, menuBar.win); |
1106 | menubar_ev.start (display, menuBar.win); |
1107 | } |
1107 | } |
1108 | #endif |
1108 | #endif |
1109 | |
1109 | |
1110 | #ifdef XPM_BACKGROUND |
1110 | #ifdef XPM_BACKGROUND |
… | |
… | |
1126 | |
1126 | |
1127 | /* graphics context for the vt window */ |
1127 | /* graphics context for the vt window */ |
1128 | gcvalue.foreground = pix_colors[Color_fg]; |
1128 | gcvalue.foreground = pix_colors[Color_fg]; |
1129 | gcvalue.background = pix_colors[Color_bg]; |
1129 | gcvalue.background = pix_colors[Color_bg]; |
1130 | gcvalue.graphics_exposures = 1; |
1130 | gcvalue.graphics_exposures = 1; |
1131 | TermWin.gc = XCreateGC (display->display, TermWin.vt, |
1131 | TermWin.gc = XCreateGC (disp, TermWin.vt, |
1132 | GCForeground | GCBackground | GCGraphicsExposures, |
1132 | GCForeground | GCBackground | GCGraphicsExposures, |
1133 | &gcvalue); |
1133 | &gcvalue); |
1134 | |
1134 | |
1135 | TermWin.drawable = new rxvt_drawable (display, TermWin.vt); |
1135 | TermWin.drawable = new rxvt_drawable (display, TermWin.vt); |
1136 | |
1136 | |
1137 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
1137 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
1138 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1138 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1139 | topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); |
1139 | topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); |
1140 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1140 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1141 | botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); |
1141 | botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); |
1142 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
1142 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
1143 | scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); |
1143 | scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); |
1144 | #endif |
1144 | #endif |
1145 | |
1145 | |
1146 | #ifdef OFF_FOCUS_FADING |
1146 | #ifdef OFF_FOCUS_FADING |
1147 | // initially we are in unfocused state |
1147 | // initially we are in unfocused state |
1148 | if (rs[Rs_fade]) |
1148 | if (rs[Rs_fade]) |