Changeset 2371 for neercsTweet

Timestamp:

Jun 13, 2008, 4:44:11 PM (12 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added ctrl-a-k to close a window and associated process (temporary code) (et pterjan a un sale PS1)

Location:

neercs/trunk/src

Files:

• effects.c (modified) (1 diff)
• main.c (modified) (9 diffs)
• neercs.h (modified) (2 diffs)

neercs/trunk/src/effects.c

@@ -201 +201 @@
     cucul_printf(cv, x, y++, "c:\t Create new window");
     cucul_printf(cv, x, y++, "m:\t Thumbnails");
+    cucul_printf(cv, x, y++, "k:\t Close window and kill associated process");
     cucul_printf(cv, x, y++, "h:\t This help");
 }

neercs/trunk/src/main.c

@@ -21 +21 @@
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/types.h>
+#include <signal.h>
 #include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
 #if defined HAVE_PTY_H
 #   include <pty.h>  /* for openpty and forkpty */
@@ -36 +41 @@
 #define YTAB 3
 
-static int create_pty(char *cmd, unsigned int w, unsigned int h);
+static int create_pty(char *cmd, unsigned int w, unsigned int h, int *cpid);
 
 int main(int argc, char **argv)
@@ -178 +183 @@
                         screen_list->screen[i]->fd = -1;
                         destroy_screen(screen_list->screen[i]);
-                        remove_screen(screen_list, i);
+                        remove_screen(screen_list, i, 0);
                         refresh = 1;
                     }
@@ -248 +253 @@
                                             screen_list->wm_type=0:
                                             screen_list->wm_type+1);
+                    refresh = 1;
+                    break;
+                case 0x0b: //CACA_KEY_CTRL_K:
+                    remove_screen(screen_list, pty, 1);
+                    pty = prevpty;
                     refresh = 1;
                     break;
@@ -320 +330 @@
             }
 
-
             cucul_blit(cv,
                        screen_list->screen[pty]->x,
                        screen_list->screen[pty]->y,
-                   screen_list->screen[pty]->cv, NULL);
+                       screen_list->screen[pty]->cv, NULL);
             if(screen_list->screen[pty]->bell)
             {
@@ -385 +394 @@
 }
 
-static int create_pty(char *cmd, unsigned int w, unsigned int h)
+static int create_pty(char *cmd, unsigned int w, unsigned int h, int *cpid)
 {
     char **argv;
@@ -410 +419 @@
     }
 
+    *cpid = pid;
+
     fcntl(fd, F_SETFL, O_NDELAY);
     return fd;
@@ -446 +457 @@
     s->w = w+1;
     s->h = h+1;
-    s->fd = create_pty(command, w, h);
+    s->fd = create_pty(command, w, h, &s->pid);
     s->bell = 0;
 
@@ -482 +493 @@
 }
 
-int remove_screen(struct screen_list *list, int n)
+int remove_screen(struct screen_list *list, int n, int please_kill)
 {
     if(n>list->count) return -1;
+
+    if(please_kill)
+    {
+        int status = 0;
+        int ret = 0;
+        /* FIXME */
+        close(list->screen[n]->fd);
+        kill(list->screen[n]->pid, SIGINT);
+        ret = waitpid(list->screen[n]->pid, &status, WNOHANG|WUNTRACED|WCONTINUED);
+        if(!ret)
+            kill(list->screen[n]->pid, SIGQUIT);
+        ret = waitpid(list->screen[n]->pid, &status, WNOHANG|WUNTRACED|WCONTINUED);
+        if(!ret)
+            kill(list->screen[n]->pid, SIGABRT);
+        ret = waitpid(list->screen[n]->pid, &status, WNOHANG|WUNTRACED|WCONTINUED);
+        if(!ret)
+            kill(list->screen[n]->pid, SIGKILL);
+
+    }
 
     memmove(&list->screen[n],

neercs/trunk/src/neercs.h

@@ -43 +43 @@
     long int total;
     int bell;
+    int pid;
 
     int x, y;
@@ -67 +68 @@
 int destroy_screen(struct screen *s);
 int add_screen(struct screen_list *list, struct screen *s);
-int remove_screen(struct screen_list *list, int n);
+int remove_screen(struct screen_list *list, int n, int please_kill);
 void resize_screen(struct screen *s, int z, int h);