Changeset 2426Tweet

Timestamp:

Jun 15, 2008, 7:01:48 PM (15 years ago)

Author:

Pascal Terjan

Message:

• First attempt to grab a process when started with -P <pid>

Location:

neercs/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• grab.c (added)
• main.c (modified) (2 diffs)
• neercs.h (modified) (4 diffs)
• screens.c (modified) (1 diff)
• term.c (modified) (1 diff)

neercs/trunk/src/Makefile.am

@@ -2 +2 @@
 bin_PROGRAMS = neercs
 
-neercs_SOURCES = neercs.h main.c screens.c term.c effects.c wm.c
+neercs_SOURCES = neercs.h grab.c main.c screens.c term.c effects.c wm.c
 neercs_CFLAGS = @CACA_CFLAGS@
 neercs_LDADD = @CACA_LIBS@ @UTIL_LIBS@

neercs/trunk/src/main.c

@@ -43 +43 @@
     struct screen_list *screen_list = NULL;
     char *default_shell = NULL;
-    int i, w, h, nt, args = 0;
+    int i, w, h;
     int eof = 0, refresh = 1, command = 0;
 
-
-    nt = argc - 1;
-    args = nt;
-
-    if(nt == 0)
-    {
-        nt = 1;
-    }
-
     default_shell = getenv("SHELL");
 
-    if(default_shell == NULL  && !args)
+    if(default_shell == NULL  && argc < 2)
     {
         fprintf(stderr, "Environment variable SHELL not set and no arguments given. kthxbye.\n");
@@ -99 +90 @@
     screen_list->pty = screen_list->prevpty = 0;
 
-
-    for(i = 0; i < nt; i++)
+    for(i = 0; i < argc-1; i++)
     {
         struct screen *tmp;
-        if(args) tmp = create_screen(w, h, argv[i + 1]);
-        else     tmp = create_screen(w, h, default_shell);
+        if(argc < 2)
+            tmp = create_screen(w, h, default_shell);
+        else
+        {
+            if(!strcmp(argv[i + 1], "-P"))
+            {
+                if(i + 2 > argc)
+                {
+                    fprintf(stderr, "-P needs a parameter !\n");
+                    exit(1);
+                }
+                tmp = create_screen_grab(w, h, atoi(argv[i + 2]));
+                i++;
+            }
+            else
+                tmp = create_screen(w, h, argv[i + 1]);
+        }
 
         if(tmp)

neercs/trunk/src/neercs.h

@@ -15 +15 @@
 
 #include <stdint.h>
-#include <cucul.h>
+#include <caca.h>
 
 
@@ -76 +76 @@
 
 int create_pty(char *cmd, unsigned int w, unsigned int h, int *cpid);
+int create_pty_grab(pid_t pid, unsigned int w, unsigned int h);
+int grab_process(pid_t pid, int ptyfd);
 
 long int import_term(struct screen_list *screen_list, struct screen *sc, void const *data, unsigned int size);
@@ -87 +89 @@
 /* Screens management */
 struct screen* create_screen(int w, int h, char *command);
+struct screen* create_screen_grab(int w, int h, int pid);
 int destroy_screen(struct screen *s);
 int add_screen(struct screen_list *list, struct screen *s);
@@ -105 +108 @@
 
 
-
-
 #if 0
 #   define debug(f, z...) fprintf(stderr, f "\n", z)

neercs/trunk/src/screens.c

@@ -28 +28 @@
 
 #include "neercs.h"
+
+struct screen* create_screen_grab(int w, int h, int pid)
+{
+    struct screen *s = (struct screen*) malloc(sizeof(struct screen));
+
+    s->cv = cucul_create_canvas(w, h);
+    cucul_set_color_ansi(s->cv, CUCUL_BLACK, CUCUL_BLACK);
+    cucul_clear_canvas(s->cv);
+    s->init = 0;
+
+    s->buf = NULL;
+    s->title = NULL;
+    s->total = 0;
+    s->w = w+1;
+    s->h = h+1;
+    s->bell = 0;
+    s->pid = pid;
+
+    s->fd = create_pty_grab(pid, w, h);
+
+    if(s->fd < 0)
+    {
+        cucul_free_canvas(s->cv);
+        free(s);
+        return NULL;
+    }
+    return s;
+}
 
 struct screen* create_screen(int w, int h, char *command)

neercs/trunk/src/term.c

@@ -577 +577 @@
 }
 
+int create_pty_grab(pid_t pid, unsigned int w, unsigned int h)
+{
+    int fdm, fds;
+
+    int ret = openpty(&fdm, &fds, NULL, NULL, NULL);
+
+    if(ret < 0)
+    {
+        fprintf(stderr, "open() error\n");
+        return -1;
+    }
+
+    set_tty_size(0, w, h);
+    grab_process(pid, fds);
+
+    fcntl(fdm, F_SETFL, O_NDELAY);
+    return fdm;
+}
+
 int set_tty_size(int fd, unsigned int w, unsigned int h)
 {