Changeset 25403

Timestamp:

05/09/08 15:37:45 (3 days ago)

Author:

bonefish

Message:

The terminal is not supposed to send signals to the shell. That's done
by the tty. Now I also understand the BeOS work-around to ignore SIGINT
in bash I removed recently.
I suppose the signal code is still needed for BeOS. If not please remove
it.

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) (2 diffs)

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;
+#else
-        ioctl(fFd, TIOCSWINSZ, &winSize);
-        return Signal(SIGWINCH);
-
-
-
+
+
+
+
+
-status_t
-Shell::Signal(int signal)
@@ -205 +212 @@
-        return send_signal(-fProcessID, signal);
-}
+#endif
-
-

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.
@@ -1480 +1481 @@
-                        fShell->Signal(SIGINT);
-        }
+#endif
-
-        // Terminal filters RET, ENTER, F1...F12, and ARROW key code.