[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.108 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.115 by root, Sun Feb 20 02:00:43 2005 UTC

     "MULTIPLE",
     "TARGETS",
     "TIMESTAMP",
     "VT_SELECTION",
     "INCR",
+    "WM_PROTOCOLS",
     "WM_DELETE_WINDOW",
     "CLIPBOARD",
 #if ENABLE_FRILLS
     "_NET_WM_PID",
     "_MOTIF_WM_HINTS",
 #endif
 #ifdef OFFIX_DND
     "DndProtocol",
     "DndSelection",
 #endif
+#if ENABLE_XEMBED
+    "_XEMBED",
+    "_XEMBED_INFO",
+#endif
   };
 bool
 rxvt_term::init_vars ()
 {
   MEvent.time = CurrentTime;
   MEvent.button = AnyButton;
   options = DEFAULT_OPTIONS;
   want_refresh = 1;
-  cmd_pid = -1;
-  pty.pty = pty.tty = -1;
   priv_modes = SavedModes = PrivMode_Default;
   TermWin.focus = 0;
   TermWin.ncol = 80;
   TermWin.nrow = 24;
   TermWin.int_bwidth = INTERNALBORDERWIDTH;
   if (scrollbar_visible ())
     {
       priv_modes |= PrivMode_scrollBar;
       SavedModes |= PrivMode_scrollBar;
     }
   if (menubar_visible ())
     {
       priv_modes |= PrivMode_menuBar;
       SavedModes |= PrivMode_menuBar;
     }
 #endif
   XGCValues gcvalue;
   long vt_emask;
   XSetWindowAttributes attributes;
   XWindowAttributes gattr;
+  Window top, parent;
   dDisp;
 #ifdef USING_W11LIB
   /* enable W11 callbacks */
   W11AddEventHandler (disp, rxvt_W11_process_x_event);
   Get_Colours ();
   if (!set_fonts ())
     rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
+  parent = DefaultRootWindow (disp);
+#if ENABLE_XEMBED
+  if (rs[Rs_embed])
+    {
+      XWindowAttributes wattr;
+      parent = strtol (rs[Rs_embed], 0, 0);
+      if (!XGetWindowAttributes (disp, parent, &wattr))
+        rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
+      window_calc (wattr.width, wattr.height);
+    }
+#endif
   window_calc (0, 0);
-  old_width = szHint.width;
-  old_height = szHint.height;
   /* sub-window placement & size in rxvt_resize_subwindows () */
 #ifdef PREFER_24BIT
   attributes.background_pixel = pix_colors_focused[Color_border];
   attributes.border_pixel = pix_colors_focused[Color_border];
   attributes.colormap = display->cmap;
-  TermWin.parent[0] = XCreateWindow (disp, DefaultRootWindow (disp),
+  top = XCreateWindow (disp, parent,
-                                     szHint.x, szHint.y,
+                       szHint.x, szHint.y,
-                                     szHint.width, szHint.height,
+                       szHint.width, szHint.height,
-                                     TermWin.ext_bwidth,
+                       TermWin.ext_bwidth,
-                                     display->depth, InputOutput,
+                       display->depth, InputOutput,
-                                     display->visual,
+                       display->visual,
-                                     CWColormap | CWBackPixel | CWBorderPixel, &attributes);
+                       CWColormap | CWBackPixel | CWBorderPixel, &attributes);
 #else
-  TermWin.parent[0] = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
+  top = XCreateSimpleWindow (disp, parent,
-                                           szHint.x, szHint.y,
+                             szHint.x, szHint.y,
-                                           szHint.width, szHint.height,
+                             szHint.width, szHint.height,
-                                           TermWin.ext_bwidth,
+                             TermWin.ext_bwidth,
-                                           pix_colors_focused[Color_border],
+                             pix_colors_focused[Color_border],
-                                           pix_colors_focused[Color_border]);
+                             pix_colors_focused[Color_border]);
 #endif
+  TermWin.parent[0] = top;
+  old_width = szHint.width;
+  old_height = szHint.height;
   process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
   process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
   classHint.res_name = (char *)rs[Rs_name];
   classHint.res_class = (char *)RESCLASS;
   wmHint.flags = InputHint | StateHint | WindowGroupHint;
   wmHint.input = True;
   wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
-  wmHint.window_group = TermWin.parent[0];
+  wmHint.window_group = top;
-  XSetWMProperties (disp, TermWin.parent[0], NULL, NULL,
+  XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
-                    (char **)argv, argc, &szHint, &wmHint, &classHint);
+                      &szHint, &wmHint, &classHint);
   /* Enable delete window protocol */
