Changeset 2005Tweet

Timestamp:

Oct 9, 2012, 9:36:01 PM (7 years ago)

Author:

sam

Message:

neercs: ESC no longer quits; but closing the shell does.

Location:

trunk/tools/neercs

Files:

• term/pty.cpp (modified) (3 diffs)
• term/pty.h (modified) (2 diffs)
• term/term.cpp (modified) (1 diff)
• video/render.cpp (modified) (1 diff)

trunk/tools/neercs/term/pty.cpp

@@ -45 +45 @@
   : m_fd(-1),
     m_pid(-1),
+    m_eof(false),
     m_unread_data(0),
     m_unread_len(0)
@@ -105 +106 @@
 }
 
+bool Pty::IsEof() const
+{
+    return m_eof;
+}
+
 size_t Pty::ReadData(char *data, size_t maxlen)
 {
@@ -142 +148 @@
         {
             Log::Error("cannot read from PTY\n");
+            m_eof = true;
             return 0;
         }
-
-        if (ret)
+        else if (ret)
         {
             if (FD_ISSET((int)m_fd, &fdset))
             {
                 ssize_t nr = read((int)m_fd, data, maxlen);
+
+                /* Data available but zero-length read: EOF */
+                if (nr <= 0)
+                    m_eof = true;
+
                 if (nr >= 0)
                     return nr;

trunk/tools/neercs/term/pty.h

@@ -13 +13 @@
 
     void Run(char const *command, ivec2 size);
+    bool IsEof() const;
 
     size_t ReadData(char *data, size_t maxlen);
@@ -23 +24 @@
     int64_t m_fd;
     int64_t m_pid;
+    bool m_eof;
     char const *m_argv[2];
     char *m_unread_data;

trunk/tools/neercs/term/term.cpp

@@ -114 +114 @@
     }
 
-    /* This is the real terminal code */
-    /* XXX: for now we draw fancy shit */
     m_time += seconds;
+
+    if (m_pty->IsEof())
+    {
+        /* FIXME: we could do more interesting things here… */
+        Ticker::Shutdown();
+    }
 
     m_pty->SetWindowSize(ivec2(caca_get_canvas_width(m_caca),
                                caca_get_canvas_height(m_caca)));
 
+    /* This is the real terminal code */
     size_t total = 0;
     for (;;)

trunk/tools/neercs/video/render.cpp

@@ -727 +727 @@
 {
     /* keyboard manager */
-    if (Input::WasReleased(Key::Escape))
-    {
-        Ticker::Shutdown();
-    }
     if (Input::WasPressed(Key::F1))
     {