X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;h=65b7d3e593d9c38e65409061b792c784f8b9bc49;hb=128be2d8da52865131653f197c05dd5f6830958a;hp=1e508b7b3decc4c2b0609cf32dee74e008a21883;hpb=3a85458521e665ba1866507f9fad75a3f2e78987;p=kub

diff --git a/kub.c b/kub.c
index 1e508b7..65b7d3e 100644
--- a/kub.c
+++ b/kub.c
@@ -93,6 +93,8 @@ typedef struct game {
 
     int current_tile;
     int diff_x, diff_y;
+    int click_x, click_y;
+    int release_x, release_y;
 } game_t;
 
 static void tile_init (tile_t *tile, color_t color, int number)
@@ -114,10 +116,18 @@ 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)
+static void tile_draw(game_t *game, tile_t *tile, cairo_t *cr, GdkRegion *region)
 {
     char number_string[3];
     int len;
+    GdkRectangle rectangle;
+
+    rectangle.x = tile->x - 1;
+    rectangle.y = tile->y - 1;
+    rectangle.width = TILE_WIDTH + 2;
+    rectangle.height = TILE_HEIGHT + 2;
+    if (gdk_region_rect_in (region, &rectangle) == GDK_OVERLAP_RECTANGLE_OUT)
+	return;
 
     len = snprintf (number_string, 3, "%d", tile->number + 1);
     if (len < 0 || len >= 3)
@@ -134,8 +144,11 @@ static void tile_draw(game_t *game, tile_t *tile, cairo_t *cr)
     if (tile->color == RED)
         cairo_set_source_rgb (cr, 1.0, 0.0, 0.0);
     if (tile->color == YELLOW)
-	cairo_set_source_rgb (cr, 1.0, .843, 0.0);
-    cairo_move_to (cr, 10, 25);
+    cairo_set_source_rgb (cr, 1.0, .843, 0.0);
+    if (tile->number + 1 > 9)
+        cairo_move_to (cr, 1, 25);
+    else
+        cairo_move_to (cr, 10, 25);
     cairo_set_font_size(cr, 25);
     cairo_show_text (cr, number_string);
     
@@ -178,21 +191,27 @@ static int tile_group_is_run_one(tile_group_t *tile_group)
 {
     int i;
     qsort (&tile_group->tiles[0], tile_group->num_tiles,
-	   sizeof (tile_t), tile_compare);
-	   
+        sizeof (tile_t), tile_compare);
+    
     if (tile_group->num_tiles > 13 || tile_group->num_tiles < 3)
     {
-	return 0;
+        printf("fail run - invalid num tiles; ");
+        return 0;
     }
     for (i = 0; i < tile_group->num_tiles - 1; ++i)
-	if(tile_group->tiles[i].color != tile_group->tiles[i + 1].color)
-	{
-	    return 0;
-	}
-	if(tile_group->tiles[i].number != tile_group->tiles[i + 1].number -1)
-	{
-	    return 0;
-	}
+    {
+        if(tile_group->tiles[i].color != tile_group->tiles[i + 1].color)
+        {
+            printf("fail run - colors don't match; ");
+            return 0;
+        }
+        if( tile_group->tiles[i].number != tile_group->tiles[i + 1].number -1 &&
+            i+1 != tile_group->num_tiles)
+        {
+            printf("fail run - invalid number sequence; ");
+            return 0;
+        }
+    }
     return 1;
 }
 
@@ -262,27 +281,32 @@ static int tile_group_is_run_two(tile_group_t *tile_group)
 static int tile_group_is_set(tile_group_t *tile_group)
 {
     int i;
-    color_t seen_color[tile_group->num_tiles];
+    color_t seen_color[4];
+    for (i = 0; i < 4; i++)
+        seen_color[i] = 0;
     
     if (tile_group->num_tiles > 4 || tile_group->num_tiles < 3)
     {
-	return 0;
+        printf("fail set - invalid num tiles; ");
+        return 0;
     }
-    for (i = 0; i < tile_group->num_tiles - 1; ++i) 
+    for (i = 0; i <= tile_group->num_tiles - 1; ++i) 
     {
-	if (tile_group->tiles[i].number != tile_group->tiles[i + 1].number)
-	{
-	    return 0;
-	}
+        if (tile_group->tiles[i].number != tile_group->tiles[i + 1].number &&
+            i+1 != tile_group->num_tiles)
+        {
+            printf("fail set - numbers don't match; ");
+            return 0;
+        }
+        seen_color[tile_group->tiles[i].color] += 1;
     }
-    seen_color[i] = tile_group->tiles[i].color;
-    for (i = 0; i < tile_group->num_tiles; ++i)
+    for (i = 0; i < 4; i++)
     {
-	seen_color[tile_group->tiles[i].color]++;
-	if (seen_color[tile_group->tiles[i].color] > 1)
-	{
-	    return 0;
-	}
+        if (seen_color[i] > 1)
+        {
+            printf("fail set - repeat color; ");
+            return 0;
+        }
     }
     return 1;
 }
