[Commit]
grrobot/src Makefile.am,1.1.1.1,1.2 grr_board_view.c,1.3,1.4
grr_board_view.h,1.2,1.3 grrobot.c,1.2,1.3
Carl Worth
commit at keithp.com
Sat Jun 14 02:17:43 PDT 2003
- Previous message: [Commit] librr/src Makefile.am,1.4,1.5 rr.c,1.4,1.5 rr.h,1.8,1.9
rr_board.c,1.8,1.9 rr_client.c,1.4,1.5
- Next message: [Commit] grrobot/src grrobot.c,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: cworth
Update of /local/src/CVS/grrobot/src
In directory home.keithp.com:/tmp/cvs-serv19639/src
Modified Files:
Makefile.am grr_board_view.c grr_board_view.h grrobot.c
Log Message:
Added drag-and-drop (works but for handling queued notices).
Fixed to peroperly grok, (and display results of) responses.
Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/grrobot/src/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.am 13 Jun 2003 10:38:48 -0000 1.1.1.1
+++ Makefile.am 14 Jun 2003 08:17:41 -0000 1.2
@@ -7,7 +7,7 @@
grr_board_view.c \
grr_board_view.h
-INCLUDES = $(GRROBOT_CFLAGS) -Wall
+INCLUDES = $(GRROBOT_CFLAGS)
LDFLAGS = $(GRROBOT_LIBS)
Index: grr_board_view.c
===================================================================
RCS file: /local/src/CVS/grrobot/src/grr_board_view.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- grr_board_view.c 14 Jun 2003 01:57:31 -0000 1.3
+++ grr_board_view.c 14 Jun 2003 08:17:41 -0000 1.4
@@ -24,11 +24,15 @@
* Author: Carl Worth <carl at theworths.org>
*/
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.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>
@@ -74,22 +78,29 @@
/* Forward declarations */
+static int
+grr_sprintf_alloc (char **str, const char *fmt, ...);
+
+static int
+grr_sprintf_alloc_va (char **str, const char *fmt, va_list ap);
+
+
static void grr_board_view_class_init (grr_board_view_class_t *klass);
static void grr_board_view_init (grr_board_view_t *view);
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);
+ 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);
@@ -151,6 +162,7 @@
{
view->board = NULL;
view->owns_board = 0;
+ view->client = NULL;
view->button = 0;
view->timer = 0;
@@ -195,17 +207,25 @@
}
void
-grr_board_view_set_board (grr_board_view_t *view,
+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);
}
+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)
{
@@ -581,72 +601,116 @@
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, af
-*/
+ 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);
-/*
- 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)) {
- view->button = event->button;
+ gtk_grab_add (widget);
- grr_board_view_update_mouse (view, event->x, event->y);
+ 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);
}
- */
- return FALSE;
+ return FALSE;
}
static gint
grr_board_view_button_release (GtkWidget *widget,
GdkEventButton *event)
{
- grr_board_view_t *view;
+ grr_board_view_t *view;
+ const char *dir;
+ const char *robot;
+ int x, 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;
-/*
- 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) */
-/*
- rr_client_move (view->client, view->robot, direction);
-*/
+ 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);
+ }
+ }
return FALSE;
}
@@ -697,13 +761,10 @@
static void
grr_board_view_update_mouse (grr_board_view_t *view, gint x, gint y)
{
- gint xc, yc;
-
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;
+ /* XXX: Should draw a robot here */
}
static void
@@ -713,4 +774,48 @@
g_return_if_fail (GRR_IS_BOARD_VIEW (view));
gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+static int
+grr_sprintf_alloc (char **str, const char *fmt, ...)
+{
+ int ret;
+ va_list ap;
+
+ va_start(ap, fmt);
+ ret = grr_sprintf_alloc_va (str, fmt, ap);
+ va_end(ap);
+
+ return ret;
+}
+
+/* ripped more or less straight out of PRINTF(3) */
+static int
+grr_sprintf_alloc_va (char **str, const char *fmt, va_list ap)
+{
+ char *new_str;
+ /* Guess we need no more than 100 bytes. */
+ int n, size = 100;
+
+ if ((*str = malloc (size)) == NULL)
+ return -1;
+ while (1) {
+ /* Try to print in the allocated space. */
+ n = vsnprintf (*str, size, fmt, ap);
+ /* If that worked, return the size. */
+ if (n > -1 && n < size)
+ return n;
+ /* Else try again with more space. */
+ if (n > -1) /* glibc 2.1 */
+ size = n+1; /* precisely what is needed */
+ else /* glibc 2.0 */
+ size *= 2; /* twice the old size */
+ new_str = realloc(*str, size);
+ if (new_str == NULL) {
+ free(*str);
+ *str = NULL;
+ return -1;
+ }
+ *str = new_str;
+ }
}
Index: grr_board_view.h
===================================================================
RCS file: /local/src/CVS/grrobot/src/grr_board_view.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- grr_board_view.h 14 Jun 2003 01:57:31 -0000 1.2
+++ grr_board_view.h 14 Jun 2003 08:17:41 -0000 1.3
@@ -56,7 +56,10 @@
int cell_width, cell_height;
- /* XXX: Obviously, the rest of this needs to be gutted */
+ int drag_x, drag_y;
+ rr_robot_t drag_robot;
+
+ rr_client_t *client;
/* Button currently pressed or 0 if none */
guint8 button;
@@ -70,10 +73,20 @@
GtkWidgetClass parent_class;
};
-GtkWidget* grr_board_view_new (rr_board_t *board);
-GtkType grr_board_view_get_type (void);
-void grr_board_view_set_board (grr_board_view_t *view,
- rr_board_t *board);
+GtkWidget*
+grr_board_view_new (rr_board_t *board);
+
+GtkType
+grr_board_view_get_type (void);
+
+void
+grr_board_view_set_board (grr_board_view_t *view,
+ rr_board_t *board);
+
+void
+grr_board_view_set_client (grr_board_view_t *view,
+ rr_client_t *client);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Index: grrobot.c
===================================================================
RCS file: /local/src/CVS/grrobot/src/grrobot.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- grrobot.c 14 Jun 2003 00:37:30 -0000 1.2
+++ grrobot.c 14 Jun 2003 08:17:41 -0000 1.3
@@ -176,17 +176,33 @@
}
static void
-command_callback (GtkWidget *widget,
- grr_game_t *game)
+grr_game_entry_callback (GtkWidget *widget,
+ grr_game_t *game)
{
+ rr_status_t status;
const gchar *entry_text;
char **response;
+ int i;
entry_text = gtk_entry_get_text (GTK_ENTRY (game->command_entry));
- gtk_text_buffer_insert_at_cursor (game->message_buffer, entry_text, -1);
- gtk_text_buffer_insert_at_cursor (game->message_buffer, "\n", -1);
- rr_client_request (game->client, entry_text, &response);
+ status = rr_client_request (game->client, entry_text, &response);
+ if (status) {
+ gtk_text_buffer_insert_at_cursor (game->message_buffer,
+ "ERROR: ", -1);
+ gtk_text_buffer_insert_at_cursor (game->message_buffer,
+ rr_status_str (status), -1);
+ gtk_text_buffer_insert_at_cursor (game->message_buffer,
+ "\n", -1);
+ } else {
+ for (i=0; response[i]; i++) {
+ gtk_text_buffer_insert_at_cursor (game->message_buffer,
+ response[i], -1);
+ gtk_text_buffer_insert_at_cursor (game->message_buffer,
+ " ", -1);
+ }
+ gtk_text_buffer_insert_at_cursor (game->message_buffer, "\n", -1);
+ }
gtk_entry_set_text (GTK_ENTRY (game->command_entry), "");
@@ -227,6 +243,8 @@
gtk_paned_pack1 (GTK_PANED (vpaned), board_frame, TRUE, TRUE);
{
game->board_view = grr_board_view_new (game->board);
+ grr_board_view_set_client (GRR_BOARD_VIEW (game->board_view),
+ game->client);
gtk_container_add (GTK_CONTAINER (board_frame), game->board_view);
gtk_widget_show (game->board_view);
@@ -256,7 +274,7 @@
gtk_container_add (GTK_CONTAINER (vbox), command_entry);
gtk_widget_show (command_entry);
g_signal_connect (G_OBJECT (command_entry), "activate",
- G_CALLBACK (command_callback),
+ G_CALLBACK (grr_game_entry_callback),
(gpointer) game);
}
gtk_widget_show (vbox);
- Previous message: [Commit] librr/src Makefile.am,1.4,1.5 rr.c,1.4,1.5 rr.h,1.8,1.9
rr_board.c,1.8,1.9 rr_client.c,1.4,1.5
- Next message: [Commit] grrobot/src grrobot.c,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Commit
mailing list