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.107 by root, Wed Feb 2 08:09:23 2005 UTC vs.
Revision 1.109 by root, Mon Feb 14 18:47:54 2005 UTC

… …
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 */
832void 832void
833rxvt_term::get_ourmods () 833rxvt_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 Window top;
932 dDisp;
931 933
932#ifdef USING_W11LIB 934#ifdef USING_W11LIB
933 /* enable W11 callbacks */ 935 /* enable W11 callbacks */
934 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 936 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif 937#endif
936 938
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 939 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
938 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 940 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
939 941
940 if (options & Opt_transparent) 942 if (options & Opt_transparent)
941 { 943 {
942 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 944 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 945 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
944 } 946 }
945 947
946#if ENABLE_FRILLS 948#if ENABLE_FRILLS
947 if (options & Opt_borderLess) 949 if (options & Opt_borderLess)
948 { 950 {
949 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 951 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
950 952
951 if (prop == None) 953 if (prop == None)
952 { 954 {
953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 955 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
954#ifdef PREFER_24BIT 956#ifdef PREFER_24BIT
… …
972 Get_Colours (); 974 Get_Colours ();
973 975
974 if (!set_fonts ()) 976 if (!set_fonts ())
975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
976 978
979#if ENABLE_FRILLS
980 if (rs[Rs_embed])
981 {
982 top = strtol (rs[Rs_embed], 0, 0);
983
984 XWindowAttributes wattr;
985 XGetWindowAttributes (disp, top, &wattr);
986
987 window_calc (wattr.width, wattr.height);
988
989#if 0
990 if (wattr.map_state == IsViewable)
991 {
992 TermWin.mapped = 1;
993 refresh_type = FAST_REFRESH;
994 XClearWindow (disp, top);
995 // TODO: make XMapNotify-event-code a function and call it
996 // TODO: how can I detetc visibility without unmpa/map?
997 // TODO: focusin etc.
998 }
999#else
1000 // it'S easiets just to unmap/map to get all state correctly set-up
1001 XUnmapWindow (disp, top);
1002#endif
1003 }
1004 else
1005#endif
1006 {
977 window_calc (0, 0); 1007 window_calc (0, 0);
1008
1009 /* sub-window placement & size in rxvt_resize_subwindows () */
1010#ifdef PREFER_24BIT
1011 attributes.background_pixel = pix_colors_focused[Color_border];
1012 attributes.border_pixel = pix_colors_focused[Color_border];
1013 attributes.colormap = display->cmap;
1014 top = XCreateWindow (disp, DefaultRootWindow (disp),
1015 szHint.x, szHint.y,
1016 szHint.width, szHint.height,
1017 TermWin.ext_bwidth,
1018 display->depth, InputOutput,
1019 display->visual,
1020 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1021#else
1022 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1023 szHint.x, szHint.y,
1024 szHint.width, szHint.height,
1025 TermWin.ext_bwidth,
1026 pix_colors_focused[Color_border],
1027 pix_colors_focused[Color_border]);
1028#endif
1029 }
1030
1031 TermWin.parent[0] = top;
1032
978 old_width = szHint.width; 1033 old_width = szHint.width;
979 old_height = szHint.height; 1034 old_height = szHint.height;
980
981 /* sub-window placement & size in rxvt_resize_subwindows () */
982
983#ifdef PREFER_24BIT
984 attributes.background_pixel = pix_colors_focused[Color_border];
985 attributes.border_pixel = pix_colors_focused[Color_border];
986 attributes.colormap = display->cmap;
987 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
988 szHint.x, szHint.y,
989 szHint.width, szHint.height,
990 TermWin.ext_bwidth,
991 display->depth, InputOutput,
992 display->visual,
993 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
994#else
995 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
996 szHint.x, szHint.y,
997 szHint.width, szHint.height,
998 TermWin.ext_bwidth,
999 pix_colors_focused[Color_border],
1000 pix_colors_focused[Color_border]);
1001#endif
1002 1035
1003 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1036 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1004 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1037 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1005 1038
1006 classHint.res_name = (char *)rs[Rs_name]; 1039 classHint.res_name = (char *)rs[Rs_name];
1007 classHint.res_class = (char *)RESCLASS; 1040 classHint.res_class = (char *)RESCLASS;
1008 1041
1009 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1042 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1010 wmHint.input = True; 1043 wmHint.input = True;
1011 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1044 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1012 wmHint.window_group = TermWin.parent[0]; 1045 wmHint.window_group = top;
1013 1046
1014 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1047 XSetWMProperties (disp, top, NULL, NULL,
1015 (char **)argv, argc, &szHint, &wmHint, &classHint); 1048 (char **)argv, argc, &szHint, &wmHint, &classHint);
1016 1049
1017 /* Enable delete window protocol */ 1050 /* Enable delete window protocol */
1018 XSetWMProtocols (display->display, TermWin.parent[0], 1051 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);
1019 &xa[XA_WMDELETEWINDOW], 1);
1020 1052
1021#if ENABLE_FRILLS 1053#if ENABLE_FRILLS
1022 long pid = getpid (); 1054 long pid = getpid ();
1023 1055
1024 XChangeProperty (display->display, TermWin.parent[0], 1056 XChangeProperty (disp, top,
1025 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1057 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1026 PropModeReplace, (unsigned char *)&pid, 1); 1058 PropModeReplace, (unsigned char *)&pid, 1);
1027#endif 1059#endif
1028 1060
1029 XSelectInput (display->display, TermWin.parent[0], 1061 XSelectInput (disp, top,
1030 KeyPressMask 1062 KeyPressMask
1031#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1032 | KeyReleaseMask 1064 | KeyReleaseMask
1033#endif 1065#endif
1034 | FocusChangeMask | VisibilityChangeMask 1066 | FocusChangeMask | VisibilityChangeMask
1035 | ExposureMask 1067 | ExposureMask
1036 | StructureNotifyMask); 1068 | StructureNotifyMask);
1037 termwin_ev.start (display, TermWin.parent[0]); 1069 termwin_ev.start (display, top);
1038 1070
1039#if ENABLE_FRILLS 1071#if ENABLE_FRILLS
1040 if (mwmhints.flags) 1072 if (mwmhints.flags)
1041 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1073 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1042 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1074 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1043#endif 1075#endif
1044 1076
1045 /* vt cursor: Black-on-White is standard, but this is more popular */ 1077 /* vt cursor: Black-on-White is standard, but this is more popular */
1046 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1047 1079
1048#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1080#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1049 /* cursor (menuBar/scrollBar): Black-on-White */ 1081 /* cursor (menuBar/scrollBar): Black-on-White */
1050 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1051#endif 1083#endif
1052 1084
1053 /* the vt window */ 1085 /* the vt window */
1054 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1086 TermWin.vt = XCreateSimpleWindow (disp, top,
1055 window_vt_x, 1087 window_vt_x,
1056 window_vt_y, 1088 window_vt_y,
1057 TermWin_TotalWidth (), 1089 TermWin_TotalWidth (),
1058 TermWin_TotalHeight (), 1090 TermWin_TotalHeight (),
1059 0, 1091 0,
1060 pix_colors_focused[Color_fg], 1092 pix_colors_focused[Color_fg],
1061 pix_colors_focused[Color_bg]); 1093 pix_colors_focused[Color_bg]);
1062#ifdef DEBUG_X 1094#ifdef DEBUG_X
1063 XStoreName (display->display, TermWin.vt, "vt window"); 1095 XStoreName (disp, TermWin.vt, "vt window");
1064#endif 1096#endif
1065 1097
1066 attributes.bit_gravity = NorthWestGravity; 1098 attributes.bit_gravity = NorthWestGravity;
1067 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1099 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1068 1100
1069 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1070 1102
1071 pointer_unblank (); 1103 pointer_unblank ();
1072 1104
… …
1075 vt_emask |= PointerMotionMask; 1107 vt_emask |= PointerMotionMask;
1076 else 1108 else
1077#endif 1109#endif
1078 vt_emask |= Button1MotionMask | Button3MotionMask; 1110 vt_emask |= Button1MotionMask | Button3MotionMask;
1079 1111
1080 XSelectInput (display->display, TermWin.vt, vt_emask); 1112 XSelectInput (disp, TermWin.vt, vt_emask);
1081 vt_ev.start (display, TermWin.vt); 1113 vt_ev.start (display, TermWin.vt);
1082 1114
1083#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1115#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1084 if (menuBar_height ()) 1116 if (menuBar_height ())
1085 { 1117 {
1086 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1118 menuBar.win = XCreateSimpleWindow (disp, top,
1087 window_vt_x, 0, 1119 window_vt_x, 0,
1088 TermWin_TotalWidth (), 1120 TermWin_TotalWidth (),
1089 menuBar_TotalHeight (), 1121 menuBar_TotalHeight (),
1090 0, 1122 0,
1091 pix_colors_focused[Color_fg], 1123 pix_colors_focused[Color_fg],
1092 pix_colors_focused[Color_scroll]); 1124 pix_colors_focused[Color_scroll]);
1093 1125
1094#ifdef DEBUG_X 1126#ifdef DEBUG_X
1095 XStoreName (display->display, menuBar.win, "menubar"); 1127 XStoreName (disp, menuBar.win, "menubar");
1096#endif 1128#endif
1097 1129
1098 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1130 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1099 1131
1100 XDefineCursor (display->display, menuBar.win, 1132 XDefineCursor (disp, menuBar.win,
1101 XCreateFontCursor (display->display, XC_left_ptr)); 1133 XCreateFontCursor (disp, XC_left_ptr));
1102 1134
1103 XSelectInput (display->display, menuBar.win, 1135 XSelectInput (disp, menuBar.win,
1104 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1136 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1105 | Button1MotionMask));
1106 menubar_ev.start (display, menuBar.win); 1137 menubar_ev.start (display, menuBar.win);
1107 } 1138 }
1108#endif 1139#endif
1109 1140
1110#ifdef XPM_BACKGROUND 1141#ifdef XPM_BACKGROUND
… …
1126 1157
1127 /* graphics context for the vt window */ 1158 /* graphics context for the vt window */
1128 gcvalue.foreground = pix_colors[Color_fg]; 1159 gcvalue.foreground = pix_colors[Color_fg];
1129 gcvalue.background = pix_colors[Color_bg]; 1160 gcvalue.background = pix_colors[Color_bg];
1130 gcvalue.graphics_exposures = 1; 1161 gcvalue.graphics_exposures = 1;
1131 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1162 TermWin.gc = XCreateGC (disp, TermWin.vt,
1132 GCForeground | GCBackground | GCGraphicsExposures, 1163 GCForeground | GCBackground | GCGraphicsExposures,
1133 &gcvalue); 1164 &gcvalue);
1134 1165
1135 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1166 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1136 1167
1137#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1168#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1138 gcvalue.foreground = pix_colors[Color_topShadow]; 1169 gcvalue.foreground = pix_colors[Color_topShadow];
1139 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1170 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1140 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1171 gcvalue.foreground = pix_colors[Color_bottomShadow];
1141 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1172 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1142 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1173 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1143 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1174 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1144#endif 1175#endif
1145 1176
1146#ifdef OFF_FOCUS_FADING 1177#ifdef OFF_FOCUS_FADING
1147 // initially we are in unfocused state 1178 // initially we are in unfocused state
1148 if (rs[Rs_fade]) 1179 if (rs[Rs_fade])

Diff Legend

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