X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;h=8a026a4369eccf1a2fa4f6883bab0d5d6516cf3f;hb=646aa6968206c6ba983210457bdf28d717caae93;hp=cf3c8958872d90d99df54dc78abd18ebc51ab723;hpb=80d1bc0be0fd7f098e3c5a1928bb3691b43fe051;p=kub

diff --git a/kub.c b/kub.c
index cf3c895..8a026a4 100644
--- a/kub.c
+++ b/kub.c
@@ -2,6 +2,11 @@
 #include <stdlib.h>
 #include <time.h>
 #include <gtk/gtk.h>
+#include <librsvg/rsvg.h>
+#include <librsvg/rsvg-cairo.h>
+
+#define FATAL_ERROR(msg) \
+    do { fprintf (stderr, "Error: %s\n", msg); exit (1); } while (0)
 
 char *colors[] = {"Black", "Blue", "Red", "Yellow"};
 
@@ -46,6 +51,7 @@ typedef struct game {
     int num_players;
     board_t board;
     deck_t deck;
+    RsvgHandle *blanktile;
 } game_t;
 
 static void card_print(card_t card)
@@ -78,8 +84,10 @@ static void player_init(player_t *player)
 /* If card_one < card_two, then return value will be negative
    if they are equal, 0 will be returned,
    if card_one > card_two, then return value will be positive */
-static int card_compare(card_t *card_one, card_t *card_two)
+static int card_compare(const void *one, const void *two)
 {
+    const card_t *card_one = one;
+    const card_t *card_two = two;
     return card_one->number - card_two->number;
 }
 
@@ -263,11 +271,11 @@ static void deck_shuffle(deck_t *deck)
 static void deck_print(deck_t *deck)
 {
     int h, i, j;  
-    for (h = 0; h <= 1; ++h)
+    for (h = 0; h < 2; ++h)
     {
-	for (i = 0; i <= 3; ++i)
+	for (i = 0; i < 4; ++i)
 	{
-	    for (j = 0; j <= 12; ++j)
+	    for (j = 0; j < 13; ++j)
 	    {
 		card_print(deck->cards[j + (i * 13) + (h * 52)]);
 	    }
@@ -276,6 +284,23 @@ static void deck_print(deck_t *deck)
     printf ("There are %d tiles in the deck\n" , deck->num_cards);
 }
 
+static void deck_draw(game_t *game, cairo_t *cr)
+{
+    int h, i, j;
+    for (h = 0; h < game->deck.num_cards; ++h)
+    {
+	for (i = 0; i < 8; ++i)
+	{
+	    for (j = 0; j < 13; ++j)
+	    {
+		card_draw(game, &game->deck.cards[h], cr, 45 * j , 55 * i);
+	    }
+	}
+    }
+}   
+
+
+
 static void hand_print(game_t *game)
 {
     int i;
@@ -285,9 +310,36 @@ static void hand_print(game_t *game)
     }
 }
 
+static void card_draw(game_t *game, card_t *card, cairo_t *cr, int x, int y)
+{
+    char number_string[2];
+    number_string[0] = card->number + '0';
+    number_string[1] = '\0';
+
+    cairo_save(cr);
+    cairo_translate(cr, x, y);
+    rsvg_handle_render_cairo (game->blanktile, cr);
+    
+    if (card->color == BLACK)
+        cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+    if (card->color == BLUE)
+        cairo_set_source_rgb (cr, 0.0, 0.0, 1.0);	
+    if (card->color == RED)
+        cairo_set_source_rgb (cr, 1.0, 0.0, 0.0);
+    if (card->color == YELLOW)
+	cairo_set_source_rgb (cr, 1.0, .843, 0.0);
+    cairo_move_to (cr, 10, 25);
+    cairo_set_font_size(cr, 25);
+    cairo_show_text (cr, number_string);
+    
+    cairo_restore(cr);
+}
+
 static void game_init(game_t *game)
 {
     int i;
+    GError *error = NULL;
+
     game->num_players = 0;
     
     for (i = 0; i < GAME_MAX_PLAYERS; ++i)
@@ -299,11 +351,24 @@ static void game_init(game_t *game)
     board_init(&game->board);
     deck_init(&game->deck);
     deck_shuffle(&game->deck);
+
+    game->blanktile = rsvg_handle_new_from_file ("tiles/blanktile.svg", &error);
+    if (error)
+	FATAL_ERROR (error->message);
 }
 
 static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_t *game)
 {
-    printf ("I should be drawing something here\n");
+    cairo_t *cr;
+
+    cr = gdk_cairo_create (widget->window);
+
+    rsvg_handle_render_cairo (game->blanktile, cr);
+    card_draw(game, &game->deck.cards[0], cr, 45, 0);
+    card_draw(game, &game->deck.cards[1], cr, 90, 0);
+    //deck_draw(game, cr);
+
+    cairo_destroy (cr);
 
     return TRUE;
 }
@@ -335,15 +400,15 @@ int main(int argc, char *argv[])
     game_t game;
     
     srand(time(NULL));
+
+    gtk_init (&argc, &argv);
     
     game_init(&game);
     deck_print(&game.deck);
-    deck_deal(&game, &game.deck);
+    //deck_deal(&game, &game.deck);
     hand_print(&game);
     deck_print(&game.deck);
 
-    gtk_init (&argc, &argv);
-
     /* Create a new window */
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
     gtk_window_set_default_size (GTK_WINDOW (window),