X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;h=a2e34a11924a99ae3f17af7c4826d9284bfd0957;hb=8b60f53889d02bb82812b3cc866018dc792d1455;hp=bad09fdb9ccaf3ba73150be4a6539efcb396b443;hpb=38a73833906ed36e3c961545bfd51f7c215596b1;p=kub

diff --git a/kub.c b/kub.c
index bad09fd..a2e34a1 100644
--- a/kub.c
+++ b/kub.c
@@ -5,6 +5,42 @@
 #include <librsvg/rsvg.h>
 #include <librsvg/rsvg-cairo.h>
 
+/*
+ *   TILE_NUMBER_X_OFFSET = 3
+ * //
+ * || TILE_NUMBER_WIDTH = 34
+ * ||/   /
+ * ||   |  TILE_WIDTH = 40
+ * ||   | /
+ * |     | 
+ * +-----+ - TILE_NUMBER_Y_OFFSET = 3	-
+ * |+---+| -				|
+ * ||   ||				|
+ * ||   ||   TILE_NUMBER_HEIGHT = 24	|
+ * |+---+| -				|
+ * |  _  | _				|-TILE_HEIGHT = 50
+ * | / \ |				|
+ * ||   ||   TILE_SUN_HEIGHT = 20	|
+ * | \_/ | _				|
+ * |     |   TILE_SUN_Y_OFFSET = 3	|	
+ * +-----+ -				-
+ * ||   | TILE_SUN_WIDTH = 20
+ * ||
+ * || TILE_SUN_X_OFFSET = 10
+ */
+#define TILE_WIDTH		40
+#define TILE_HEIGHT		50
+
+#define TILE_NUMBER_X_OFFSET	3
+#define TILE_NUMBER_Y_OFFSET	3
+#define TILE_NUMBER_WIDTH	34
+#define TILE_NUMBER_HEIGHT	24
+
+#define TILE_SUN_X_OFFSET	10
+#define TILE_SUN_Y_OFFSET	3
+#define TILE_SUN_WIDTH		20
+#define TILE_SUN_HEIGHT		20
+
 #define FATAL_ERROR(msg) \
     do { fprintf (stderr, "Error: %s\n", msg); exit (1); } while (0)
 
@@ -15,6 +51,8 @@ typedef enum {BLACK, BLUE, RED, YELLOW} color_t;
 typedef struct tile {
     color_t color;
     int number;
+    int x;
+    int y;
 } tile_t;
 
 #define DECK_MAX_TILES 104
@@ -52,14 +90,25 @@ typedef struct game {
     board_t board;
     deck_t deck;
     RsvgHandle *blanktile;
+
+    int current_tile;
 } game_t;
 
+static void
+tile_init (tile_t *tile, color_t color, int number)
+{
+    tile->color = color;
+    tile->number = number;
+    tile->x = 0;
+    tile->y = 0;
+}
+
 static void tile_print(tile_t tile)
 {
     printf("%6s %2d\n", colors[tile.color], tile.number + 1);
 }
 
-static void tile_draw(game_t *game, tile_t *tile, cairo_t *cr, int x, int y)
+static void tile_draw(game_t *game, tile_t *tile, cairo_t *cr)
 {
     char number_string[3];
     int len;
@@ -69,7 +118,7 @@ static void tile_draw(game_t *game, tile_t *tile, cairo_t *cr, int x, int y)
 	FATAL_ERROR ("snprintf failed");
 
     cairo_save(cr);
-    cairo_translate(cr, x, y);
+    cairo_translate(cr, tile->x, tile->y);
     rsvg_handle_render_cairo (game->blanktile, cr);
     
     if (tile->color == BLACK)
@@ -273,9 +322,7 @@ static void deck_init(deck_t *deck)
 	{
 	    for (j = 0; j <= 12; ++j) 
 	    {
-		deck->tiles[j + (i * 13) + (h * 52)].color = i;
-		deck->tiles[j + (i * 13) + (h * 52)].number = j;
-		deck->num_tiles += 1;
+		tile_init (&deck->tiles[deck->num_tiles++], i, j);
 		printf ("There are %d tiles in the deck\n", deck->num_tiles);
 	    }
 	}
@@ -312,17 +359,13 @@ static void deck_print(deck_t *deck)
     printf ("There are %d tiles in the deck\n" , deck->num_tiles);
 }
 
+
 static void deck_draw(game_t *game, cairo_t *cr)
 {
-    int i, j;
-    
-    for (i = 0; i < 8; ++i)
+    int i;
+    for (i = 0; i < game->deck.num_tiles; i++)
     {
-	for (j = 0; j < 13; ++j)
-	{
-	    tile_draw(game, &game->deck.tiles[j + (i * 13)],
-		      cr, 45 * j, 55 * i);
-	}
+	    tile_draw(game, &game->deck.tiles[i], cr);
     }
 }   
 
@@ -355,6 +398,8 @@ static void game_init(game_t *game)
     game->blanktile = rsvg_handle_new_from_file ("tiles/blanktile.svg", &error);
     if (error)
 	FATAL_ERROR (error->message);
+
+    game->current_tile = game->deck.num_tiles - 1;
 }
 
 static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_t *game)
@@ -379,7 +424,25 @@ static gboolean on_key_press_event (GtkWidget *widget, GdkEventKey *event, game_
 
 static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event, game_t *game)
 {
-    printf ("You pressed button %d\n", event->button);
+    tile_t *tile;
+
+    tile = &game->deck.tiles[game->current_tile];
+
+    printf ("Placing tile #%d\n", game->current_tile);
+
+    /* First, invalidate the region where the tile currently is. */
+    gtk_widget_queue_draw_area (widget, tile->x, tile->y, TILE_WIDTH, TILE_HEIGHT);
+			
+    /* Then, move the tile */
+    tile->x = event->x;
+    tile->y = event->y;
+
+    /* Finally, invalidate the region where the tile is now. */
+    gtk_widget_queue_draw_area (widget, tile->x, tile->y, TILE_WIDTH, TILE_HEIGHT);
+
+    game->current_tile--;
+    if (game->current_tile < 0)
+	game->current_tile = game->deck.num_tiles - 1;
 
     return TRUE;
 }