updated to acm-like color scheme

diff --git a/lib/cfg.ml b/lib/cfg.ml
index 501f17c342db625910c1a935e9711042286e3ba0..1bccdc3eb1b06cac8886de1bbad1bba43ed7f944 100644 (file)
--- a/lib/cfg.ml
+++ b/lib/cfg.ml
@@ -54,22 +54,24 @@ let max_scan_dist = intvar "tide.input.max_scan_dist" 0
 module Color = struct
   (* color palette *)
   let palette = [|
 module Color = struct
   (* color palette *)
   let palette = [|

-    intvar "tide.palette.00" 0xff002b36;
-    intvar "tide.palette.01" 0xff073642;
-    intvar "tide.palette.02" 0xff40565d;
-    intvar "tide.palette.03" 0xff657b83;
-    intvar "tide.palette.04" 0xff839496;
-    intvar "tide.palette.05" 0xff93a1a1;
-    intvar "tide.palette.06" 0xffeee8d5;
-    intvar "tide.palette.07" 0xfffdf6e3;
-    intvar "tide.palette.08" 0xffb58900;
-    intvar "tide.palette.09" 0xffcb4b16;
-    intvar "tide.palette.10" 0xffdc322f;
-    intvar "tide.palette.11" 0xffd33682;
-    intvar "tide.palette.12" 0xff6c71c4;
-    intvar "tide.palette.13" 0xff268bd2;
-    intvar "tide.palette.14" 0xff2aa198;
-    intvar "tide.palette.15" 0xff859900;
+    intvar "tide.palette.00" 0xefefda; (* Edit background *)
+    intvar "tide.palette.01" 0xdaefef; (* Tags background *)
+    intvar "tide.palette.02" 0xdede8e; (* Edit selection *)
+    intvar "tide.palette.03" 0x8edede; (* Tags Selection *)
+    intvar "tide.palette.04" 0x000000; (* Text and cursor *)
+    intvar "tide.palette.05" 0x89893c; (* Scroll background *)
+    intvar "tide.palette.06" 0x7878bc; (* Border color *)
+    intvar "tide.palette.07" 0x000000; (* unused *)
+
+    intvar "tide.palette.08" 0x772222; (* Red *)
+    intvar "tide.palette.09" 0x227722; (* Green *)
+    intvar "tide.palette.10" 0x222277; (* Blue *)
+
+    intvar "tide.palette.11" 0x004488; (*  *)
+    intvar "tide.palette.12" 0x770077; (*  *)
+    intvar "tide.palette.13" 0x007777; (*  *)
+    intvar "tide.palette.14" 0xeeeecc; (*  *)
+    intvar "tide.palette.15" 0xff8c00; (*  *)

   |]
 
   (* UI color index definitions *)
   |]
 
   (* UI color index definitions *)


@@ -90,12 +92,12 @@ module Color = struct
 
   (* syntax color definitions *)
   module Syntax = struct
 
   (* syntax color definitions *)
   module Syntax = struct

-    let normal    = intvar "tide.colors.syntax.normal"    5
-    let comment   = intvar "tide.colors.syntax.comment"   3
-    let constant  = intvar "tide.colors.syntax.constant"  14
-    let keyword   = intvar "tide.colors.syntax.keyword"   15
-    let typedef   = intvar "tide.colors.syntax.typedef"   8
-    let preproc   = intvar "tide.colors.syntax.preproc"   9
+    let normal    = intvar "tide.colors.syntax.normal"    4
+    let comment   = intvar "tide.colors.syntax.comment"   8
+    let constant  = intvar "tide.colors.syntax.constant"  9
+    let keyword   = intvar "tide.colors.syntax.keyword"   10
+    let typedef   = intvar "tide.colors.syntax.typedef"   10
+    let preproc   = intvar "tide.colors.syntax.preproc"   4

 (*
     let number    = intvar "tide.colors.syntax.number"    14
     let boolean   = intvar "tide.colors.syntax.boolean"   14
 (*
     let number    = intvar "tide.colors.syntax.number"    14
     let boolean   = intvar "tide.colors.syntax.boolean"   14

diff --git a/lib/draw.ml b/lib/draw.ml
index f61ea0aa6fba008ac2510e8de764785ca6095bc4..84c0bebfa22fd6d4be79b7f280bb6e3786cf7fc7 100644 (file)
--- a/lib/draw.ml
+++ b/lib/draw.ml
@@ -113,8 +113,8 @@ let rectangle color width height csr =
 (* curried helpers *)
 let dark_bkg = rectangle Cfg.Color.palette.(0)
 let light_bkg = rectangle Cfg.Color.palette.(1)
 (* curried helpers *)
 let dark_bkg = rectangle Cfg.Color.palette.(0)
 let light_bkg = rectangle Cfg.Color.palette.(1)

-let rule_bkg = rectangle Cfg.Color.palette.(3)
-let draw_cursor = rectangle Cfg.Color.palette.(6) 1 font_height
+let rule_bkg = rectangle Cfg.Color.palette.(5)
+let draw_cursor = rectangle Cfg.Color.palette.(4) 1 font_height

 
 let hrule width csr =
   rule_bkg width 1 csr;
 
 let hrule width csr =
   rule_bkg width 1 csr;

diff --git a/lib/misc_prims.c b/lib/misc_prims.c
index fdb0a92f681bbb7830212550d9b971e54ca8b4f1..4cfa5f98f86d0efcce37edfdfd9b2b37dd7db2d2 100644 (file)
--- a/lib/misc_prims.c
+++ b/lib/misc_prims.c
@@ -9,9 +9,7 @@ CAMLprim value load_file(value path) {
     CAMLlocal1(str);
     int fd, nread;
     struct stat sb;
     CAMLlocal1(str);
     int fd, nread;
     struct stat sb;

-    if (((fd = open(String_val(path), O_RDONLY, 0)) < 0) ||
-        (fstat(fd, &sb) < 0) ||
-        (sb.st_size == 0)) {
+    if (((fd = open(path, O_RDONLY, 0)) < 0) || (fstat(fd, &sb) < 0) || (sb.st_size == 0)) {

         str = caml_alloc_string(0);
     } else {
         str = caml_alloc_string(sb.st_size);
         str = caml_alloc_string(0);
     } else {
         str = caml_alloc_string(sb.st_size);

diff --git a/lib/x11_prims.c b/lib/x11_prims.c
index 2f6b8f6dfebf11f593aea58accbb26e05dd46e8a..39f7835a72c48825f937273d160df970e1aa3a3a 100644 (file)
--- a/lib/x11_prims.c
+++ b/lib/x11_prims.c
@@ -581,7 +581,7 @@ static int32_t special_keys(int32_t key) {
  ******************************************************************************/
 static void xftcolor(XftColor* xc, int c) {
     #define COLOR(c) ((c) | ((c) >> 8))
  ******************************************************************************/
 static void xftcolor(XftColor* xc, int c) {
     #define COLOR(c) ((c) | ((c) >> 8))

-    xc->color.alpha = COLOR((c & 0xFF000000) >> 16);
+    xc->color.alpha = 0xFFFF;

     xc->color.red   = COLOR((c & 0x00FF0000) >> 8);
     xc->color.green = COLOR((c & 0x0000FF00));
     xc->color.blue  = COLOR((c & 0x000000FF) << 8);
     xc->color.red   = COLOR((c & 0x00FF0000) >> 8);
     xc->color.green = COLOR((c & 0x0000FF00));
     xc->color.blue  = COLOR((c & 0x000000FF) << 8);