]> git.cworth.org Git - grrobot/blobdiff - src/grr_board_view.c
Fixed messages and scrolling
[grrobot] / src / grr_board_view.c
index 6e71a0f0356a36999c83ac28873449716dfb2c29..4a3b733713627e586b731617d873204bbe0615da 100644 (file)
  * Author: Carl Worth <carl@theworths.org>
  */
 
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <Xr.h>
 #include <xsvg.h>
 
-#include <math.h>
-#include <stdio.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <gdk/gdkx.h>
 
 #include "grr_board_view.h"
+#include "grr_util.h"
 
 #define SCROLL_DELAY_LENGTH  300
 #define GRR_BOARD_VIEW_DEFAULT_SIZE 100
@@ -79,18 +83,17 @@ static void grr_board_view_init                     (grr_board_view_t         *v
 static void grr_board_view_destroy                  (GtkObject        *object);
 static void grr_board_view_realize                  (GtkWidget        *widget);
 static void grr_board_view_size_request             (GtkWidget      *widget,
-                                              GtkRequisition *requisition);
+                                                    GtkRequisition *requisition);
 static void grr_board_view_size_allocate            (GtkWidget     *widget,
-                                              GtkAllocation *allocation);
+                                                    GtkAllocation *allocation);
 static gint grr_board_view_expose                   (GtkWidget        *widget,
-                                               GdkEventExpose   *event);
+                                                    GdkEventExpose   *event);
 static gint grr_board_view_button_press             (GtkWidget        *widget,
-                                               GdkEventButton   *event);
+                                                    GdkEventButton   *event);
 static gint grr_board_view_button_release           (GtkWidget        *widget,
-                                               GdkEventButton   *event);
+                                                    GdkEventButton   *event);
 static gint grr_board_view_motion_notify            (GtkWidget        *widget,
-                                               GdkEventMotion   *event);
-static gint grr_board_view_timer                    (grr_board_view_t         *view);
+                                                    GdkEventMotion   *event);
 
 static void grr_board_view_update_mouse             (grr_board_view_t *view, gint x, gint y);
 static void grr_board_view_update                   (grr_board_view_t *view);
@@ -128,40 +131,33 @@ 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;
-    view->policy = GTK_UPDATE_CONTINUOUS;
     view->timer = 0;
-    view->radius = 0;
-    view->pointer_width = 0;
-    view->angle = 0.0;
-    view->old_value = 0.0;
-    view->old_lower = 0.0;
-    view->old_upper = 0.0;
 }
 
 GtkWidget*
@@ -171,16 +167,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)
 {
@@ -191,96 +192,75 @@ 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);
-    g_return_if_fail (GRR_IS_BOARD_VIEW (view));
-
-    view->board = board;
-
-    grr_board_view_update (view);
-}
-
 static void
 grr_board_view_realize (GtkWidget *widget)
 {
-  grr_board_view_t *view;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GRR_IS_BOARD_VIEW (widget));
-
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-  view = GRR_BOARD_VIEW (widget);
-
-  attributes.x = widget->allocation.x;
-  attributes.y = widget->allocation.y;
-  attributes.width = widget->allocation.width;
-  attributes.height = widget->allocation.height;
-  attributes.wclass = GDK_INPUT_OUTPUT;
-  attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.event_mask = gtk_widget_get_events (widget) | 
-    GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | 
-    GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK |
-    GDK_POINTER_MOTION_HINT_MASK;
-  attributes.visual = gtk_widget_get_visual (widget);
-  attributes.colormap = gtk_widget_get_colormap (widget);
-
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-  widget->window = gdk_window_new (widget->parent->window, &attributes, attributes_mask);
+    grr_board_view_t *view;
+    GdkWindowAttr attributes;
+    gint attributes_mask;
 
-  widget->style = gtk_style_attach (widget->style, widget->window);
+    g_return_if_fail (widget != NULL);
+    g_return_if_fail (GRR_IS_BOARD_VIEW (widget));
+  
+    GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+    view = GRR_BOARD_VIEW (widget);
 
-  gdk_window_set_user_data (widget->window, widget);
+    attributes.x = widget->allocation.x;
+    attributes.y = widget->allocation.y;
+    attributes.width = widget->allocation.width;
+    attributes.height = widget->allocation.height;
+    attributes.wclass = GDK_INPUT_OUTPUT;
+    attributes.window_type = GDK_WINDOW_CHILD;
+    attributes.event_mask = gtk_widget_get_events (widget) | 
+       GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | 
+       GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK |
+       GDK_POINTER_MOTION_HINT_MASK;
+    attributes.visual = gtk_widget_get_visual (widget);
+    attributes.colormap = gtk_widget_get_colormap (widget);
+    
+    attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+    widget->window = gdk_window_new (widget->parent->window, &attributes, attributes_mask);
+    
+    widget->style = gtk_style_attach (widget->style, widget->window);
+    
+    gdk_window_set_user_data (widget->window, widget);
 
