Changeset 3969Tweet

Timestamp:

Nov 19, 2009, 5:26:53 PM (13 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Massive indentation pass, could insert odd things, blame pterjan, he doesn't care.

Location:

neercs/trunk/src

Files:

• attach.c (modified) (27 diffs)
• configuration.c (modified) (18 diffs)
• effects.c (modified) (16 diffs)
• lock.c (modified) (13 diffs)
• main.c (modified) (19 diffs)
• mygetopt.c (modified) (7 diffs)
• mytrace.c (modified) (41 diffs)
• recurrent.c (modified) (4 diffs)
• screens.c (modified) (15 diffs)
• screensaver.c (modified) (5 diffs)
• server.c (modified) (1 diff)
• term.c (modified) (49 diffs)
• wm.c (modified) (3 diffs)

neercs/trunk/src/attach.c

@@ -1 @@
-/*
+/* 
  *  neercs        console-based window manager
  *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
@@ -33 +33 @@
 #include "neercs.h"
 
-char * build_socket_path(char *socket_dir, char *session_name, enum socket_type socktype)
+char *build_socket_path(char *socket_dir, char *session_name,
+                        enum socket_type socktype)
 {
     char *path, *dir;
-    path = (char *)malloc(PATH_MAX+1);
+    path = (char *)malloc(PATH_MAX + 1);
     dir = socket_dir;
-    if(!dir)
+    if (!dir)
         dir = getenv("NEERCSDIR");
-    if(!dir)
+    if (!dir)
         dir = getenv("TMPDIR");
-    if(!dir)
+    if (!dir)
         dir = "/tmp";
-    if(path)
-        snprintf(path, PATH_MAX+1, "%s/neercs.%s%s.sock", dir, session_name, socktype?"":".srv");
+    if (path)
+        snprintf(path, PATH_MAX + 1, "%s/neercs.%s%s.sock", dir, session_name,
+                 socktype ? "" : ".srv");
     return path;
 }
 
-static char * socket_to_session(char const * sockpath)
+static char *socket_to_session(char const *sockpath)
 {
     char *p, *s;
     p = strrchr(sockpath, '/');
-    if(!p)
+    if (!p)
     {
         debug("Invalid socket path %s", sockpath);
         return NULL;
     }
-    p+=8; /* skip neercs. */
+    p += 8;                     /* skip neercs. */
     s = strdup(p);
     p = strrchr(s, '.');
-    *p = '\0'; /* drop .sock */
+    *p = '\0';                  /* drop .sock */
     p = strrchr(s, '.');
-    *p = '\0'; /* drop .srv */
+    *p = '\0';                  /* drop .srv */
     p = strdup(s);
     free(s);
@@ -69 +71 @@
 }
 
