Further general development. Net is now playable, though

configuration is absent as yet.

[originally from svn r4145]

1 files changed, 225 insertions, 28 deletions

diff --git a/gtk.c b/gtk.c
index 8bb01fd..ec086fc 100644
--- a/gtk.c
+++ b/gtk.c
@@ -1,9 +1,14 @@
 /*
  * gtk.c: GTK front end for my puzzle collection.
+ * 
+ * TODO:
+ * 
+ *  - Handle resizing, probably just by forbidding it.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 #include <stdarg.h>
 
 #include <gtk/gtk.h>
@@ -39,69 +44,261 @@ void fatal(char *fmt, ...)
  * doing so. I'm just coding cleanly because there's no
  * particularly good reason not to.
  */
-struct window_data {
+struct frontend {
     GtkWidget *window;
     GtkWidget *area;
+    GdkPixmap *pixmap;
+    GdkColor *colours;
+    int ncolours;
+    GdkColormap *colmap;
+    int w, h;
     midend_data *me;
+    GdkGC *gc;
+    int bbox_l, bbox_r, bbox_u, bbox_d;
+    int timer_active;
 };
 
+void frontend_default_colour(frontend *fe, float *output)
+{
+    GdkColor col = fe->window->style->bg[GTK_STATE_NORMAL];
+    output[0] = col.red / 65535.0;
+    output[1] = col.green / 65535.0;
+    output[2] = col.blue / 65535.0;
+}
+
+void start_draw(frontend *fe)
+{
+    fe->gc = gdk_gc_new(fe->area->window);
+    fe->bbox_l = fe->w;
+    fe->bbox_r = 0;
+    fe->bbox_u = fe->h;
+    fe->bbox_d = 0;
+}
+
+void draw_rect(frontend *fe, int x, int y, int w, int h, int colour)
+{
+    gdk_gc_set_foreground(fe->gc, &fe->colours[colour]);
+    gdk_draw_rectangle(fe->pixmap, fe->gc, 1, x, y, w, h);
+}
+
+void draw_line(frontend *fe, int x1, int y1, int x2, int y2, int colour)
+{
+    gdk_gc_set_foreground(fe->gc, &fe->colours[colour]);
+    gdk_draw_line(fe->pixmap, fe->gc, x1, y1, x2, y2);
+}
+
+void draw_polygon(frontend *fe, int *coords, int npoints,
+                  int fill, int colour)
+{
+    GdkPoint *points = snewn(npoints, GdkPoint);
+    int i;
+
+    for (i = 0; i < npoints; i++) {
+        points[i].x = coords[i*2];
+        points[i].y = coords[i*2+1];
+    }
+
+    gdk_gc_set_foreground(fe->gc, &fe->colours[colour]);
+    gdk_draw_polygon(fe->pixmap, fe->gc, fill, points, npoints);
+
+    sfree(points);
+}
+
+void draw_update(frontend *fe, int x, int y, int w, int h)
+{
+    if (fe->bbox_l > x  ) fe->bbox_l = x  ;
+    if (fe->bbox_r < x+w) fe->bbox_r = x+w;
+    if (fe->bbox_u > y  ) fe->bbox_u = y  ;
+    if (fe->bbox_d < y+h) fe->bbox_d = y+h;
+}
+
+void end_draw(frontend *fe)
+{
+    gdk_gc_unref(fe->gc);
+    fe->gc = NULL;
+
+    if (fe->bbox_l < fe->bbox_r && fe->bbox_u < fe->bbox_d) {
+	gdk_draw_pixmap(fe->area->window,
+			fe->area->style->fg_gc[GTK_WIDGET_STATE(fe->area)],
+			fe->pixmap,
+                        fe->bbox_l, fe->bbox_u,
+                        fe->bbox_l, fe->bbox_u,
+                        fe->bbox_r - fe->bbox_l, fe->bbox_d - fe->bbox_u);
+    }
+}
+
 static void destroy(GtkWidget *widget, gpointer data)
 {
     gtk_main_quit();
 }
 
-gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-    struct window_data *wdata = (struct window_data *)data;
+    frontend *fe = (frontend *)data;
 
-    IGNORE(wdata);
+    if (!fe->pixmap)
+        return TRUE;
 
-    if (!midend_process_key(wdata->me, 0, 0, event->keyval))
-	gtk_widget_destroy(wdata->window);
+    if (event->string[0] && !event->string[1] &&
+        !midend_process_key(fe->me, 0, 0, event->string[0]))
+	gtk_widget_destroy(fe->window);
 
     return TRUE;
 }
 
-gint button_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gint button_event(GtkWidget *widget, GdkEventButton *event,
+                         gpointer data)
 {
-    struct window_data *wdata = (struct window_data *)data;
+    frontend *fe = (frontend *)data;
+    int button;
+
+    if (!fe->pixmap)
+        return TRUE;
+
+    if (event->type != GDK_BUTTON_PRESS)
+        return TRUE;
 
-    IGNORE(wdata);
+    if (event->button == 1)
+	button = LEFT_BUTTON;
+    else if (event->button == 2)
+	button = MIDDLE_BUTTON;
+    else if (event->button == 3)
+	button = RIGHT_BUTTON;
+    else
+	return FALSE;		       /* don't even know what button! */
+
+    if (!midend_process_key(fe->me, event->x, event->y, button))
+	gtk_widget_destroy(fe->window);
 
     return TRUE;
 }
 