-  XSetWMProtocols (disp, TermWin.parent[0],
+  XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1);
-                   &xa[XA_WMDELETEWINDOW], 1);
 #if ENABLE_FRILLS
   long pid = getpid ();
-  XChangeProperty (disp, TermWin.parent[0],
+  XChangeProperty (disp, top,
                    xa[XA_NET_WM_PID], XA_CARDINAL, 32,
                    PropModeReplace, (unsigned char *)&pid, 1);
 #endif
-  XSelectInput (disp, TermWin.parent[0],
+  XSelectInput (disp, top,
                 KeyPressMask
 #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
                 | KeyReleaseMask
 #endif
                 | FocusChangeMask | VisibilityChangeMask
-                | ExposureMask
-                | StructureNotifyMask);
+                | ExposureMask | StructureNotifyMask);
-  termwin_ev.start (display, TermWin.parent[0]);
+  termwin_ev.start (display, top);
 #if ENABLE_FRILLS
   if (mwmhints.flags)
-    XChangeProperty (disp, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
+    XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
                      PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
 #endif
   /* vt cursor: Black-on-White is standard, but this is more popular */
   TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
   /* cursor (menuBar/scrollBar): Black-on-White */
   leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
 #endif
   /* the vt window */
-  TermWin.vt = XCreateSimpleWindow (disp, TermWin.parent[0],
+  TermWin.vt = XCreateSimpleWindow (disp, top,
                                     window_vt_x,
                                     window_vt_y,
                                     TermWin_TotalWidth (),
                                     TermWin_TotalHeight (),
                                     0,
   attributes.bit_gravity = NorthWestGravity;
   XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
   vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
-  pointer_unblank ();
 #ifdef POINTER_BLANK
   if (options & Opt_pointerBlank)
     vt_emask |= PointerMotionMask;
   else
 #endif
   vt_ev.start (display, TermWin.vt);
 #if defined(MENUBAR) && (MENUBAR_MAX > 1)
   if (menuBar_height ())
     {
-      menuBar.win = XCreateSimpleWindow (disp, TermWin.parent[0],
+      menuBar.win = XCreateSimpleWindow (disp, top,
                                          window_vt_x, 0,
                                          TermWin_TotalWidth (),
                                          menuBar_TotalHeight (),
                                          0,
                                          pix_colors_focused[Color_fg],
   // initially we are in unfocused state
   if (rs[Rs_fade])
     pix_colors = pix_colors_unfocused;
 #endif
+  pointer_unblank ();
   scr_recolour ();
+#if ENABLE_XEMBED
+  if (rs[Rs_embed])
+    {
+      long info[2] = { 0, XEMBED_MAPPED };
+      XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
+                       32, PropModeReplace, (unsigned char *)&info, 2);
+    }
+#endif
 }
 /* ------------------------------------------------------------------------- *
  *                            GET TTY CURRENT STATE                          *
  * ------------------------------------------------------------------------- */
  * the slave.
  */
 void
 rxvt_term::run_command (const char *const *argv)
 {
+#if ENABLE_FRILLS
+  if (rs[Rs_pty_fd])
+    {
+      pty.pty = atoi (rs[Rs_pty_fd]);
+      fcntl (pty.pty, F_SETFL, O_NONBLOCK);
+    }
+  else
+#endif
-  if (!pty.get ())
+    if (!pty.get ())
-    rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
+      rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
   pty.set_utf8_mode (enc_utf8);
   /* set initial window size */
   tt_winch ();
 #endif
     er = -1;
   rxvt_get_ttymode (&tio, er);
+#if ENABLE_FRILLS
+  if (rs[Rs_pty_fd])
+    return;
+#endif
   sw_chld.start (SIGCHLD);
 #ifndef __QNX__
   /* spin off the command interpreter */
   switch (cmd_pid = fork ())
     {
       case -1:
+        {
+          cmd_pid = 0;
-        rxvt_fatal ("can't fork, aborting.\n");
+          rxvt_fatal ("can't fork, aborting.\n");
+        }
       case 0:
         init_env ();
         if (!pty.make_controlling_tty ())
           fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.108 by root, Fri Feb 4 11:41:23 2005 UTC vs. Revision 1.115 by root, Sun Feb 20 02:00:43 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.108 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.115 by root, Sun Feb 20 02:00:43 2005 UTC