Changeset 25411

Timestamp:

05/10/08 06:22:18 (6 days ago)

Author:

mmu_man

Message:

Indeed we don't need this signal hack for BeOS, we just need to tell it the pgid. That reduces the number of things to remove later ;)

Files:

• haiku/trunk/src/apps/terminal/Shell.cpp (modified) (2 diffs)
• haiku/trunk/src/apps/terminal/Shell.h (modified) (1 diff)
• haiku/trunk/src/apps/terminal/TermView.cpp (modified) (1 diff)

haiku/trunk/src/apps/terminal/Shell.cpp

@@ -195 +195 @@
-        winSize.ws_row = rows;
-        winSize.ws_col = columns;
-#ifdef __HAIKU__
-        if (ioctl(fFd, TIOCSWINSZ, &winSize) != 0)
-                return errno;
-        return B_OK;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
@@ -497 +483 @@
-                tcsetpgrp(0, getpgrp());
-                        // set this process group ID as the controlling terminal
+#ifndef __HAIKU__
+                ioctl(0, 'pgid', getpid());
+#endif
-
-                /* pty open and set termios successful. */

haiku/trunk/src/apps/terminal/Shell.h

@@ -33 +33 @@
-
-        status_t        UpdateWindowSize(int row, int columns);
-#ifndef __HAIKU__
-        status_t        Signal(int signal);
-#endif
-
-        status_t        GetAttr(struct termios &attr);

haiku/trunk/src/apps/terminal/TermView.cpp

@@ -1472 +1472 @@
-        currentMessage->FindInt32("raw_char", &rawChar);
-
-#ifndef __HAIKU__
-        // If bytes[0] equal intr character,
-        // send signal to shell process group.
-        struct termios tio;
-        fShell->GetAttr(tio);
-        if (*bytes == tio.c_cc[VINTR]) {
-                if (tio.c_lflag & ISIG)
-                        fShell->Signal(SIGINT);
-        }
-#endif
-
-        // Terminal filters RET, ENTER, F1...F12, and ARROW key code.
-        // TODO: Cleanup