Add very basic usage of librsvg to draw a red tile.

This is basically the minimal necessary support to start using
librsvg to render SVG graphics. Just a single, static red 6 tile
for now.

diff --git a/Makefile b/Makefile
index f51e1cdd6e8ed11d9d198cff3da810040343f550..54d45f0871faba5d60085cd126b613a88e9f4b8e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@ WARN_CFLAGS=-Wall -Wpointer-arith -Wstrict-prototypes \
        -Wmissing-prototypes -Wmissing-declarations \
        -Wnested-externs -fno-strict-aliasing
 
-KUB_CFLAGS=$(WARN_CFLAGS) `pkg-config --cflags gtk+-2.0` -DGTK_DISABLE_DEPRECATED
-KUB_LDFLAGS=`pkg-config --libs gtk+-2.0`
+KUB_CFLAGS=$(WARN_CFLAGS) `pkg-config --cflags gtk+-2.0 librsvg-2.0` -DGTK_DISABLE_DEPRECATED
+KUB_LDFLAGS=`pkg-config --libs gtk+-2.0 librsvg-2.0`
 
 kub: kub.c
        $(CC) $(KUB_CFLAGS) $(KUB_LDFLAGS) -o $@ $^

diff --git a/kub.c b/kub.c
index 326856bfc326d954394e55a27169b93728ef17c8..9b468efdd27d879ba1747f8c79ee3f87e168801c 100644 (file)
--- 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 *red6;
 } game_t;
 
 static void card_print(card_t card)
@@ -288,6 +294,8 @@ static void hand_print(game_t *game)
 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,6 +307,10 @@ static void game_init(game_t *game)
     board_init(&game->board);
     deck_init(&game->deck);
     deck_shuffle(&game->deck);
+
+    game->red6 = rsvg_handle_new_from_file ("tiles/red6.svg", &error);
+    if (error)
+       FATAL_ERROR (error->message);
 }
 
 static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_t *game)
@@ -307,9 +319,7 @@ static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_
 
     cr = gdk_cairo_create (widget->window);
 
-    cairo_set_source_rgb (cr, 1, 0, 0); /* red */
-    cairo_rectangle (cr, 86, 66, 74, 103);
-    cairo_fill (cr);
+    rsvg_handle_render_cairo (game->red6, cr);
 
     cairo_destroy (cr);
 
@@ -343,6 +353,8 @@ int main(int argc, char *argv[])
     game_t game;
     
     srand(time(NULL));
+
+    gtk_init (&argc, &argv);
     
     game_init(&game);
     deck_print(&game.deck);
@@ -350,8 +362,6 @@ int main(int argc, char *argv[])
     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),