Changeset 2458Tweet

Timestamp:

Jun 19, 2008, 11:50:29 PM (15 years ago)

Author:

Pascal Terjan

Message:

• Support detaching (NOT ATTACHING)

Location:

neercs/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• main.c (modified) (5 diffs)
• neercs.h (modified) (2 diffs)

neercs/trunk/src/Makefile.am

@@ -3 +3 @@
 
 neercs_SOURCES = neercs.h mygetopt.c recurrent.c main.c screens.c term.c \
-                 grab.c effects.c wm.c screensaver.c
+                 grab.c effects.c wm.c screensaver.c attach.c
 neercs_CFLAGS = @CACA_CFLAGS@
 neercs_LDADD = @CACA_LIBS@ @UTIL_LIBS@ @PAM_LIBS@

neercs/trunk/src/main.c

@@ -127 +127 @@
     screen_list->in_screensaver = 0;
     screen_list->locked = 0;
+    screen_list->attached = 1;
     memset(screen_list->lockmsg, 0, 1024);
     memset(screen_list->lockpass, 0, 1024);
@@ -203 +204 @@
     {
         caca_event_t ev;
-        int ret;
+        int ret = 0;
 
         refresh |= update_screens_contents(screen_list);
@@ -214 +215 @@
 
         /* Get events, if any */
-        ret = caca_get_event(dp, CACA_EVENT_ANY, &ev, 0);
+        if(screen_list->attached)
+            ret = caca_get_event(dp, CACA_EVENT_ANY, &ev, 0);
+        else
+            sleep(1);
 
         if(ret && (caca_get_event_type(&ev) & CACA_EVENT_KEY_PRESS))
@@ -279 +283 @@
                     screen_list->help = !screen_list->help;
                     refresh = 1;
+                    break;
+                case 'd':
+                case 0x04: //CACA_KEY_CTRL_D:
+                    detach(screen_list, dp);
                     break;
                 }
@@ -392 +400 @@
         /* Resfresh screen */
 
-        if(screen_list->locked)
+        if(!screen_list->attached)
+        {
+            /* No need to refresh */
+        }
+        else if(screen_list->locked)
         {
             draw_lock(cv, screen_list);

neercs/trunk/src/neercs.h

@@ -62 +62 @@
     int in_bell;                 /* Bell occuring in a window  */
     int dont_update_coords;      /* Used by recurrents */
+    int attached;                /* Are we attached to a terminal */
 
     /* Lock */
@@ -117 +118 @@
 long long get_ms(void);
 
+int detach(struct screen_list* screen_list, caca_display_t * dp);
 
 /* Screens management */