Draw 2 digit numbers *closer* to center of tile

[kub] / kub.c

diff --git a/kub.c b/kub.c
index 1e508b7b3decc4c2b0609cf32dee74e008a21883..452175ef3dc135ca7c2afaa93fb4a4b0128a3434 100644 (file)
--- a/kub.c
+++ b/kub.c
@@ -114,10 +114,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)
@@ -135,7 +143,10 @@ static void tile_draw(game_t *game, tile_t *tile, cairo_t *cr)
         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);
+       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);
     
@@ -378,12 +389,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 +407,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 +420,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);
     }
 }
 
@@ -444,9 +455,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,17 +477,17 @@ 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;
+               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;
-       }
+                       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;
+               }
     }
-
+       
     return TRUE;
 }