-int create_socket(struct screen_list* screen_list, enum socket_type socktype)
+int create_socket(struct screen_list *screen_list, enum socket_type socktype)
 {
     int sock;
@@ -76 +78 @@
     sock = socket(AF_UNIX, SOCK_DGRAM, 0);
 
-    if(sock < 0)
+    if (sock < 0)
     {
         perror("create_socket:socket");
@@ -85 +87 @@
 
     myaddr.sun_family = AF_UNIX;
-    strncpy(myaddr.sun_path, screen_list->socket_path[socktype], sizeof(myaddr.sun_path) - 1);
+    strncpy(myaddr.sun_path, screen_list->socket_path[socktype],
+            sizeof(myaddr.sun_path) - 1);
 
     unlink(screen_list->socket_path[socktype]);
 
-    if(bind(sock, (struct sockaddr *)&myaddr, sizeof(struct sockaddr_un)) < 0)
+    if (bind(sock, (struct sockaddr *)&myaddr, sizeof(struct sockaddr_un)) < 0)
     {
         free(screen_list->socket_path[socktype]);
@@ -106 +109 @@
 }
 
-char ** list_sockets(char *socket_dir, char *session_name)
+char **list_sockets(char *socket_dir, char *session_name)
 {
     char *pattern, *dir;
@@ -113 +116 @@
     globbuf.gl_pathv = NULL;
 
-    pattern = (char *)malloc(PATH_MAX+1);
+    pattern = (char *)malloc(PATH_MAX + 1);
 
     dir = socket_dir;
-    if(!dir)
+    if (!dir)
         dir = getenv("NEERCSDIR");
-    if(!dir)
+    if (!dir)
         dir = getenv("TMPDIR");
-    if(!dir)
+    if (!dir)
         dir = "/tmp";
 
-    if(!pattern)
+    if (!pattern)
         return globbuf.gl_pathv;
 
-    if(session_name && strlen(session_name)+strlen(dir)+13<PATH_MAX)
+    if (session_name && strlen(session_name) + strlen(dir) + 13 < PATH_MAX)
         sprintf(pattern, "%s/neercs.%s.srv.sock", dir, session_name);
     else
@@ -141 +144 @@
 }
 
-char * connect_socket(struct screen_list* screen_list, enum socket_type socktype)
+char *connect_socket(struct screen_list *screen_list,
+                     enum socket_type socktype)
 {
     int sock;
@@ -149 +153 @@
 
     /* Open the socket */
-    if ((sock = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0) 
+    if ((sock = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0)
     {
         perror("connect_server:socket");
@@ -155 +159 @@
     }
 
-    memset(&addr,0,sizeof(addr));
+    memset(&addr, 0, sizeof(addr));
     addr.sun_family = AF_UNIX;
-    strcpy(addr.sun_path,screen_list->socket_path[socktype]);
+    strcpy(addr.sun_path, screen_list->socket_path[socktype]);
     if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0)
     {
-        debug("Failed to connect to %s: %s", screen_list->socket_path[socktype], strerror(errno));
+        debug("Failed to connect to %s: %s",
+              screen_list->socket_path[socktype], strerror(errno));
         close(sock);
         return NULL;
@@ -168 +173 @@
     screen_list->socket[socktype] = sock;
 
-    if(socktype == SOCK_SERVER)
+    if (socktype == SOCK_SERVER)
     {
         return socket_to_session(screen_list->socket_path[socktype]);
@@ -176 +181 @@
 }
 
-int request_attach(struct screen_list* screen_list)
+int request_attach(struct screen_list *screen_list)
 {
     char buf[41];
     int bytes;
 
-    bytes = snprintf(buf, sizeof(buf)-1, "ATTACH %10d %10d %10d",
+    bytes = snprintf(buf, sizeof(buf) - 1, "ATTACH %10d %10d %10d",
                      caca_get_canvas_width(screen_list->cv),
                      caca_get_canvas_height(screen_list->cv),
@@ -190 +195 @@
 }
 
-static char * select_socket(struct screen_list* screen_list)
+static char *select_socket(struct screen_list *screen_list)
 {
     char **sockets = NULL, **usable_sockets = NULL;
@@ -197 +202 @@
 
     sockets = list_sockets(screen_list->socket_dir, screen_list->session_name);
-    if(sockets)
-    {
-        for(i=0; sockets[i]; i++);
+    if (sockets)
+    {
+        for (i = 0; sockets[i]; i++);
 
         /* Return the socket or NULL if there is not more than one match */
-        if(i<=1)
-        {
-            if(sockets[0])
+        if (i <= 1)
+        {
+            if (sockets[0])
                 ret = strdup(sockets[0]);
             goto end;
@@ -210 +215 @@
 
         /* Else ask the user to chose one */
-        usable_sockets = malloc(i*sizeof(char*));
-        for(i=0; sockets[i]; i++)
+        usable_sockets = malloc(i * sizeof(char *));
+        for (i = 0; sockets[i]; i++)
         {
             struct sockaddr_un addr;
-            if ((sock = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0) 
+            if ((sock = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0)
             {
                 perror("select_socket:socket");
                 goto end;
             }
-            memset(&addr,0,sizeof(addr));
+            memset(&addr, 0, sizeof(addr));
             addr.sun_family = AF_UNIX;
             strcpy(addr.sun_path, sockets[i]);
             if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0)
             {
-                switch(errno)
+                switch (errno)
                 {
                 case EACCES:
@@ -233 +238 @@
                     break;
                 default:
-                    fprintf(stderr, "Unknown error on %s:%s\n", sockets[i], strerror(errno));
+                    fprintf(stderr, "Unknown error on %s:%s\n", sockets[i],
+                            strerror(errno));
                 }
             }
@@ -244 +250 @@
             }
         }
-        if(!nb_usable_sockets)
+        if (!nb_usable_sockets)
             goto end;
-        if(nb_usable_sockets == 1)
+        if (nb_usable_sockets == 1)
         {
             ret = strdup(usable_sockets[0]);
@@ -259 +265 @@
             screen_list->cv = caca_create_canvas(0, 0);
             screen_list->dp = caca_create_display(screen_list->cv);
-            if(!screen_list->dp)
+            if (!screen_list->dp)
                 goto end;
             caca_set_cursor(screen_list->dp, 0);
             caca_set_display_title(screen_list->dp, PACKAGE_STRING);
-            while(1)
+            while (1)
             {
-                if(refresh)
+                if (refresh)
                 {
                     caca_set_color_ansi(screen_list->cv, CACA_BLUE, CACA_BLUE);
@@ -273 +279 @@
                                   caca_get_canvas_height(screen_list->cv),
                                   '#');
-                    caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_BLUE);
-                    caca_draw_cp437_box(screen_list->cv,
-                                  0, 0,
-                                  caca_get_canvas_width(screen_list->cv),
-                                  caca_get_canvas_height(screen_list->cv)
-                                  );
-                    caca_printf(screen_list->cv, 2, 2, "Please select a session to reconnect:");
-                    for(i=0; i<nb_usable_sockets; i++)
+                    caca_set_color_ansi(screen_list->cv, CACA_DEFAULT,
+                                        CACA_BLUE);
+                    caca_draw_cp437_box(screen_list->cv, 0, 0,
+                                        caca_get_canvas_width(screen_list->cv),
+                                        caca_get_canvas_height(screen_list->
+                                                               cv));
+                    caca_printf(screen_list->cv, 2, 2,
+                                "Please select a session to reconnect:");
+                    for (i = 0; i < nb_usable_sockets; i++)
                     {
-                        if(i == current_line-1)
+                        if (i == current_line - 1)
                         {
                             caca_set_attr(screen_list->cv, CACA_BOLD);
-                            caca_set_color_ansi(screen_list->cv, CACA_GREEN, CACA_BLUE);
-                            caca_put_char(screen_list->cv, 1, i+3, '>');
+                            caca_set_color_ansi(screen_list->cv, CACA_GREEN,
+                                                CACA_BLUE);
+                            caca_put_char(screen_list->cv, 1, i + 3, '>');
                         }
                         else
                         {
                             caca_set_attr(screen_list->cv, 0);
-                            caca_set_color_ansi(screen_list->cv, CACA_LIGHTGRAY, CACA_BLUE);
-                            caca_put_char(screen_list->cv, 1, i+3, ' ');
+                            caca_set_color_ansi(screen_list->cv,
+                                                CACA_LIGHTGRAY, CACA_BLUE);
+                            caca_put_char(screen_list->cv, 1, i + 3, ' ');
                         }
                         caca_printf(screen_list->cv,
-                                    3, i+3,
+                                    3, i + 3,
                                     "%s",
                                     socket_to_session(usable_sockets[i]));
@@ -303 +312 @@
                 }
 
-                if(!caca_get_event(screen_list->dp,
-                                  CACA_EVENT_KEY_PRESS
-                                  |CACA_EVENT_RESIZE
-                                  |CACA_EVENT_QUIT,
-                                  &ev, 10000))
+                if (!caca_get_event(screen_list->dp,
+                                    CACA_EVENT_KEY_PRESS
+                                    | CACA_EVENT_RESIZE
+                                    | CACA_EVENT_QUIT, &ev, 10000))
                     continue;
 
                 t = caca_get_event_type(&ev);
 
-                if(t & CACA_EVENT_KEY_PRESS)
+                if (t & CACA_EVENT_KEY_PRESS)
                 {
                     unsigned int c = caca_get_event_key_ch(&ev);
-                    switch(c)
+                    switch (c)
                     {
                     case CACA_KEY_UP:
-                        if(current_line>1)
+                        if (current_line > 1)
                             current_line--;
                         break;
                     case CACA_KEY_DOWN:
-                        if(current_line<nb_usable_sockets)
+                        if (current_line < nb_usable_sockets)
                             current_line++;
                         break;
                     case CACA_KEY_RETURN:
-                        ret = strdup(usable_sockets[current_line-1]);
+                        ret = strdup(usable_sockets[current_line - 1]);
                         goto end;
                         break;
@@ -337 +345 @@
                     refresh = 1;
                 }
-                else if(t & CACA_EVENT_RESIZE)
+                else if (t & CACA_EVENT_RESIZE)
                 {
                     refresh = 1;
                 }
-                else if(t & CACA_EVENT_QUIT)
+                else if (t & CACA_EVENT_QUIT)
                     goto end;
             }
@@ -347 +355 @@
     }
 
-end:
-    if(sockets)
-    {
-        for(i=0; sockets[i]; i++)
+  end:
+    if (sockets)
+    {
+        for (i = 0; sockets[i]; i++)
             free(sockets[i]);
         free(sockets);
     }
-    if(usable_sockets)
-    {
-        for(i=0; i<nb_usable_sockets; i++)
+    if (usable_sockets)
+    {
+        for (i = 0; i < nb_usable_sockets; i++)
             free(usable_sockets[i]);
         free(usable_sockets);
     }
-    if(screen_list->dp)
+    if (screen_list->dp)
     {
         caca_free_display(screen_list->dp);
         screen_list->dp = NULL;
     }
-    if(screen_list->cv)
+    if (screen_list->cv)
     {
         caca_free_canvas(screen_list->cv);
@@ -373 +381 @@
 }
 
-void attach(struct screen_list* screen_list)
+void attach(struct screen_list *screen_list)
 {
     screen_list->socket_path[SOCK_SERVER] = select_socket(screen_list);
 
-    if(screen_list->socket_path[SOCK_SERVER])
+    if (screen_list->socket_path[SOCK_SERVER])
     {
         char *session;
         session = connect_socket(screen_list, SOCK_SERVER);
-        if(session)
+        if (session)
         {
             debug("Connected to session %s", session);
@@ -387 +395 @@
             screen_list->cv = caca_create_canvas(0, 0);
             screen_list->dp = caca_create_display(screen_list->cv);
-            if(!screen_list->dp)
+            if (!screen_list->dp)
                 return;
-            caca_set_display_time(screen_list->dp, screen_list->delay*1000);
+            caca_set_display_time(screen_list->dp, screen_list->delay * 1000);
             caca_set_cursor(screen_list->dp, 1);
 
             screen_list->socket_path[SOCK_CLIENT] =
-                build_socket_path(screen_list->socket_dir, session, SOCK_CLIENT);
+                build_socket_path(screen_list->socket_dir, session,
+                                  SOCK_CLIENT);
             create_socket(screen_list, SOCK_CLIENT);
             request_attach(screen_list);
-            if(screen_list->session_name)
+            if (screen_list->session_name)
                 free(screen_list->session_name);
             screen_list->session_name = session;
@@ -415 +424 @@
 }
 
-int send_event(caca_event_t ev, struct screen_list* screen_list)
+int send_event(caca_event_t ev, struct screen_list *screen_list)
 {
     enum caca_event_type t;
@@ -421 +430 @@
     t = caca_get_event_type(&ev);
 
-    if(t & CACA_EVENT_KEY_PRESS)
+    if (t & CACA_EVENT_KEY_PRESS)
     {
         char buf[16];
         int bytes;
-        bytes = snprintf(buf, sizeof(buf)-1, "KEY %d", caca_get_event_key_ch(&ev));
+        bytes =
+            snprintf(buf, sizeof(buf) - 1, "KEY %d",
+                     caca_get_event_key_ch(&ev));
         buf[bytes] = '\0';
         debug("Sending key press to server: %s", buf);
         return write(screen_list->socket[SOCK_SERVER], buf, strlen(buf)) <= 0;
     }
-    else if(t & CACA_EVENT_RESIZE)
+    else if (t & CACA_EVENT_RESIZE)
     {
         char buf[32];
         int bytes;
-        bytes = snprintf(buf, sizeof(buf)-1, "RESIZE %10d %10d",
+        bytes = snprintf(buf, sizeof(buf) - 1, "RESIZE %10d %10d",
                          caca_get_event_resize_width(&ev),
                          caca_get_event_resize_height(&ev));
@@ -441 +452 @@
         return write(screen_list->socket[SOCK_SERVER], buf, strlen(buf)) <= 0;
     }
-    else if(t & CACA_EVENT_QUIT)
-        return write(screen_list->socket[SOCK_SERVER], "QUIT", strlen("QUIT")) <= 0;
+    else if (t & CACA_EVENT_QUIT)
+        return write(screen_list->socket[SOCK_SERVER], "QUIT",
+                     strlen("QUIT")) <= 0;
 
     return 0;
 }
 
-int send_delay(struct screen_list* screen_list)
+int send_delay(struct screen_list *screen_list)
 {
     char buf[18];
     int bytes;
-    bytes = snprintf(buf, sizeof(buf)-1, "DELAY %10d", screen_list->delay);
+    bytes = snprintf(buf, sizeof(buf) - 1, "DELAY %10d", screen_list->delay);
     buf[bytes] = '\0';
     return write(screen_list->socket[SOCK_SERVER], buf, strlen(buf)) <= 0;

neercs/trunk/src/configuration.c

@@ -1 @@
-/*
+/* 
  *  neercs        console-based window manager
  *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
@@ -36 +36 @@
 
     /* Check if file exist */
-    if(stat(filename, &st) < 0)
-    {
-        return -1;
-    }
-    /* Get its size  */
+    if (stat(filename, &st) < 0)
+    {
+        return -1;
+    }
+    /* Get its size */
     size = st.st_size;
-    if(!size)
+    if (!size)
     {
         fprintf(stderr, "File too short\n");
@@ -50 +50 @@
     /* Open it */
     fp = fopen(filename, "r");
-    if(!fp)
+    if (!fp)
     {
         return -1;
@@ -56 +56 @@
 
     buffer = malloc(size + 1);
-    if(!buffer)
+    if (!buffer)
     {
         fclose(fp);
-        fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+        fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__,
+                __LINE__);
         return -1;
     }
     /* Read it */
-    while((i = fread(buffer+total, 1, size, fp)) > 0)
-    {
-        total+=i;
+    while ((i = fread(buffer + total, 1, size, fp)) > 0)
+    {
+        total += i;
     }
     buffer[total] = '\n';
@@ -71 +72 @@
     fclose(fp);
 
-    i=0;
+    i = 0;
 
     /* Parse it */
-    while((i = parse_conf_line(buffer + offset, total-offset, screen_list)) > 0)
-    {
-        offset+=i;
+    while ((i =
+            parse_conf_line(buffer + offset, total - offset, screen_list)) > 0)
+    {
+        offset += i;
         l++;
     }
@@ -97 +99 @@
     static struct option *prev = NULL;
 
-    if(size <= 0) return -1;
-
-    /* Find EOL  */
-    for(i=0; i<size; i++)
-    {
-        if(buf[i] == '\n')
+    if (size <= 0)
+        return -1;
+
+    /* Find EOL */
+    for (i = 0; i < size; i++)
+    {
+        if (buf[i] == '\n')
         {
             s = i + 1;
@@ -110 +113 @@
 
     /* Strip comments and trailing spaces */
-    for(i=0; i<s; i++)
-    {
-        if(buf[i] == ';' && !in_quote)
+    for (i = 0; i < s; i++)
+    {
+        if (buf[i] == ';' && !in_quote)
         {
             eol = i;
             break;
         }
-        else if(buf[i] == '\n')
+        else if (buf[i] == '\n')
         {
             eol = i;
             break;
         }
-        else if(buf[i] == ' ' && !c) {}
+        else if (buf[i] == ' ' && !c)
+        {
+        }
         else
         {
-            if(line == NULL)
+            if (line == NULL)
             {
                 line = malloc(2);
-                if(!line)
+                if (!line)
                 {
                     fprintf(stderr, "Can't allocate memory at %s:%d\n",
-                           __FUNCTION__, __LINE__);
+                            __FUNCTION__, __LINE__);
                     return -1;
                 }
@@ -137 +142 @@
             else
             {
-                line = realloc(line, l+2);
-                if(!line)
+                line = realloc(line, l + 2);
+                if (!line)
                 {
                     fprintf(stderr, "Can't allocate memory at %s:%d\n",
-                           __FUNCTION__, __LINE__);
+                            __FUNCTION__, __LINE__);
                     return -1;
                 }
             }
-            if(buf[i] == '"')
+            if (buf[i] == '"')
                 in_quote = !in_quote;
-            if(buf[i] == ' ')
+            if (buf[i] == ' ')
                 end_spaces++;
             else
                 end_spaces = 0;
 
-            line[l]   = buf[i];
-            line[l+1] = 0;
+            line[l] = buf[i];
+            line[l + 1] = 0;
             l++;
             c = 1;
@@ -159 +164 @@
     }
 
-    if(c==0)
+    if (c == 0)
     {
         /* This line is empty, do nothing */
@@ -166 +171 @@
     {
         struct option *option = malloc(sizeof(struct option));
-        if(!option)
+        if (!option)
         {
             fprintf(stderr, "Can't allocate memory at %s:%d\n",
-                   __FUNCTION__, __LINE__);
+                    __FUNCTION__, __LINE__);
             return -1;
         }
         option->next = NULL;
-        l-=end_spaces;
-        line = realloc(line, l+1);
+        l -= end_spaces;
+        line = realloc(line, l + 1);
         line[l] = 0;
 
         get_key_value(line, option);
 
-        if(!screen_list->config)
+        if (!screen_list->config)
             screen_list->config = option;
 
-        if(prev)
+        if (prev)
             prev->next = option;
 
@@ -193 +198 @@
 int get_key_value(char *line, struct option *option)
 {
-    unsigned int i, o = 0, b=0, end_spaces = 0;
+    unsigned int i, o = 0, b = 0, end_spaces = 0;
     char *cur = NULL;
     option->value = NULL;
@@ -199 +204 @@
 
     /* Line is a section delimiter */
-    if(line[0] == '[')
+    if (line[0] == '[')
     {
         option->value = malloc(strlen(line) - 1);
-        if(!option->value)
+        if (!option->value)
         {
             fprintf(stderr, "Can't allocate memory at %s:%d\n",
@@ -208 +213 @@
             return -1;
         }
-        memcpy(option->value, line+1, strlen(line) - 1);
+        memcpy(option->value, line + 1, strlen(line) - 1);
         option->value[strlen(line) - 2] = 0;
         return 0;
@@ -214 +219 @@
 
     cur = malloc(1);
-    if(!cur)
+    if (!cur)
     {
         fprintf(stderr, "Can't allocate memory at %s:%d\n",
@@ -222 +227 @@
     cur[0] = 0;
 
-    for(i=0; i<strlen(line); i++)
-    {
-        if(line[i] == ' ' && !b) continue;
-
-
-        if(line[i] == '=')
+    for (i = 0; i < strlen(line); i++)
+    {
+        if (line[i] == ' ' && !b)
+            continue;
+
+
+        if (line[i] == '=')
         {
             b = 0;
-            cur[o-end_spaces] = 0;
-            cur = realloc(cur, (o-end_spaces)+1);
-            if(!cur)
+            cur[o - end_spaces] = 0;
+            cur = realloc(cur, (o - end_spaces) + 1);
+            if (!cur)
             {
                 fprintf(stderr, "Can't allocate memory at %s:%d\n",
-                       __FUNCTION__, __LINE__);
+                        __FUNCTION__, __LINE__);
                 return -1;
             }
@@ -244 +250 @@
         else
         {
-            if(line[i] == ' ') end_spaces++;
-            else end_spaces = 0;
-
-            cur = realloc(cur, o+2);
-            if(!cur)
+            if (line[i] == ' ')
+                end_spaces++;
+            else
+                end_spaces = 0;
+
+            cur = realloc(cur, o + 2);
+            if (!cur)
             {
                 fprintf(stderr, "Can't allocate memory at %s:%d\n",
-                       __FUNCTION__, __LINE__);
+                        __FUNCTION__, __LINE__);
                 return -1;
             }
-            cur[o]   = line[i];
+            cur[o] = line[i];
             o++;
             b = 1;
@@ -276 +284 @@
     char *section = NULL;
 
-    while(option)
-    {
-        if(option->key == NULL)
+    while (option)
+    {
+        if (option->key == NULL)
         {
             section = option->key;
@@ -285 +293 @@
         }
 
-        if(IS_TOKEN("window_manager"))
-        {
-            if     (IS_VALUE("full"))   screen_list->wm_type = WM_FULL;
-            else if(IS_VALUE("hsplit")) screen_list->wm_type = WM_HSPLIT;
-            else if(IS_VALUE("vsplit")) screen_list->wm_type = WM_VSPLIT;
-            else if(IS_VALUE("card"))   screen_list->wm_type = WM_CARD;
-            else if(IS_VALUE("cube"))   screen_list->wm_type = WM_CUBE;
-            else fprintf(stderr, "Unknown window manager '%s'\n", option->key);
-
-        } else if(IS_TOKEN("cube_duration"))
-        {
-           screen_list->cube.duration = atoi(option->value) * 1000000;
-        } else if(IS_TOKEN("thumbnails"))
-        {
-            if     (IS_VALUE("true") || IS_VALUE("1")) screen_list->mini = 1;
-            else                                       screen_list->mini = 0;
-
-        } else if(IS_TOKEN("status_bar"))
-        {
-            if     (IS_VALUE("true") || IS_VALUE("1")) screen_list->status = 1;
-            else                                       screen_list->status = 0;
-
-        } else if(IS_TOKEN("screensaver_timeout"))
+        if (IS_TOKEN("window_manager"))
+        {
+            if (IS_VALUE("full"))
+                screen_list->wm_type = WM_FULL;
+            else if (IS_VALUE("hsplit"))
+                screen_list->wm_type = WM_HSPLIT;
+            else if (IS_VALUE("vsplit"))
+                screen_list->wm_type = WM_VSPLIT;
+            else if (IS_VALUE("card"))
+                screen_list->wm_type = WM_CARD;
+            else if (IS_VALUE("cube"))
+                screen_list->wm_type = WM_CUBE;
+            else
+                fprintf(stderr, "Unknown window manager '%s'\n", option->key);
+
+        }
+        else if (IS_TOKEN("cube_duration"))
+        {
+            screen_list->cube.duration = atoi(option->value) * 1000000;
+        }
+        else if (IS_TOKEN("thumbnails"))
+        {
+            if (IS_VALUE("true") || IS_VALUE("1"))
+                screen_list->mini = 1;
+            else
+                screen_list->mini = 0;
+
+        }
+        else if (IS_TOKEN("status_bar"))
+        {
+            if (IS_VALUE("true") || IS_VALUE("1"))
+                screen_list->status = 1;
+            else
+                screen_list->status = 0;
+
+        }
+        else if (IS_TOKEN("screensaver_timeout"))
         {
             screen_list->screensaver_timeout = atoi(option->value) * 1000000;
             /* if timeout is 0, set it to 0xFFFFFFFFFFFFFFFF */
-            if(!screen_list->screensaver_timeout) screen_list->screensaver_timeout-=1;
-        }  else if(IS_TOKEN("autolock_timeout"))
+            if (!screen_list->screensaver_timeout)
+                screen_list->screensaver_timeout -= 1;
+        }
+        else if (IS_TOKEN("autolock_timeout"))
         {
             debug("Autolock is %d\n", screen_list->autolock_timeout);
-            if(screen_list->autolock_timeout == 0 ||
-               screen_list->autolock_timeout == ((long long unsigned int)0) - 1)
-            {
-                screen_list->autolock_timeout = atoi(option->value) * 1000000;
-                /* if timeout is 0, set it to 0xFFFFFFFFFFFFFFFF */
-                if(!screen_list->autolock_timeout) screen_list->autolock_timeout-=1;
-            }
-        }  else if(IS_TOKEN("lock_on_detach"))
-        {
-            if     (IS_VALUE("true") || IS_VALUE("1")) screen_list->lock_on_detach = 1;
-            else                                       screen_list->lock_on_detach = 0;
-        } else if(IS_TOKEN("socket_dir"))
+            if (screen_list->autolock_timeout == 0 ||
+                screen_list->autolock_timeout ==
+                ((long long unsigned int)0) - 1)
+            {
+                screen_list->autolock_timeout = atoi(option->value) * 1000000;
+                /* if timeout is 0, set it to 0xFFFFFFFFFFFFFFFF */
+                if (!screen_list->autolock_timeout)
+                    screen_list->autolock_timeout -= 1;
+            }
+        }
+        else if (IS_TOKEN("lock_on_detach"))
+        {
+            if (IS_VALUE("true") || IS_VALUE("1"))
+                screen_list->lock_on_detach = 1;
+            else
+                screen_list->lock_on_detach = 0;
+        }
+        else if (IS_TOKEN("socket_dir"))
         {
             screen_list->socket_dir = option->value;
-        } else if(IS_TOKEN("delay"))
+        }
+        else if (IS_TOKEN("delay"))
         {
             screen_list->requested_delay = atoi(option->value);
             screen_list->delay = atoi(option->value);
-        } else
+        }
+        else
         {
             fprintf(stderr, "Unknown option '%s'\n", option->key);

neercs/trunk/src/effects.c

@@ -1 @@
-/*
+/* 
  *  neercs        console-based window manager
  *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
@@ -29 +29 @@
 void draw_thumbnails(struct screen_list *screen_list)
 {
-    char const * const *fonts;
+    char const *const *fonts;
     caca_dither_t *d;
     caca_font_t *f;
     uint8_t *buf;
-    int i, y = caca_get_canvas_height(screen_list->cv) - 6 - screen_list->status;
+    int i, y =
+        caca_get_canvas_height(screen_list->cv) - 6 - screen_list->status;
     int miniw, minih;
 
-    if(screen_list->count)
+    if (screen_list->count)
     {
         fonts = caca_get_font_list();
@@ -48 +49 @@
 
 #if defined(HAVE_ENDIAN_H)
-        if(__BYTE_ORDER == __BIG_ENDIAN)
+        if (__BYTE_ORDER == __BIG_ENDIAN)
 #else
-            /* This is compile-time optimised with at least -O1 or -Os */
-            uint32_t const tmp = 0x12345678;
-        if(*(uint8_t const *)&tmp == 0x12)
+        /* This is compile-time optimised with at least -O1 or -Os */
+        uint32_t const tmp = 0x12345678;
+        if (*(uint8_t const *)&tmp == 0x12)
 #endif
             d = caca_create_dither(32, miniw, minih, 4 * miniw,
-                                    0xff0000, 0xff00, 0xff, 0x0);
+                                   0xff0000, 0xff00, 0xff, 0x0);
         else
             d = caca_create_dither(32, miniw, minih, 4 * miniw,
-                                    0xff00, 0xff0000, 0xff000000, 0x0);
-
-        for(i = 0; i < screen_list->count; i++)
+                                   0xff00, 0xff0000, 0xff000000, 0x0);
+
+        for (i = 0; i < screen_list->count; i++)
         {
-            if(!screen_list->screen[i]->changed && !screen_list->changed)
+            if (!screen_list->screen[i]->changed && !screen_list->changed)
                 continue;
             caca_render_canvas(screen_list->screen[i]->cv, f, buf,
-                                miniw, minih, miniw * 4);
+                               miniw, minih, miniw * 4);
             caca_dither_bitmap(screen_list->cv, 20 * i, y, 19, 6, d, buf);
             caca_set_color_ansi(screen_list->cv, CACA_WHITE, CACA_BLUE);
 
-            if(screen_list->pty == i)
-                caca_draw_cp437_box(screen_list->cv,20 * i, y, 19, 6);
-            caca_printf(screen_list->cv, 20 * i, y, "(%i)", i+1);
+            if (screen_list->pty == i)
+                caca_draw_cp437_box(screen_list->cv, 20 * i, y, 19, 6);
+            caca_printf(screen_list->cv, 20 * i, y, "(%i)", i + 1);
         }
 
@@ -88 +89 @@
 
 
-    /*    caca_fill_box(screen_list->cv,
-                   x, y,
-                   caca_get_canvas_width(screen_list->cv), 1, '#');*/
-
-/* Hour */
-    {
-        time_t now = time ((time_t *) 0);
+    /* caca_fill_box(screen_list->cv, x, y,
+       caca_get_canvas_width(screen_list->cv), 1, '#'); */
+
+    /* Hour */
+    {
+        time_t now = time((time_t *) 0);
         struct tm *t = localtime(&now);
         char hour[256];
@@ -100 +100 @@
 
         caca_set_color_ansi(screen_list->cv, CACA_LIGHTBLUE, CACA_BLUE);
-        caca_printf(screen_list->cv, x, y,
-                     "[");
+        caca_printf(screen_list->cv, x, y, "[");
 
         caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_BLUE);
-        caca_printf(screen_list->cv, x+1, y,
-                     hour);
+        caca_printf(screen_list->cv, x + 1, y, hour);
         caca_set_color_ansi(screen_list->cv, CACA_LIGHTBLUE, CACA_BLUE);
-        caca_printf(screen_list->cv, x + strlen(hour) + 1, y,
-                     "]");
+        caca_printf(screen_list->cv, x + strlen(hour) + 1, y, "]");
         x += 7;
 
     }
 
-/* Window */
+    /* Window */
     {
         char text[256];
-        sprintf(text, "%d/%d", screen_list->pty+1, screen_list->count);
+        sprintf(text, "%d/%d", screen_list->pty + 1, screen_list->count);
         caca_set_color_ansi(screen_list->cv, CACA_BLUE, CACA_BLUE);
         caca_put_char(screen_list->cv, x, y, '#');
@@ -123 +120 @@
         caca_printf(screen_list->cv, x, y, "Window:");
         caca_set_color_ansi(screen_list->cv, CACA_BLUE, CACA_BLUE);
-        caca_put_char(screen_list->cv, x+7, y, '#');
+        caca_put_char(screen_list->cv, x + 7, y, '#');
         caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_BLUE);
-        caca_printf(screen_list->cv, x+8, y, text);
-        x+= 8+strlen(text);
-    }
-
-/* Window Manager */
+        caca_printf(screen_list->cv, x + 8, y, text);
+        x += 8 + strlen(text);
+    }
+
+    /* Window Manager */
     {
         char text[256];
 
-        switch(screen_list->wm_type)
+        switch (screen_list->wm_type)
         {
         case WM_CARD:
@@ -160 +157 @@
         caca_printf(screen_list->cv, x, y, "WM:");
         caca_set_color_ansi(screen_list->cv, CACA_BLUE, CACA_BLUE);
-        caca_put_char(screen_list->cv, x+3, y, '#');
+        caca_put_char(screen_list->cv, x + 3, y, '#');
         caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_BLUE);
-        caca_printf(screen_list->cv, x+4, y, text);
-        x+= 4+strlen(text);
-    }
-
-/* Help (must be the last one )*/
+        caca_printf(screen_list->cv, x + 4, y, text);
+        x += 4 + strlen(text);
+    }
+
+    /* Help (must be the last one ) */
     {
         char text[256];
         sprintf(text, "Help: ctrl-a-h");
         caca_set_color_ansi(screen_list->cv, CACA_BLUE, CACA_BLUE);
-        while(x < (int)(caca_get_canvas_width(screen_list->cv) - strlen(text)))
+        while (x <
+               (int)(caca_get_canvas_width(screen_list->cv) - strlen(text)))
         {
             caca_put_char(screen_list->cv, x, y, '#');
@@ -192 +190 @@
 
     caca_set_color_ansi(screen_list->cv, CACA_BLUE, CACA_BLUE);
-    caca_fill_box(screen_list->cv,
-                   x, y,
-                   w, h, '#');
+    caca_fill_box(screen_list->cv, x, y, w, h, '#');
     caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_BLUE);
-    caca_draw_cp437_box(screen_list->cv,
-                         x, y,
-                         w, h);
-
-    x+=2;
+    caca_draw_cp437_box(screen_list->cv, x, y, w, h);
+
+    x += 2;
     y++;
     caca_printf(screen_list->cv,
-                 (caca_get_canvas_width(screen_list->cv) - strlen(PACKAGE_STRING)) / 2,
-                 y-1,
-                 PACKAGE_STRING);
+                (caca_get_canvas_width(screen_list->cv) -
+                 strlen(PACKAGE_STRING)) / 2, y - 1, PACKAGE_STRING);
     caca_printf(screen_list->cv, x, y++, "Copyright (c) 2006-2009");
-    caca_printf(screen_list->cv, x, y++, "              Sam Hocevar <sam@zoy.org>");
-    caca_printf(screen_list->cv, x, y++, "              Jean-Yves Lamoureux <jylam@lnxscene.org>");
-    caca_printf(screen_list->cv, x, y++, "              Pascal Terjan <pterjan@linuxfr.org>");
+    caca_printf(screen_list->cv, x, y++,
+                "              Sam Hocevar <sam@zoy.org>");
+    caca_printf(screen_list->cv, x, y++,
+                "              Jean-Yves Lamoureux <jylam@lnxscene.org>");
+    caca_printf(screen_list->cv, x, y++,
+                "              Pascal Terjan <pterjan@linuxfr.org>");
     caca_printf(screen_list->cv, x, y++, "");
     caca_printf(screen_list->cv, x, y++, "");
-    caca_printf(screen_list->cv, x, y++, "All shortcuts are in format 'ctrl-a-X' where X is :");
+    caca_printf(screen_list->cv, x, y++,
+                "All shortcuts are in format 'ctrl-a-X' where X is :");
     caca_printf(screen_list->cv, x, y++, "n:\t Next window");
     caca_printf(screen_list->cv, x, y++, "p:\t Previous window");
@@ -219 +216 @@
     caca_printf(screen_list->cv, x, y++, "m:\t Thumbnails");
     caca_printf(screen_list->cv, x, y++, "d:\t Detach");
-    caca_printf(screen_list->cv, x, y++, "k:\t Close window and kill associated process");
+    caca_printf(screen_list->cv, x, y++,
+                "k:\t Close window and kill associated process");
     caca_printf(screen_list->cv, x, y++, "h:\t This help");
     caca_printf(screen_list->cv, x, y++, "");
     caca_printf(screen_list->cv, x, y++, "");
-    caca_printf(screen_list->cv, x, y++, "See http://caca.zoy.org/wiki/neercs for more informations");
+    caca_printf(screen_list->cv, x, y++,
+                "See http://caca.zoy.org/wiki/neercs for more informations");
 }
 
@@ -230 +229 @@
     debug("Got %x\n", c);
 
-    switch(c)
+    switch (c)
     {
     case 0x111:
-        if(screen_list->cur_in_list>0)
+        if (screen_list->cur_in_list > 0)
             screen_list->cur_in_list--;
         break;
     case 0x112:
-        if(screen_list->cur_in_list<screen_list->count-1)
+        if (screen_list->cur_in_list < screen_list->count - 1)
             screen_list->cur_in_list++;
         break;
@@ -243 +242 @@
         screen_list->window_list = 0;
         screen_list->prevpty = screen_list->pty;
-        screen_list->pty     = screen_list->cur_in_list;
+        screen_list->pty = screen_list->cur_in_list;
         break;
     case 0x22:
@@ -263 +262 @@
     debug("Drawing list\n");
     caca_set_color_ansi(screen_list->cv, CACA_BLACK, CACA_BLACK);
-    caca_fill_box(screen_list->cv,
-                   0, 0,
-                   w, h, '#');
+    caca_fill_box(screen_list->cv, 0, 0, w, h, '#');
     caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_DEFAULT);
-    caca_draw_cp437_box(screen_list->cv,
-                         0, 0,
-                         w, h);
+    caca_draw_cp437_box(screen_list->cv, 0, 0, w, h);
 
     caca_printf(screen_list->cv, 2, 1, "Num \tName");
-    for(i = 0; i < screen_list->count; i++)
+    for (i = 0; i < screen_list->count; i++)
     {
         char line[1024];
-        if(screen_list->cur_in_list == i)
+        if (screen_list->cur_in_list == i)
             caca_set_color_ansi(screen_list->cv, CACA_BLACK, CACA_WHITE);
         else
             caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_DEFAULT);
-        sprintf(line, "%d \t%s", i+1, screen_list->screen[i]->title);
-
-        caca_printf(screen_list->cv, 2, i+3, line);
+        sprintf(line, "%d \t%s", i + 1, screen_list->screen[i]->title);
+
+        caca_printf(screen_list->cv, 2, i + 3, line);
     }
 }
@@ -288 +283 @@
 /* Total close time */
 #define DELAY 500000.0f
-int close_screen_recurrent(struct screen_list* screen_list, struct recurrent* rec, void *user, long long unsigned int t)
+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;
@@ -295 +292 @@
     screen_list->delay = 0;
     rec->kill_me = 0;
-    if(delta>=DELAY)
+    if (delta >= DELAY)
     {
         rec->kill_me = 1;
@@ -311 +308 @@
         int h = s->orig_h * r;
 
-        /* libcaca canvas resize function is bugged, do it by hand  */
+        /* libcaca canvas resize function is bugged, do it by hand */
         old = s->cv;
         new = caca_create_canvas(w, h);
@@ -322 +319 @@
         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);
+        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);
     }
     screen_list->changed = 1;

neercs/trunk/src/lock.c

@@ -1 @@
-/*
+/* 
  *  neercs        console-based window manager
  *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
@@ -48 +48 @@
 
 #if defined USE_LOCK
-    if(!screen_list->locked) return 0;
-
-    if(c==0x08)      // BACKSPACE
-    {
-        if(screen_list->lock_offset)
-        {
-            screen_list->lockpass[screen_list->lock_offset-1] = 0;
+    if (!screen_list->locked)
+        return 0;
+
+    if (c == 0x08)              // BACKSPACE
+    {
+        if (screen_list->lock_offset)
+        {
+            screen_list->lockpass[screen_list->lock_offset - 1] = 0;
             screen_list->lock_offset--;
         }
     }
-    else if(c==0x0d) // RETURN
+    else if (c == 0x0d)         // RETURN
     {
         memset(screen_list->lockmsg, 0, 1024);
-        if(validate_lock(screen_list, getenv("USER"), screen_list->lockpass))
+        if (validate_lock(screen_list, getenv("USER"), screen_list->lockpass))
         {
             memset(screen_list->lockpass, 0, 1024);
@@ -77 +78 @@
     else
     {
-        if(screen_list->lock_offset < 1023)
+        if (screen_list->lock_offset < 1023)
         {
             screen_list->lockpass[screen_list->lock_offset++] = c;
-            screen_list->lockpass[screen_list->lock_offset]   = 0;
+            screen_list->lockpass[screen_list->lock_offset] = 0;
         }
     }
@@ -95 +96 @@
     caca_canvas_t *cv = screen_list->cv;
 
-    gethostname(buffer, sizeof(buffer)-1);
+    gethostname(buffer, sizeof(buffer) - 1);
 
     int w = 65, h = 20;
@@ -103 +104 @@
 
     caca_set_color_ansi(cv, CACA_BLUE, CACA_BLUE);
-    caca_fill_box(cv,
-                   x, y,
-                   w, h, '#');
+    caca_fill_box(cv, x, y, w, h, '#');
     caca_set_color_ansi(cv, CACA_DEFAULT, CACA_BLUE);
-    caca_draw_cp437_box(cv,
-                         x, y,
-                         w, h);
-
-    x+=2;
+    caca_draw_cp437_box(cv, x, y, w, h);
+
+    x += 2;
     y++;
     caca_printf(cv,
-                 (caca_get_canvas_width(cv) - strlen(PACKAGE_STRING " locked")) / 2,
-                 y-1,
-                 PACKAGE_STRING " locked");
-
-    caca_printf(cv, x, y++, "Please type in your password for %s@%s :", getenv("USER"), buffer);
-    y+=2;
-
-    x = (caca_get_canvas_width(cv)/2) - ((strlen(screen_list->lockpass) / 2) + strlen("Password : "));
+                (caca_get_canvas_width(cv) -
+                 strlen(PACKAGE_STRING " locked")) / 2, y - 1,
+                PACKAGE_STRING " locked");
+
+    caca_printf(cv, x, y++, "Please type in your password for %s@%s :",
+                getenv("USER"), buffer);
+    y += 2;
+
+    x = (caca_get_canvas_width(cv) / 2) -
+        ((strlen(screen_list->lockpass) / 2) + strlen("Password : "));
     caca_printf(cv, x, y, "Password : ");
-    x+=strlen("Password : ");
-    for(i=0; i<strlen(screen_list->lockpass); i++)
+    x += strlen("Password : ");
+    for (i = 0; i < strlen(screen_list->lockpass); i++)
     {
         caca_put_str(cv, x, y, "*");
@@ -131 +130 @@
 
 
-    if(strlen(screen_list->lockmsg))
-    {
-        x = ((caca_get_canvas_width(cv) - w) / 2) + (strlen(screen_list->lockmsg));
-        y+=2;
+    if (strlen(screen_list->lockmsg))
+    {
+        x = ((caca_get_canvas_width(cv) - w) / 2) +
+            (strlen(screen_list->lockmsg));
+        y += 2;
         caca_set_color_ansi(cv, CACA_RED, CACA_BLUE);
         caca_printf(cv, x, y, "Error : %s", screen_list->lockmsg);
@@ -155 +155 @@
     for (i = 0; i < num_msg; ++i)
     {
-        switch(msg[i]->msg_style)
+        switch (msg[i]->msg_style)
         {
         case PAM_PROMPT_ECHO_ON:
@@ -164 +164 @@
         case PAM_ERROR_MSG:
             break;
-        default :
+        default:
             printf("Unknow message type from PAM\n");
             break;
@@ -179 +179 @@
 #if USE_LOCK
     int ret;
-    pam_handle_t *pamh=NULL;
+    pam_handle_t *pamh = NULL;
     char buffer[100];
-    const char *service="neercs";
+    const char *service = "neercs";
     struct pam_conv conv = {
         convpam,
@@ -188 +188 @@
 
     ret = pam_start(service, user, &conv, &pamh);
-    if(ret!=PAM_SUCCESS)
+    if (ret != PAM_SUCCESS)
         return 0;
     pam_set_item(pamh, PAM_RUSER, user);
 
-    ret = gethostname(buffer, sizeof(buffer)-1);
+    ret = gethostname(buffer, sizeof(buffer) - 1);
     if (ret)
     {
@@ -203 +203 @@
 
     ret = pam_set_item(pamh, PAM_RHOST, buffer);
-    if(ret!=PAM_SUCCESS)
+    if (ret != PAM_SUCCESS)
     {
         sprintf(screen_list->lockmsg, "Can't set hostname");
@@ -211 +211 @@
 
     ret = pam_authenticate(pamh, 0);
-    if(ret!=PAM_SUCCESS)
+    if (ret != PAM_SUCCESS)
     {
         sprintf(screen_list->lockmsg, "Can't authenticate");
@@ -223 +223 @@
     return 1;
 }
-

neercs/trunk/src/main.c

@@ -1 @@
-/*
+/* 
  *  neercs        console-based window manager
  *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
@@ -53 +53 @@
     printf("%s\n", PACKAGE_STRING);
     printf("Copyright (C) 2006, 2008 Sam Hocevar <sam@zoy.org>\n");
-    printf("                         Jean-Yves Lamoureux <jylam@lnxscene.org>\n\n");
-    printf("This is free software.  You may redistribute copies of it under the\n");
-    printf("terms of the Do What The Fuck You Want To Public License, Version 2\n");
+    printf
+        ("                         Jean-Yves Lamoureux <jylam@lnxscene.org>\n\n");
+    printf
+        ("This is free software.  You may redistribute copies of it under the\n");
+    printf
+        ("terms of the Do What The Fuck You Want To Public License, Version 2\n");
     printf("<http://sam.zoy.org/wtfpl/>.\n");
     printf("There is NO WARRANTY, to the extent permitted by law.\n");
     printf("\n");
-    printf("For more informations, visit http://libcaca.zoy.org/wiki/neercs\n");
+    printf
+        ("For more informations, visit http://libcaca.zoy.org/wiki/neercs\n");
 }
 
@@ -71 +75 @@
     printf("\t--pid\t\t-P [pid]\t\tgrab process\n");
     printf("\t\t\t-r [session]\t\treattach to a detached neercs\n");
-    printf("\t\t\t-R [session]\t\treattach if possible, otherwise start a new session\n");
+    printf
+        ("\t\t\t-R [session]\t\treattach if possible, otherwise start a new session\n");
     printf("\t\t\t-S <name>\t\tname this session <name> instead of <pid>\n");
     printf("\t--lock-after\t-l [n]\t\t\tlock screen after n seconds\n");
@@ -88 +93 @@
     screen_list->default_shell = getenv("SHELL");
 
-    args = argc -1;
-    if(screen_list->default_shell == NULL  && args <= 0)
-    {
-        fprintf(stderr, "Environment variable SHELL not set and no arguments given. kthxbye.\n");
+    args = argc - 1;
+    if (screen_list->default_shell == NULL && args <= 0)
+    {
+        fprintf(stderr,
+                "Environment variable SHELL not set and no arguments given. kthxbye.\n");
         goto end;
     }
 
-    if(handle_command_line(argc, argv, screen_list) < 0)
+    if (handle_command_line(argc, argv, screen_list) < 0)
         goto end;
 
@@ -101 +107 @@
     read_configuration_file("/etc/neercsrc", screen_list);
 
-    /* Then local one  */
-    if(screen_list->user_path)
+    /* Then local one */
+    if (screen_list->user_path)
     {
         read_configuration_file(screen_list->user_path, screen_list);
@@ -108 +114 @@
     }
 
-    if(screen_list->attach)
-    {
-        if(screen_list->nb_to_grab || screen_list->to_start)
-        {
-            fprintf(stderr, "-R can not be associated with commands or pids!\n");
+    if (screen_list->attach)
+    {
+        if (screen_list->nb_to_grab || screen_list->to_start)
+        {
+            fprintf(stderr,
+                    "-R can not be associated with commands or pids!\n");
             goto end;
         }
@@ -118 +125 @@
         attach(screen_list);
 
-        if(screen_list->forceattach && !screen_list->attach)
+        if (screen_list->forceattach && !screen_list->attach)
             goto end;
     }
 
     /* Build default session name */
-    if(!screen_list->session_name)
-    {
-        char mypid[32]; /* FIXME Compute the length of PID_MAX ? */
+    if (!screen_list->session_name)
+    {
+        char mypid[32];         /* FIXME Compute the length of PID_MAX ? */
         snprintf(mypid, 31, "%d", getpid());
-        mypid[31]= '\0';
+        mypid[31] = '\0';
         screen_list->session_name = strdup(mypid);
-        if(!screen_list->session_name)
-        {
-            fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+        if (!screen_list->session_name)
+        {
+            fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__,
+                    __LINE__);
             goto end;
         }
     }
-    if(!screen_list->socket_path[SOCK_CLIENT])
+    if (!screen_list->socket_path[SOCK_CLIENT])
         screen_list->socket_path[SOCK_CLIENT] =
-            build_socket_path(screen_list->socket_dir, screen_list->session_name, SOCK_CLIENT);
-
-    if(!screen_list->socket_path[SOCK_SERVER])
+            build_socket_path(screen_list->socket_dir,
+                              screen_list->session_name, SOCK_CLIENT);
+
+    if (!screen_list->socket_path[SOCK_SERVER])
         screen_list->socket_path[SOCK_SERVER] =
-            build_socket_path(screen_list->socket_dir, screen_list->session_name, SOCK_SERVER);
+            build_socket_path(screen_list->socket_dir,
+                              screen_list->session_name, SOCK_SERVER);
 
     /* Fork the server if needed */
-    if(!screen_list->attach)
+    if (!screen_list->attach)
     {
         debug("Spawning a new server");
-        if(start_server(screen_list))
+        if (start_server(screen_list))
             goto end;
     }
@@ -156 +166 @@
     /* Clean up */
     mainret = 0;
-end:
-
-    if(screen_list)
+  end:
+
+    if (screen_list)
     {
         free_screen_list(screen_list);
@@ -171 +181 @@
     struct option *option;
 
-    if(screen_list->dp)
+    if (screen_list->dp)
         caca_free_display(screen_list->dp);
 
-    if(screen_list->cv)
+    if (screen_list->cv)
         caca_free_canvas(screen_list->cv);
 
-    for(i = 0; i < screen_list->count; i++)
+    for (i = 0; i < screen_list->count; i++)
     {
         destroy_screen(screen_list->screen[i]);
     }
 
-    if(screen_list->socket_path[SOCK_SERVER])
+    if (screen_list->socket_path[SOCK_SERVER])
         free(screen_list->socket_path[SOCK_SERVER]);
 
-    if(screen_list->socket_path[SOCK_CLIENT])
+    if (screen_list->socket_path[SOCK_CLIENT])
     {
         unlink(screen_list->socket_path[SOCK_CLIENT]);
@@ -191 +201 @@
     }
 
-    if(screen_list->socket[SOCK_CLIENT])
+    if (screen_list->socket[SOCK_CLIENT])
         close(screen_list->socket[SOCK_CLIENT]);
 
-    if(screen_list->socket[SOCK_SERVER])
+    if (screen_list->socket[SOCK_SERVER])
         close(screen_list->socket[SOCK_SERVER]);
 
-    if(screen_list->screen)
+    if (screen_list->screen)
         free(screen_list->screen);
 
     option = screen_list->config;
 
-    while(option)
+    while (option)
     {
         struct option *kromeugnon = option;
         option = option->next;
-        if(kromeugnon->key)   free(kromeugnon->key);
-        if(kromeugnon->value) free(kromeugnon->value);
+        if (kromeugnon->key)
+            free(kromeugnon->key);
+        if (kromeugnon->value)
+            free(kromeugnon->value);
         free(kromeugnon);
     }
 
-    for(i=0; i<screen_list->recurrent_list->count; i++)
+    for (i = 0; i < screen_list->recurrent_list->count; i++)
     {
         remove_recurrent(screen_list->recurrent_list, i);
@@ -217 +229 @@
     }
 
-    if(screen_list->recurrent_list->recurrent)
+    if (screen_list->recurrent_list->recurrent)
         free(screen_list->recurrent_list->recurrent);
-    if(screen_list->recurrent_list)
+    if (screen_list->recurrent_list)
         free(screen_list->recurrent_list);
 
-    if(screen_list->session_name)
+    if (screen_list->session_name)
         free(screen_list->session_name);
 
-    if(screen_list->title)
+    if (screen_list->title)
         free(screen_list->title);
 
@@ -239 +251 @@
 
     /* Create screen list */
-    screen_list = (struct screen_list*)     malloc(sizeof(struct screen_list));
-    if(!screen_list)
-    {
-        fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+    screen_list = (struct screen_list *)malloc(sizeof(struct screen_list));
+    if (!screen_list)
+    {
+        fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__,
+                __LINE__);
         return NULL;
     }
-    screen_list->screen = (struct screen**) malloc(sizeof(sizeof(struct screen*)));
-    if(!screen_list->screen)
-    {
-        fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+    screen_list->screen =
+        (struct screen **)malloc(sizeof(sizeof(struct screen *)));
+    if (!screen_list->screen)
+    {
+        fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__,
+                __LINE__);
         free(screen_list);
         return NULL;
@@ -263 +278 @@
     screen_list->changed = 0;
     screen_list->requested_delay = 0;
-    screen_list->delay = 1000/60; /* Don't refresh more than 60 times per second */
+    screen_list->delay = 1000 / 60;     /* Don't refresh more than 60 times
+                                           per second */
     screen_list->pty = screen_list->prevpty = 0;
     screen_list->dont_update_coords = 0;
@@ -275 +291 @@
     screen_list->socket[SOCK_SERVER] = 0;
     screen_list->socket[SOCK_CLIENT] = 0;
-    screen_list->socket_dir    = NULL;
+    screen_list->socket_dir = NULL;
     screen_list->socket_path[SOCK_SERVER] = NULL;
     screen_list->socket_path[SOCK_CLIENT] = NULL;
-    screen_list->session_name  = NULL;
+    screen_list->session_name = NULL;
     screen_list->default_shell = NULL;
-    screen_list->user_path     = NULL;
+    screen_list->user_path = NULL;
     screen_list->autolock_timeout = -1;
     screen_list->to_grab = NULL;
@@ -304 +320 @@
     /* Build local config file path */
     user_dir = getenv("HOME");
-    if(!user_dir)
+    if (!user_dir)
     {
         user_info = getpwuid(getuid());
-        if(user_info)
+        if (user_info)
         {
             user_dir = user_info->pw_dir;
         }
     }
-    if(user_dir)
-    {
-        screen_list->user_path = malloc(strlen(user_dir) + strlen("/.neercsrc") + 1);
+    if (user_dir)
+    {
+        screen_list->user_path =
+            malloc(strlen(user_dir) + strlen("/.neercsrc") + 1);
         sprintf(screen_list->user_path, "%s/%s", user_dir, ".neercsrc");
     }
 
 
-    screen_list->recurrent_list = (struct recurrent_list*) malloc(sizeof(struct recurrent_list));
-    screen_list->recurrent_list->recurrent = (struct recurrent**) malloc(sizeof(struct recurrent*));
-    if(!screen_list->recurrent_list->recurrent)
-    {
-        fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+    screen_list->recurrent_list =
+        (struct recurrent_list *)malloc(sizeof(struct recurrent_list));
+    screen_list->recurrent_list->recurrent =
+        (struct recurrent **)malloc(sizeof(struct recurrent *));
+    if (!screen_list->recurrent_list->recurrent)
+    {
+        fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__,
+                __LINE__);
         free(screen_list);
         free(screen_list->screen);
@@ -337 +357 @@
 
 
-int handle_command_line(int argc, char *argv[], struct screen_list *screen_list)
+int handle_command_line(int argc, char *argv[],
+                        struct screen_list *screen_list)
 {
     int s = 0, i;
-    for(;;)
+    for (;;)
     {
         int option_index = 0;
         int pidopt;
-        static struct myoption long_options[] =
-            {
-                { "config",      1, NULL, 'c' },
+        static struct myoption long_options[] = {
+            {"config", 1, NULL, 'c'},
 #if defined USE_GRAB
-                { "pid",         0, NULL, 'P' },
+            {"pid", 0, NULL, 'P'},
 #endif
-                { "lock-after",  1, NULL, 'l' },
-                { "help",        0, NULL, 'h' },
-                { "version",     0, NULL, 'v' },
-                { NULL, 0, NULL, 0 },
-            };
+            {"lock-after", 1, NULL, 'l'},
+            {"help", 0, NULL, 'h'},
+            {"version", 0, NULL, 'v'},
+            {NULL, 0, NULL, 0},
+        };
 #if defined USE_GRAB
-        int c = mygetopt(argc, argv, "c:S:R::l::r::P::hv", long_options, &option_index);
+        int c =
+            mygetopt(argc, argv, "c:S:R::l::r::P::hv", long_options,
+                     &option_index);
 #else
-        int c = mygetopt(argc, argv, "c:S:R::l::r::hv", long_options, &option_index);
+        int c =
+            mygetopt(argc, argv, "c:S:R::l::r::hv", long_options,
+                     &option_index);
 #endif
-        if(c == -1)
-            break;
-
-        switch(c)
-        {
-        case 'c': /* --config */
-            if(screen_list->user_path)
+        if (c == -1)
+            break;
+
+        switch (c)
+        {
+        case 'c':              /* --config */
+            if (screen_list->user_path)
                 free(screen_list->user_path);
             screen_list->user_path = strdup(myoptarg);
-            s+=2;
+            s += 2;
             break;
         case 'S':
-            if(!screen_list->session_name)
+            if (!screen_list->session_name)
                 screen_list->session_name = strdup(myoptarg);
-            s+=2;
-            break;
-        case 'P': /* --pid */
-            if(myoptarg)
+            s += 2;
+            break;
+        case 'P':              /* --pid */
+            if (myoptarg)
             {
                 pidopt = atoi(myoptarg);
-                if(pidopt <= 0)
+                if (pidopt <= 0)
                 {
                     fprintf(stderr, "Invalid pid %d\n", pidopt);
-                    if(screen_list->to_grab)
+                    if (screen_list->to_grab)
                         free(screen_list->to_grab);
                     return -1;
@@ -390 +414 @@
             else
                 pidopt = select_process(screen_list);
-            if(pidopt <= 0)
+            if (pidopt <= 0)
             {
-                s+=1;
+                s += 1;
                 break;
             }
-            if(!screen_list->to_grab)
+            if (!screen_list->to_grab)
             {
                 /* At most argc-1-s times -P <pid> + final 0 */
-                screen_list->to_grab = (int *)malloc(((argc-1-s)/2+1)*sizeof(int));
-                if(!screen_list->to_grab)
+                screen_list->to_grab =
+                    (int *)malloc(((argc - 1 - s) / 2 + 1) * sizeof(int));
+                if (!screen_list->to_grab)
                 {
-                    fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+                    fprintf(stderr, "Can't allocate memory at %s:%d\n",
+                            __FUNCTION__, __LINE__);
                     return -1;
                 }
@@ -407 +433 @@
             screen_list->to_grab[screen_list->nb_to_grab++] = pidopt;
             screen_list->to_grab[screen_list->nb_to_grab] = 0;
-            s+=2;
+            s += 2;
             break;
         case 'l':
             screen_list->autolock_timeout = atoi(myoptarg) * 1000000;
-                if(screen_list->autolock_timeout == 0)
-                screen_list->autolock_timeout-=1;
+            if (screen_list->autolock_timeout == 0)
+                screen_list->autolock_timeout -= 1;
             break;
         case 'r':
             screen_list->forceattach = 1;
         case 'R':
-            if(screen_list->attach)
+            if (screen_list->attach)
             {
                 fprintf(stderr, "Attaching can only be requested once\n");
                 return -1;
             }
-            if(myoptarg)
+            if (myoptarg)
             {
-                if(screen_list->session_name)
+                if (screen_list->session_name)
                     free(screen_list->session_name);
                 screen_list->session_name = strdup(myoptarg);
-                s+=1;
+                s += 1;
             }
             screen_list->attach = 1;
-            s+=1;
-            break;
-        case 'h': /* --help */
+            s += 1;
+            break;
+        case 'h':              /* --help */
             usage(argc, argv);
             return -1;
             break;
-        case 'v': /* --version */
+        case 'v':              /* --version */
             version();
             return -1;
@@ -448 +474 @@
         }
     }
-    if(s >= 0 && s < argc - 1)
-    {
-        screen_list->to_start = (char**)malloc((argc-s)*sizeof(char*));
-        if(!screen_list->to_start)
-        {
-            fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+    if (s >= 0 && s < argc - 1)
+    {
+        screen_list->to_start = (char **)malloc((argc - s) * sizeof(char *));
+        if (!screen_list->to_start)
+        {
+            fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__,
+                    __LINE__);
             return -1;
         }
-        for(i=0; i<(argc-1) - s; i++)
-        {
-            screen_list->to_start[i] = strdup(argv[i+s+1]);
-        }
-        screen_list->to_start[argc-1-s] = NULL;
+        for (i = 0; i < (argc - 1) - s; i++)
+        {
+            screen_list->to_start[i] = strdup(argv[i + s + 1]);
+        }
+        screen_list->to_start[argc - 1 - s] = NULL;
     }
     return s;

neercs/trunk/src/mygetopt.c

@@ -1 @@
-/*
+/* 
  *  neercs        console-based window manager
  *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
@@ -15 +15 @@
  */
 
-/*
+/* 
  *  mygetopt.c: getopt_long reimplementation
  */
@@ -28 +28 @@
 #include "mygetopt.h"
 
-int   myoptind = 1;
+int myoptind = 1;
 char *myoptarg = NULL;
 
 /* XXX: this getopt_long implementation should not be trusted for other
- * applications without any serious peer reviewing. It “just works” with
- * zzuf but may fail miserably in other programs. */
-int mygetopt(int argc, char * const _argv[], const char *optstring,
+   applications without any serious peer reviewing. It “just works” with
+   zzuf but may fail miserably in other programs. */
+int mygetopt(int argc, char *const _argv[], const char *optstring,
              const struct myoption *longopts, int *longindex)
 {
-    char **argv = (char **)(uintptr_t)_argv;
+    char **argv = (char **)(uintptr_t) _argv;
     char *flag;
     int i;
 
-    if(myoptind >= argc)
+    if (myoptind >= argc)
         return -1;
 
     flag = argv[myoptind];
 
-    if(flag[0] == '-' && flag[1] != '-')
+    if (flag[0] == '-' && flag[1] != '-')
     {
         char *tmp;
         int ret = flag[1];
 
-        if(ret == '\0')
+        if (ret == '\0')
             return -1;
 
         tmp = strchr(optstring, ret);
-        if(!tmp || ret == ':')
+        if (!tmp || ret == ':')
             return '?';
 
         myoptind++;
-        if(tmp[1] == ':')
+        if (tmp[1] == ':')
         {
-            if(flag[2] != '\0')
+            if (flag[2] != '\0')
                 myoptarg = flag + 2;
+            else if (myoptind >= argc)
+            {
+                if (tmp[2] != ':')
+                {
+                    fprintf(stderr, "%s: `%s' needs an argument\n", argv[0],
+                            flag);
+                    return -2;
+                }
+            }
             else
-                if(myoptind >= argc)
-                {
-                    if(tmp[2] != ':')
-                    {
-                        fprintf(stderr, "%s: `%s' needs an argument\n", argv[0], flag);
-                        return -2;
-                    }
-                }
-                else
-                    myoptarg = argv[myoptind++];
+                myoptarg = argv[myoptind++];
             return ret;
         }
 
-        if(flag[2] != '\0')
+        if (flag[2] != '\0')
         {
             flag[1] = '-';
@@ -87 +87 @@
     }
 
-    if(flag[0] == '-' && flag[1] == '-')
+    if (flag[0] == '-' && flag[1] == '-')
     {
-        if(flag[2] == '\0')
+        if (flag[2] == '\0')
             return -1;
 
-        for(i = 0; longopts[i].name; i++)
+        for (i = 0; longopts[i].name; i++)
         {
             size_t l = strlen(longopts[i].name);
 
-            if(strncmp(flag + 2, longopts[i].name, l))
+            if (strncmp(flag + 2, longopts[i].name, l))
                 continue;
 
-            switch(flag[2 + l])
+            switch (flag[2 + l])
             {
             case '=':
-                if(!longopts[i].has_arg)
+                if (!longopts[i].has_arg)
                     goto bad_opt;
-                if(longindex)
+                if (longindex)
                     *longindex = i;
                 myoptind++;
@@ -110 +110 @@
                 return longopts[i].val;
             case '\0':
-                if(longindex)
+                if (longindex)
                     *longindex = i;
                 myoptind++;
-                if(longopts[i].has_arg)
+                if (longopts[i].has_arg)
                     myoptarg = argv[myoptind++];
                 return longopts[i].val;
@@ -120 +120 @@
             }
         }
-    bad_opt:
+      bad_opt:
         fprintf(stderr, "%s: unrecognized option `%s'\n", argv[0], flag);
         return '?';
@@ -127 +127 @@
     return -1;
 }
-

neercs/trunk/src/mytrace.c

@@ -1 @@
-/*
+/* 
  *  neercs        console-based window manager
  *  Copyright (c) 2008 Pascal Terjan
@@ -37 +37 @@
 #if defined USE_GRAB
 static int memcpy_from_target(struct mytrace *t,
-                              char* dest, long src, size_t n);
+                              char *dest, long src, size_t n);
 static int memcpy_into_target(struct mytrace *t,
                               long dest, char const *src, size_t n);
@@ -95 +95 @@
 /* from unistd_32.h on an amd64 system */
 int syscalls32[] = { 5, 6, 4, 63, 57, 66, 37, 2, 1, 11, 54 };
+
 int syscalls64[] =
 #else
 int syscalls32[] =
 #endif
-    { SYS_open, SYS_close, SYS_write, SYS_dup2, SYS_setpgid, SYS_setsid,
-      SYS_kill, SYS_fork, SYS_exit, SYS_execve, SYS_ioctl };
+{ SYS_open, SYS_close, SYS_write, SYS_dup2, SYS_setpgid, SYS_setsid,
+    SYS_kill, SYS_fork, SYS_exit, SYS_execve, SYS_ioctl
+};
 
 char const *syscallnames[] =
     { "open", "close", "write", "dup2", "setpgid", "setsid", "kill", "fork",
-      "exit", "execve", "ioctl" };
+    "exit", "execve", "ioctl"
+};
 
 #endif /* USE_GRAB */
@@ -113 +116 @@
 };
 
-struct mytrace* mytrace_attach(long int pid)
+struct mytrace *mytrace_attach(long int pid)
 {
 #if defined USE_GRAB
@@ -119 +122 @@
     int status;
 
-    if(ptrace(PTRACE_ATTACH, pid, 0, 0) < 0)
+    if (ptrace(PTRACE_ATTACH, pid, 0, 0) < 0)
     {
         perror("PTRACE_ATTACH (attach)");
         return NULL;
     }
-    if(waitpid(pid, &status, 0) < 0)
+    if (waitpid(pid, &status, 0) < 0)
     {
         perror("waitpid");
         return NULL;
     }
-    if(!WIFSTOPPED(status))
+    if (!WIFSTOPPED(status))
     {
         fprintf(stderr, "traced process was not stopped\n");
@@ -147 +150 @@
 }
 
-struct mytrace* mytrace_fork(struct mytrace *t)
+struct mytrace *mytrace_fork(struct mytrace *t)
 {
 #if defined USE_GRAB
@@ -198 +201 @@
     int ret, err;
 
-    if(ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
+    if (ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
     {
         perror("PTRACE_GETREGS (open)\n");
@@ -205 +208 @@
 
     /* Backup the data that we will use */
-    if(memcpy_from_target(t, backup_data, regs.RSP, size) < 0)
+    if (memcpy_from_target(t, backup_data, regs.RSP, size) < 0)
         return -1;
 
@@ -241 +244 @@
     int ret, err;
 
-    if(ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
+    if (ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
     {
         perror("PTRACE_GETREGS (write)\n");
@@ -250 +253 @@
 
     /* Backup the data that we will use */
-    if(memcpy_from_target(t, backup_data, regs.RSP, len) < 0)
+    if (memcpy_from_target(t, backup_data, regs.RSP, len) < 0)
         return -1;
 
@@ -326 +329 @@
     char *env, *p;
     long p2, envaddr, argvaddr, envptraddr;
-    char envpath[PATH_MAX+1];
-    ssize_t envsize = 16*1024;
+    char envpath[PATH_MAX + 1];
+    ssize_t envsize = 16 * 1024;
     int ret, fd, l, l2;
     char *nullp = NULL;
@@ -334 +337 @@
     ptrace(PTRACE_SETOPTIONS, t->pid, NULL, PTRACE_O_TRACEEXEC);
 
-    if(ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
+    if (ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
     {
         perror("PTRACE_GETREGS (exec)\n");
@@ -367 +370 @@
     }
     envsize = r;
-    l2 = sizeof(char *); /* Size of a pointer */
+    l2 = sizeof(char *);        /* Size of a pointer */
     p2 = regs.RSP;
 
     /* First argument is the command string */
-    l = strlen(command)+1;
+    l = strlen(command) + 1;
     memcpy_into_target(t, p2, command, l);
     p2 += l;
@@ -392 +395 @@
     envptraddr = p2;
     p = env;
-    while (p < env+envsize)
+    while (p < env + envsize)
     {
         long diffp = p - env + envaddr;
         memcpy_into_target(t, p2, (char *)&diffp, l2);
         p2 += l2;
-        p += strlen(p)+1;
+        p += strlen(p) + 1;
     }
     /* And have a NULL pointer at the end of the array */
@@ -420 +423 @@
     int ret, err;
 
-    if(ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
+    if (ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
     {
         perror("PTRACE_GETREGS (tcgets)\n");
@@ -427 +430 @@
 
     /* Backup the data that we will use */
-    if(memcpy_from_target(t, backup_data, regs.RSP, size) < 0)
-        return -1;
-
-    ret = remote_syscall(t, MYCALL_IOCTL, fd,TCGETS, regs.RSP);
+    if (memcpy_from_target(t, backup_data, regs.RSP, size) < 0)
+        return -1;
+
+    ret = remote_syscall(t, MYCALL_IOCTL, fd, TCGETS, regs.RSP);
     err = errno;
 
@@ -454 +457 @@
     int ret, err;
 
-    if(ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
+    if (ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
     {
         perror("PTRACE_GETREGS (tcsets)\n");
@@ -461 +464 @@
 
     /* Backup the data that we will use */
-    if(memcpy_from_target(t, backup_data, regs.RSP, size) < 0)
+    if (memcpy_from_target(t, backup_data, regs.RSP, size) < 0)
         return -1;
 
@@ -491 +494 @@
 }
 
-/*
+/* 
  * XXX: the following functions are local
  */
@@ -497 +500 @@
 #if defined USE_GRAB
 static int memcpy_from_target(struct mytrace *t,
-                              char* dest, long src, size_t n)
+                              char *dest, long src, size_t n)
 {
     static int const align = sizeof(long) - 1;
 
-    while(n)
+    while (n)
     {
         long data;
         size_t todo = sizeof(long) - (src & align);
 
-        if(n < todo)
+        if (n < todo)
             todo = n;
 
         data = ptrace(PTRACE_PEEKTEXT, t->pid, src - (src & align), 0);
-        if(errno)
+        if (errno)
         {
             perror("ptrace_peektext (memcpy_from_target)");
@@ -530 +533 @@
     static int const align = sizeof(long) - 1;
 
-    while(n)
+    while (n)
     {
         long data;
         size_t todo = sizeof(long) - (dest & align);
 
-        if(n < todo)
+        if (n < todo)
             todo = n;
-        if(todo != sizeof(long))
+        if (todo != sizeof(long))
         {
             data = ptrace(PTRACE_PEEKTEXT, t->pid, dest - (dest & align), 0);
-            if(errno)
+            if (errno)
             {
                 perror("ptrace_peektext (memcpy_into_target)");
@@ -548 +551 @@
 
         memcpy((char *)&data + (dest & align), src, todo);
-        if(ptrace(PTRACE_POKETEXT, t->pid, dest - (dest & align), data) < 0)
+        if (ptrace(PTRACE_POKETEXT, t->pid, dest - (dest & align), data) < 0)
         {
             perror("ptrace_poketext (memcpy_into_target)");
@@ -565 +568 @@
                            long arg1, long arg2, long arg3)
 {
-    /* Method for remote syscall:
-     *  - wait until the traced application exits from a syscall
-     *  - save registers
-     *  - rewind eip/rip to point on the syscall instruction
-     *  - single step: execute syscall instruction
-     *  - retrieve resulting registers
-     *  - restore registers */
+    /* Method for remote syscall: - wait until the traced application exits
+       from a syscall - save registers - rewind eip/rip to point on the
+       syscall instruction - single step: execute syscall instruction -
+       retrieve resulting registers - restore registers */
     struct user_regs_struct regs, oldregs;
     long oinst;
@@ -577 +577 @@
     int offset = 2;
 
-    if(call < 0 || call >= (long)(sizeof(syscallnames)/sizeof(*syscallnames)))
+    if (call < 0
+        || call >= (long)(sizeof(syscallnames) / sizeof(*syscallnames)))
     {
         fprintf(stderr, "unknown remote syscall %li\n", call);
@@ -592 +593 @@
 #endif
 
-    for(;;)
-    {
-        if(ptrace(PTRACE_GETREGS, t->pid, NULL, &oldregs) < 0)
+    for (;;)
+    {
+        if (ptrace(PTRACE_GETREGS, t->pid, NULL, &oldregs) < 0)
         {
             perror("PTRACE_GETREGS (syscall 1)\n");
@@ -603 +604 @@
 
 #if defined __x86_64__
-        if(oinst == SYSCALL_AMD64)
+        if (oinst == SYSCALL_AMD64)
             break;
 #endif
-        if(oinst == SYSCALL_X86 || oinst == SYSCALL_X86_NEW)
+        if (oinst == SYSCALL_X86 || oinst == SYSCALL_X86_NEW)
         {
             bits = 32;
@@ -612 +613 @@
         }
 
-        if(ptrace(PTRACE_SYSCALL, t->pid, NULL, 0) < 0)
+        if (ptrace(PTRACE_SYSCALL, t->pid, NULL, 0) < 0)
         {
             perror("ptrace_syscall (1)");
@@ -618 +619 @@
         }
         waitpid(t->pid, NULL, 0);
-        if(ptrace(PTRACE_SYSCALL, t->pid, NULL, 0) < 0)
+        if (ptrace(PTRACE_SYSCALL, t->pid, NULL, 0) < 0)
         {
             perror("ptrace_syscall (2)");
@@ -628 +629 @@
     print_registers(t->pid);
 
-    if(oinst == SYSCALL_X86_NEW)
-    {
-        /*  Get back to sysenter */
-        while((ptrace(PTRACE_PEEKTEXT, t->pid, oldregs.RIP - offset, 0) & 0xffff) != 0x340f)
+    if (oinst == SYSCALL_X86_NEW)
+    {
+        /* Get back to sysenter */
+        while ((ptrace(PTRACE_PEEKTEXT, t->pid, oldregs.RIP - offset, 0) &
+                0xffff) != 0x340f)
             offset++;
         oldregs.RBP = oldregs.RSP;
@@ -639 +641 @@
     regs.RIP = regs.RIP - offset;
 #if defined __x86_64__
-    if(bits == 64)
+    if (bits == 64)
     {
         regs.RAX = syscalls64[call];
@@ -655 +657 @@
     }
 
-    if(ptrace(PTRACE_SETREGS, t->pid, NULL, &regs) < 0)
+    if (ptrace(PTRACE_SETREGS, t->pid, NULL, &regs) < 0)
     {
         perror("PTRACE_SETREGS (syscall 1)\n");
@@ -661 +663 @@
     }
 
-    for(;;)
+    for (;;)
     {
         int status;
@@ -667 +669 @@
         print_registers(t->pid);
 
-        if(ptrace(PTRACE_SINGLESTEP, t->pid, NULL, NULL) < 0)
+        if (ptrace(PTRACE_SINGLESTEP, t->pid, NULL, NULL) < 0)
         {
             perror("PTRACE_SINGLESTEP (syscall)\n");
@@ -674 +676 @@
         waitpid(t->pid, &status, 0);
 
-        if(WIFEXITED(status))
+        if (WIFEXITED(status))
             return 0;
 
-        if(!WIFSTOPPED(status) || WSTOPSIG(status) != SIGTRAP)
+        if (!WIFSTOPPED(status) || WSTOPSIG(status) != SIGTRAP)
             continue;
 
         /* Fuck Linux: there is no macro for this */
-        switch((status >> 16) & 0xffff)
+        switch ((status >> 16) & 0xffff)
         {
         case PTRACE_EVENT_FORK:
-            if(ptrace(PTRACE_GETEVENTMSG, t->pid, 0, &t->child) < 0)
+            if (ptrace(PTRACE_GETEVENTMSG, t->pid, 0, &t->child) < 0)
             {
                 perror("PTRACE_GETEVENTMSG (syscall)\n");
@@ -705 +707 @@
     print_registers(t->pid);
 
-    if(ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
+    if (ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
     {
         perror("PTRACE_GETREGS (syscall 2)\n");
@@ -711 +713 @@
     }
 
-    if(ptrace(PTRACE_SETREGS, t->pid, NULL, &oldregs) < 0)
+    if (ptrace(PTRACE_SETREGS, t->pid, NULL, &oldregs) < 0)
     {
         perror("PTRACE_SETREGS (syscall 2)\n");
@@ -720 +722 @@
     debug("syscall %s returned %ld", syscallnames[call], regs.RAX);
 
-    if((long)regs.RAX < 0)
+    if ((long)regs.RAX < 0)
     {
         errno = -(long)regs.RAX;
@@ -734 +736 @@
 static void print_registers(pid_t pid)
 {
-    union { long int l; unsigned char data[sizeof(long int)]; } inst;
+    union
+    {
+        long int l;
+        unsigned char data[sizeof(long int)];
+    } inst;
     struct user_regs_struct regs;
     int i;
 
-    if(ptrace(PTRACE_GETREGS, pid, NULL, &regs) < 0)
+    if (ptrace(PTRACE_GETREGS, pid, NULL, &regs) < 0)
     {
         perror("PTRACE_GETREGS (syscall 2)");
@@ -744 +750 @@
     }
 
-    fprintf(stderr, "  / %s: "FMT"   ", STRINGIFY(RAX), regs.RAX);
-    fprintf(stderr, "%s: "FMT"\n", STRINGIFY(RBX), regs.RBX);
-    fprintf(stderr, "  | %s: "FMT"   ", STRINGIFY(RCX), regs.RCX);
-    fprintf(stderr, "%s: "FMT"\n", STRINGIFY(RDX), regs.RDX);
-    fprintf(stderr, "  | %s: "FMT"   ", STRINGIFY(RDI), regs.RDI);
-    fprintf(stderr, "%s: "FMT"\n", STRINGIFY(RSI), regs.RSI);
-    fprintf(stderr, "  | %s: "FMT"   ", STRINGIFY(RSP), regs.RSP);
-    fprintf(stderr, "%s: "FMT"\n", STRINGIFY(RIP), regs.RIP);
+    fprintf(stderr, "  / %s: " FMT "   ", STRINGIFY(RAX), regs.RAX);
+    fprintf(stderr, "%s: " FMT "\n", STRINGIFY(RBX), regs.RBX);
+    fprintf(stderr, "  | %s: " FMT "   ", STRINGIFY(RCX), regs.RCX);
+    fprintf(stderr, "%s: " FMT "\n", STRINGIFY(RDX), regs.RDX);
+    fprintf(stderr, "  | %s: " FMT "   ", STRINGIFY(RDI), regs.RDI);
+    fprintf(stderr, "%s: " FMT "\n", STRINGIFY(RSI), regs.RSI);
+    fprintf(stderr, "  | %s: " FMT "   ", STRINGIFY(RSP), regs.RSP);
+    fprintf(stderr, "%s: " FMT "\n", STRINGIFY(RIP), regs.RIP);
 
     inst.l = ptrace(PTRACE_PEEKTEXT, pid, regs.RIP - 4, 0);
@@ -761 +767 @@
 
     fprintf(stderr, "  \\ stack: ... ");
-    for(i = -16; i < 24; i += sizeof(long))
+    for (i = -16; i < 24; i += sizeof(long))
     {
         inst.l = ptrace(PTRACE_PEEKDATA, pid, regs.RSP + i, 0);
@@ -772 +778 @@
                 inst.data[0], inst.data[1], inst.data[2], inst.data[3]);
 #endif
-        if(i == 0)
+        if (i == 0)
             fprintf(stderr, "[%s] ", STRINGIFY(RSP));
     }

neercs/trunk/src/recurrent.c

@@ -1 @@
-/*
+/* 
  *  neercs        console-based window manager
  *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
@@ -31 +31 @@
 
 
-int handle_recurrents(struct screen_list* screen_list)
+int handle_recurrents(struct screen_list *screen_list)
 {
     int refresh = 0, i;
     /* Recurrent functions */
-    for(i=0; i<screen_list->recurrent_list->count; i++)
+    for (i = 0; i < screen_list->recurrent_list->count; i++)
     {
-        if(screen_list->recurrent_list->recurrent[i]->function)
+        if (screen_list->recurrent_list->recurrent[i]->function)
         {
-            refresh |= screen_list->recurrent_list->recurrent[i]->function(screen_list,
-                                                                           screen_list->recurrent_list->recurrent[i],
-                                                                           screen_list->recurrent_list->recurrent[i]->user,
-                                                                           get_us());
+            refresh |=
+                screen_list->recurrent_list->recurrent[i]->
+                function(screen_list,
+                         screen_list->recurrent_list->recurrent[i],
+                         screen_list->recurrent_list->recurrent[i]->user,
+                         get_us());
         }
     }
     /* Delete recurrent functions */
-    for(i=0; i<screen_list->recurrent_list->count; i++)
+    for (i = 0; i < screen_list->recurrent_list->count; i++)
     {
-        if(screen_list->recurrent_list->recurrent[i]->kill_me)
+        if (screen_list->recurrent_list->recurrent[i]->kill_me)
         {
             remove_recurrent(screen_list->recurrent_list, i);
@@ -58 +60 @@
 
 
-/* Add recurrent function. It will be called at each main loop iteration, unless it is removed */
+/* Add recurrent function. It will be called at each main loop iteration,
+   unless it is removed */
 int add_recurrent(struct recurrent_list *list,
-                  int (*func)(struct screen_list*, struct recurrent* rec, void *user, long long unsigned int t),
+                  int (*func) (struct screen_list *, struct recurrent * rec,
+                               void *user, long long unsigned int t),
                   void *user)
 {
-    if(list == NULL || func == NULL) return -1;
+    if (list == NULL || func == NULL)
+        return -1;
 
-    list->recurrent = (struct recurrent**) realloc(list->recurrent,
-                                                   sizeof(struct recurrent*)
-                                                   * (list->count+1));
+    list->recurrent = (struct recurrent **)realloc(list->recurrent,
+                                                   sizeof(struct recurrent *)
+                                                   * (list->count + 1));
 
-    if(!list->recurrent)
-        fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+    if (!list->recurrent)
+        fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__,
+                __LINE__);
 
     list->recurrent[list->count] = malloc(sizeof(struct recurrent));
 
-    list->recurrent[list->count]->kill_me    = 0;
-    list->recurrent[list->count]->function   = func;
-    list->recurrent[list->count]->user       = user;
+    list->recurrent[list->count]->kill_me = 0;
+    list->recurrent[list->count]->function = func;
+    list->recurrent[list->count]->user = user;
     list->recurrent[list->count]->start_time = get_us();
     list->count++;
 
-    return list->count-1;
+    return list->count - 1;
 }
 
@@ -88 +94 @@
 {
 
-    if(n>=list->count) return -1;
+    if (n >= list->count)
+        return -1;
 
     memmove(&list->recurrent[n],
-            &list->recurrent[n+1],
-            sizeof(struct recurrent*)*(list->count-(n+1)));
+            &list->recurrent[n + 1],
+            sizeof(struct recurrent *) * (list->count - (n + 1)));
 
     free(list->recurrent[n]);
-    list->recurrent = (struct recurrent**) realloc(list->recurrent,
-                                             sizeof(sizeof(struct recurrent*))
-                                             * (list->count));
-    if(!list->recurrent)
-        fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+    list->recurrent = (struct recurrent **)realloc(list->recurrent,
+                                                   sizeof(sizeof
+                                                          (struct recurrent *))
+                                                   * (list->count));
+    if (!list->recurrent)
+        fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__,
+                __LINE__);
 
 

neercs/trunk/src/screens.c

@@ -1 @@
-/*
+/* 
  *  neercs        console-based window manager
  *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
@@ -30 +30 @@
 #include "neercs.h"
 
-struct screen* create_screen_grab(int w, int h, int pid)
-{
-    struct screen *s = (struct screen*) malloc(sizeof(struct screen));
+struct screen *create_screen_grab(int w, int h, int pid)
+{
+    struct screen *s = (struct screen *)malloc(sizeof(struct screen));
 
     s->cv = caca_create_canvas(w, h);
@@ -48 +48 @@
     s->fd = create_pty_grab(pid, w, h, &s->pid);
 
-    if(s->fd < 0)
+    if (s->fd < 0)
     {
         caca_free_canvas(s->cv);
@@ -57 +57 @@
 }
 
-struct screen* create_screen(int w, int h, char *command)
-{
-    struct screen *s = (struct screen*) malloc(sizeof(struct screen));
+struct screen *create_screen(int w, int h, char *command)
+{
+    struct screen *s = (struct screen *)malloc(sizeof(struct screen));
 
     s->cv = caca_create_canvas(w, h);
@@ -82 +82 @@
 
 
-    if(s->fd < 0)
+    if (s->fd < 0)
     {
         caca_free_canvas(s->cv);
@@ -93 +93 @@
 int destroy_screen(struct screen *s)
 {
-    if(s->fd>=0)
+    if (s->fd >= 0)
         close(s->fd);
-    if(s->buf)
+    if (s->buf)
         free(s->buf);
-    if(s->title)
+    if (s->title)
         free(s->title);
     s->buf = NULL;
-    if(s->cv)
+    if (s->cv)
         caca_free_canvas(s->cv);
     s->cv = NULL;
@@ -109 +109 @@
 int add_screen(struct screen_list *list, struct screen *s)
 {
-    if(list == NULL || s == NULL) return -1;
+    if (list == NULL || s == NULL)
+        return -1;
 
     else
     {
-        list->screen = (struct screen**) realloc(list->screen,
-                                                 sizeof(sizeof(struct screen*))
-                                                 * (list->count+1));
-        if(!list->screen)
-            fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+        list->screen = (struct screen **)realloc(list->screen,
+                                                 sizeof(sizeof
+                                                        (struct screen *)) *
+                                                 (list->count + 1));
+        if (!list->screen)
+            fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__,
+                    __LINE__);
         list->screen[list->count] = s;
         list->count++;
@@ -124 +127 @@
     list->changed = 1;
 
-    return list->count-1;
+    return list->count - 1;
 }
 
@@ -130 +133 @@
 {
 
-    if(n>=list->count) return -1;
-
-    if(please_kill)
+    if (n >= list->count)
+        return -1;
+
+    if (please_kill)
     {
         int status = 0;
@@ -141 +145 @@
         kill(list->screen[n]->pid, SIGINT);
         ret = waitpid(list->screen[n]->pid, &status,
-                      WNOHANG|WUNTRACED|WCONTINUED);
-        if(!ret)
+                      WNOHANG | WUNTRACED | WCONTINUED);
+        if (!ret)
             kill(list->screen[n]->pid, SIGQUIT);
         ret = waitpid(list->screen[n]->pid, &status,
-                      WNOHANG|WUNTRACED|WCONTINUED);
-        if(!ret)
+                      WNOHANG | WUNTRACED | WCONTINUED);
+        if (!ret)
             kill(list->screen[n]->pid, SIGABRT);
         ret = waitpid(list->screen[n]->pid, &status,
-                      WNOHANG|WUNTRACED|WCONTINUED);
-        if(!ret)
+                      WNOHANG | WUNTRACED | WCONTINUED);
+        if (!ret)
             kill(list->screen[n]->pid, SIGKILL);
 
@@ -157 +161 @@
 
     memmove(&list->screen[n],
-            &list->screen[n+1],
-            sizeof(struct screen*)*(list->count-(n+1)));
-
-    list->screen = (struct screen**) realloc(list->screen,
-                                             sizeof(sizeof(struct screen*))
+            &list->screen[n + 1],
+            sizeof(struct screen *) * (list->count - (n + 1)));
+
+    list->screen = (struct screen **)realloc(list->screen,
+                                             sizeof(sizeof(struct screen *))
                                              * (list->count));
-    if(!list->screen)
-        fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+    if (!list->screen)
+        fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__,
+                __LINE__);
 
 
@@ -179 +184 @@
     int i;
 
-    if(!screen_list->count) return;
+    if (!screen_list->count)
+        return;
 
 
     debug("Current pty is %d\n", screen_list->pty);
 
-    screen_list->width  = caca_get_canvas_width(screen_list->cv);
-    screen_list->height = caca_get_canvas_height(screen_list->cv) - (screen_list->mini*6) - screen_list->status;
-
-    if(!screen_list->dont_update_coords)
+    screen_list->width = caca_get_canvas_width(screen_list->cv);
+    screen_list->height =
+        caca_get_canvas_height(screen_list->cv) - (screen_list->mini * 6) -
+        screen_list->status;
+
+    if (!screen_list->dont_update_coords)
     {
         update_windows_props(screen_list);
     }
 
-    if(screen_list->changed)
+    if (screen_list->changed)
     {
         caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_DEFAULT);
@@ -208 +216 @@
 
 
-    if(screen_list->mini)
+    if (screen_list->mini)
     {
         draw_thumbnails(screen_list);
     }
-    if(screen_list->status)
+    if (screen_list->status)
     {
         draw_status(screen_list);
     }
-    if(screen_list->help)
+    if (screen_list->help)
     {
         draw_help(screen_list);
     }
-    if(screen_list->window_list)
+    if (screen_list->window_list)
     {
         draw_list(screen_list);
     }
     screen_list->changed = 0;
-    for(i = screen_list->count - 1; i >=0; i--)
+    for (i = screen_list->count - 1; i >= 0; i--)
         screen_list->screen[i]->changed = 0;
 }
 
 
-int update_screens_contents(struct screen_list* screen_list)
+int update_screens_contents(struct screen_list *screen_list)
 {
     int i, refresh = 0;
@@ -240 +248 @@
     /* Read data, if any */
     FD_ZERO(&fdset);
-    for(i = 0; i < screen_list->count; i++)
-    {
-        if(screen_list->screen[i]->fd >= 0)
+    for (i = 0; i < screen_list->count; i++)
+    {
+        if (screen_list->screen[i]->fd >= 0)
             FD_SET(screen_list->screen[i]->fd, &fdset);
-        if(screen_list->screen[i]->fd > maxfd)
+        if (screen_list->screen[i]->fd > maxfd)
             maxfd = screen_list->screen[i]->fd;
     }
@@ -251 +259 @@
     ret = select(maxfd + 1, &fdset, NULL, NULL, &tv);
 
-    if(ret < 0)
-    {
-        if(errno == EINTR)
-            ; /* We probably got a SIGWINCH, ignore it */
+    if (ret < 0)
+    {
+        if (errno == EINTR)
+            ;                   /* We probably got a SIGWINCH, ignore it */
         else
         {
-            /* FIXME: Useless since break will mean that we return 0
-             * But I don't know what was the purpose of this code */
-            for(i = 0; i < screen_list->count; i++)
-                if(screen_list->screen[i]->total)
+            /* FIXME: Useless since break will mean that we return 0 But I
+               don't know what was the purpose of this code */
+            for (i = 0; i < screen_list->count; i++)
+                if (screen_list->screen[i]->total)
                     break;
-            if(i == screen_list->count)
+            if (i == screen_list->count)
                 return 0;
         }
     }
-    else if(ret)
-    {
-
-    for(i = 0; i < screen_list->count; i++)
-    {
-        /* FIXME: try a new strategy: read all filedescriptors until
-         * each of them starved at least once. */
-
-        if(screen_list->screen[i]->fd < 0 ||
-           !FD_ISSET(screen_list->screen[i]->fd, &fdset))
-            continue;
-
-        for(;;)
+    else if (ret)
+    {
+
+        for (i = 0; i < screen_list->count; i++)
         {
-            ssize_t nr;
-
-            screen_list->screen[i]->buf =
-                realloc(screen_list->screen[i]->buf,
-                        screen_list->screen[i]->total + 1024);
-            if(!screen_list->screen[i]->buf)
-                fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
-
-            nr = read(screen_list->screen[i]->fd,
-                      screen_list->screen[i]->buf +
-                      screen_list->screen[i]->total, 1024);
-
-            if(nr > 0)
+            /* FIXME: try a new strategy: read all filedescriptors until each
+               of them starved at least once. */
+
+            if (screen_list->screen[i]->fd < 0 ||
+                !FD_ISSET(screen_list->screen[i]->fd, &fdset))
+                continue;
+
+            for (;;)
             {
-                screen_list->screen[i]->total += nr;
-                continue;
+                ssize_t nr;
+
+                screen_list->screen[i]->buf =
+                    realloc(screen_list->screen[i]->buf,
+                            screen_list->screen[i]->total + 1024);
+                if (!screen_list->screen[i]->buf)
+                    fprintf(stderr, "Can't allocate memory at %s:%d\n",
+                            __FUNCTION__, __LINE__);
+
+                nr = read(screen_list->screen[i]->fd,
+                          screen_list->screen[i]->buf +
+                          screen_list->screen[i]->total, 1024);
+
+                if (nr > 0)
+                {
+                    screen_list->screen[i]->total += nr;
+                    continue;
+                }
+
+                if (nr == 0 || errno != EWOULDBLOCK)
+                {
+                    remove_screen(screen_list, i, 0);
+                    if (i < screen_list->prevpty)
+                        screen_list->prevpty--;
+                    if (i == screen_list->pty)
+                    {
+                        screen_list->pty = screen_list->prevpty;
+                        screen_list->prevpty = 0;
+                    }
+                    if (i < (screen_list->pty))
+                        (screen_list->pty)--;
+                    /* Don't skip the element which is now at position i */
+                    i--;
+                    refresh = 1;
+                }
+
+                break;
             }
-
-            if(nr == 0 || errno != EWOULDBLOCK)
-            {
-                remove_screen(screen_list, i, 0);
-                if(i < screen_list->prevpty) screen_list->prevpty--;
-                if(i == screen_list->pty)
-                {
-                    screen_list->pty = screen_list->prevpty;
-                    screen_list->prevpty = 0;
-                }
-                if(i < (screen_list->pty)) (screen_list->pty)--;
-                /* Don't skip the element which is now at position i */
-                i--;
-                refresh = 1;
-            }
-
-            break;
         }
     }
-    }
     return refresh;
 }
-
-

neercs/trunk/src/screensaver.c

@@ -1 @@
-/*
+/* 
  *  neercs        console-based window manager
  *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
@@ -57 +57 @@
 
 char toaster_text[3][99] = { {
-"      __._ \n"
-"   .-'== _',\n"
-"  <|_= .-'  |\n"
-"   | --|   \\'.-_ \n"
-"   |   | \\  \" _.\n"
-"    `-_|.-\\_.-\n"
-}, {
-"      __._ \n"
-"   .-'== _',\n"
-"  \\|_= .-'  |\n"
-"   | --|  __'-.\n"
-"   |   | ___.-\n"
-"    `-_|.-\n"
-}, {
-"   _- __._\n"
-"  /.-'== _',_.-.\n"
-"  \\|_= .-'/  _.'\n"
-"   | --| / .-\n"
-"   |   |  _.|\n"
-"    `-_|.-\n"} };
+                              "      __._ \n"
+                              "   .-'== _',\n"
+                              "  <|_= .-'  |\n"
+                              "   | --|   \\'.-_ \n"
+                              "   |   | \\  \" _.\n" "    `-_|.-\\_.-\n"}, {
+                                                                            "      __._ \n"
+                                                                            "   .-'== _',\n"
+                                                                            "  \\|_= .-'  |\n"
+                                                                            "   | --|  __'-.\n"
+                                                                            "   |   | ___.-\n"
+                                                                            "    `-_|.-\n"},
+{
+ "   _- __._\n" "  /.-'== _',_.-.\n" "  \\|_= .-'/  _.'\n" "   | --| / .-\n"
+ "   |   |  _.|\n" "    `-_|.-\n"}
+};
 
 char toaster_mask[3][99] = { {
-"      __._ \n"
-"   .-'== _',\n"
-"  <|_=X.-'XX|\n"
-"   |X--|XXX\\'.-_ \n"
-"   |XXX|X\\XX\"X_.\n"
-"    `-_|.-\\_.-\n"
-}, {
+                              "      __._ \n"
+                              "   .-'== _',\n"
+                              "  <|_=X.-'XX|\n"
+                              "   |X--|XXX\\'.-_ \n"
+                              "   |XXX|X\\XX\"X_.\n" "    `-_|.-\\_.-\n"}, {
 
-"      __._ \n"
-"   .-'== _',\n"
-"  \\|_= .-'XX|\n"
-"   |X--|XX__'-.\n"
-"   |XXX|X___.-\n"
-"    `-_|.-\n"
-}, {
-"   _- __._\n"
-"  /.-'== _',_.-.\n"
-"  \\|_= .-'/XX_.'\n"
-"   |X--|X/X.-\n"
-"   |XXX|XX_.|\n"
-"    `-_|.-\n"} };
+                                                                            "      __._ \n"
+                                                                            "   .-'== _',\n"
+                                                                            "  \\|_= .-'XX|\n"
+                                                                            "   |X--|XX__'-.\n"
+                                                                            "   |XXX|X___.-\n"
+                                                                            "    `-_|.-\n"},
+{
+ "   _- __._\n" "  /.-'== _',_.-.\n" "  \\|_= .-'/XX_.'\n" "   |X--|X/X.-\n"
+ "   |XXX|XX_.|\n" "    `-_|.-\n"}
+};
 
 struct flying_toaster
@@ -116 +106 @@
 
     flying_toaster = malloc(sizeof(struct flying_toaster));
-    flying_toaster->toaster = (caca_canvas_t **)malloc(sizeof(caca_canvas_t*)*3);
-    flying_toaster->mask = (caca_canvas_t **)malloc(sizeof(caca_canvas_t*)*3);
+    flying_toaster->toaster =
+        (caca_canvas_t **) malloc(sizeof(caca_canvas_t *) * 3);
+    flying_toaster->mask =
+        (caca_canvas_t **) malloc(sizeof(caca_canvas_t *) * 3);
 
-    for(i = 0; i < 3; i++)
+    for (i = 0; i < 3; i++)
     {
         flying_toaster->toaster[i] = caca_create_canvas(0, 0);
         flying_toaster->mask[i] = caca_create_canvas(0, 0);
         caca_import_canvas_from_memory(flying_toaster->toaster[i],
-                           toaster_text[i],
-                           strlen(toaster_text[i]), "utf8");
+                                       toaster_text[i],
+                                       strlen(toaster_text[i]), "utf8");
         caca_import_canvas_from_memory(flying_toaster->mask[i],
-                           toaster_mask[i],
-                           strlen(toaster_mask[i]), "utf8");
+                                       toaster_mask[i],
+                                       strlen(toaster_mask[i]), "utf8");
     }
 
-    for(i = 0; i < COUNT; i++)
+    for (i = 0; i < COUNT; i++)
     {
-        flying_toaster->x[i] = (rand()%w) * PRECISION;
-        flying_toaster->y[i] = (rand()%h) * PRECISION;
-        flying_toaster->s[i] = (rand()%3) * PRECISION;
+        flying_toaster->x[i] = (rand() % w) * PRECISION;
+        flying_toaster->y[i] = (rand() % h) * PRECISION;
+        flying_toaster->s[i] = (rand() % 3) * PRECISION;
     }
 
@@ -158 +150 @@
     struct flying_toaster *d = screen_list->screensaver_data;
     int i, w, h, x, y, s;
-    if(!d) return;
+    if (!d)
+        return;
 
     w = caca_get_canvas_width(screen_list->cv);
@@ -166 +159 @@
     caca_clear_canvas(screen_list->cv);
 
-    for(i = 0; i < COUNT; i++)
+    for (i = 0; i < COUNT; i++)
     {
-        x = d->x[i]/PRECISION;
-        y = d->y[i]/PRECISION;
-        s = d->s[i]/PRECISION;
+        x = d->x[i] / PRECISION;
+        y = d->y[i] / PRECISION;
+        s = d->s[i] / PRECISION;
 
         caca_blit(screen_list->cv, x, y, d->toaster[s], d->mask[s]);
 
-        d->x[i]-=40;
-        d->y[i]+=10;
+        d->x[i] -= 40;
+        d->y[i] += 10;
 
-        if(d->x[i]/PRECISION + caca_get_canvas_width(d->toaster[s])<=0)
-            d->x[i] = ((rand()%w)/3+w) * PRECISION;
-        if(d->y[i]/PRECISION>=h)
-            d->y[i] = ((rand()%h)/2-h) * PRECISION;
+        if (d->x[i] / PRECISION + caca_get_canvas_width(d->toaster[s]) <= 0)
+            d->x[i] = ((rand() % w) / 3 + w) * PRECISION;
+        if (d->y[i] / PRECISION >= h)
+            d->y[i] = ((rand() % h) / 2 - h) * PRECISION;
 
-        d->s[i] = ((d->s[i]+24)%(3*PRECISION));
+        d->s[i] = ((d->s[i] + 24) % (3 * PRECISION));
     }
 }

neercs/trunk/src/server.c

@@ -455 +455 @@
     if (screen_list->help)
     {
-        if (c == CACA_KEY_ESCAPE ||
-            c == 'h')
+        if (c == CACA_KEY_ESCAPE || c == 'h')
         {
             screen_list->help = 0;

neercs/trunk/src/term.c

@@ -1 @@
-/*
+/* 
  *  neercs        console-based window manager
  *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
@@ -20 +20 @@
 #include <string.h>
 #if defined HAVE_PTY_H
-#   include <pty.h>  /* for openpty and forkpty */
+#   include <pty.h>             /* for openpty and forkpty */
 #else
-#   include <util.h> /* for OS X */
+#   include <util.h>            /* for OS X */
 #endif
 #include <unistd.h>
@@ -37 +37 @@
     switch (uc)
     {
-    case '+': return 0x2192; /* RIGHTWARDS ARROW */
-    case ',': return 0x2190; /* LEFTWARDS ARROW */
-    case '-': return 0x2191; /* UPWARDS ARROW */
-    case '.': return 0x2193; /* DOWNWARDS ARROW */
-    case '0': return 0x25AE; /* BLACK VERTICAL RECTANGLE */
-    case '_': return 0x25AE; /* BLACK VERTICAL RECTANGLE */
-    case '`': return 0x25C6; /* BLACK DIAMOND */
-    case 'a': return 0x2592; /* MEDIUM SHADE */
-    case 'b': return 0x2409; /* SYMBOL FOR HORIZONTAL TABULATION */
-    case 'c': return 0x240C; /* SYMBOL FOR FORM FEED */
-    case 'd': return 0x240D; /* SYMBOL FOR CARRIAGE RETURN */
-    case 'e': return 0x240A; /* SYMBOL FOR LINE FEED */
-    case 'f': return 0x00B0; /* DEGREE SIGN */
-    case 'g': return 0x00B1; /* PLUS-MINUS SIGN */
-    case 'h': return 0x2424; /* SYMBOL FOR NEWLINE */
-    case 'i': return 0x240B; /* SYMBOL FOR VERTICAL TABULATION */
-    case 'j': return 0x2518; /* BOX DRAWINGS LIGHT UP AND LEFT */
-    case 'k': return 0x2510; /* BOX DRAWINGS LIGHT DOWN AND LEFT */
-    case 'l': return 0x250C; /* BOX DRAWINGS LIGHT DOWN AND RIGHT */
-    case 'm': return 0x2514; /* BOX DRAWINGS LIGHT UP AND RIGHT */
-    case 'n': return 0x253C; /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
-    case 'o': return 0x23BA; /* HORIZONTAL SCAN LINE-1 */
-    case 'p': return 0x23BB; /* HORIZONTAL SCAN LINE-3 */
-    case 'q': return 0x2500; /* BOX DRAWINGS LIGHT HORIZONTAL */
-    case 'r': return 0x23BC; /* HORIZONTAL SCAN LINE-7 */
-    case 's': return 0x23BD; /* HORIZONTAL SCAN LINE-9 */
-    case 't': return 0x251C; /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
-    case 'u': return 0x2524; /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */
-    case 'v': return 0x2534; /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */
-    case 'w': return 0x252C; /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
-    case 'x': return 0x2502; /* BOX DRAWINGS LIGHT VERTICAL */
-    case 'y': return 0x2264; /* LESS-THAN OR EQUAL TO */
-    case 'z': return 0x2265; /* GREATER-THAN OR EQUAL TO */
-    case '{': return 0x03C0; /* GREEK SMALL LETTER PI */
-    case '|': return 0x2260; /* NOT EQUAL TO */
-    case '}': return 0x00A3; /* POUND SIGN */
-    case '~': return 0x00B7; /* MIDDLE DOT */
+    case '+':
+        return 0x2192;          /* RIGHTWARDS ARROW */
+    case ',':
+        return 0x2190;          /* LEFTWARDS ARROW */
+    case '-':
+        return 0x2191;          /* UPWARDS ARROW */
+    case '.':
+        return 0x2193;          /* DOWNWARDS ARROW */
+    case '0':
+        return 0x25AE;          /* BLACK VERTICAL RECTANGLE */
+    case '_':
+        return 0x25AE;          /* BLACK VERTICAL RECTANGLE */
+    case '`':
+        return 0x25C6;          /* BLACK DIAMOND */
+    case 'a':
+        return 0x2592;          /* MEDIUM SHADE */
+    case 'b':
+        return 0x2409;          /* SYMBOL FOR HORIZONTAL TABULATION */
+    case 'c':
+        return 0x240C;          /* SYMBOL FOR FORM FEED */
+    case 'd':
+        return 0x240D;          /* SYMBOL FOR CARRIAGE RETURN */
+    case 'e':
+        return 0x240A;          /* SYMBOL FOR LINE FEED */
+    case 'f':
+        return 0x00B0;          /* DEGREE SIGN */
+    case 'g':
+        return 0x00B1;          /* PLUS-MINUS SIGN */
+    case 'h':
+        return 0x2424;          /* SYMBOL FOR NEWLINE */
+    case 'i':
+        return 0x240B;          /* SYMBOL FOR VERTICAL TABULATION */
+    case 'j':
+        return 0x2518;          /* BOX DRAWINGS LIGHT UP AND LEFT */
+    case 'k':
+        return 0x2510;          /* BOX DRAWINGS LIGHT DOWN AND LEFT */
+    case 'l':
+        return 0x250C;          /* BOX DRAWINGS LIGHT DOWN AND RIGHT */
+    case 'm':
+        return 0x2514;          /* BOX DRAWINGS LIGHT UP AND RIGHT */
+    case 'n':
+        return 0x253C;          /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
+    case 'o':
+        return 0x23BA;          /* HORIZONTAL SCAN LINE-1 */
+    case 'p':
+        return 0x23BB;          /* HORIZONTAL SCAN LINE-3 */
+    case 'q':
+        return 0x2500;          /* BOX DRAWINGS LIGHT HORIZONTAL */
+    case 'r':
+        return 0x23BC;          /* HORIZONTAL SCAN LINE-7 */
+    case 's':
+        return 0x23BD;          /* HORIZONTAL SCAN LINE-9 */
+    case 't':
+        return 0x251C;          /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
+    case 'u':
+        return 0x2524;          /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */
+    case 'v':
+        return 0x2534;          /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */
+    case 'w':
+        return 0x252C;          /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
+    case 'x':
+        return 0x2502;          /* BOX DRAWINGS LIGHT VERTICAL */
+    case 'y':
+        return 0x2264;          /* LESS-THAN OR EQUAL TO */
+    case 'z':
+        return 0x2265;          /* GREATER-THAN OR EQUAL TO */
+    case '{':
+        return 0x03C0;          /* GREEK SMALL LETTER PI */
+    case '|':
+        return 0x2260;          /* NOT EQUAL TO */
+    case '}':
+        return 0x00A3;          /* POUND SIGN */
+    case '~':
+        return 0x00B7;          /* MIDDLE DOT */
     default:
         return uc;
@@ -88 +125 @@
                             unsigned int, unsigned int const *);
 
-long int import_term(struct screen_list *screen_list, struct screen *sc, void const *data, unsigned int size)
+long int import_term(struct screen_list *screen_list, struct screen *sc,
+                     void const *data, unsigned int size)
 {
-    unsigned char const *buffer = (unsigned char const*)data;
-    unsigned int i, j, k,skip, dummy = 0;
+    unsigned char const *buffer = (unsigned char const *)data;
+    unsigned int i, j, k, skip, dummy = 0;
     unsigned int width, height, top, bottom;
     uint32_t savedattr;
@@ -102 +140 @@
     top = 1;
     bottom = height;
-    
-    if(!sc->init)
+
+    if (!sc->init)
     {
         sc->dfg = CACA_LIGHTGRAY;
@@ -118 +156 @@
     }
 
-    for(i = 0; i < size; i += skip)
+    for (i = 0; i < size; i += skip)
     {
         uint32_t ch = 0;
@@ -125 +163 @@
         skip = 1;
 
-        if(buffer[i] == '\r')
+        if (buffer[i] == '\r')
         {
             x = 0;
         }
 
-        else if(buffer[i] == '\n')
+        else if (buffer[i] == '\n')
         {
             x = 0;
             y++;
         }
-        else if(buffer[i] == '\a')
-        {
-            if(!sc->bell)
+        else if (buffer[i] == '\a')
+        {
+            if (!sc->bell)
                 screen_list->in_bell++;
             sc->bell = 1;
         }
 
-        else if(buffer[i] == '\t')
+        else if (buffer[i] == '\t')
         {
             x = (x + 7) & ~7;
         }
 
-        else if(buffer[i] == '\x08')
-        {
-            if(x > 0)
+        else if (buffer[i] == '\x08')
+        {
+            if (x > 0)
                 x--;
         }
 
-        else if(buffer[i] == '\x0e')
-        {
-            /* Shift Out (Ctrl-N) -> Switch to
-             * Alternate Character Set: invokes
-             * the G1 character set. */
+        else if (buffer[i] == '\x0e')
+        {
+            /* Shift Out (Ctrl-N) -> Switch to Alternate Character Set:
+               invokes the G1 character set. */
             sc->conv_state.glr[0] = 1;
         }
 
-        else if(buffer[i] == '\x0f')
-        {
-            /* Shift In (Ctrl-O) -> Switch to
-             * Standard Character Set: invokes
-             * the G0 character set. */
+        else if (buffer[i] == '\x0f')
+        {
+            /* Shift In (Ctrl-O) -> Switch to Standard Character Set: invokes
+               the G0 character set. */
             sc->conv_state.glr[0] = 0;
         }
 
         /* If there are not enough characters to parse the escape sequence,
-         * wait until the next try. We require 3. */
-        else if(buffer[i] == '\033' && i + 2 >= size)
+           wait until the next try. We require 3. */
+        else if (buffer[i] == '\033' && i + 2 >= size)
             break;
 
-        /* Single Shift Select of G2 Character Set (SS2: 0x8e):
-         * affects next character only */
-        else if(buffer[i] == '\033' && buffer[i + 1] == 'N')
+        /* Single Shift Select of G2 Character Set (SS2: 0x8e): affects next
+           character only */
+        else if (buffer[i] == '\033' && buffer[i + 1] == 'N')
         {
             sc->conv_state.ss = 2;
@@ -182 +218 @@
         }
         /* Reverse Index (RI) go up one line, reverse scroll if necessary */
-        else if(buffer[i] == '\033' && buffer[i + 1] == 'M')
-        {
-            /* FIXME : not sure about the meaning of 'go up one line' and 
-             * 'if necessary' words. Implemented as a scroller only. */
-            for(j = height; j > 0; j--)
-            {
-                for(k = 0; k < width; k++)
-                {
-                        caca_put_char(sc->cv, k, j, caca_get_char(sc->cv, k, j-1));
-                        caca_put_attr(sc->cv, k, j, caca_get_attr(sc->cv, k, j-1));
-                }
+        else if (buffer[i] == '\033' && buffer[i + 1] == 'M')
+        {
+            /* FIXME : not sure about the meaning of 'go up one line' and 'if 
+               necessary' words. Implemented as a scroller only. */
+            for (j = height; j > 0; j--)
+            {
+                for (k = 0; k < width; k++)
+                {
+                    caca_put_char(sc->cv, k, j,
+                                  caca_get_char(sc->cv, k, j - 1));
+                    caca_put_attr(sc->cv, k, j,
+                                  caca_get_attr(sc->cv, k, j - 1));
+                }
             }
             caca_draw_line(sc->cv, 0, 0, width, 0, ' ');
             skip += 1;
         }
-        
-        /* Single Shift Select of G3 Character Set (SS2: 0x8f):
-         * affects next character only */
-        else if(buffer[i] == '\033' && buffer[i + 1] == 'O')
+
+        /* Single Shift Select of G3 Character Set (SS2: 0x8f): affects next
+           character only */
+        else if (buffer[i] == '\033' && buffer[i + 1] == 'O')
         {
             sc->conv_state.ss = 3;
@@ -207 +245 @@
 
         /* LOCKING-SHIFT TWO (LS2), ISO 2022, ECMA-48 (1986), ISO 6429 : 1988 */
-        else if(buffer[i] == '\033' && buffer[i + 1] == 'n')
+        else if (buffer[i] == '\033' && buffer[i + 1] == 'n')
         {
             sc->conv_state.glr[0] = 2;
@@ -213 +251 @@
         }
 
-        /* LOCKING-SHIFT THREE (LS3) ISO 2022, ECMA-48 (1986), ISO 6429 : 1988 */
-        else if(buffer[i] == '\033' && buffer[i + 1] == 'o')
+        /* LOCKING-SHIFT THREE (LS3) ISO 2022, ECMA-48 (1986), ISO 6429 : 1988 
+         */
+        else if (buffer[i] == '\033' && buffer[i + 1] == 'o')
         {
             sc->conv_state.glr[0] = 3;
@@ -221 +260 @@
 
         /* RESET TO INITIAL STATE (RIS), ECMA-48 (1986), ISO 6429 : 1988 */
-        else if(buffer[i] == '\033' && buffer[i + 1] == 'c')
+        else if (buffer[i] == '\033' && buffer[i + 1] == 'c')
         {
             sc->dfg = CACA_DEFAULT;
@@ -234 +273 @@
         }
 
-        /* Coding Method Delimiter (CMD), ECMA-48 (1991), ISO/IEC 6429:1992 (ISO IR 189) */
-        else if(buffer[i] == '\033' && buffer[i + 1] == 'd')
+        /* Coding Method Delimiter (CMD), ECMA-48 (1991), ISO/IEC 6429:1992
+           (ISO IR 189) */
+        else if (buffer[i] == '\033' && buffer[i + 1] == 'd')
         {
             reset_conv_state(sc);
@@ -241 +281 @@
         }
 
-        /* GZDM4, G0-Designators, multi, 94^n chars [grandfathered short form from ISO 2022:1986] */
-        else if(buffer[i] == '\033' && buffer[i + 1] == '$' && (buffer[i + 2] >= '@') && (buffer[i + 2] <= 'C'))
+        /* GZDM4, G0-Designators, multi, 94^n chars [grandfathered short form
+           from ISO 2022:1986] */
+        else if (buffer[i] == '\033' && buffer[i + 1] == '$'
+                 && (buffer[i + 2] >= '@') && (buffer[i + 2] <= 'C'))
         {
             sc->conv_state.gn[0] = LITERAL2CHAR('$', buffer[i + 2]);
@@ -248 +290 @@
         }
 
-        /* GnDMx Gn-Designators, 9x^n chars; need one more char to distinguish these */
-        else if(buffer[i] == '\033' && buffer[i + 1] == '$' && (i + 3 >= size))
+        /* GnDMx Gn-Designators, 9x^n chars; need one more char to distinguish 
+           these */
+        else if (buffer[i] == '\033' && buffer[i + 1] == '$'
+                 && (i + 3 >= size))
             break;
 
         /* GZD4 G0-Designator, 94 chars */
-        else if(buffer[i] == '\033' && buffer[i + 1] == '(')
+        else if (buffer[i] == '\033' && buffer[i + 1] == '(')
         {
             sc->conv_state.gn[0] = buffer[i + 2];
@@ -260 +304 @@
 
         /* G1D4 G1-Designator, 94 chars */
-        else if(buffer[i] == '\033' && buffer[i + 1] == ')')
+        else if (buffer[i] == '\033' && buffer[i + 1] == ')')
         {
             sc->conv_state.gn[1] = buffer[i + 2];
@@ -267 +311 @@
 
         /* G2D4 G2-Designator, 94 chars */
-        else if(buffer[i] == '\033' && buffer[i + 1] == '*')
+        else if (buffer[i] == '\033' && buffer[i + 1] == '*')
         {
             sc->conv_state.gn[2] = buffer[i + 2];
@@ -274 +318 @@
 
         /* G3D4 G3-Designator, 94 chars */
-        else if(buffer[i] == '\033' && buffer[i + 1] == '+')
+        else if (buffer[i] == '\033' && buffer[i + 1] == '+')
         {
             sc->conv_state.gn[3] = buffer[i + 2];
@@ -281 +325 @@
 
         /* G2D6 G2-Designator, 96 chars */
-        else if(buffer[i] == '\033' && buffer[i + 1] == '.')
+        else if (buffer[i] == '\033' && buffer[i + 1] == '.')
         {
             sc->conv_state.gn[2] = LITERAL2CHAR('.', buffer[i + 2]);
@@ -288 +332 @@
 
         /* G3D6 G3-Designator, 96 chars */
-        else if(buffer[i] == '\033' && buffer[i + 1] == '/')
+        else if (buffer[i] == '\033' && buffer[i + 1] == '/')
         {
             sc->conv_state.gn[3] = LITERAL2CHAR('.', buffer[i + 2]);
@@ -295 +339 @@
 
         /* GZDM4 G0-Designator, 94^n chars */
-        else if(buffer[i] == '\033' && buffer[i + 1] == '$' && buffer[i + 2] == '(')
+        else if (buffer[i] == '\033' && buffer[i + 1] == '$'
+                 && buffer[i + 2] == '(')
         {
             sc->conv_state.gn[0] = LITERAL2CHAR('$', buffer[i + 3]);
@@ -302 +347 @@
 
         /* G1DM4 G1-Designator, 94^n chars */
-        else if(buffer[i] == '\033' && buffer[i + 1] == '$' && buffer[i + 2] == ')')
+        else if (buffer[i] == '\033' && buffer[i + 1] == '$'
+                 && buffer[i + 2] == ')')
         {
             sc->conv_state.gn[1] = LITERAL2CHAR('$', buffer[i + 3]);
@@ -309 +355 @@
 
         /* G2DM4 G2-Designator, 94^n chars */
-        else if(buffer[i] == '\033' && buffer[i + 1] == '$' && buffer[i + 2] == '*')
+        else if (buffer[i] == '\033' && buffer[i + 1] == '$'
+                 && buffer[i + 2] == '*')
         {
             sc->conv_state.gn[2] = LITERAL2CHAR('$', buffer[i + 3]);
@@ -316 +363 @@
 
         /* G3DM4 G3-Designator, 94^n chars */
-        else if(buffer[i] == '\033' && buffer[i + 1] == '$' && buffer[i + 2] == '+')
+        else if (buffer[i] == '\033' && buffer[i + 1] == '$'
+                 && buffer[i + 2] == '+')
         {
             sc->conv_state.gn[3] = LITERAL2CHAR('$', buffer[i + 3]);
@@ -323 +371 @@
 
         /* G2DM6 G2-Designator, 96^n chars */
-        else if(buffer[i] == '\033' && buffer[i + 1] == '$' && buffer[i + 2] == '.')
+        else if (buffer[i] == '\033' && buffer[i + 1] == '$'
+                 && buffer[i + 2] == '.')
         {
             sc->conv_state.gn[2] = LITERAL3CHAR('$', '.', buffer[i + 3]);
@@ -330 +379 @@
 
         /* G3DM6 G3-Designator, 96^n chars */
-        else if(buffer[i] == '\033' && buffer[i + 1] == '$' && buffer[i + 2] == '/')
+        else if (buffer[i] == '\033' && buffer[i + 1] == '$'
+                 && buffer[i + 2] == '/')
         {
             sc->conv_state.gn[3] = LITERAL3CHAR('$', '.', buffer[i + 3]);
@@ -337 +387 @@
 
         /* Interpret escape commands, as per Standard ECMA-48 "Control
-         * Functions for Coded Character Sets", 5.4. Control sequences. */
-        else if(buffer[i] == '\033' && buffer[i + 1] == '[')
+           Functions for Coded Character Sets", 5.4. Control sequences. */
+        else if (buffer[i] == '\033' && buffer[i + 1] == '[')
         {
             unsigned int argc = 0, argv[101];
@@ -344 +394 @@
 
 
-        /* Compute offsets to parameter bytes, intermediate bytes and
-         * to the final byte. Only the final byte is mandatory, there
-         * can be zero of the others.
-         * 0  param=2             inter                 final           final+1
-         * +-----+------------------+---------------------+-----------------+
-         * | CSI | parameter bytes  | intermediate bytes  |   final byte    |
-         * |     |   0x30 - 0x3f    |    0x20 - 0x2f      |   0x40 - 0x7e   |
-         * | ^[[ | 0123456789:;<=>? | SPC !"#$%&'()*+,-./ | azAZ@[\]^_`{|}~ |
-         * +-----+------------------+---------------------+-----------------+
-         */
+            /* Compute offsets to parameter bytes, intermediate bytes and to
+               the final byte. Only the final byte is mandatory, there can be
+               zero of the others. 0 param=2 inter final final+1
+               +-----+------------------+---------------------+-----------------+
+               | CSI | parameter bytes | intermediate bytes | final byte | | |
+               0x30 - 0x3f | 0x20 - 0x2f | 0x40 - 0x7e | | ^[[ | 0123456789:;<=>?
+               | SPC !"#$%&'()*+,-./ | azAZ@[\]^_`{|}~ |
+               +-----+------------------+---------------------+-----------------+ */
             param = 2;
 
-            for(inter = param; i + inter < size; inter++)
-                if(buffer[i + inter] < 0x30 || buffer[i + inter] > 0x3f)
+            for (inter = param; i + inter < size; inter++)
+                if (buffer[i + inter] < 0x30 || buffer[i + inter] > 0x3f)
                     break;
 
-            for(final = inter; i + final < size; final++)
-                if(buffer[i + final] < 0x20 || buffer[i + final] > 0x2f)
+            for (final = inter; i + final < size; final++)
+                if (buffer[i + final] < 0x20 || buffer[i + final] > 0x2f)
                     break;
 
-            if(i + final >= size
+            if (i + final >= size
                 || buffer[i + final] < 0x40 || buffer[i + final] > 0x7e)
-                break; /* Invalid Final Byte */
+                break;          /* Invalid Final Byte */
 
             skip += final;
 
             /* Sanity checks */
-            if(param < inter && buffer[i + param] >= 0x3c)
+            if (param < inter && buffer[i + param] >= 0x3c)
             {
                 /* Private sequence, only parse what we know */
                 debug("ansi import: private sequence \"^[[%.*s\"",
                       final - param + 1, buffer + i + param);
-                continue; /* Private sequence, skip it entirely */
-            }
-
-            if(final - param > 100)
-                continue; /* Suspiciously long sequence, skip it */
+                continue;       /* Private sequence, skip it entirely */
+            }
+
+            if (final - param > 100)
+                continue;       /* Suspiciously long sequence, skip it */
 
             /* Parse parameter bytes as per ECMA-48 5.4.2: Parameter string
-             * format */
-            if(param < inter)
+               format */
+            if (param < inter)
             {
                 argv[0] = 0;
-                for(j = param; j < inter; j++)
-                {
-                    if(buffer[i + j] == ';')
+                for (j = param; j < inter; j++)
+                {
+                    if (buffer[i + j] == ';')
                         argv[++argc] = 0;
-                    else if(buffer[i + j] >= '0' && buffer[i + j] <= '9')
+                    else if (buffer[i + j] >= '0' && buffer[i + j] <= '9')
                         argv[argc] = 10 * argv[argc] + (buffer[i + j] - '0');
                 }
@@ -398 +446 @@
 
             /* Interpret final byte. The code representations are given in
-             * ECMA-48 5.4: Control sequences, and the code definitions are
-             * given in ECMA-48 8.3: Definition of control functions. */
+               ECMA-48 5.4: Control sequences, and the code definitions are
+               given in ECMA-48 8.3: Definition of control functions. */
             debug("ansi import: command '%c'", buffer[i + final]);
-            switch(buffer[i + final])
-            {
-            case 'A': /* CUU (0x41) - Cursor Up */
+            switch (buffer[i + final])
+            {
+            case 'A':          /* CUU (0x41) - Cursor Up */
                 y -= argc ? argv[0] : 1;
-                if(y < 0)
+                if (y < 0)
                     y = 0;
                 break;
-            case 'B': /* CUD (0x42) - Cursor Down */
+            case 'B':          /* CUD (0x42) - Cursor Down */
                 y += argc ? argv[0] : 1;
                 break;
-            case 'C': /* CUF (0x43) - Cursor Right */
+            case 'C':          /* CUF (0x43) - Cursor Right */
                 x += argc ? argv[0] : 1;
                 break;
-            case 'D': /* CUB (0x44) - Cursor Left */
+            case 'D':          /* CUB (0x44) - Cursor Left */
                 x -= argc ? argv[0] : 1;
-                if(x < 0)
+                if (x < 0)
                     x = 0;
                 break;
-            case 'G': /* CHA (0x47) - Cursor Character Absolute */
+            case 'G':          /* CHA (0x47) - Cursor Character Absolute */
                 x = (argc && argv[0] > 0) ? argv[0] - 1 : 0;
                 break;
-            case 'H': /* CUP (0x48) - Cursor Position */
+            case 'H':          /* CUP (0x48) - Cursor Position */
                 x = (argc > 1 && argv[1] > 0) ? argv[1] - 1 : 0;
                 y = (argc > 0 && argv[0] > 0) ? argv[0] - 1 : 0;
                 break;
-            case 'J': /* ED (0x4a) - Erase In Page */
+            case 'J':          /* ED (0x4a) - Erase In Page */
                 savedattr = caca_get_attr(sc->cv, -1, -1);
                 caca_set_attr(sc->cv, sc->clearattr);
-                if(!argc || argv[0] == 0)
+                if (!argc || argv[0] == 0)
                 {
                     caca_draw_line(sc->cv, x, y, width, y, ' ');
-                    caca_fill_box(sc->cv, 0, y + 1, width - 1, height - 1, ' ');
-                }
-                else if(argv[0] == 1)
+                    caca_fill_box(sc->cv, 0, y + 1, width - 1, height - 1,
+                                  ' ');
+                }
+                else if (argv[0] == 1)
                 {
                     caca_fill_box(sc->cv, 0, 0, width - 1, y - 1, ' ');
                     caca_draw_line(sc->cv, 0, y, x, y, ' ');
                 }
-                else if(argv[0] == 2)
-                {
-                    //x = y = 0;
+                else if (argv[0] == 2)
+                {
+                    // x = y = 0;
                     caca_fill_box(sc->cv, 0, 0, width, height, ' ');
                 }
                 caca_set_attr(sc->cv, savedattr);
                 break;
-            case 'K': /* EL (0x4b) - Erase In Line */
-                if(!argc || argv[0] == 0) 
+            case 'K':          /* EL (0x4b) - Erase In Line */
+                if (!argc || argv[0] == 0)
                 {
                     caca_draw_line(sc->cv, x, y, width, y, ' ');
                 }
-                else if(argv[0] == 1)
+                else if (argv[0] == 1)
                 {
                     caca_draw_line(sc->cv, 0, y, x, y, ' ');
                 }
-                else if(argv[0] == 2)
-                {
-                    if((unsigned int)x < width)
+                else if (argv[0] == 2)
+                {
+                    if ((unsigned int)x < width)
                         caca_draw_line(sc->cv, x, y, width - 1, y, ' ');
                 }
-                //x = width;
-                break;
-            case 'L': /* IL - Insert line */
+                // x = width;
+                break;
+            case 'L':          /* IL - Insert line */
                 {
                     unsigned int nb_lines = argc ? argv[0] : 1;
                     debug("IL %d %d", argc, nb_lines);
-                    for(j = bottom - 1; j >= (unsigned int)y + nb_lines; j--)
+                    for (j = bottom - 1; j >= (unsigned int)y + nb_lines; j--)
                     {
-                        for(k = 0; k < width; k++)
+                        for (k = 0; k < width; k++)
                         {
-                            caca_put_char(sc->cv, k, j, caca_get_char(sc->cv, k, j - nb_lines));
-                            caca_put_attr(sc->cv, k, j, caca_get_attr(sc->cv, k, j - nb_lines));
-                         }
-                        caca_draw_line(sc->cv, 0, j - nb_lines, width, j - nb_lines, ' ');
+                            caca_put_char(sc->cv, k, j,
+                                          caca_get_char(sc->cv, k,
+                                                        j - nb_lines));
+                            caca_put_attr(sc->cv, k, j,
+                                          caca_get_attr(sc->cv, k,
+                                                        j - nb_lines));
+                        }
+                        caca_draw_line(sc->cv, 0, j - nb_lines, width,
+                                       j - nb_lines, ' ');
                     }
                 }
                 break;
-            case 'P': /* DCH (0x50) - Delete Character */
-                if(!argc || argv[0] == 0)
-                    argv[0] = 1; /* echo -ne 'foobar\r\e[0P\n' */ 
+            case 'P':          /* DCH (0x50) - Delete Character */
+                if (!argc || argv[0] == 0)
+                    argv[0] = 1;        /* echo -ne 'foobar\r\e[0P\n' */
                 /* Jylam : Start from x, not 0 */
-                for(j = x; (unsigned int)(j + argv[0]) < width; j++)
+                for (j = x; (unsigned int)(j + argv[0]) < width; j++)
                 {
                     caca_put_char(sc->cv, j, y,
-                                   caca_get_char(sc->cv, j + argv[0], y));
+                                  caca_get_char(sc->cv, j + argv[0], y));
                     caca_put_attr(sc->cv, j, y,
-                                   caca_get_attr(sc->cv, j + argv[0], y));
-                }
-                break; /* Jylam: this one was missing I guess */
+                                  caca_get_attr(sc->cv, j + argv[0], y));
+                }
+                break;          /* Jylam: this one was missing I guess */
 #if 0
                 savedattr = caca_get_attr(sc->cv, -1, -1);
                 caca_set_attr(sc->cv, sc->clearattr);
-                for( ; (unsigned int)j < width; j++)
+                for (; (unsigned int)j < width; j++)
                     caca_put_char(sc->cv, j, y, ' ');
                 caca_set_attr(sc->cv, savedattr);
 #endif
-            case 'X': /* ECH (0x58) - Erase Character */
-                if(argc && argv[0])
+            case 'X':          /* ECH (0x58) - Erase Character */
+                if (argc && argv[0])
                 {
                     savedattr = caca_get_attr(sc->cv, -1, -1);
@@ -504 +558 @@
                     caca_set_attr(sc->cv, savedattr);
                 }
-            case 'd': /* VPA (0x64) - Line Position Absolute */
+            case 'd':          /* VPA (0x64) - Line Position Absolute */
                 y = (argc && argv[0] > 0) ? argv[0] - 1 : 0;
                 break;
-            case 'f': /* HVP (0x66) - Character And Line Position */
+            case 'f':          /* HVP (0x66) - Character And Line Position */
                 x = (argc > 1 && argv[1] > 0) ? argv[1] - 1 : 0;
                 y = (argc > 0 && argv[0] > 0) ? argv[0] - 1 : 0;
                 break;
-            case 'r': /* FIXME */
-                if(argc == 2) /* DCSTBM - Set top and bottom margin */
+            case 'r':          /* FIXME */
+                if (argc == 2)  /* DCSTBM - Set top and bottom margin */
                 {
                     debug("DCSTBM %d %d", argv[0], argv[1]);
@@ -521 +575 @@
                     debug("ansi import: command r with %d params", argc);
                 break;
-            case 'h': /* SM (0x68) - FIXME */
+            case 'h':          /* SM (0x68) - FIXME */
                 debug("ansi import: set mode %i", argc ? (int)argv[0] : -1);
                 break;
-            case 'l': /* RM (0x6c) - FIXME */
+            case 'l':          /* RM (0x6c) - FIXME */
                 debug("ansi import: reset mode %i", argc ? (int)argv[0] : -1);
                 break;
-            case 'm': /* SGR (0x6d) - Select Graphic Rendition */
-                if(argc)
+            case 'm':          /* SGR (0x6d) - Select Graphic Rendition */
+                if (argc)
                     ansi_parse_grcm(sc, argc, argv);
                 else
                     ansi_parse_grcm(sc, 1, &dummy);
                 break;
-            case 's': /* Private (save cursor position) */
+            case 's':          /* Private (save cursor position) */
                 save_x = x;
                 save_y = y;
                 break;
-            case 'u': /* Private (reload cursor position) */
+            case 'u':          /* Private (reload cursor position) */
                 x = save_x;
                 y = save_y;
@@ -549 +603 @@
 
         /* Parse OSC stuff. */
-        else if(buffer[i] == '\033' && buffer[i + 1] == ']')
+        else if (buffer[i] == '\033' && buffer[i + 1] == ']')
         {
             char *string;
@@ -555 +609 @@
             unsigned int mode = 2, semicolon, final;
 
-            for(semicolon = mode; i + semicolon < size; semicolon++)
-            {
-                if(buffer[i + semicolon] < '0' || buffer[i + semicolon] > '9')
+            for (semicolon = mode; i + semicolon < size; semicolon++)
+            {
+                if (buffer[i + semicolon] < '0' || buffer[i + semicolon] > '9')
                     break;
                 command = 10 * command + (buffer[i + semicolon] - '0');
             }
 
-            if(i + semicolon >= size || buffer[i + semicolon] != ';')
-                break; /* Invalid Mode */
-
-            for(final = semicolon + 1; i + final < size; final++)
-                if(buffer[i + final] < 0x20)
+            if (i + semicolon >= size || buffer[i + semicolon] != ';')
+                break;          /* Invalid Mode */
+
+            for (final = semicolon + 1; i + final < size; final++)
+                if (buffer[i + final] < 0x20)
                     break;
 
-            if(i + final >= size || buffer[i + final] != '\a')
-                break; /* Not enough data or no bell found */
-                /* FIXME: XTerm also reacts to <ESC><backslash> and <ST> */
-                /* FIXME: differenciate between not enough data (try again)
-                 *        and invalid data (print shit) */
+            if (i + final >= size || buffer[i + final] != '\a')
+                break;          /* Not enough data or no bell found */
+            /* FIXME: XTerm also reacts to <ESC><backslash> and <ST> */
+            /* FIXME: differenciate between not enough data (try again) and
+               invalid data (print shit) */
 
             skip += final;
 
             string = malloc(final - (semicolon + 1) + 1);
-            memcpy(string, buffer + i + (semicolon + 1), final - (semicolon + 1));
+            memcpy(string, buffer + i + (semicolon + 1),
+                   final - (semicolon + 1));
             string[final - (semicolon + 1)] = '\0';
             debug("ansi import: got OSC command %i string '%s'", command,
                   string);
-            if(command == 0 || command == 2)
-            {
-                if(sc->title)
+            if (command == 0 || command == 2)
+            {
+                if (sc->title)
                     free(sc->title);
                 sc->title = string;
@@ -597 +652 @@
             size_t bytes;
 
-            if(i + 6 < size) 
+            if (i + 6 < size)
             {
                 ch = caca_utf8_to_utf32((char const *)(buffer + i), &bytes);
-            } else
+            }
+            else
             {
                 /* Add a trailing zero to what we're going to read */
@@ -609 +665 @@
             }
 
-            if(!bytes)
+            if (!bytes)
             {
                 /* If the Unicode is invalid, assume it was latin1. */
@@ -617 +673 @@
 
             /* very incomplete ISO-2022 implementation tailored to DEC ACS */
-            if(sc->conv_state.cs == '@')
+            if (sc->conv_state.cs == '@')
             {
                 if (((ch > ' ') && (ch <= '~'))
                     &&
-                    (sc->conv_state.gn[sc->conv_state.ss ? sc->conv_state.gn[sc->conv_state.ss] : sc->conv_state.glr[0]] == '0'))
+                    (sc->conv_state.
+                     gn[sc->conv_state.ss ? sc->conv_state.
+                        gn[sc->conv_state.ss] : sc->conv_state.glr[0]] == '0'))
                 {
                     ch = dec_acs(ch);
                 }
                 else if (((ch > 0x80) && (ch < 0xff))
-                         &&
-                         (sc->conv_state.gn[sc->conv_state.glr[1]] == '0'))
+                         && (sc->conv_state.gn[sc->conv_state.glr[1]] == '0'))
                 {
                     ch = dec_acs(ch + ' ' - 0x80);
                 }
             }
-            sc->conv_state.ss = 0; /* no single-shift (GL) */
+            sc->conv_state.ss = 0;      /* no single-shift (GL) */
 
             wch = caca_utf32_is_fullwidth(ch) ? 2 : 1;
-            
+
             skip += bytes - 1;
         }
 
         /* Wrap long lines or grow horizontally */
-        while((unsigned int)x + wch > width)
+        while ((unsigned int)x + wch > width)
         {
             x -= width;
@@ -647 +704 @@
 
         /* Scroll or grow vertically */
-        if((unsigned int)y >= bottom)
+        if ((unsigned int)y >= bottom)
         {
             int lines = (y - bottom) + 1;
@@ -653 +710 @@
             savedattr = caca_get_attr(sc->cv, -1, -1);
 
-            for(j = top - 1; j + lines < bottom; j++)
-            {
-                for(k = 0; k < width; k++)
-                {
-                    caca_put_char(sc->cv, k, j, caca_get_char(sc->cv, k, j + lines));
-                    caca_put_attr(sc->cv, k, j, caca_get_attr(sc->cv, k, j + lines));
+            for (j = top - 1; j + lines < bottom; j++)
+            {
+                for (k = 0; k < width; k++)
+                {
+                    caca_put_char(sc->cv, k, j,
+                                  caca_get_char(sc->cv, k, j + lines));
+                    caca_put_attr(sc->cv, k, j,
+                                  caca_get_attr(sc->cv, k, j + lines));
                 }
             }
             caca_set_attr(sc->cv, sc->clearattr);
-            caca_fill_box(sc->cv, 0, bottom - lines,
-                                   width, bottom - 1, ' ');
+            caca_fill_box(sc->cv, 0, bottom - lines, width, bottom - 1, ' ');
             y -= lines;
             caca_set_attr(sc->cv, savedattr);
@@ -669 +727 @@
 
         /* Now paste our character, if any */
-        if(wch)
+        if (wch)
         {
             caca_put_char(sc->cv, x, y, ch);
@@ -678 +736 @@
     caca_gotoxy(sc->cv, x, y);
 
-    if(i)
+    if (i)
         sc->changed = 1;
     return i;
 }
 
-/* Coding Method Delimiter (CMD), ECMA-48 (1991), ISO/IEC 6429:1992 (ISO IR 189) */
+/* Coding Method Delimiter (CMD), ECMA-48 (1991), ISO/IEC 6429:1992 (ISO IR
+   189) */
 
 static void reset_conv_state(struct screen *sc)
 {
-    sc->conv_state.cs = '@'; /* ISO-2022 coding system */
+    sc->conv_state.cs = '@';    /* ISO-2022 coding system */
     sc->conv_state.cn[0] = '@'; /* ISO 646 C0 control charset */
     sc->conv_state.cn[1] = 'C'; /* ISO 6429-1983 C1 control charset */
-    sc->conv_state.glr[0] = 0; /* G0 in GL */
-    sc->conv_state.glr[1] = 2; /* G2 in GR */
+    sc->conv_state.glr[0] = 0;  /* G0 in GL */
+    sc->conv_state.glr[1] = 2;  /* G2 in GR */
     sc->conv_state.gn[0] = 'B'; /* US-ASCII G0 charset */
     sc->conv_state.gn[1] = '0'; /* DEC ACS G1 charset */
-    sc->conv_state.gn[2] = LITERAL2CHAR('.', 'A'); /* ISO 8859-1 G2 charset */
-    sc->conv_state.gn[3] = LITERAL2CHAR('.', 'A'); /* ISO 8859-1 G3 charset */
-    sc->conv_state.ss = 0; /* no single-shift (GL) */
+    sc->conv_state.gn[2] = LITERAL2CHAR('.', 'A');      /* ISO 8859-1 G2
+                                                           charset */
+    sc->conv_state.gn[3] = LITERAL2CHAR('.', 'A');      /* ISO 8859-1 G3
+                                                           charset */
+    sc->conv_state.ss = 0;      /* no single-shift (GL) */
     sc->conv_state.ctrl8bit = 1;
 }
@@ -705 +766 @@
                             unsigned int argc, unsigned int const *argv)
 {
-    static uint8_t const ansi2caca[] =
-    {
+    static uint8_t const ansi2caca[] = {
         CACA_BLACK, CACA_RED, CACA_GREEN, CACA_BROWN,
         CACA_BLUE, CACA_MAGENTA, CACA_CYAN, CACA_LIGHTGRAY
@@ -712 +772 @@
 
     unsigned int j;
-    uint8_t efg, ebg; /* Effective (libcaca) fg/bg */
-
-    for(j = 0; j < argc; j++)
+    uint8_t efg, ebg;           /* Effective (libcaca) fg/bg */
+
+    for (j = 0; j < argc; j++)
     {
         /* Defined in ECMA-48 8.3.117: SGR - SELECT GRAPHIC RENDITION */
-        if(argv[j] >= 30 && argv[j] <= 37)
+        if (argv[j] >= 30 && argv[j] <= 37)
             sc->fg = ansi2caca[argv[j] - 30];
-        else if(argv[j] >= 40 && argv[j] <= 47)
+        else if (argv[j] >= 40 && argv[j] <= 47)
             sc->bg = ansi2caca[argv[j] - 40];
-        else if(argv[j] >= 90 && argv[j] <= 97)
+        else if (argv[j] >= 90 && argv[j] <= 97)
             sc->fg = ansi2caca[argv[j] - 90] + 8;
-        else if(argv[j] >= 100 && argv[j] <= 107)
+        else if (argv[j] >= 100 && argv[j] <= 107)
             sc->bg = ansi2caca[argv[j] - 100] + 8;
-        else switch(argv[j])
-        {
-        case 0: /* default rendition */
-            sc->fg = sc->dfg;
-            sc->bg = sc->dbg;
-            sc->bold = sc->blink = sc->italics = sc->negative
-             = sc->concealed = sc->underline = sc->faint = sc->strike
-             = sc->proportional = 0;
-            break;
-        case 1: /* bold or increased intensity */
-            sc->bold = 1;
-            break;
-        case 2: /* faint, decreased intensity or second colour */
-            sc->faint = 1;
-            break;
-        case 3: /* italicized */
-            sc->italics = 1;
-            break;
-        case 4: /* singly underlined */
-            sc->underline = 1;
-            break;
-        case 5: /* slowly blinking (less then 150 per minute) */
-        case 6: /* rapidly blinking (150 per minute or more) */
-            sc->blink = 1;
-            break;
-        case 7: /* negative image */
-            sc->negative = 1;
-            break;
-        case 8: /* concealed characters */
-            sc->concealed = 1;
-            break;
-        case 9: /* crossed-out (characters still legible but marked as to be
-                 * deleted */
-            sc->strike = 1;
-            break;
-        case 21: /* doubly underlined */
-            sc->underline = 1;
-            break;
-        case 22: /* normal colour or normal intensity (neither bold nor
-                  * faint) */
-            sc->bold = sc->faint = 0;
-            break;
-        case 23: /* not italicized, not fraktur */
-            sc->italics = 0;
-            break;
-        case 24: /* not underlined (neither singly nor doubly) */
-            sc->underline = 0;
-            break;
-        case 25: /* steady (not blinking) */
-            sc->blink = 0;
-            break;
-        case 26: /* (reserved for proportional spacing as specified in CCITT
-                  * Recommendation T.61) */
-            sc->proportional = 1;
-            break;
-        case 27: /* positive image */
-            sc->negative = 0;
-            break;
-        case 28: /* revealed characters */
-            sc->concealed = 0;
-            break;
-        case 29: /* not crossed out */
-            sc->strike = 0;
-            break;
-        case 38: /* (reserved for future standardization, intended for setting
-                  * character foreground colour as specified in ISO 8613-6
-                  * [CCITT Recommendation T.416]) */
-            break;
-        case 39: /* default display colour (implementation-defined) */
-            sc->fg = sc->dfg;
-            break;
-        case 48: /* (reserved for future standardization, intended for setting
-                  * character background colour as specified in ISO 8613-6
-                  * [CCITT Recommendation T.416]) */
-            break;
-        case 49: /* default background colour (implementation-defined) */
-            sc->bg = sc->dbg;
-            break;
-        case 50: /* (reserved for cancelling the effect of the rendering
-                  * aspect established by parameter value 26) */
-            sc->proportional = 0;
-            break;
-        default:
-            debug("ansi import: unknown sgr %i", argv[j]);
-            break;
-        }
+        else
+            switch (argv[j])
+            {
+            case 0:            /* default rendition */
+                sc->fg = sc->dfg;
+                sc->bg = sc->dbg;
+                sc->bold = sc->blink = sc->italics = sc->negative
+                    = sc->concealed = sc->underline = sc->faint = sc->strike
+                    = sc->proportional = 0;
+                break;
+            case 1:            /* bold or increased intensity */
+                sc->bold = 1;
+                break;
+            case 2:            /* faint, decreased intensity or second colour 
+                                 */
+                sc->faint = 1;
+                break;
+            case 3:            /* italicized */
+                sc->italics = 1;
+                break;
+            case 4:            /* singly underlined */
+                sc->underline = 1;
+                break;
+            case 5:            /* slowly blinking (less then 150 per minute) */
+            case 6:            /* rapidly blinking (150 per minute or more) */
+                sc->blink = 1;
+                break;
+            case 7:            /* negative image */
+                sc->negative = 1;
+                break;
+            case 8:            /* concealed characters */
+                sc->concealed = 1;
+                break;
+            case 9:            /* crossed-out (characters still legible but
+                                   marked as to be deleted */
+                sc->strike = 1;
+                break;
+            case 21:           /* doubly underlined */
+                sc->underline = 1;
+                break;
+            case 22:           /* normal colour or normal intensity (neither
+                                   bold nor faint) */
+                sc->bold = sc->faint = 0;
+                break;
+            case 23:           /* not italicized, not fraktur */
+                sc->italics = 0;
+                break;
+            case 24:           /* not underlined (neither singly nor doubly) */
+                sc->underline = 0;
+                break;
+            case 25:           /* steady (not blinking) */
+                sc->blink = 0;
+                break;
+            case 26:           /* (reserved for proportional spacing as
+                                   specified in CCITT Recommendation T.61) */
+                sc->proportional = 1;
+                break;
+            case 27:           /* positive image */
+                sc->negative = 0;
+                break;
+            case 28:           /* revealed characters */
+                sc->concealed = 0;
+                break;
+            case 29:           /* not crossed out */
+                sc->strike = 0;
+                break;
+            case 38:           /* (reserved for future standardization,
+                                   intended for setting character foreground
+                                   colour as specified in ISO 8613-6 [CCITT
+                                   Recommendation T.416]) */
+                break;
+            case 39:           /* default display colour
+                                   (implementation-defined) */
+                sc->fg = sc->dfg;
+                break;
+            case 48:           /* (reserved for future standardization,
+                                   intended for setting character background
+                                   colour as specified in ISO 8613-6 [CCITT
+                                   Recommendation T.416]) */
+                break;
+            case 49:           /* default background colour
+                                   (implementation-defined) */
+                sc->bg = sc->dbg;
+                break;
+            case 50:           /* (reserved for cancelling the effect of the
+                                   rendering aspect established by parameter
+                                   value 26) */
+                sc->proportional = 0;
+                break;
+            default:
+                debug("ansi import: unknown sgr %i", argv[j]);
+                break;
+            }
     }
 
-    if(sc->concealed)
+    if (sc->concealed)
     {
         efg = ebg = CACA_TRANSPARENT;
@@ -822 +889 @@
         ebg = sc->negative ? sc->fg : sc->bg;
 
-        if(sc->bold)
-        {
-            if(efg < 8)
+        if (sc->bold)
+        {
+            if (efg < 8)
                 efg += 8;
-            else if(efg == CACA_DEFAULT)
+            else if (efg == CACA_DEFAULT)
                 efg = CACA_WHITE;
         }
@@ -839 +906 @@
     int fd;
     pid_t pid;
-    
+
     pid = forkpty(&fd, NULL, NULL, NULL);
-    if(pid < 0)
+    if (pid < 0)
     {
         fprintf(stderr, "forkpty() error\n");
         return -1;
     }
-    else if(pid == 0)
+    else if (pid == 0)
     {
         set_tty_size(0, w, h);
@@ -852 +919 @@
         putenv("TERM=xterm");
         argv = malloc(2 * sizeof(char *));
-        if(!argv)
-        {
-            fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+        if (!argv)
+        {
+            fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__,
+                    __LINE__);
             return -1;
         }
@@ -876 +944 @@
     int ret = openpty(&fdm, &fds, NULL, NULL, NULL);
 
-    if(ret < 0)
+    if (ret < 0)
     {
         fprintf(stderr, "open() error\n");
@@ -903 +971 @@
 
 
-int update_terms(struct screen_list* screen_list)
+int update_terms(struct screen_list *screen_list)
 {
     int i, refresh = 0;
-    for(i = 0; i < screen_list->count; i++)
+    for (i = 0; i < screen_list->count; i++)
     {
-        if(screen_list->screen[i]->total && !screen_list->dont_update_coords)
+        if (screen_list->screen[i]->total && !screen_list->dont_update_coords)
         {
             unsigned long int bytes;
@@ -917 +985 @@
                                 screen_list->screen[i]->total);
 
-            if(bytes > 0)
+            if (bytes > 0)
             {
                 screen_list->screen[i]->total -= bytes;
@@ -923 +991 @@
                         screen_list->screen[i]->buf + bytes,
                         screen_list->screen[i]->total);
-                if(screen_list->screen[i]->visible || screen_list->mini)
+                if (screen_list->screen[i]->visible || screen_list->mini)
                     refresh = 1;
             }
@@ -930 +998 @@
     return refresh;
 }
-

neercs/trunk/src/wm.c

@@ -1 @@
-/*
+/* 
  *  neercs        console-based window manager
  *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
@@ -39 +39 @@
     s->h = h;
 
-    /*
+    /* 
      * caca_set_canvas_boundaries() is bugged as hell, so let's resize it by
      * hands
@@ -419 +419 @@
             float cube_projected[12][2];
             float fov = 0.5f;
-            float angle = 90.0f * ((float)cur_time / (float)screen_list->cube.duration);
+            float angle =
+                90.0f * ((float)cur_time / (float)screen_list->cube.duration);
 
             angle *= (M_PI / 180.0f);