Changeset 2445Tweet

Timestamp:

Jun 16, 2008, 4:33:19 PM (15 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added delayed (recurrent) functions, as well as a window-killing eyecandy

Location:

neercs/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• effects.c (modified) (1 diff)
• main.c (modified) (7 diffs)
• neercs.h (modified) (6 diffs)
• recurrent.c (added)
• screens.c (modified) (3 diffs)
• term.c (modified) (1 diff)
• wm.c (modified) (1 diff)

neercs/trunk/src/Makefile.am

@@ -7 +7 @@
 endif
 
-neercs_SOURCES = neercs.h $(grab_c) mygetopt.c main.c screens.c term.c effects.c wm.c
+neercs_SOURCES = neercs.h $(grab_c) mygetopt.c recurrent.c main.c screens.c term.c effects.c wm.c
 neercs_CFLAGS = @CACA_CFLAGS@
 neercs_LDADD = @CACA_LIBS@ @UTIL_LIBS@

neercs/trunk/src/effects.c

@@ -209 +209 @@
     cucul_printf(cv, x, y++, "See http://libcaca.zoy.org/wiki/neercs for more informations");
 }
+
+
+
+
+#define DELAY 500000.0f
+
+int close_screen_recurrent(struct screen_list* screen_list, struct recurrent* rec, void *user, long long unsigned int t)
+{
+    long long unsigned int delta = t - rec->start_time;
+
+    screen_list->dont_update_coords = 1;
+    rec->kill_me = 0;
+    if(delta>=DELAY)
+    {
+        rec->kill_me = 1;
+        remove_screen(screen_list, screen_list->pty, 1);
+        screen_list->pty = screen_list->prevpty;
+        screen_list->prevpty = 0;
+        screen_list->dont_update_coords = 0;
+    }
+    else
+    {
+        float r = 1 - ((DELAY - (DELAY - delta)) / DELAY);
+        cucul_canvas_t *old, *new;
+        struct screen *s = screen_list->screen[screen_list->pty];
+        int w = s->orig_w * r;
+        int h = s->orig_h * r;
+
+
+        old = s->cv;
+        new = cucul_create_canvas(w, h);
+        cucul_blit(new, 0, 0, old, NULL);
+        s->cv = new;
+        cucul_free_canvas(old);
+        set_tty_size(s->fd, w, h);
+
+        s->w = w;
+        s->h = h;
+
+        s->x =
+            (s->orig_x * r) +
+            ((s->orig_w/2) - s->w/2);
+        s->y =
+            (s->orig_y * r) +
+            ((s->orig_h/2) - s->h/2);
+
+    }
+
+    return 1;
+}

neercs/trunk/src/main.c

@@ -25 +25 @@
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/time.h>
+#include <time.h>
 
 #if defined HAVE_PTY_H
@@ -68 +70 @@
     static caca_display_t *dp;
     struct screen_list *screen_list = NULL;
+    struct recurrent_list *recurrent_list = NULL;
     char *default_shell = NULL;
     int i, w, h, args, s=0;
@@ -117 +120 @@
     screen_list->in_bell = 0;
     screen_list->pty = screen_list->prevpty = 0;
+    screen_list->dont_update_coords = 0;
+
+    recurrent_list = (struct recurrent_list*) malloc(sizeof(struct recurrent_list));
+    recurrent_list->recurrent = (struct recurrent**) malloc(sizeof(struct recurrent*));
+    if(!recurrent_list->recurrent)
+    {
+        fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+        return -1;
+    }
+    recurrent_list->count = 0;
 
     for(;;)
@@ -172 +185 @@
     update_windows_props(cv, screen_list);
     caca_refresh_display(dp);
-
 
     for(;;)
@@ -239 +251 @@
                     break;
                 case 0x0b: //CACA_KEY_CTRL_K:
-                    remove_screen(screen_list, screen_list->pty, 1);
-                    screen_list->pty = screen_list->prevpty;
-                    screen_list->prevpty = 0;
+                    add_recurrent(recurrent_list, close_screen_recurrent, cv);
                     refresh = 1;
                     break;
@@ -283 +293 @@
         }
 
