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.105 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.109 by root, Mon Feb 14 18:47:54 2005 UTC

… …
206 206
207bool 207bool
208rxvt_term::init_vars () 208rxvt_term::init_vars ()
209{ 209{
210 sw_term.start (SIGTERM); 210 sw_term.start (SIGTERM);
211 sw_int.start (SIGINT);
211 212
212 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 213 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
213#ifdef OFF_FOCUS_FADING 214#ifdef OFF_FOCUS_FADING
214 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
215#endif 216#endif
… …
252 last_bot = last_state = -1; 253 last_bot = last_state = -1;
253 254
254#ifdef MENUBAR 255#ifdef MENUBAR
255 menu_readonly = 1; 256 menu_readonly = 1;
256# if ! (MENUBAR_MAX > 1) 257# if ! (MENUBAR_MAX > 1)
257 CurrentBar = & (BarList); 258 CurrentBar = &BarList;
258# endif /* (MENUBAR_MAX > 1) */ 259# endif /* (MENUBAR_MAX > 1) */
259#endif 260#endif
260 261
261 return true; 262 return true;
262} 263}
… …
336 */ 337 */
337 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
338 rs[Rs_display_name] = ":0"; 339 rs[Rs_display_name] = ":0";
339 340
340 get_options (r_argc, r_argv); 341 get_options (r_argc, r_argv);
341 free (r_argv);
342 342
343#ifdef LOCAL_X_IS_UNIX 343#ifdef LOCAL_X_IS_UNIX
344 if (rs[Rs_display_name][0] == ':') 344 if (rs[Rs_display_name][0] == ':')
345 { 345 {
346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
… …
353 353
354 if (!display 354 if (!display
355 && ! (display = displays.get (rs[Rs_display_name]))) 355 && ! (display = displays.get (rs[Rs_display_name])))
356 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]);
357 357
358 extract_resources (display->display, rs[Rs_name]); 358 extract_resources ();
359 free (r_argv);
359 360
360 /* 361 /*
361 * set any defaults not already set 362 * set any defaults not already set
362 */ 363 */
363 if (cmd_argv && cmd_argv[0]) 364 if (cmd_argv && cmd_argv[0])
… …
829 * Use resource ``modifier'' to override the Meta modifier 830 * Use resource ``modifier'' to override the Meta modifier
830 */ 831 */
831void 832void
832rxvt_term::get_ourmods () 833rxvt_term::get_ourmods ()
833{ 834{
834 int i, j, k; 835 int i, j, k;
835 int requestedmeta, realmeta, realalt; 836 int requestedmeta, realmeta, realalt;
836 const char *cm, *rsmod; 837 const char *cm, *rsmod;
837 XModifierKeymap *map; 838 XModifierKeymap *map;
838 KeyCode *kc; 839 KeyCode *kc;
839 const unsigned int modmasks[] = 840 const unsigned int modmasks[] =
840 { 841 {
841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
842 }; 843 };
843 844
… …
925#endif 926#endif
926 XGCValues gcvalue; 927 XGCValues gcvalue;
927 long vt_emask; 928 long vt_emask;
928 XSetWindowAttributes attributes; 929 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 930 XWindowAttributes gattr;
931 Window top;
932 dDisp;
930 933
931#ifdef USING_W11LIB 934#ifdef USING_W11LIB
932 /* enable W11 callbacks */ 935 /* enable W11 callbacks */
933 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 936 W11AddEventHandler (disp, rxvt_W11_process_x_event);
934#endif 937#endif
935 938
936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 939 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
937 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 940 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
938 941
939 if (options & Opt_transparent) 942 if (options & Opt_transparent)
940 { 943 {
941 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 944 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
942 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 945 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
943 } 946 }
944 947
945#if ENABLE_FRILLS 948#if ENABLE_FRILLS
946 if (options & Opt_borderLess) 949 if (options & Opt_borderLess)
947 { 950 {
948 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 951 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
949 952
950 if (prop == None) 953 if (prop == None)
951 { 954 {
952 /* 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");*/
953#ifdef PREFER_24BIT 956#ifdef PREFER_24BIT
… …
971 Get_Colours (); 974 Get_Colours ();
972 975
973 if (!set_fonts ()) 976 if (!set_fonts ())
974 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");
975 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 {
976 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
977 old_width = szHint.width; 1033 old_width = szHint.width;
978 old_height = szHint.height; 1034 old_height = szHint.height;
979
980 /* sub-window placement & size in rxvt_resize_subwindows () */
981
982#ifdef PREFER_24BIT
983 attributes.background_pixel = pix_colors_focused[Color_border];
984 attributes.border_pixel = pix_colors_focused[Color_border];
985 attributes.colormap = display->cmap;
986 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
987 szHint.x, szHint.y,
988 szHint.width, szHint.height,
989 TermWin.ext_bwidth,
990 display->depth, InputOutput,
991 display->visual,
992 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
993#else
994 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
995 szHint.x, szHint.y,
996 szHint.width, szHint.height,
997 TermWin.ext_bwidth,
998 pix_colors_focused[Color_border],
999 pix_colors_focused[Color_border]);
1000#endif
1001 1035
1002 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1036 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1003 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1037 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1004 1038
1005 classHint.res_name = (char *)rs[Rs_name]; 1039 classHint.res_name = (char *)rs[Rs_name];
1006 classHint.res_class = (char *)RESCLASS; 1040 classHint.res_class = (char *)RESCLASS;
1007 1041
1008 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1042 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1009 wmHint.input = True; 1043 wmHint.input = True;
1010 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1044 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1011 wmHint.window_group = TermWin.parent[0]; 1045 wmHint.window_group = top;
1012 1046
1013 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1047 XSetWMProperties (disp, top, NULL, NULL,
1014 (char **)argv, argc, &szHint, &wmHint, &classHint); 1048 (char **)argv, argc, &szHint, &wmHint, &classHint);
1015 1049
1016 /* Enable delete window protocol */ 1050 /* Enable delete window protocol */
1017 XSetWMProtocols (display->display, TermWin.parent[0], 1051 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);
1018 &xa[XA_WMDELETEWINDOW], 1);
1019 1052
1020#if ENABLE_FRILLS 1053#if ENABLE_FRILLS
1021 long pid = getpid (); 1054 long pid = getpid ();
1022 1055
1023 XChangeProperty (display->display, TermWin.parent[0], 1056 XChangeProperty (disp, top,
1024 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1057 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1025 PropModeReplace, (unsigned char *)&pid, 1); 1058 PropModeReplace, (unsigned char *)&pid, 1);
1026#endif 1059#endif
1027 1060
1028 XSelectInput (display->display, TermWin.parent[0], 1061 XSelectInput (disp, top,
1029 KeyPressMask 1062 KeyPressMask
1030#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1031 | KeyReleaseMask 1064 | KeyReleaseMask
1032#endif 1065#endif
1033 | FocusChangeMask | VisibilityChangeMask 1066 | FocusChangeMask | VisibilityChangeMask
1034 | ExposureMask 1067 | ExposureMask
1035 | StructureNotifyMask); 1068 | StructureNotifyMask);
1036 termwin_ev.start (display, TermWin.parent[0]); 1069 termwin_ev.start (display, top);
1037 1070
1038#if ENABLE_FRILLS 1071#if ENABLE_FRILLS
1039 if (mwmhints.flags) 1072 if (mwmhints.flags)
1040 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,
1041 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1074 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1042#endif 1075#endif
1043 1076
1044 /* 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 */
1045 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1046 1079
1047#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1080#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1048 /* cursor (menuBar/scrollBar): Black-on-White */ 1081 /* cursor (menuBar/scrollBar): Black-on-White */
1049 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1050#endif 1083#endif
1051 1084
1052 /* the vt window */ 1085 /* the vt window */
1053 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1086 TermWin.vt = XCreateSimpleWindow (disp, top,
1054 window_vt_x, 1087 window_vt_x,
1055 window_vt_y, 1088 window_vt_y,
1056 TermWin_TotalWidth (), 1089 TermWin_TotalWidth (),
1057 TermWin_TotalHeight (), 1090 TermWin_TotalHeight (),
1058 0, 1091 0,
1059 pix_colors_focused[Color_fg], 1092 pix_colors_focused[Color_fg],
1060 pix_colors_focused[Color_bg]); 1093 pix_colors_focused[Color_bg]);
1061#ifdef DEBUG_X 1094#ifdef DEBUG_X
1062 XStoreName (display->display, TermWin.vt, "vt window"); 1095 XStoreName (disp, TermWin.vt, "vt window");
1063#endif 1096#endif
1064 1097
1065 attributes.bit_gravity = NorthWestGravity; 1098 attributes.bit_gravity = NorthWestGravity;
1066 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1099 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1067 1100
1068 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1069 1102
1070 pointer_unblank (); 1103 pointer_unblank ();
1071 1104
… …
1074 vt_emask |= PointerMotionMask; 1107 vt_emask |= PointerMotionMask;
1075 else 1108 else
1076#endif 1109#endif
1077 vt_emask |= Button1MotionMask | Button3MotionMask; 1110 vt_emask |= Button1MotionMask | Button3MotionMask;
1078 1111
1079 XSelectInput (display->display, TermWin.vt, vt_emask); 1112 XSelectInput (disp, TermWin.vt, vt_emask);
1080 vt_ev.start (display, TermWin.vt); 1113 vt_ev.start (display, TermWin.vt);
1081 1114
1082#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1115#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1083 if (menuBar_height ()) 1116 if (menuBar_height ())
1084 { 1117 {
1085 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1118 menuBar.win = XCreateSimpleWindow (disp, top,
1086 window_vt_x, 0, 1119 window_vt_x, 0,
1087 TermWin_TotalWidth (), 1120 TermWin_TotalWidth (),
1088 menuBar_TotalHeight (), 1121 menuBar_TotalHeight (),
1089 0, 1122 0,
1090 pix_colors_focused[Color_fg], 1123 pix_colors_focused[Color_fg],
1091 pix_colors_focused[Color_scroll]); 1124 pix_colors_focused[Color_scroll]);
1092 1125
1093#ifdef DEBUG_X 1126#ifdef DEBUG_X
1094 XStoreName (display->display, menuBar.win, "menubar"); 1127 XStoreName (disp, menuBar.win, "menubar");
1095#endif 1128#endif
1096 1129
1097 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1130 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1098 1131
1099 XDefineCursor (display->display, menuBar.win, 1132 XDefineCursor (disp, menuBar.win,
1100 XCreateFontCursor (display->display, XC_left_ptr)); 1133 XCreateFontCursor (disp, XC_left_ptr));
1101 1134
1102 XSelectInput (display->display, menuBar.win, 1135 XSelectInput (disp, menuBar.win,
1103 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1136 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1104 | Button1MotionMask));
1105 menubar_ev.start (display, menuBar.win); 1137 menubar_ev.start (display, menuBar.win);
1106 } 1138 }
1107#endif 1139#endif
1108 1140
1109#ifdef XPM_BACKGROUND 1141#ifdef XPM_BACKGROUND
… …
1125 1157
1126 /* graphics context for the vt window */ 1158 /* graphics context for the vt window */
1127 gcvalue.foreground = pix_colors[Color_fg]; 1159 gcvalue.foreground = pix_colors[Color_fg];
1128 gcvalue.background = pix_colors[Color_bg]; 1160 gcvalue.background = pix_colors[Color_bg];
1129 gcvalue.graphics_exposures = 1; 1161 gcvalue.graphics_exposures = 1;
1130 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1162 TermWin.gc = XCreateGC (disp, TermWin.vt,
1131 GCForeground | GCBackground | GCGraphicsExposures, 1163 GCForeground | GCBackground | GCGraphicsExposures,
1132 &gcvalue); 1164 &gcvalue);
1133 1165
1134 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1166 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1135 1167
1136#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1168#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1137 gcvalue.foreground = pix_colors[Color_topShadow]; 1169 gcvalue.foreground = pix_colors[Color_topShadow];
1138 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1170 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1139 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1171 gcvalue.foreground = pix_colors[Color_bottomShadow];
1140 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1172 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1141 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1173 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1142 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1174 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1143#endif 1175#endif
1144 1176
1145#ifdef OFF_FOCUS_FADING 1177#ifdef OFF_FOCUS_FADING
1146 // initially we are in unfocused state 1178 // initially we are in unfocused state
1147 if (rs[Rs_fade]) 1179 if (rs[Rs_fade])

Diff Legend

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