graphic: Remove the area argument form draw vfunc

It turns out that with the new clipping machinery it was only used in
one place.

14 files changed, 23 insertions, 25 deletions

diff --git a/games/pacman/game-custom-graphic.c b/games/pacman/game-custom-graphic.c
index 5c81824..6c1b34d 100644
--- a/games/pacman/game-custom-graphic.c
+++ b/games/pacman/game-custom-graphic.c
@@ -25,7 +25,7 @@
 static GameGraphicClass *parent_class = NULL;
 
 static void
-game_custom_graphic_draw (GameGraphic *graphic, cairo_t *cr, const GameRectangle *area)
+game_custom_graphic_draw (GameGraphic *graphic, cairo_t *cr)
 {
   GameCustomGraphic *custom = GAME_CUSTOM_GRAPHIC (graphic);
   
diff --git a/games/pacman/pacman-ghost.c b/games/pacman/pacman-ghost.c
index 191c2f5..5f44182 100644
--- a/games/pacman/pacman-ghost.c
+++ b/games/pacman/pacman-ghost.c
@@ -73,7 +73,7 @@ pacman_ghost_draw_folded (PacmanGhost *ghost, cairo_t *cr)
 }
 
 static void
-pacman_ghost_draw (GameGraphic *graphic, cairo_t *cr, const GameRectangle *area)
+pacman_ghost_draw (GameGraphic *graphic, cairo_t *cr)
 {
   PacmanGhost *ghost = PACMAN_GHOST (graphic);
   
diff --git a/games/pacman/pacman-graphic.c b/games/pacman/pacman-graphic.c
index ab440d8..d2eff4a 100644
--- a/games/pacman/pacman-graphic.c
+++ b/games/pacman/pacman-graphic.c
@@ -32,7 +32,7 @@ enum {
 static GameGraphicClass *parent_class = NULL;
 
 static void
-pacman_graphic_draw (GameGraphic *graphic, cairo_t *cr, const GameRectangle *area)
+pacman_graphic_draw (GameGraphic *graphic, cairo_t *cr)
 {
   PacmanGraphic *pacman = PACMAN_GRAPHIC (graphic);
   double mouth_direction = 0;
diff --git a/games/sheep/sheep-board.c b/games/sheep/sheep-board.c
index 8e7f1db..dc9418e 100644
--- a/games/sheep/sheep-board.c
+++ b/games/sheep/sheep-board.c
@@ -28,14 +28,14 @@
 static GameBoardClass *parent_class = NULL;
 
 static void
-sheep_board_draw (GameGraphic *graphic, cairo_t *cr, const GameRectangle *rect)
+sheep_board_draw (GameGraphic *graphic, cairo_t *cr)
 {
   cairo_set_source_rgb (cr, 0.3, 1.0, 0.3);
   cairo_paint (cr);
   cairo_set_source_rgb (cr, 0.5, 0.5, 0.5);
-  cairo_rectangle (cr, 0.0, rect->y1, 2.0, rect->y2 - rect->y1);
+  cairo_rectangle (cr, 0.0, graphic->rect.y1, 2.0, graphic->rect.y2 - graphic->rect.y1);
   cairo_fill (cr);
-  GAME_GRAPHIC_CLASS (parent_class)->draw (graphic, cr, rect);
+  GAME_GRAPHIC_CLASS (parent_class)->draw (graphic, cr);
 }
 
 static void
diff --git a/games/tetris/tetris-board.c b/games/tetris/tetris-board.c
index b217f38..e712c47 100644
--- a/games/tetris/tetris-board.c
+++ b/games/tetris/tetris-board.c
@@ -408,7 +408,7 @@ tetris_board_start_action (GameWorker *worker, const char *action)
 }
 
 static void
-tetris_board_draw (GameGraphic *graphic, cairo_t *cr, const GameRectangle *rect)
+tetris_board_draw (GameGraphic *graphic, cairo_t *cr)
 {
 #define LINE_WIDTH 0.2
   cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
@@ -419,7 +419,7 @@ tetris_board_draw (GameGraphic *graphic, cairo_t *cr, const GameRectangle *rect)
   cairo_set_line_width (cr, LINE_WIDTH);
   cairo_stroke (cr);
 
-  GAME_GRAPHIC_CLASS (parent_class)->draw (graphic, cr, rect);
+  GAME_GRAPHIC_CLASS (parent_class)->draw (graphic, cr);
 
   if (TETRIS_BOARD (graphic)->player->dead) {
     cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.3);
diff --git a/libgame/game-board.c b/libgame/game-board.c
index 03094a5..a7a51a4 100644
--- a/libgame/game-board.c
+++ b/libgame/game-board.c
@@ -38,9 +38,9 @@ enum {
 GameGraphicClass *parent_class;
 
 static void
-game_board_draw_repeated (GameBoard *board, cairo_t *cr, const GameRectangle *areap)
+game_board_draw_repeated (GameBoard *board, cairo_t *cr)
 {
-  GameRectangle rect, area = *areap;
+  GameRectangle rect, area = GAME_GRAPHIC (board)->rect;
   GamePoint p, move_x = { - board->repeat.x, 0 }, move_y = { 0, - board->repeat.y };
   GSList *walk;
   double tmp;
@@ -108,8 +108,7 @@ game_board_draw_repeated (GameBoard *board, cairo_t *cr, const GameRectangle *ar
 }
 
 static void
-game_board_draw_unrepeated (GameBoard *board, cairo_t *cr, 
-    const GameRectangle *area)
+game_board_draw_unrepeated (GameBoard *board, cairo_t *cr)
 {
   GSList *walk;
 
@@ -125,14 +124,14 @@ game_board_draw_unrepeated (GameBoard *board, cairo_t *cr,
 }
 
 static void
-game_board_draw (GameGraphic *graphic, cairo_t *cr, const GameRectangle *area)
+game_board_draw (GameGraphic *graphic, cairo_t *cr)
 {
   GameBoard *board = GAME_BOARD (graphic);
   
   if (board->repeat.x > 0.0 || board->repeat.y > 0.0)
-    game_board_draw_repeated (board, cr, area);
+    game_board_draw_repeated (board, cr);
   else
-    game_board_draw_unrepeated (board, cr, area);
+    game_board_draw_unrepeated (board, cr);
 }
 
 static gchar *
diff --git a/libgame/game-colored.c b/libgame/game-colored.c
index fd43460..ff7678e 100644
--- a/libgame/game-colored.c
+++ b/libgame/game-colored.c
@@ -124,7 +124,7 @@ game_colored_dispose (GObject *object)
 }
 
 static void
-game_colored_draw (GameGraphic *graphic, cairo_t *cr, const GameRectangle *area)
+game_colored_draw (GameGraphic *graphic, cairo_t *cr)
 {
   GameColored *colored = GAME_COLORED (graphic);
   cairo_pattern_t *mask;
diff --git a/libgame/game-graphic.c b/libgame/game-graphic.c
index 12bcafa..26d1b71 100644
--- a/libgame/game-graphic.c
+++ b/libgame/game-graphic.c
@@ -221,7 +221,7 @@ game_graphic_draw (GameGraphic *graphic, cairo_t *cr)
 
   klass = GAME_GRAPHIC_GET_CLASS (graphic);
   g_return_val_if_fail (klass->draw, FALSE);
-  klass->draw (graphic, cr, &graphic->rect);
+  klass->draw (graphic, cr);
   if (cairo_status (cr) != CAIRO_STATUS_SUCCESS) {
     gchar *s = game_object_to_string (GAME_OBJECT (graphic));
     g_printerr ("Error drawing to %s: %s\n", s, cairo_status_to_string (cairo_status (cr)));
diff --git a/libgame/game-graphic.h b/libgame/game-graphic.h
index 0e36f2f..e1ef0a0 100644
--- a/libgame/game-graphic.h
+++ b/libgame/game-graphic.h
@@ -51,8 +51,7 @@ struct _GameGraphicClass {
 
   /* vfuncs */
   void			(* draw)		(GameGraphic *		graphic,
-						 cairo_t *		cr,
-						 const GameRectangle *	rect);
+						 cairo_t *		cr);
   /* signals */
   void			(* invalidate)		(GameGraphic *		graphic, 
 						 const GameRectangle *	rect);
diff --git a/libgame/game-grid.c b/libgame/game-grid.c
index 5387fef..e6d9b3e 100644
--- a/libgame/game-grid.c
+++ b/libgame/game-grid.c
@@ -56,7 +56,7 @@ game_grid_to_string (GameObject *object)
 }
 
 static void
-game_grid_draw (GameGraphic *graphic, cairo_t *cr, const GameRectangle *area)
+game_grid_draw (GameGraphic *graphic, cairo_t *cr)
 {
   double scale_x = 1.0, scale_y = 1.0;
   cairo_matrix_t matrix;
@@ -118,7 +118,7 @@ game_grid_draw (GameGraphic *graphic, cairo_t *cr, const GameRectangle *area)
     cairo_fill (cr);
     cairo_restore (cr);
   }
-  GAME_GRAPHIC_CLASS (parent_class)->draw (graphic, cr, area);
+  GAME_GRAPHIC_CLASS (parent_class)->draw (graphic, cr);
 }
 
 static void
diff --git a/libgame/game-image.c b/libgame/game-image.c
index 0ecdda7..d6d7c0b 100644
--- a/libgame/game-image.c
+++ b/libgame/game-image.c
@@ -100,7 +100,7 @@ game_image_dispose (GObject *object)
 }
 
 static void
-game_image_draw (GameGraphic *graphic, cairo_t *cr, const GameRectangle *area)
+game_image_draw (GameGraphic *graphic, cairo_t *cr)
 {
   GameImage *image = GAME_IMAGE (graphic);
   int width, height;
diff --git a/libgame/game-plain.c b/libgame/game-plain.c
index ddfb272..c16c9dd 100644
--- a/libgame/game-plain.c
+++ b/libgame/game-plain.c
@@ -68,7 +68,7 @@ game_plain_set_property (GObject *obj, guint param_id, const GValue *value,
 }
 
 static void
-game_plain_draw (GameGraphic *graphic, cairo_t *cr, const GameRectangle *area)
+game_plain_draw (GameGraphic *graphic, cairo_t *cr)
 {
   GamePlain *plain = GAME_PLAIN (graphic);
   
diff --git a/libgame/game-text.c b/libgame/game-text.c
index b2c46fa..de798ac 100644
--- a/libgame/game-text.c
+++ b/libgame/game-text.c
@@ -75,7 +75,7 @@ game_text_finalize (GObject *object)
 }
 
 static void
-game_text_draw (GameGraphic *graphic, cairo_t *cr, const GameRectangle *area)
+game_text_draw (GameGraphic *graphic, cairo_t *cr)
 {
   GameText *text = GAME_TEXT (graphic);
   int width, height, size, new_size = 0, max = G_MAXINT;
diff --git a/libgame/game-viewport.c b/libgame/game-viewport.c
index 03fb025..d072167 100644
--- a/libgame/game-viewport.c
+++ b/libgame/game-viewport.c
@@ -120,7 +120,7 @@ game_viewport_set_property (GObject *object, guint param_id,
 }
 
 static void
-game_viewport_draw (GameGraphic *graphic, cairo_t *cr, const GameRectangle *rect)
+game_viewport_draw (GameGraphic *graphic, cairo_t *cr)
 {
   GameViewport *port = GAME_VIEWPORT (graphic);