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.108 by root, Fri Feb 4 11:41: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;
… …
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 }
… …
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 dDisp;
932 932
933#ifdef USING_W11LIB 933#ifdef USING_W11LIB
934 /* enable W11 callbacks */ 934 /* enable W11 callbacks */
935 W11AddEventHandler (disp, rxvt_W11_process_x_event); 935 W11AddEventHandler (disp, rxvt_W11_process_x_event);
… …
973 Get_Colours (); 973 Get_Colours ();
974 974
975 if (!set_fonts ()) 975 if (!set_fonts ())
976 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");
977 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 {
978 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
979 old_width = szHint.width; 1032 old_width = szHint.width;
980 old_height = szHint.height; 1033 old_height = szHint.height;
981
982 /* sub-window placement & size in rxvt_resize_subwindows () */
983
984#ifdef PREFER_24BIT
985 attributes.background_pixel = pix_colors_focused[Color_border];
986 attributes.border_pixel = pix_colors_focused[Color_border];
987 attributes.colormap = display->cmap;
988 TermWin.parent[0] = XCreateWindow (disp, DefaultRootWindow (disp),
989 szHint.x, szHint.y,
990 szHint.width, szHint.height,
991 TermWin.ext_bwidth,
992 display->depth, InputOutput,
993 display->visual,
994 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
995#else
996 TermWin.parent[0] = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
997 szHint.x, szHint.y,
998 szHint.width, szHint.height,
999 TermWin.ext_bwidth,
1000 pix_colors_focused[Color_border],
1001 pix_colors_focused[Color_border]);
1002#endif
1003 1034
1004 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1035 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1005 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1036 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1006 1037
1007 classHint.res_name = (char *)rs[Rs_name]; 1038 classHint.res_name = (char *)rs[Rs_name];
1008 classHint.res_class = (char *)RESCLASS; 1039 classHint.res_class = (char *)RESCLASS;
1009 1040
1010 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1041 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1011 wmHint.input = True; 1042 wmHint.input = True;
1012 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1043 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1013 wmHint.window_group = TermWin.parent[0]; 1044 wmHint.window_group = top;
1014 1045
1015 XSetWMProperties (disp, TermWin.parent[0], NULL, NULL, 1046 XSetWMProperties (disp, top, NULL, NULL,
1016 (char **)argv, argc, &szHint, &wmHint, &classHint); 1047 (char **)argv, argc, &szHint, &wmHint, &classHint);
1017 1048
1018 /* Enable delete window protocol */ 1049 /* Enable delete window protocol */
1019 XSetWMProtocols (disp, TermWin.parent[0], 1050 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);
1020 &xa[XA_WMDELETEWINDOW], 1);
1021 1051
1022#if ENABLE_FRILLS 1052#if ENABLE_FRILLS
1023 long pid = getpid (); 1053 long pid = getpid ();
1024 1054
1025 XChangeProperty (disp, TermWin.parent[0], 1055 XChangeProperty (disp, top,
1026 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1056 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1027 PropModeReplace, (unsigned char *)&pid, 1); 1057 PropModeReplace, (unsigned char *)&pid, 1);
1028#endif 1058#endif
1029 1059
1030 XSelectInput (disp, TermWin.parent[0], 1060 XSelectInput (disp, top,
1031 KeyPressMask 1061 KeyPressMask
1032#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1062#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1033 | KeyReleaseMask 1063 | KeyReleaseMask
1034#endif 1064#endif
1035 | FocusChangeMask | VisibilityChangeMask 1065 | FocusChangeMask | VisibilityChangeMask
1036 | ExposureMask 1066 | ExposureMask
1037 | StructureNotifyMask); 1067 | StructureNotifyMask);
1038 termwin_ev.start (display, TermWin.parent[0]); 1068 termwin_ev.start (display, top);
1039 1069
1040#if ENABLE_FRILLS 1070#if ENABLE_FRILLS
1041 if (mwmhints.flags) 1071 if (mwmhints.flags)
1042 XChangeProperty (disp, 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,
1043 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1073 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1044#endif 1074#endif
1045 1075
1046 /* 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 */
1047 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1077 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
… …
1050 /* cursor (menuBar/scrollBar): Black-on-White */ 1080 /* cursor (menuBar/scrollBar): Black-on-White */
1051 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1081 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1052#endif 1082#endif
1053 1083
1054 /* the vt window */ 1084 /* the vt window */
1055 TermWin.vt = XCreateSimpleWindow (disp, TermWin.parent[0], 1085 TermWin.vt = XCreateSimpleWindow (disp, top,
1056 window_vt_x, 1086 window_vt_x,
1057 window_vt_y, 1087 window_vt_y,
1058 TermWin_TotalWidth (), 1088 TermWin_TotalWidth (),
1059 TermWin_TotalHeight (), 1089 TermWin_TotalHeight (),
1060 0, 1090 0,
… …
1082 vt_ev.start (display, TermWin.vt); 1112 vt_ev.start (display, TermWin.vt);
1083 1113
1084#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1114#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1085 if (menuBar_height ()) 1115 if (menuBar_height ())
1086 { 1116 {
1087 menuBar.win = XCreateSimpleWindow (disp, TermWin.parent[0], 1117 menuBar.win = XCreateSimpleWindow (disp, top,
1088 window_vt_x, 0, 1118 window_vt_x, 0,
1089 TermWin_TotalWidth (), 1119 TermWin_TotalWidth (),
1090 menuBar_TotalHeight (), 1120 menuBar_TotalHeight (),
1091 0, 1121 0,
1092 pix_colors_focused[Color_fg], 1122 pix_colors_focused[Color_fg],
… …
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