Add unconditional return value to card_compare

[kub] / kub.c

diff --git a/kub.c b/kub.c
index fc5c8b688225c55b9a1061e287bfcd804d3c0e4e..b9636afc3e344d7273478c953880be27084cc1a2 100644 (file)
--- a/kub.c
+++ b/kub.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
+#include <gtk/gtk.h>
 
 char *colors[] = {"Black", "Blue", "Red", "Yellow"};
 
@@ -37,6 +38,8 @@ typedef struct player {
 } player_t;
 
 #define GAME_MAX_PLAYERS 4
+#define GAME_WINDOW_DEFAULT_WIDTH  800
+#define GAME_WINDOW_DEFAULT_HEIGHT 600
 
 typedef struct game {
     player_t players[GAME_MAX_PLAYERS];
@@ -74,12 +77,14 @@ static void player_init(player_t *player)
 
 static int card_compare(card_t *card_one, card_t *card_two)
 {
-    if (card_one.number < card_two.number)
+    if (card_one->number < card_two->number)
        return -1;
-    if (card_one.number == card_two.number)
+    if (card_one->number == card_two->number)
        return 0;
-    if (card_one.number > card_two.number)
-       return 1;
+    /* At this point, we know that this must be true:
+     * if (card_one->number > card_two->number)
+     */
+    return 1;
 }
 
 static int card_group_is_run(card_group_t *card_group)
@@ -264,8 +269,37 @@ static void game_init(game_t *game)
     deck_shuffle(&game->deck);
 }
 
-int main(void)
+static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_t *game)
+{
+    printf ("I should be drawing something here\n");
+
+    return TRUE;
+}
+
+static gboolean on_key_press_event (GtkWidget *widget, GdkEventKey *event, game_t *game)
+{
+    printf ("You pressed key %d\n", event->keyval);
+
+    return TRUE;
+}
+
+static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event, game_t *game)
+{
+    printf ("You pressed button %d\n", event->button);
+
+    return TRUE;
+}
+
+static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *event, game_t *game)
 {
+    printf ("You released button %d\n", event->button);
+
+    return TRUE;
+}
+
+int main(int argc, char *argv[])
+{
+    GtkWidget *window;
     game_t game;
     
     srand(time(NULL));
@@ -275,6 +309,35 @@ int main(void)
     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),
+                                GAME_WINDOW_DEFAULT_WIDTH,
+                                GAME_WINDOW_DEFAULT_HEIGHT);
+
+    gtk_widget_set_events (window,
+                          GDK_EXPOSURE_MASK |
+                          GDK_KEY_PRESS_MASK | 
+                          GDK_BUTTON_PRESS_MASK | 
+                          GDK_BUTTON_RELEASE_MASK);
+
+    g_signal_connect (G_OBJECT (window), "delete_event",
+                     G_CALLBACK (gtk_main_quit), NULL);
+    g_signal_connect (G_OBJECT (window), "expose_event",
+                     G_CALLBACK (on_expose_event), &game);
+    g_signal_connect (G_OBJECT (window), "key_press_event",
+                     G_CALLBACK (on_key_press_event), &game);
+    g_signal_connect (G_OBJECT (window), "button_press_event",
+                     G_CALLBACK (on_button_press_event), &game);
+    g_signal_connect (G_OBJECT (window), "button_release_event",
+                     G_CALLBACK (on_button_release_event), &game);
+
+    gtk_widget_show_all (window);
+    gtk_main ();
+
     return 0;
-    
+
 }