-static struct window_data *new_window(void)
+static gint expose_area(GtkWidget *widget, GdkEventExpose *event,
+                        gpointer data)
 {
-    struct window_data *wdata;
+    frontend *fe = (frontend *)data;
+
+    if (fe->pixmap) {
+	gdk_draw_pixmap(widget->window,
+			widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+			fe->pixmap,
+			event->area.x, event->area.y,
+			event->area.x, event->area.y,
+			event->area.width, event->area.height);
+    }
+    return TRUE;
+}
+
+static gint configure_area(GtkWidget *widget,
+                           GdkEventConfigure *event, gpointer data)
+{
+    frontend *fe = (frontend *)data;
+    GdkGC *gc;
+
+    fe->pixmap = gdk_pixmap_new(widget->window, fe->w, fe->h, -1);
+
+    gc = gdk_gc_new(fe->area->window);
+    gdk_gc_set_foreground(gc, &fe->colours[0]);
+    gdk_draw_rectangle(fe->pixmap, gc, 1, 0, 0, fe->w, fe->h);
+    gdk_gc_unref(gc);
+
+    midend_redraw(fe->me);
+
+    return TRUE;
+}
+
+static gint timer_func(gpointer data)
+{
+    frontend *fe = (frontend *)data;
+
+    if (fe->timer_active)
+        midend_timer(fe->me, 0.02);    /* may clear timer_active */
+
+    return fe->timer_active;
+}
+
+void deactivate_timer(frontend *fe)
+{
+    fe->timer_active = FALSE;
+}
+
+void activate_timer(frontend *fe)
+{
+    gtk_timeout_add(20, timer_func, fe);
+    fe->timer_active = TRUE;
+}
+
+static frontend *new_window(void)
+{
+    frontend *fe;
     int x, y;
 
-    wdata = snew(struct window_data);
+    fe = snew(frontend);
 
-    wdata->me = midend_new();
-    midend_new_game(wdata->me, NULL);
+    fe->me = midend_new(fe);
+    midend_new_game(fe->me, NULL);
 
-    wdata->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    fe->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
-    wdata->area = gtk_drawing_area_new();
-    midend_size(wdata->me, &x, &y);
-    gtk_drawing_area_size(GTK_DRAWING_AREA(wdata->area), x, y);
+    {
+        int i, ncolours;
+        float *colours;
+        gboolean *success;
 
-    gtk_container_add(GTK_CONTAINER(wdata->window), wdata->area);
-    gtk_widget_show(wdata->area);
+        fe->colmap = gdk_colormap_get_system();
+        colours = midend_colours(fe->me, &ncolours);
+        fe->ncolours = ncolours;
+        fe->colours = snewn(ncolours, GdkColor);
+        for (i = 0; i < ncolours; i++) {
+            fe->colours[i].red = colours[i*3] * 0xFFFF;
+            fe->colours[i].green = colours[i*3+1] * 0xFFFF;
+            fe->colours[i].blue = colours[i*3+2] * 0xFFFF;
+        }
+        success = snewn(ncolours, gboolean);
+        gdk_colormap_alloc_colors(fe->colmap, fe->colours, ncolours,
+                                  FALSE, FALSE, success);
+        for (i = 0; i < ncolours; i++) {
+            if (!success[i])
+                g_error("couldn't allocate colour %d (#%02x%02x%02x)\n",
+                        i, fe->colours[i].red >> 8,
+                        fe->colours[i].green >> 8,
+                        fe->colours[i].blue >> 8);
+        }
+    }
 
-    gtk_signal_connect(GTK_OBJECT(wdata->window), "destroy",
-		       GTK_SIGNAL_FUNC(destroy), wdata);
-    gtk_signal_connect(GTK_OBJECT(wdata->window), "key_press_event",
-		       GTK_SIGNAL_FUNC(key_event), wdata);
-    gtk_signal_connect(GTK_OBJECT(wdata->area), "button_press_event",
-		       GTK_SIGNAL_FUNC(button_event), wdata);
-    gtk_widget_show(wdata->window);
-    return wdata;
+    fe->area = gtk_drawing_area_new();
+    midend_size(fe->me, &x, &y);
+    gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y);
+    fe->w = x;
+    fe->h = y;
+
+    gtk_container_add(GTK_CONTAINER(fe->window), fe->area);
+
+    fe->pixmap = NULL;
+
+    gtk_signal_connect(GTK_OBJECT(fe->window), "destroy",
+		       GTK_SIGNAL_FUNC(destroy), fe);
+    gtk_signal_connect(GTK_OBJECT(fe->window), "key_press_event",
+		       GTK_SIGNAL_FUNC(key_event), fe);
+    gtk_signal_connect(GTK_OBJECT(fe->area), "button_press_event",
+		       GTK_SIGNAL_FUNC(button_event), fe);
+    gtk_signal_connect(GTK_OBJECT(fe->area), "expose_event",
+		       GTK_SIGNAL_FUNC(expose_area), fe);
+    gtk_signal_connect(GTK_OBJECT(fe->area), "configure_event",
+		       GTK_SIGNAL_FUNC(configure_area), fe);
+
+    gtk_widget_add_events(GTK_WIDGET(fe->area), GDK_BUTTON_PRESS_MASK);
+
+    gtk_widget_show(fe->area);
+    gtk_widget_show(fe->window);
+
+    return fe;
 }
 
 int main(int argc, char **argv)
 {
+    srand(time(NULL));
+
     gtk_init(&argc, &argv);
     (void) new_window();
     gtk_main();