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.110 by root, Thu Feb 17 15:07:48 2005 UTC

… …
225 225
226 MEvent.time = CurrentTime; 226 MEvent.time = CurrentTime;
227 MEvent.button = AnyButton; 227 MEvent.button = AnyButton;
228 options = DEFAULT_OPTIONS; 228 options = DEFAULT_OPTIONS;
229 want_refresh = 1; 229 want_refresh = 1;
230 cmd_pid = -1;
231 pty.pty = pty.tty = -1;
232 priv_modes = SavedModes = PrivMode_Default; 230 priv_modes = SavedModes = PrivMode_Default;
233 TermWin.focus = 0; 231 TermWin.focus = 0;
234 TermWin.ncol = 80; 232 TermWin.ncol = 80;
235 TermWin.nrow = 24; 233 TermWin.nrow = 24;
236 TermWin.int_bwidth = INTERNALBORDERWIDTH; 234 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
337 */ 335 */
338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 336 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
339 rs[Rs_display_name] = ":0"; 337 rs[Rs_display_name] = ":0";
340 338
341 get_options (r_argc, r_argv); 339 get_options (r_argc, r_argv);
342 free (r_argv);
343 340
344#ifdef LOCAL_X_IS_UNIX 341#ifdef LOCAL_X_IS_UNIX
345 if (rs[Rs_display_name][0] == ':') 342 if (rs[Rs_display_name][0] == ':')
346 { 343 {
347 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 344 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
… …
354 351
355 if (!display 352 if (!display
356 && ! (display = displays.get (rs[Rs_display_name]))) 353 && ! (display = displays.get (rs[Rs_display_name])))
357 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 354 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
358 355
359 extract_resources (display->display, rs[Rs_name]); 356 extract_resources ();
357 free (r_argv);
360 358
361 /* 359 /*
362 * set any defaults not already set 360 * set any defaults not already set
363 */ 361 */
364 if (cmd_argv && cmd_argv[0]) 362 if (cmd_argv && cmd_argv[0])
… …
673 if (scrollbar_visible ()) 671 if (scrollbar_visible ())
674 { 672 {
675 priv_modes |= PrivMode_scrollBar; 673 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 674 SavedModes |= PrivMode_scrollBar;
677 } 675 }
676
678 if (menubar_visible ()) 677 if (menubar_visible ())
679 { 678 {
680 priv_modes |= PrivMode_menuBar; 679 priv_modes |= PrivMode_menuBar;
681 SavedModes |= PrivMode_menuBar; 680 SavedModes |= PrivMode_menuBar;
682 } 681 }
… …
830 * Use resource ``modifier'' to override the Meta modifier 829 * Use resource ``modifier'' to override the Meta modifier
831 */ 830 */
832void 831void
833rxvt_term::get_ourmods () 832rxvt_term::get_ourmods ()
834{ 833{
835 int i, j, k; 834 int i, j, k;
836 int requestedmeta, realmeta, realalt; 835 int requestedmeta, realmeta, realalt;
837 const char *cm, *rsmod; 836 const char *cm, *rsmod;
838 XModifierKeymap *map; 837 XModifierKeymap *map;
839 KeyCode *kc; 838 KeyCode *kc;
840 const unsigned int modmasks[] = 839 const unsigned int modmasks[] =
841 { 840 {
842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
843 }; 842 };
844 843
… …
926#endif 925#endif
927 XGCValues gcvalue; 926 XGCValues gcvalue;
928 long vt_emask; 927 long vt_emask;
929 XSetWindowAttributes attributes; 928 XSetWindowAttributes attributes;
930 XWindowAttributes gattr; 929 XWindowAttributes gattr;
930 Window top;
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
… …
972 Get_Colours (); 973 Get_Colours ();
973 974
974 if (!set_fonts ()) 975 if (!set_fonts ())
975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
976 977
978#if ENABLE_FRILLS
979 if (rs[Rs_embed])
980 {
981 top = strtol (rs[Rs_embed], 0, 0);
982
983 XWindowAttributes wattr;
984 XGetWindowAttributes (disp, top, &wattr);
985
986 window_calc (wattr.width, wattr.height);
987
988#if 0
989 if (wattr.map_state == IsViewable)
990 {
991 TermWin.mapped = 1;
992 refresh_type = FAST_REFRESH;
993 XClearWindow (disp, top);
994 // TODO: make XMapNotify-event-code a function and call it
995 // TODO: how can I detetc visibility without unmpa/map?
996 // TODO: focusin etc.
997 }
998#else
999 // it'S easiets just to unmap/map to get all state correctly set-up
1000 XUnmapWindow (disp, top);
1001#endif
1002 }
1003 else
1004#endif
1005 {
977 window_calc (0, 0); 1006 window_calc (0, 0);
1007
1008 /* sub-window placement & size in rxvt_resize_subwindows () */
1009#ifdef PREFER_24BIT
1010 attributes.background_pixel = pix_colors_focused[Color_border];
1011 attributes.border_pixel = pix_colors_focused[Color_border];
1012 attributes.colormap = display->cmap;
1013 top = XCreateWindow (disp, DefaultRootWindow (disp),
1014 szHint.x, szHint.y,
1015 szHint.width, szHint.height,
1016 TermWin.ext_bwidth,
1017 display->depth, InputOutput,
1018 display->visual,
1019 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1020#else
1021 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1022 szHint.x, szHint.y,
1023 szHint.width, szHint.height,
1024 TermWin.ext_bwidth,
1025 pix_colors_focused[Color_border],
1026 pix_colors_focused[Color_border]);
1027#endif
1028 }
1029
1030 TermWin.parent[0] = top;
1031
978 old_width = szHint.width; 1032 old_width = szHint.width;
979 old_height = szHint.height; 1033 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 1034
1003 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1035 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1004 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1036 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1005 1037
1006 classHint.res_name = (char *)rs[Rs_name]; 1038 classHint.res_name = (char *)rs[Rs_name];
1007 classHint.res_class = (char *)RESCLASS; 1039 classHint.res_class = (char *)RESCLASS;
1008 1040
1009 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1041 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1010 wmHint.input = True; 1042 wmHint.input = True;
1011 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1043 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1012 wmHint.window_group = TermWin.parent[0]; 1044 wmHint.window_group = top;
1013 1045
1014 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1046 XSetWMProperties (disp, top, NULL, NULL,
1015 (char **)argv, argc, &szHint, &wmHint, &classHint); 1047 (char **)argv, argc, &szHint, &wmHint, &classHint);
1016 1048
1017 /* Enable delete window protocol */ 1049 /* Enable delete window protocol */
1018 XSetWMProtocols (display->display, TermWin.parent[0], 1050 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);
1019 &xa[XA_WMDELETEWINDOW], 1);
1020 1051
1021#if ENABLE_FRILLS 1052#if ENABLE_FRILLS
1022 long pid = getpid (); 1053 long pid = getpid ();
1023 1054
1024 XChangeProperty (display->display, TermWin.parent[0], 1055 XChangeProperty (disp, top,
1025 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1056 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1026 PropModeReplace, (unsigned char *)&pid, 1); 1057 PropModeReplace, (unsigned char *)&pid, 1);
1027#endif 1058#endif
1028 1059
1029 XSelectInput (display->display, TermWin.parent[0], 1060 XSelectInput (disp, top,
1030 KeyPressMask 1061 KeyPressMask
1031#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1062#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1032 | KeyReleaseMask 1063 | KeyReleaseMask
1033#endif 1064#endif
1034 | FocusChangeMask | VisibilityChangeMask 1065 | FocusChangeMask | VisibilityChangeMask
1035 | ExposureMask 1066 | ExposureMask
1036 | StructureNotifyMask); 1067 | StructureNotifyMask);
1037 termwin_ev.start (display, TermWin.parent[0]); 1068 termwin_ev.start (display, top);
1038 1069
1039#if ENABLE_FRILLS 1070#if ENABLE_FRILLS
1040 if (mwmhints.flags) 1071 if (mwmhints.flags)
1041 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1072 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1042 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1073 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1043#endif 1074#endif
1044 1075
1045 /* vt cursor: Black-on-White is standard, but this is more popular */ 1076 /* vt cursor: Black-on-White is standard, but this is more popular */
1046 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1077 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1047 1078
1048#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1079#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1049 /* cursor (menuBar/scrollBar): Black-on-White */ 1080 /* cursor (menuBar/scrollBar): Black-on-White */
1050 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1081 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1051#endif 1082#endif
1052 1083
1053 /* the vt window */ 1084 /* the vt window */
1054 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1085 TermWin.vt = XCreateSimpleWindow (disp, top,
1055 window_vt_x, 1086 window_vt_x,
1056 window_vt_y, 1087 window_vt_y,
1057 TermWin_TotalWidth (), 1088 TermWin_TotalWidth (),
1058 TermWin_TotalHeight (), 1089 TermWin_TotalHeight (),
1059 0, 1090 0,
1060 pix_colors_focused[Color_fg], 1091 pix_colors_focused[Color_fg],
1061 pix_colors_focused[Color_bg]); 1092 pix_colors_focused[Color_bg]);
1062#ifdef DEBUG_X 1093#ifdef DEBUG_X
1063 XStoreName (display->display, TermWin.vt, "vt window"); 1094 XStoreName (disp, TermWin.vt, "vt window");
1064#endif 1095#endif
1065 1096
1066 attributes.bit_gravity = NorthWestGravity; 1097 attributes.bit_gravity = NorthWestGravity;
1067 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1098 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1068 1099
1069 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1100 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1070 1101
1071 pointer_unblank (); 1102 pointer_unblank ();
1072 1103
… …
1075 vt_emask |= PointerMotionMask; 1106 vt_emask |= PointerMotionMask;
1076 else 1107 else
1077#endif 1108#endif
1078 vt_emask |= Button1MotionMask | Button3MotionMask; 1109 vt_emask |= Button1MotionMask | Button3MotionMask;
1079 1110
1080 XSelectInput (display->display, TermWin.vt, vt_emask); 1111 XSelectInput (disp, TermWin.vt, vt_emask);
1081 vt_ev.start (display, TermWin.vt); 1112 vt_ev.start (display, TermWin.vt);
1082 1113
1083#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1114#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1084 if (menuBar_height ()) 1115 if (menuBar_height ())
1085 { 1116 {
1086 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1117 menuBar.win = XCreateSimpleWindow (disp, top,
1087 window_vt_x, 0, 1118 window_vt_x, 0,
1088 TermWin_TotalWidth (), 1119 TermWin_TotalWidth (),
1089 menuBar_TotalHeight (), 1120 menuBar_TotalHeight (),
1090 0, 1121 0,
1091 pix_colors_focused[Color_fg], 1122 pix_colors_focused[Color_fg],
1092 pix_colors_focused[Color_scroll]); 1123 pix_colors_focused[Color_scroll]);
1093 1124
1094#ifdef DEBUG_X 1125#ifdef DEBUG_X
1095 XStoreName (display->display, menuBar.win, "menubar"); 1126 XStoreName (disp, menuBar.win, "menubar");
1096#endif 1127#endif
1097 1128
1098 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1129 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1099 1130
1100 XDefineCursor (display->display, menuBar.win, 1131 XDefineCursor (disp, menuBar.win,
1101 XCreateFontCursor (display->display, XC_left_ptr)); 1132 XCreateFontCursor (disp, XC_left_ptr));
1102 1133
1103 XSelectInput (display->display, menuBar.win, 1134 XSelectInput (disp, menuBar.win,
1104 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1135 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1105 | Button1MotionMask));
1106 menubar_ev.start (display, menuBar.win); 1136 menubar_ev.start (display, menuBar.win);
1107 } 1137 }
1108#endif 1138#endif
1109 1139
1110#ifdef XPM_BACKGROUND 1140#ifdef XPM_BACKGROUND
… …
1126 1156
1127 /* graphics context for the vt window */ 1157 /* graphics context for the vt window */
1128 gcvalue.foreground = pix_colors[Color_fg]; 1158 gcvalue.foreground = pix_colors[Color_fg];
1129 gcvalue.background = pix_colors[Color_bg]; 1159 gcvalue.background = pix_colors[Color_bg];
1130 gcvalue.graphics_exposures = 1; 1160 gcvalue.graphics_exposures = 1;
1131 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1161 TermWin.gc = XCreateGC (disp, TermWin.vt,
1132 GCForeground | GCBackground | GCGraphicsExposures, 1162 GCForeground | GCBackground | GCGraphicsExposures,
1133 &gcvalue); 1163 &gcvalue);
1134 1164
1135 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1165 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1136 1166
1137#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1167#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1138 gcvalue.foreground = pix_colors[Color_topShadow]; 1168 gcvalue.foreground = pix_colors[Color_topShadow];
1139 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1169 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1140 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1170 gcvalue.foreground = pix_colors[Color_bottomShadow];
1141 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1171 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1142 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1172 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1143 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1173 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1144#endif 1174#endif
1145 1175
1146#ifdef OFF_FOCUS_FADING 1176#ifdef OFF_FOCUS_FADING
1147 // initially we are in unfocused state 1177 // initially we are in unfocused state
1148 if (rs[Rs_fade]) 1178 if (rs[Rs_fade])
… …
1386 * the slave. 1416 * the slave.
1387 */ 1417 */
1388void 1418void
1389rxvt_term::run_command (const char *const *argv) 1419rxvt_term::run_command (const char *const *argv)
1390{ 1420{
1421#if ENABLE_FRILLS
1422 if (rs[Rs_pty_fd])
1423 {
1424 pty.pty = atoi (rs[Rs_pty_fd]);
1425 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1426 }
1427 else
1428#endif
1391 if (!pty.get ()) 1429 if (!pty.get ())
1392 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1430 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1393 1431
1394 pty.set_utf8_mode (enc_utf8); 1432 pty.set_utf8_mode (enc_utf8);
1395 1433
1396 /* set initial window size */ 1434 /* set initial window size */
1397 tt_winch (); 1435 tt_winch ();
… …
1407#endif 1445#endif
1408 er = -1; 1446 er = -1;
1409 1447
1410 rxvt_get_ttymode (&tio, er); 1448 rxvt_get_ttymode (&tio, er);
1411 1449
1450#if ENABLE_FRILLS
1451 if (rs[Rs_pty_fd])
1452 return;
1453#endif
1454
1412 sw_chld.start (SIGCHLD); 1455 sw_chld.start (SIGCHLD);
1413 1456
1414#ifndef __QNX__ 1457#ifndef __QNX__
1415 /* spin off the command interpreter */ 1458 /* spin off the command interpreter */
1416 switch (cmd_pid = fork ()) 1459 switch (cmd_pid = fork ())
1417 { 1460 {
1418 case -1: 1461 case -1:
1462 {
1463 cmd_pid = 0;
1419 rxvt_fatal ("can't fork, aborting.\n"); 1464 rxvt_fatal ("can't fork, aborting.\n");
1465 }
1420 case 0: 1466 case 0:
1421 init_env (); 1467 init_env ();
1422 1468
1423 if (!pty.make_controlling_tty ()) 1469 if (!pty.make_controlling_tty ())
1424 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1470 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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