X-Git-Url: https://harishankar.org/repos/?p=wordblah.git;a=blobdiff_plain;f=wordblox_player.c;h=2904929b9077768ae40bb31a5e25b7d0d59480de;hp=f4ecbb5c26d29b04057d9c6a4eefe0ef795f9194;hb=817fe9c8d7535a465ed42153c550ceef8390ffac;hpb=b43a3bf7a7ae8b3221c886d5392498db868d35c8

diff --git a/wordblox_player.c b/wordblox_player.c
index f4ecbb5..2904929 100644
--- a/wordblox_player.c
+++ b/wordblox_player.c
@@ -6,28 +6,48 @@
 
 GtkWidget *window; 
 
+struct MainAppData {
+	Puzzle puzzle;
+	char filename[65535];
+	bool is_loaded;
+} app_data;
+
 /* slot for drawing the puzzle */
 gboolean on_puzzle_area_draw (GtkWidget *widget, cairo_t *cr, gpointer data)
 {
-	GdkRGBA colorfore, colorback;
-	gdk_rgba_parse (&colorfore, "#000000"); 
-	gdk_rgba_parse (&colorback, "#ffffff");
-	cairo_set_line_width (cr, 3);
-	gtk_widget_set_size_request (widget, 10*30+5, 10*30+5);
-	for (int i = 0; i < 10; i ++)
+	/* if a puzzle is loaded */
+	if (app_data.is_loaded == true)
 	{
-		for (int j = 0; j < 10; j ++)
+		GdkRGBA colorfore, colorback;
+		gdk_rgba_parse (&colorfore, "#000000"); 
+		gdk_rgba_parse (&colorback, "#ffffff");
+		cairo_set_line_width (cr, 3);
+		
+		/* set the size of the drawing area */
+		gtk_widget_set_size_request (widget, app_data.puzzle.grid_size*30+5, 
+											app_data.puzzle.grid_size*30+5);
+								
+		/* Draw the grid */			
+		for (int i = 0; i < app_data.puzzle.grid_size; i ++)
 		{
-			cairo_rectangle (cr, i*30+5, j*30+5, 30, 30);
-			gdk_cairo_set_source_rgba (cr, &colorfore);
-			cairo_stroke (cr);
-			
-			cairo_rectangle (cr, i*30+5, j*30+5, 30, 30);
-			gdk_cairo_set_source_rgba (cr, &colorback);
-			cairo_fill (cr);
+			for (int j = 0; j < app_data.puzzle.grid_size; j ++)
+			{
+				cairo_rectangle (cr, j*30+5, i*30+5, 30, 30);
+				gdk_cairo_set_source_rgba (cr, &colorfore);
+				cairo_stroke (cr);
+				
+				/* if it is not a blank grid then set the background color
+				   to black */
+				if (app_data.puzzle.chars[i][j] != '#')
+					gdk_cairo_set_source_rgba (cr, &colorback);
+				
+				cairo_rectangle (cr, j*30+5, i*30+5, 30, 30);
+
+				cairo_fill (cr);
+			}
 		}
 	}
-	
+			
 	return FALSE;
 
 }
@@ -39,7 +59,7 @@ void on_menu_exit_activate (GtkMenuItem *item, gpointer data)
 }
 
 /* slot for open menu */
-void on_menu_open_activate (GtkMenuItem *item, gpointer data)
+void on_menu_open_activate (GtkMenuItem *item, GtkDrawingArea* area)
 {
 	GtkWidget *dialog;
 	GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
@@ -55,9 +75,11 @@ void on_menu_open_activate (GtkMenuItem *item, gpointer data)
 	{
 		char *filename;
 		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(dialog));
-		Puzzle p = load_puzzle (filename);
+		app_data.puzzle = load_puzzle (filename);
+		app_data.is_loaded = true;
+		strcpy (app_data.filename, filename);		
 		/* if the grid is not frozen then the game cannot be played */
-		if (p.grid_frozen == false)
+		if (app_data.puzzle.grid_frozen == false)
 		{
 			GtkWidget *errordlg ;
 			errordlg = gtk_message_dialog_new (GTK_WINDOW(window), 
@@ -67,9 +89,11 @@ void on_menu_open_activate (GtkMenuItem *item, gpointer data)
 												UNFROZEN_GRID_PLAYER);
 			gtk_dialog_run (GTK_DIALOG(errordlg));
 			gtk_widget_destroy (errordlg);
-		
+			app_data.is_loaded = false;
 		}
 		
+		gtk_widget_queue_draw_area (GTK_WIDGET (area), 0, 0, 305, 305);
+		
 		g_free (filename);
 	}
 	
@@ -99,12 +123,14 @@ int main (int argc, char *argv [])
 				("/org/harishankar/wordblox/wordblox.svg", NULL);
 	if (icon == NULL)
 		fprintf (stderr, ERROR_ICON);
-		
+	
 	GtkBuilder *builder;
 	builder = gtk_builder_new ();
 	guint ret = gtk_builder_add_from_resource (builder, 
 		"/org/harishankar/wordblox/wordblox_player.glade", NULL);
 	
+	app_data.is_loaded = false;
+	
 	if (ret == 0)
 	{
 		fprintf (stderr, ERROR_WINDOW);