-  gtk_style_set_background (widget->style, widget->window, GTK_STATE_ACTIVE);
+    gtk_style_set_background (widget->style, widget->window, GTK_STATE_ACTIVE);
 }
 
 static void 
 grr_board_view_size_request (GtkWidget      *widget,
                       GtkRequisition *requisition)
 {
-  requisition->width = GRR_BOARD_VIEW_DEFAULT_SIZE;
-  requisition->height = GRR_BOARD_VIEW_DEFAULT_SIZE;
+    requisition->width = GRR_BOARD_VIEW_DEFAULT_SIZE;
+    requisition->height = GRR_BOARD_VIEW_DEFAULT_SIZE;
 }
 
 static void
 grr_board_view_size_allocate (GtkWidget     *widget,
                        GtkAllocation *allocation)
 {
-  grr_board_view_t *view;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GRR_IS_BOARD_VIEW (widget));
-  g_return_if_fail (allocation != NULL);
-
-  widget->allocation = *allocation;
-  view = GRR_BOARD_VIEW (widget);
+    grr_board_view_t *view;
 
-  if (GTK_WIDGET_REALIZED (widget))
-    {
+    g_return_if_fail (widget != NULL);
+    g_return_if_fail (GRR_IS_BOARD_VIEW (widget));
+    g_return_if_fail (allocation != NULL);
 
-      gdk_window_move_resize (widget->window,
-                             allocation->x, allocation->y,
-                             allocation->width, allocation->height);
+    widget->allocation = *allocation;
+    view = GRR_BOARD_VIEW (widget);
 
+    if (GTK_WIDGET_REALIZED (widget)) {
+       gdk_window_move_resize (widget->window,
+                               allocation->x, allocation->y,
+                               allocation->width, allocation->height);
     }
-  view->radius = MIN (allocation->width, allocation->height) * 0.45;
-  view->pointer_width = view->radius / 5;
 }
 
 static void
@@ -496,6 +476,7 @@ grr_board_view_expose (GtkWidget      *widget,
                       GdkEventExpose *event)
 {
     grr_board_view_t *view;
+    rr_board_t *board;
     Display *dpy;
     Drawable drawable;
     XrState *xrs;
@@ -512,6 +493,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);
@@ -523,7 +505,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)
@@ -537,7 +519,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++) {
@@ -545,7 +527,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);
@@ -554,26 +536,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 */
@@ -584,7 +570,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);
        }
     }
@@ -594,57 +580,114 @@ grr_board_view_expose (GtkWidget      *widget,
     return FALSE;
 }
 
