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.112 by root, Sat Feb 19 01:07:58 2005 UTC

… …
181 "MULTIPLE", 181 "MULTIPLE",
182 "TARGETS", 182 "TARGETS",
183 "TIMESTAMP", 183 "TIMESTAMP",
184 "VT_SELECTION", 184 "VT_SELECTION",
185 "INCR", 185 "INCR",
186 "WM_PROTOCOLS",
186 "WM_DELETE_WINDOW", 187 "WM_DELETE_WINDOW",
187 "CLIPBOARD", 188 "CLIPBOARD",
188#if ENABLE_FRILLS 189#if ENABLE_FRILLS
189 "_NET_WM_PID", 190 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS", 191 "_MOTIF_WM_HINTS",
… …
200#endif 201#endif
201#ifdef OFFIX_DND 202#ifdef OFFIX_DND
202 "DndProtocol", 203 "DndProtocol",
203 "DndSelection", 204 "DndSelection",
204#endif 205#endif
206#if ENABLE_XEMBED
207 "_XEMBED",
208#endif
205 }; 209 };
206 210
207bool 211bool
208rxvt_term::init_vars () 212rxvt_term::init_vars ()
209{ 213{
… …
225 229
226 MEvent.time = CurrentTime; 230 MEvent.time = CurrentTime;
227 MEvent.button = AnyButton; 231 MEvent.button = AnyButton;
228 options = DEFAULT_OPTIONS; 232 options = DEFAULT_OPTIONS;
229 want_refresh = 1; 233 want_refresh = 1;
230 cmd_pid = -1;
231 pty.pty = pty.tty = -1;
232 priv_modes = SavedModes = PrivMode_Default; 234 priv_modes = SavedModes = PrivMode_Default;
233 TermWin.focus = 0; 235 TermWin.focus = 0;
234 TermWin.ncol = 80; 236 TermWin.ncol = 80;
235 TermWin.nrow = 24; 237 TermWin.nrow = 24;
236 TermWin.int_bwidth = INTERNALBORDERWIDTH; 238 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
673 if (scrollbar_visible ()) 675 if (scrollbar_visible ())
674 { 676 {
675 priv_modes |= PrivMode_scrollBar; 677 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 678 SavedModes |= PrivMode_scrollBar;
677 } 679 }
680
678 if (menubar_visible ()) 681 if (menubar_visible ())
679 { 682 {
680 priv_modes |= PrivMode_menuBar; 683 priv_modes |= PrivMode_menuBar;
681 SavedModes |= PrivMode_menuBar; 684 SavedModes |= PrivMode_menuBar;
682 } 685 }
… …
926#endif 929#endif
927 XGCValues gcvalue; 930 XGCValues gcvalue;
928 long vt_emask; 931 long vt_emask;
929 XSetWindowAttributes attributes; 932 XSetWindowAttributes attributes;
930 XWindowAttributes gattr; 933 XWindowAttributes gattr;
934 Window top;
931 dDisp; 935 dDisp;
932 936
933#ifdef USING_W11LIB 937#ifdef USING_W11LIB
934 /* enable W11 callbacks */ 938 /* enable W11 callbacks */
935 W11AddEventHandler (disp, rxvt_W11_process_x_event); 939 W11AddEventHandler (disp, rxvt_W11_process_x_event);
… …
973 Get_Colours (); 977 Get_Colours ();
974 978
975 if (!set_fonts ()) 979 if (!set_fonts ())
976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 980 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977 981
982#if ENABLE_XEMBED
983 if (rs[Rs_embed])
984 {
985 XWindowAttributes wattr;
986
987 top = strtol (rs[Rs_embed], 0, 0);
988
989 if (!XGetWindowAttributes (disp, top, &wattr))
990 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
991
992 window_calc (wattr.width, wattr.height);
993
994#if 0
995 if (wattr.map_state == IsViewable)
996 {
997 TermWin.mapped = 1;
998 refresh_type = FAST_REFRESH;
999 XClearWindow (disp, top);
1000 // TODO: make XMapNotify-event-code a function and call it
1001 // TODO: how can I detetc visibility without unmpa/map?
1002 // TODO: focusin etc.
1003 }
1004#else
1005 // it'S easiets just to unmap/map to get all state correctly set-up
1006 XUnmapWindow (disp, top);
1007#endif
1008 }
1009 else
1010#endif
1011 {
978 window_calc (0, 0); 1012 window_calc (0, 0);
1013
1014 /* sub-window placement & size in rxvt_resize_subwindows () */
1015#ifdef PREFER_24BIT
1016 attributes.background_pixel = pix_colors_focused[Color_border];
1017 attributes.border_pixel = pix_colors_focused[Color_border];
1018 attributes.colormap = display->cmap;
1019 top = XCreateWindow (disp, DefaultRootWindow (disp),
1020 szHint.x, szHint.y,
1021 szHint.width, szHint.height,
1022 TermWin.ext_bwidth,
1023 display->depth, InputOutput,
1024 display->visual,
1025 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1026#else
1027 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1028 szHint.x, szHint.y,
1029 szHint.width, szHint.height,
1030 TermWin.ext_bwidth,
1031 pix_colors_focused[Color_border],
1032 pix_colors_focused[Color_border]);
1033#endif
1034 }
1035
1036 TermWin.parent[0] = top;
1037
979 old_width = szHint.width; 1038 old_width = szHint.width;
980 old_height = szHint.height; 1039 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 1040
1004 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1041 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1005 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1042 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1006 1043
1007 classHint.res_name = (char *)rs[Rs_name]; 1044 classHint.res_name = (char *)rs[Rs_name];
1008 classHint.res_class = (char *)RESCLASS; 1045 classHint.res_class = (char *)RESCLASS;
1009 1046
1010 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1047 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1011 wmHint.input = True; 1048 wmHint.input = True;
1012 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1049 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1013 wmHint.window_group = TermWin.parent[0]; 1050 wmHint.window_group = top;
1014 1051
1015 XSetWMProperties (disp, TermWin.parent[0], NULL, NULL, 1052 XSetWMProperties (disp, top, NULL, NULL,
1016 (char **)argv, argc, &szHint, &wmHint, &classHint); 1053 (char **)argv, argc, &szHint, &wmHint, &classHint);
1017 1054
1018 /* Enable delete window protocol */ 1055 /* Enable delete window protocol */
1019 XSetWMProtocols (disp, TermWin.parent[0], 1056 XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1);
1020 &xa[XA_WMDELETEWINDOW], 1);
1021 1057
1022#if ENABLE_FRILLS 1058#if ENABLE_FRILLS
1023 long pid = getpid (); 1059 long pid = getpid ();
1024 1060
1025 XChangeProperty (disp, TermWin.parent[0], 1061 XChangeProperty (disp, top,
1026 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1062 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1027 PropModeReplace, (unsigned char *)&pid, 1); 1063 PropModeReplace, (unsigned char *)&pid, 1);
1028#endif 1064#endif
1029 1065
1030 XSelectInput (disp, TermWin.parent[0], 1066 XSelectInput (disp, top,
1031 KeyPressMask 1067 KeyPressMask
1032#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1068#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1033 | KeyReleaseMask 1069 | KeyReleaseMask
1034#endif 1070#endif
1035 | FocusChangeMask | VisibilityChangeMask 1071 | FocusChangeMask | VisibilityChangeMask
1036 | ExposureMask
1037 | StructureNotifyMask); 1072 | ExposureMask | StructureNotifyMask);
1073
1038 termwin_ev.start (display, TermWin.parent[0]); 1074 termwin_ev.start (display, top);
1039 1075
1040#if ENABLE_FRILLS 1076#if ENABLE_FRILLS
1041 if (mwmhints.flags) 1077 if (mwmhints.flags)
1042 XChangeProperty (disp, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1078 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1043 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1079 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1044#endif 1080#endif
1045 1081
1046 /* vt cursor: Black-on-White is standard, but this is more popular */ 1082 /* vt cursor: Black-on-White is standard, but this is more popular */
1047 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1083 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
… …
1050 /* cursor (menuBar/scrollBar): Black-on-White */ 1086 /* cursor (menuBar/scrollBar): Black-on-White */
1051 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1087 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1052#endif 1088#endif
1053 1089
1054 /* the vt window */ 1090 /* the vt window */
1055 TermWin.vt = XCreateSimpleWindow (disp, TermWin.parent[0], 1091 TermWin.vt = XCreateSimpleWindow (disp, top,
1056 window_vt_x, 1092 window_vt_x,
1057 window_vt_y, 1093 window_vt_y,
1058 TermWin_TotalWidth (), 1094 TermWin_TotalWidth (),
1059 TermWin_TotalHeight (), 1095 TermWin_TotalHeight (),
1060 0, 1096 0,
… …
1082 vt_ev.start (display, TermWin.vt); 1118 vt_ev.start (display, TermWin.vt);
1083 1119
1084#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1120#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1085 if (menuBar_height ()) 1121 if (menuBar_height ())
1086 { 1122 {
1087 menuBar.win = XCreateSimpleWindow (disp, TermWin.parent[0], 1123 menuBar.win = XCreateSimpleWindow (disp, top,
1088 window_vt_x, 0, 1124 window_vt_x, 0,
1089 TermWin_TotalWidth (), 1125 TermWin_TotalWidth (),
1090 menuBar_TotalHeight (), 1126 menuBar_TotalHeight (),
1091 0, 1127 0,
1092 pix_colors_focused[Color_fg], 1128 pix_colors_focused[Color_fg],
… …
1386 * the slave. 1422 * the slave.
1387 */ 1423 */
1388void 1424void
1389rxvt_term::run_command (const char *const *argv) 1425rxvt_term::run_command (const char *const *argv)
1390{ 1426{
1427#if ENABLE_FRILLS
1428 if (rs[Rs_pty_fd])
1429 {
1430 pty.pty = atoi (rs[Rs_pty_fd]);
1431 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1432 }
1433 else
1434#endif
1391 if (!pty.get ()) 1435 if (!pty.get ())
1392 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1436 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1393 1437
1394 pty.set_utf8_mode (enc_utf8); 1438 pty.set_utf8_mode (enc_utf8);
1395 1439
1396 /* set initial window size */ 1440 /* set initial window size */
1397 tt_winch (); 1441 tt_winch ();
… …
1407#endif 1451#endif
1408 er = -1; 1452 er = -1;
1409 1453
1410 rxvt_get_ttymode (&tio, er); 1454 rxvt_get_ttymode (&tio, er);
1411 1455
1456#if ENABLE_FRILLS
1457 if (rs[Rs_pty_fd])
1458 return;
1459#endif
1460
1412 sw_chld.start (SIGCHLD); 1461 sw_chld.start (SIGCHLD);
1413 1462
1414#ifndef __QNX__ 1463#ifndef __QNX__
1415 /* spin off the command interpreter */ 1464 /* spin off the command interpreter */
1416 switch (cmd_pid = fork ()) 1465 switch (cmd_pid = fork ())
1417 { 1466 {
1418 case -1: 1467 case -1:
1468 {
1469 cmd_pid = 0;
1419 rxvt_fatal ("can't fork, aborting.\n"); 1470 rxvt_fatal ("can't fork, aborting.\n");
1471 }
1420 case 0: 1472 case 0:
1421 init_env (); 1473 init_env ();
1422 1474
1423 if (!pty.make_controlling_tty ()) 1475 if (!pty.make_controlling_tty ())
1424 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1476 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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