Ben Hutchings' patch to allow Gtk windows to be shrunk as well as grown

[sgt/puzzles] / misc.c

diff --git a/misc.c b/misc.c
index 2f8d08d..8f5314c 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -147,8 +147,6 @@ unsigned char *hex2bin(const char *in, int outlen)
     unsigned char *ret = snewn(outlen, unsigned char);
     int i;
 
-    debug(("hex2bin: in '%s'", in));
-
     memset(ret, 0, outlen*sizeof(unsigned char));
     for (i = 0; i < outlen*2; i++) {
         int c = in[i];
@@ -169,4 +167,76 @@ unsigned char *hex2bin(const char *in, int outlen)
     return ret;
 }
 
+void game_mkhighlight(frontend *fe, float *ret,
+                      int background, int highlight, int lowlight)
+{
+    float max;
+    int i;
+
+    frontend_default_colour(fe, &ret[background * 3]);
+
+    /*
+     * Drop the background colour so that the highlight is
+     * noticeably brighter than it while still being under 1.
+     */
+    max = ret[background*3];
+    for (i = 1; i < 3; i++)
+        if (ret[background*3+i] > max)
+            max = ret[background*3+i];
+    if (max * 1.2F > 1.0F) {
+        for (i = 0; i < 3; i++)
+            ret[background*3+i] /= (max * 1.2F);
+    }
+
+    for (i = 0; i < 3; i++) {
+        ret[highlight * 3 + i] = ret[background * 3 + i] * 1.2F;
+        ret[lowlight * 3 + i] = ret[background * 3 + i] * 0.8F;
+    }
+}
+
+static void memswap(void *av, void *bv, int size)
+{
+    char tmpbuf[512];
+    char *a = av, *b = bv;
+
+    while (size > 0) {
+       int thislen = min(size, sizeof(tmpbuf));
+       memcpy(tmpbuf, a, thislen);
+       memcpy(a, b, thislen);
+       memcpy(b, tmpbuf, thislen);
+       a += thislen;
+       b += thislen;
+       size -= thislen;
+    }
+}
+
+void shuffle(void *array, int nelts, int eltsize, random_state *rs)
+{
+    char *carray = (char *)array;
+    int i;
+
+    for (i = nelts; i-- > 1 ;) {
+        int j = random_upto(rs, i+1);
+        if (j != i)
+            memswap(carray + eltsize * i, carray + eltsize * j, eltsize);
+    }
+}
+
+void draw_rect_outline(drawing *dr, int x, int y, int w, int h, int colour)
+{
+    int x0 = x, x1 = x+w-1, y0 = y, y1 = y+h-1;
+    int coords[8];
+
+    coords[0] = x0;
+    coords[1] = y0;
+    coords[2] = x0;
+    coords[3] = y1;
+    coords[4] = x1;
+    coords[5] = y1;
+    coords[6] = x1;
+    coords[7] = y0;
+
+    draw_polygon(dr, coords, 4, -1, colour);
+}
+
 /* vim: set shiftwidth=4 tabstop=8: */