--- rxvt-unicode/src/init.C 2006/01/16 15:00:20 1.143 +++ rxvt-unicode/src/init.C 2006/01/20 11:02:46 1.150 @@ -205,10 +205,6 @@ "_XROOTPMAP_ID", "ESETROOT_PMAP_ID", #endif -#ifdef OFFIX_DND - "DndProtocol", - "DndSelection", -#endif #if ENABLE_XEMBED "_XEMBED", "_XEMBED_INFO", @@ -930,17 +926,25 @@ display->depth = gattr.depth; // doh //TODO, per-term not per-display? } + /* grab colors before netscape does */ + Get_Colours (); + + if (!set_fonts ()) + rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); + + parent = DefaultRootWindow (disp); + + attributes.override_redirect = !!OPTION (Opt_override_redirect); + #if ENABLE_FRILLS if (OPTION (Opt_borderLess)) { - prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); + prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); if (prop == None) { /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ -#ifdef PREFER_24BIT attributes.override_redirect = TRUE; -#endif mwmhints.flags = 0; } else @@ -953,14 +957,6 @@ mwmhints.flags = 0; #endif - /* grab colors before netscape does */ - 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]) { @@ -978,7 +974,6 @@ window_calc (0, 0); /* 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; @@ -988,15 +983,8 @@ ext_bwidth, display->depth, InputOutput, display->visual, - CWColormap | CWBackPixel | CWBorderPixel, &attributes); -#else - top = XCreateSimpleWindow (disp, parent, - szHint.x, szHint.y, - szHint.width, szHint.height, - ext_bwidth, - pix_colors_focused[Color_border], - pix_colors_focused[Color_border]); -#endif + CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, + &attributes); this->parent[0] = top; @@ -1372,23 +1360,23 @@ #if ENABLE_FRILLS if (rs[Rs_pty_fd]) { - pty.pty = atoi (rs[Rs_pty_fd]); + pty->pty = atoi (rs[Rs_pty_fd]); - if (pty.pty >= 0) + if (pty->pty >= 0) { if (getfd_hook) - pty.pty = (*getfd_hook) (pty.pty); + pty->pty = (*getfd_hook) (pty->pty); - if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) + if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); } } else #endif - if (!pty.get ()) + if (!pty->get ()) rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); - pty.set_utf8_mode (enc_utf8); + pty->set_utf8_mode (enc_utf8); /* set initial window size */ tt_winch (); @@ -1411,7 +1399,6 @@ return; #endif -#ifndef __QNX__ /* spin off the command interpreter */ switch (cmd_pid = fork ()) { @@ -1423,20 +1410,20 @@ case 0: init_env (); - if (!pty.make_controlling_tty ()) + if (!pty->make_controlling_tty ()) fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); else { /* Reopen stdin, stdout and stderr over the tty file descriptor */ - dup2 (pty.tty, STDIN_FILENO); - dup2 (pty.tty, STDOUT_FILENO); - dup2 (pty.tty, STDERR_FILENO); + dup2 (pty->tty, STDIN_FILENO); + dup2 (pty->tty, STDOUT_FILENO); + dup2 (pty->tty, STDERR_FILENO); // close all our file handles that we do no longer need for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) { - if ((*t)->pty.pty > 2) close ((*t)->pty.pty); - if ((*t)->pty.tty > 2) close ((*t)->pty.tty); + if ((*t)->pty->pty > 2) close ((*t)->pty->pty); + if ((*t)->pty->tty > 2) close ((*t)->pty->tty); } run_child (argv); @@ -1446,36 +1433,18 @@ _exit (EXIT_FAILURE); default: - { -#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) - int fdstdin; - - fdstdin = dup (STDIN_FILENO); - dup2 (pty.tty, STDIN_FILENO); +#if UTMP_SUPPORT + if (!OPTION (Opt_utmpInhibit)) + pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); #endif -#ifdef UTMP_SUPPORT - privileged_utmp (SAVE); -#endif + pty->close_tty (); -#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) + child_ev.start (cmd_pid); - dup2 (fdstdin, STDIN_FILENO); - close (fdstdin); -#endif - } - - pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ + HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END)); break; } -#else /* __QNX__ uses qnxspawn () */ - fchmod (pty.tty, 0622); - fcntl (pty.tty, F_SETFD, FD_CLOEXEC); - fcntl (pty.pty, F_SETFD, FD_CLOEXEC); - - if (run_child (argv) == -1) - exit (EXIT_FAILURE); -#endif } /* ------------------------------------------------------------------------- * @@ -1529,7 +1498,6 @@ sigemptyset (&ss); sigprocmask (SIG_SETMASK, &ss, 0); -#ifndef __QNX__ /* command interpreter path */ if (argv != NULL) { @@ -1565,62 +1533,6 @@ /* no error message: STDERR is closed! */ } -#else /* __QNX__ uses qnxspawn () */ - - char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; - char *command = NULL, fullcommand[_MAX_PATH]; - char **arg_v, *arg_a[2] = { NULL, NULL }; - - if (argv != NULL) - { - if (access (argv[0], X_OK) == -1) - { - if (strchr (argv[0], '/') == NULL) - { - searchenv (argv[0], "PATH", fullcommand); - - if (fullcommand[0] != '\0') - command = fullcommand; - } - - if (access (command, X_OK) == -1) - return -1; - } - else - command = argv[0]; - - arg_v = argv; - } - else - { - if ((command = getenv ("SHELL")) == NULL || *command == '\0') - command = "/bin/sh"; - - arg_a[0] = my_basename (command); - - if (OPTION (Opt_loginShell)) - { - login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); - - login[0] = '-'; - strcpy (&login[1], arg_a[0]); - arg_a[0] = login; - } - - arg_v = arg_a; - } - - iov_a[0] = iov_a[1] = iov_a[2] = pty.tty; - cmd_pid = qnx_spawn (0, 0, 0, -1, -1, - _SPAWN_SETSID | _SPAWN_TCSETPGRP, - command, arg_v, environ, iov_a, 0); - if (login) - free (login); - - pty.close_tty (); - return pty.pty; -#endif - return -1; }