]> git.cworth.org Git - grrobot/blobdiff - src/grr_board_view.c
Added click-to-move in addition to drag-to-move
[grrobot] / src / grr_board_view.c
index 0903ff1e95597ee85980b018c8c5adea5afe6878..c4cf316e49103c9c158bd5373c9fc237206f9f3b 100644 (file)
@@ -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);
@@ -561,26 +543,30 @@ grr_board_view_expose (GtkWidget      *widget,
 
     /* Draw grid. */
     XrSave (xrs);
-    XrSetRGBColor (xrs, .75, .75, 1);
-    XrSetLineWidth (xrs, 1);
-    for (j=0; j < view->board_height; j++) {
-       XrMoveTo (xrs, 0, j * view->cell_height + 0.5);
-       XrRelLineTo (xrs, view->board_width * view->cell_width, 0);
-    }
-    for (i=0; i < view->board_width; i++) {
-       XrMoveTo (xrs, i * view->cell_width + 0.5, 0);
-       XrRelLineTo (xrs, 0, view->board_height * view->cell_height);
+    {
+       XrSetRGBColor (xrs, .75, .75, 1);
+       XrSetLineWidth (xrs, 1);
+       for (j=0; j < view->board_height; j++) {
+           XrMoveTo (xrs, 0, j * view->cell_height + 0.5);
+           XrRelLineTo (xrs, view->board_width * view->cell_width, 0);
+       }
+       for (i=0; i < view->board_width; i++) {
+           XrMoveTo (xrs, i * view->cell_width + 0.5, 0);
+           XrRelLineTo (xrs, 0, view->board_height * view->cell_height);
+       }
+       XrStroke (xrs);
     }
-    XrStroke (xrs);
     XrRestore (xrs);
 
     /* Draw goal target in center of board */
     XrSave (xrs);
-    XrTranslate (xrs,
-                (view->board_width / 2 - 1) * view->cell_width,
-                (view->board_height / 2 - 1) * view->cell_height);
-    grr_cell_draw (xrs, goal_target, goal_target,
-                  view->cell_width * 2, view->cell_height * 2);
+    {
+       XrTranslate (xrs,
+                    (view->board_width / 2 - 1) * view->cell_width,
+                    (view->board_height / 2 - 1) * view->cell_height);
+       grr_cell_draw (xrs, goal_target, goal_target,
+                      view->cell_width * 2, view->cell_height * 2);
+    }
     XrRestore (xrs);
 
     /* Draw walls */
@@ -591,7 +577,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);
        }
     }
@@ -635,8 +621,6 @@ grr_board_view_button_press (GtkWidget      *widget,
        gtk_grab_add (widget);
 
        view->button = event->button;
-       view->drag_x = x;
-       view->drag_y = y;
        view->drag_robot = RR_CELL_GET_ROBOT (cell);
 
        grr_board_view_update_mouse (view, event->x, event->y);
@@ -647,12 +631,13 @@ grr_board_view_button_press (GtkWidget      *widget,
 
 static gint
 grr_board_view_button_release (GtkWidget      *widget,
-                         GdkEventButton *event)
+                              GdkEventButton *event)
 {
     grr_board_view_t *view;
     const char *dir;
     const char *robot;
     int x, y;
+    int robot_x, robot_y;
     int dx, dy;
 
     g_return_val_if_fail (widget != NULL, FALSE);
@@ -663,53 +648,53 @@ grr_board_view_button_release (GtkWidget      *widget,
 
     if (view->button == event->button) {
       gtk_grab_remove (widget);
-
       view->button = 0;
+    }
+
+    grr_board_view_pointer_coords_to_grid (view, event->x, event->y, &x, &y);
+
+    rr_board_find_robot (view->board, view->drag_robot, &robot_x, &robot_y);
+    dx = x - robot_x;
+    dy = y - robot_y;
+    if (dx == 0 && dy == 0)
+       return FALSE;
 
-      grr_board_view_pointer_coords_to_grid (view, event->x, event->y, &x, &y);
-
-      dx = x - view->drag_x;
-      dy = y - view->drag_y;
-      if (dx == 0 && dy == 0)
-         return FALSE;
-
-      if (abs(dx) > abs(dy))
-         if (x > view->drag_x)
-             dir = "east";
-         else
-             dir = "west";
-      else
-         if (y > view->drag_y)
-             dir = "south";
-         else
-             dir = "north";
-
-      switch (view->drag_robot) {
-      case RR_ROBOT_BLUE:
-         robot = "blue";
-         break;
-      case RR_ROBOT_GREEN:
-         robot = "green";
-         break;
-      case RR_ROBOT_RED:
-         robot = "RED";
-         break;
-      case RR_ROBOT_YELLOW:
-         robot = "YELLOW";
-         break;
-      default:
-         return FALSE;
-      }
-
-      if (view->client) {
-         char *move_str;
-
-         grr_sprintf_alloc (&move_str, "%s %s", robot, dir);
-         if (move_str == NULL)
-             return FALSE;
-         rr_client_move (view->client, move_str);
-         free (move_str);
-      }
+    if (abs(dx) > abs(dy))
+       if (x > robot_x)
+           dir = "east";
+       else
+           dir = "west";
+    else
+       if (y > robot_y)
+           dir = "south";
+       else
+           dir = "north";
+    
+    switch (view->drag_robot) {
+    case RR_ROBOT_BLUE:
+       robot = "blue";
+       break;
+    case RR_ROBOT_GREEN:
+       robot = "green";
+       break;
+    case RR_ROBOT_RED:
+       robot = "RED";
+       break;
+    case RR_ROBOT_YELLOW:
+       robot = "YELLOW";
+       break;
+    default:
+       return FALSE;
+    }
+    
+    if (view->client) {
+       char *move_str;
+       
+       grr_sprintf_alloc (&move_str, "%s %s", robot, dir);
+       if (move_str == NULL)
+           return FALSE;
+       rr_client_move (view->client, move_str);
+       free (move_str);
     }
 
   return FALSE;