zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-22 00:15:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Framework alteration: we now support a `game_ui' structure in

Browse Source 
addition to the `game_state'. The new structure is intended to
contain ephemeral data pertaining to the game's user interface
rather than the actual game: things stored in the UI structure are
not restored in an Undo, for example.
make_move() is passed the UI to modify as it wishes; it is now
allowed to return the _same_ game_state it was passed, to indicate
that although no move has been made there has been a UI operation
requiring a redraw.

[originally from svn r4207]
This commit is contained in:
Simon Tatham
2004-05-11 17:44:30 +00:00
parent a1c88470a3
commit 180802b362
10 changed files with 187 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
gtk.c
View File

@ -283,7 +283,7 @@ static gint button_event(GtkWidget *widget, GdkEventButton *event,
if (!fe->pixmap)
return TRUE;
if (event->type != GDK_BUTTON_PRESS)
if (event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE)
return TRUE;
if (event->button == 2 || (event->state & GDK_SHIFT_MASK))
@ -295,6 +295,36 @@ static gint button_event(GtkWidget *widget, GdkEventButton *event,
else
return FALSE; /* don't even know what button! */
if (event->type == GDK_BUTTON_RELEASE)
button += LEFT_RELEASE - LEFT_BUTTON;
if (!midend_process_key(fe->me, event->x, event->y, button))
gtk_widget_destroy(fe->window);
return TRUE;
}
static gint motion_event(GtkWidget *widget, GdkEventMotion *event,
gpointer data)
{
frontend *fe = (frontend *)data;
int button;
if (!fe->pixmap)
return TRUE;
if (event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE)
return TRUE;
if (event->state & (GDK_BUTTON2_MASK | GDK_SHIFT_MASK))
button = MIDDLE_DRAG;
else if (event->state & GDK_BUTTON1_MASK)
button = LEFT_DRAG;
else if (event->state & GDK_BUTTON3_MASK)
button = RIGHT_DRAG;
else
return FALSE; /* don't even know what button! */
if (!midend_process_key(fe->me, event->x, event->y, button))
gtk_widget_destroy(fe->window);
@ -893,6 +923,10 @@ static frontend *new_window(void)
GTK_SIGNAL_FUNC(key_event), fe);
gtk_signal_connect(GTK_OBJECT(fe->area), "button_press_event",
GTK_SIGNAL_FUNC(button_event), fe);
gtk_signal_connect(GTK_OBJECT(fe->area), "button_release_event",
GTK_SIGNAL_FUNC(button_event), fe);
gtk_signal_connect(GTK_OBJECT(fe->area), "motion_notify_event",
GTK_SIGNAL_FUNC(motion_event), fe);
gtk_signal_connect(GTK_OBJECT(fe->area), "expose_event",
GTK_SIGNAL_FUNC(expose_area), fe);
gtk_signal_connect(GTK_OBJECT(fe->window), "map_event",
@ -900,7 +934,10 @@ static frontend *new_window(void)
gtk_signal_connect(GTK_OBJECT(fe->area), "configure_event",
GTK_SIGNAL_FUNC(configure_area), fe);
gtk_widget_add_events(GTK_WIDGET(fe->area), GDK_BUTTON_PRESS_MASK);
gtk_widget_add_events(GTK_WIDGET(fe->area),
GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
GDK_BUTTON_MOTION_MASK);
gtk_widget_show(fe->area);
gtk_widget_show(fe->window);