Fixed layout of text entry widget to fixed height

[grrobot] / src / grr_board_view.c

diff --git a/src/grr_board_view.c b/src/grr_board_view.c
index 0903ff1e95597ee85980b018c8c5adea5afe6878..d4d0d263fb7b77c9cbfcbd12e2ba40d512271f4a 100644 (file)
--- a/src/grr_board_view.c
+++ b/src/grr_board_view.c
@@ -138,30 +138,29 @@ grr_board_view_get_type ()
 static void
 grr_board_view_class_init (grr_board_view_class_t *class)
 {
-  GtkObjectClass *object_class;
-  GtkWidgetClass *widget_class;
+    GtkObjectClass *object_class;
+    GtkWidgetClass *widget_class;
 
-  object_class = (GtkObjectClass*) class;
-  widget_class = (GtkWidgetClass*) class;
+    object_class = (GtkObjectClass*) class;
+    widget_class = (GtkWidgetClass*) class;
 
-  parent_class = gtk_type_class (gtk_widget_get_type ());
+    parent_class = gtk_type_class (gtk_widget_get_type ());
 
-  object_class->destroy = grr_board_view_destroy;
+    object_class->destroy = grr_board_view_destroy;
 
-  widget_class->realize = grr_board_view_realize;
-  widget_class->expose_event = grr_board_view_expose;
-  widget_class->size_request = grr_board_view_size_request;
-  widget_class->size_allocate = grr_board_view_size_allocate;
-  widget_class->button_press_event = grr_board_view_button_press;
-  widget_class->button_release_event = grr_board_view_button_release;
-  widget_class->motion_notify_event = grr_board_view_motion_notify;
+    widget_class->realize = grr_board_view_realize;
+    widget_class->expose_event = grr_board_view_expose;
+    widget_class->size_request = grr_board_view_size_request;
+    widget_class->size_allocate = grr_board_view_size_allocate;
+    widget_class->button_press_event = grr_board_view_button_press;
+    widget_class->button_release_event = grr_board_view_button_release;
+    widget_class->motion_notify_event = grr_board_view_motion_notify;
 }
 
 static void
 grr_board_view_init (grr_board_view_t *view)
 {
     view->board = NULL;
-    view->owns_board = 0;
     view->client = NULL;
     
     view->button = 0;
@@ -175,16 +174,21 @@ grr_board_view_new (rr_board_t *board)
     
     view = g_object_new (grr_board_view_get_type (), NULL);
 
-    if (board == NULL) {
-       board = rr_board_create (16, 16);
-       view->owns_board = 1;
-    }
+    view->board = board;
 
-    grr_board_view_set_board (view, board);
+    grr_board_view_update (view);
 
     return GTK_WIDGET (view);
 }
 
+void
+grr_board_view_set_client (grr_board_view_t *view, rr_client_t *client)
+{
+    g_return_if_fail (view != NULL);
+
+    view->client = client;
+}
+
 static void
 grr_board_view_destroy (GtkObject *object)
 {
@@ -195,37 +199,13 @@ grr_board_view_destroy (GtkObject *object)
 
     view = GRR_BOARD_VIEW (object);
 
-    rr_board_destroy (view->board);
-
-    if (view->board && view->owns_board) {
-       rr_board_destroy (view->board);
-       view->board = NULL;
-    }
+    view->board = NULL;
+    view->client = NULL;
     
     if (GTK_OBJECT_CLASS (parent_class)->destroy)
        (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
 
-void
-grr_board_view_set_board (grr_board_view_t *view,
-                         rr_board_t *board)
-{
-    g_return_if_fail (view != NULL);
-
-    view->board = board;
-
-    grr_board_view_update (view);
-}
-
-void
-grr_board_view_set_client (grr_board_view_t *view,
-                          rr_client_t *client)
-{
-    g_return_if_fail (view != NULL);
-
-    view->client = client;
-}
-
 static void
 grr_board_view_realize (GtkWidget *widget)
 {
@@ -503,6 +483,7 @@ grr_board_view_expose (GtkWidget      *widget,
                       GdkEventExpose *event)
 {
     grr_board_view_t *view;
+    rr_board_t *board;
     Display *dpy;
     Drawable drawable;
     XrState *xrs;
@@ -519,6 +500,7 @@ grr_board_view_expose (GtkWidget      *widget,
        return FALSE;
 
     view = GRR_BOARD_VIEW (widget);
+    board = view->board;
 
     /* Unabstract X from GTK+ */
     gdk_window_get_internal_paint_info (widget->window, &real_drawable, &x_off, &y_off);
@@ -530,7 +512,7 @@ grr_board_view_expose (GtkWidget      *widget,
     XrSetTargetDrawable (xrs, dpy, drawable);
     XrTranslate (xrs, -x_off, -y_off);
 
-    rr_board_get_size (view->board, &view->board_width, &view->board_height);
+    rr_board_get_size (board, &view->board_width, &view->board_height);
 
     view->cell_width = widget->allocation.width / view->board_width;
     if (view->cell_width == 0)
@@ -544,7 +526,7 @@ grr_board_view_expose (GtkWidget      *widget,
 
     XrTranslate (xrs, view->board_pad_x, view->board_pad_y);
 
-    goal_target = rr_board_get_goal_target (view->board);
+    goal_target = rr_board_get_goal_target (board);
 
     /* Draw cell targets */
     for (j=0; j < view->board_height; j++) {
@@ -552,7 +534,7 @@ grr_board_view_expose (GtkWidget      *widget,
            XrSave (xrs);
            XrTranslate (xrs, i * view->cell_width, j * view->cell_height);
            grr_cell_draw (xrs,
-                          rr_board_get_cell (view->board, i, j),
+                          rr_board_get_cell (board, i, j),
                           goal_target,
                           view->cell_width, view->cell_height);
            XrRestore (xrs);
@@ -591,7 +573,7 @@ grr_board_view_expose (GtkWidget      *widget,
            XrScale (xrs,
                     view->cell_width / GRR_SVG_ASSUMED_WIDTH,
                     view->cell_height / GRR_SVG_ASSUMED_HEIGHT);
-           grr_wall_draw (xrs, RR_CELL_GET_WALLS (rr_board_get_cell(view->board, i, j)));
+           grr_wall_draw (xrs, RR_CELL_GET_WALLS (rr_board_get_cell(board, i, j)));
            XrRestore (xrs);
        }
     }