+static void
+grr_board_view_pointer_coords_to_grid (grr_board_view_t *view,
+                                      int pointer_x, int pointer_y,
+                                      int *grid_x, int *grid_y)
+{
+    *grid_x = (pointer_x - view->board_pad_x) / view->cell_width;
+    *grid_y = (pointer_y - view->board_pad_y) / view->cell_height;
+}
+
+
 static gint
 grr_board_view_button_press (GtkWidget      *widget,
                       GdkEventButton *event)
 {
-  grr_board_view_t *view;
-
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GRR_IS_BOARD_VIEW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
+    grr_board_view_t *view;
+    rr_cell_t cell;
+    int x, y;
 
-  view = GRR_BOARD_VIEW (widget);
+    g_return_val_if_fail (widget != NULL, FALSE);
+    g_return_val_if_fail (GRR_IS_BOARD_VIEW (widget), FALSE);
+    g_return_val_if_fail (event != NULL, FALSE);
+    
+    view = GRR_BOARD_VIEW (widget);
 
-  /* XXX:   grr_board_view_pointer_coords_to_grid (view, event->x, event->y, &i, &j);
+    grr_board_view_pointer_coords_to_grid (view,
+                                          event->x, event->y,
+                                          &x, &y);
   
-  if (!view->button &&
-      rr_board_has_robot (view->board, i, j))
-    {
-      gtk_grab_add (widget);
+    cell = rr_board_get_cell (view->board, x, y);
+    if (!view->button && RR_CELL_GET_ROBOT (cell)) {
+
+       gtk_grab_add (widget);
 
-      view->button = event->button;
+       view->button = event->button;
+       view->drag_robot = RR_CELL_GET_ROBOT (cell);
 
-      grr_board_view_update_mouse (view, event->x, event->y);
+       grr_board_view_update_mouse (view, event->x, event->y);
     }
-  */
 
-  return FALSE;
+    return FALSE;
 }
 
 static gint
 grr_board_view_button_release (GtkWidget      *widget,
-                         GdkEventButton *event)
+                              GdkEventButton *event)
 {
-  grr_board_view_t *view;
+    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);
-  g_return_val_if_fail (GRR_IS_BOARD_VIEW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
+    g_return_val_if_fail (widget != NULL, FALSE);
+    g_return_val_if_fail (GRR_IS_BOARD_VIEW (widget), FALSE);
+    g_return_val_if_fail (event != NULL, FALSE);
 
-  view = GRR_BOARD_VIEW (widget);
+    view = GRR_BOARD_VIEW (widget);
 
-  if (view->button == event->button)
-    {
+    if (view->button == event->button) {
       gtk_grab_remove (widget);
-
       view->button = 0;
+    }
 
-      /* XXX:      grr_board_view_pointer_coords_to_grid (view, event->x, event->y, &i, &j); */
+    grr_board_view_pointer_coords_to_grid (view, event->x, event->y, &x, &y);
 
-      /* XXX: Need to compute direction based on (i, j) and old (i, j) */
-      /*XXX:       rr_client_move (view->client, view->robot, direction); */
+    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;
 
+    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;
@@ -654,111 +697,60 @@ static gint
 grr_board_view_motion_notify (GtkWidget      *widget,
                         GdkEventMotion *event)
 {
-  grr_board_view_t *view;
-  GdkModifierType mods;
-  gint x, y, mask;
-
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GRR_IS_BOARD_VIEW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  view = GRR_BOARD_VIEW (widget);
-
-  if (view->button != 0)
-    {
-      x = event->x;
-      y = event->y;
-
-      if (event->is_hint || (event->window != widget->window))
-       gdk_window_get_pointer (widget->window, &x, &y, &mods);
-
-      switch (view->button)
-       {
+    grr_board_view_t *view;
+    GdkModifierType mods;
+    gint x, y, mask;
+    
+    g_return_val_if_fail (widget != NULL, FALSE);
+    g_return_val_if_fail (GRR_IS_BOARD_VIEW (widget), FALSE);
+    g_return_val_if_fail (event != NULL, FALSE);
+    
+    view = GRR_BOARD_VIEW (widget);
+    
+    if (view->button != 0) {
+       x = event->x;
+       y = event->y;
+
+       if (event->is_hint || (event->window != widget->window))
+           gdk_window_get_pointer (widget->window, &x, &y, &mods);
+       
+       switch (view->button) {
        case 1:
-         mask = GDK_BUTTON1_MASK;
-         break;
+           mask = GDK_BUTTON1_MASK;
+           break;
        case 2:
-         mask = GDK_BUTTON2_MASK;
-         break;
+           mask = GDK_BUTTON2_MASK;
+           break;
        case 3:
-         mask = GDK_BUTTON3_MASK;
-         break;
+           mask = GDK_BUTTON3_MASK;
+           break;
        default:
-         mask = 0;
-         break;
+           mask = 0;
+           break;
        }
 
-      if (mods & mask)
-       grr_board_view_update_mouse (view, x,y);
+       if (mods & mask)
+           grr_board_view_update_mouse (view, x,y);
     }
 
-  return FALSE;
-}
-
-static gint
-grr_board_view_timer (grr_board_view_t *view)
-{
-    g_return_val_if_fail (view != NULL, FALSE);
-    g_return_val_if_fail (GRR_IS_BOARD_VIEW (view), FALSE);
-
     return FALSE;
 }
 
 static void
 grr_board_view_update_mouse (grr_board_view_t *view, gint x, gint y)
 {
-    gint xc, yc;
-    gfloat old_value;
-
     g_return_if_fail (view != NULL);
     g_return_if_fail (GRR_IS_BOARD_VIEW (view));
 
-    xc = GTK_WIDGET(view)->allocation.width / 2;
-    yc = GTK_WIDGET(view)->allocation.height / 2;
-
-    old_value = view->adjustment->value;
-    view->angle = atan2(yc-y, x-xc);
-
-    if (view->angle < -G_PI/2.)
-       view->angle += 2*G_PI;
-    
-    if (view->angle < -G_PI/6)
-       view->angle = -G_PI/6;
-
-    if (view->angle > 7.*G_PI/6.)
-       view->angle = 7.*G_PI/6.;
-    
-    view->adjustment->value = view->adjustment->lower + (7.*G_PI/6 - view->angle) *
-       (view->adjustment->upper - view->adjustment->lower) / (4.*G_PI/3.);
-    
-    if (view->adjustment->value != old_value)
-       {
-           if (view->policy == GTK_UPDATE_CONTINUOUS)
-               {
-                   g_signal_emit_by_name (GTK_OBJECT (view->adjustment), "value_changed");
-               }
-      else
-         {
-             gtk_widget_queue_draw (GTK_WIDGET (view));
-             
-             if (view->policy == GTK_UPDATE_DELAYED)
-                 {
-                     if (view->timer)
-                         gtk_timeout_remove (view->timer);
-                     
-                     view->timer = gtk_timeout_add (SCROLL_DELAY_LENGTH,
-                                                    (GtkFunction) grr_board_view_timer,
-                                                    (gpointer) view);
-                 }
-         }
-       }
+    /* XXX: Should draw a robot here */
 }
 
 static void
 grr_board_view_update (grr_board_view_t *view)
 {
-  g_return_if_fail (view != NULL);
-  g_return_if_fail (GRR_IS_BOARD_VIEW (view));
+    g_return_if_fail (view != NULL);
+    g_return_if_fail (GRR_IS_BOARD_VIEW (view));
 
-  gtk_widget_queue_draw (GTK_WIDGET (view));
+    gtk_widget_queue_draw (GTK_WIDGET (view));
 }
+