+        /* Recurrent functions */
+        for(i=0; i<recurrent_list->count; i++)
+        {
+            if(recurrent_list->recurrent[i]->function)
+            {
+                refresh |= recurrent_list->recurrent[i]->function(screen_list,
+                                                                  recurrent_list->recurrent[i],
+                                                                  recurrent_list->recurrent[i]->user,
+                                                                  get_ms());
+            }
+        }
+       /* Delete recurrent functions */
+        for(i=0; i<recurrent_list->count; i++)
+        {
+            if(recurrent_list->recurrent[i]->kill_me)
+            {
+                remove_recurrent(recurrent_list, i);
+                i = 0;
+            }
+        }
+
         /* Resfresh screen */
         if(refresh || screen_list->in_bell)
@@ -306 +337 @@
         destroy_screen(screen_list->screen[i]);
     }
+
     free(screen_list->screen);
     free(screen_list);
 
 
+    for(i=0; i<recurrent_list->count; i++)
+    {
+        remove_recurrent(recurrent_list, i);
+        i = 0;
+    }
+
+    free(recurrent_list->recurrent);
+    free(recurrent_list);
+
+
     return 0;
 }
+
+
+
+long long get_ms(void)
+{
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+
+
+    return (tv.tv_sec*(1000000) + tv.tv_usec);
+}

neercs/trunk/src/neercs.h

@@ -27 +27 @@
 };
 
+
 struct screen
 {
@@ -52 +53 @@
     int x, y;
     int w, h;
+
+    int orig_x, orig_y;
+    int orig_w, orig_h;
+
 };
 
@@ -58 +63 @@
     int wm_type;
     int in_bell;
+    int dont_update_coords;
     /* Add-ons*/
     int mini;
@@ -63 +69 @@
     int help;
 
-
     int pty, prevpty;
     int count;
     int width, height;
     struct screen **screen;
+};
+
+
+struct recurrent
+{
+    int (*function)(struct screen_list*, struct recurrent* rec, void *user, long long unsigned int t);
+    void *user;
+    long long unsigned int  start_time;
+    int kill_me;
+};
+
+struct recurrent_list
+{
+    int count;
+    struct recurrent **recurrent;
 };
 
@@ -88 +108 @@
                      struct screen_list *screen_list);
 int update_screens_contents(struct screen_list* screen_list);
+long long get_ms(void);
+
 
 /* Screens management */
@@ -110 +132 @@
 void draw_status(cucul_canvas_t *cv, struct screen_list *screen_list);
 void draw_help(cucul_canvas_t *cv, struct screen_list *screen_list);
+int close_screen_recurrent(struct screen_list*, struct recurrent* rec, void *user, long long unsigned int t);
+
+
+/* Recurrents */
+int add_recurrent(struct recurrent_list *list,
+                  int (*function)(struct screen_list*, struct recurrent* rec, void *user, long long unsigned int t),
+                  void *user);
+int remove_recurrent(struct recurrent_list *list, int n);
 
 

neercs/trunk/src/screens.c

@@ -78 +78 @@
     s->scroll = 0;
     s->fd = create_pty(command, w, h, &s->pid);
+
+    s->orig_w = s->w;
+    s->orig_h = s->h;
+    s->orig_x = s->x;
+    s->orig_y = s->y;
+
 
     if(s->fd < 0)
@@ -180 +186 @@
     screen_list->height = cucul_get_canvas_height(cv) - (screen_list->mini*6);
 
-    update_windows_props(cv, screen_list);
+    if(!screen_list->dont_update_coords)
+        update_windows_props(cv, screen_list);
 
     if(screen_list->screen[screen_list->pty]->title)
@@ -199 +206 @@
                        screen_list->screen[i]->y,
                        screen_list->screen[i]->cv, NULL);
+
             cucul_draw_cp437_box(cv,
                                  screen_list->screen[i]->x - 1,

neercs/trunk/src/term.c

@@ -618 +618 @@
     for(i = 0; i < screen_list->count; i++)
     {
-        if(screen_list->screen[i]->total)
+        if(screen_list->screen[i]->total && !screen_list->dont_update_coords)
         {
             unsigned long int bytes;

neercs/trunk/src/wm.c

@@ -40 +40 @@
     cucul_free_canvas(old);
     set_tty_size(s->fd, w, h);
+
+    s->orig_w = s->w;
+    s->orig_h = s->h;
+    s->orig_x = s->x;
+    s->orig_y = s->y;
 }