@@ -378,12 +402,12 @@ static void deck_spread(deck_t *deck)
     }
 }
 
-static void deck_draw(game_t *game, cairo_t *cr)
+static void deck_draw(game_t *game, cairo_t *cr, GdkRegion *region)
 {
     int i;
     for (i = 0; i < game->deck.num_tiles; i++)
     {
-	    tile_draw(game, &game->deck.tiles[i], cr);
+	    tile_draw(game, &game->deck.tiles[i], cr, region);
     }
 }   
 
@@ -396,7 +420,7 @@ static void hand_print(game_t *game, int player)
     }
 }
 
-static void hand_draw(game_t *game, int player, cairo_t *cr)
+static void hand_draw(game_t *game, int player, cairo_t *cr, GdkRegion *region)
 {
     int i;
     int gwdw = GAME_WINDOW_DEFAULT_WIDTH;
@@ -409,7 +433,7 @@ static void hand_draw(game_t *game, int player, cairo_t *cr)
     }
     for (i = 0; i < game->players[player].hand.num_tiles; i++)
     {
-	tile_draw(game, &game->players[player].hand.tiles[i], cr);
+	tile_draw(game, &game->players[player].hand.tiles[i], cr, region);
     }
 }
 
@@ -434,7 +458,10 @@ static void game_init(game_t *game)
     if (error)
 	FATAL_ERROR (error->message);
 
-    game->current_tile = game->deck.num_tiles - 1;
+    /*This line appears to be useless, has been replaced by line below*/
+    //game->current_tile = game->deck.num_tiles - 1;    
+    game->current_tile = -1;
+    
     game->diff_x = game->diff_y = 0;
 }
 
@@ -444,9 +471,9 @@ static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_
 
     cr = gdk_cairo_create (widget->window);
 
-    deck_draw(game, cr);
+    deck_draw(game, cr, event->region);
 
-    hand_draw(game, 0, cr);
+    hand_draw(game, 0, cr, event->region);
 
     cairo_destroy (cr);
 
@@ -466,24 +493,52 @@ static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event,
     
     for (i = 0; i < game->deck.num_tiles; i++)
     {
-	tile_x = game->deck.tiles[i].x;
-	tile_y = game->deck.tiles[i].y;
-    	if (event->x >= tile_x && event->x <= (tile_x + TILE_WIDTH) &&
-	    event->y >= tile_y && event->y <= (tile_y + TILE_HEIGHT) )
-	{
-	    game->current_tile = i;
-	    game->diff_x = event->x - tile_x;
-	    game->diff_y = event->y - tile_y;
-	}
+        tile_x = game->deck.tiles[i].x;
+        tile_y = game->deck.tiles[i].y;
+        if (event->x >= tile_x && event->x <= (tile_x + TILE_WIDTH) &&
+            event->y >= tile_y && event->y <= (tile_y + TILE_HEIGHT) )
+        {
+            game->current_tile = i;
+            game->diff_x = event->x - tile_x;
+            game->diff_y = event->y - tile_y;
+        }
+    }
+    if (game->current_tile == -1)
+    {            
+            game->click_x = event->x;
+            game->click_y = event->y;
     }
-
     return TRUE;
 }
 
 static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *event, game_t *game)
 {
+    if (game->current_tile == -1)
+    {
+        tile_group_t group;
+        group.num_tiles = 0;
+        
+        int i, tile_x, tile_y;
+        for (i = 0; i < game->deck.num_tiles; i++)
+        {
+            tile_x = game->deck.tiles[i].x;
+            tile_y = game->deck.tiles[i].y;
+            if ( (event->x >= tile_x && game->click_x <= tile_x &&
+                 event->y >= tile_y && game->click_y <= tile_y) ||
+                 (event->x >= tile_x && game->click_x <= tile_x &&
+                 event->y <= (tile_y + TILE_HEIGHT) && game->click_y >= tile_y) )
+            {
+                group.tiles[group.num_tiles] = game->deck.tiles[i];
+                group.num_tiles++;
+            }
+        }
+        printf("is run %d\n", tile_group_is_run_one(&group) );
+        printf("is set %d\n", tile_group_is_set(&group) );
+        for (i = 0; i < group.num_tiles; i++)
+            tile_print(group.tiles[i]);
+    }
+    
     game->current_tile = -1;
-    printf ("You released button %d\n", event->button);
 
     return TRUE;
 }