src/usr.bin/tmux/colour.c - diff

Return to colour.c CVS log

Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/colour.c between version 1.1 and 1.2

-version 1.1, 2009/06/01 22:58:49
+version 1.2, 2009/09/10 17:16:24
 Line 18
 Line 18
 Line 18
  #include <sys/types.h>
+ #include <stdlib.h>
  #include <string.h>
  #include "tmux.h"
+ /*
+  * Colour to string conversion functions. Bit 8 of the colour means it is one
+  * of the 256 colour palette.
+  */
+ void
+ colour_set_fg(struct grid_cell *gc, int c)
+ {
+         if (c & 0x100)
+                 gc->flags |= GRID_FLAG_FG256;
+         gc->fg = c;
+ }
+ void
+ colour_set_bg(struct grid_cell *gc, int c)
+ {
+         if (c & 0x100)
+                 gc->flags |= GRID_FLAG_BG256;
+         gc->bg = c;
+ }
  const char *
- colour_tostring(u_char c)
+ colour_tostring(int c)
  {
+         static char     s[32];
+         if (c & 0x100) {
+                 xsnprintf(s, sizeof s, "colour%u", c & ~0x100);
+                 return (s);
+         }
          switch (c) {
          case 0:
                  return ("black");
-Line 51
+Line 80
 Line 51
 Line 80
  int
  colour_fromstring(const char *s)
  {
+         const char      *errstr;
+         int              n;
+         if (strncasecmp(s, "colour", (sizeof "colour") - 1) == 0) {
+                 n = strtonum(s + (sizeof "colour") - 1, 0, 255, &errstr);
+                 if (errstr != NULL)
+                         return (-1);
+                 return (n | 0x100);
+         }
          if (strcasecmp(s, "black") == 0 || (s[0] == '0' && s[1] == '\0'))
                  return (0);
          if (strcasecmp(s, "red") == 0 || (s[0] == '1' && s[1] == '\0'))