int cur_x, cur_y, cur_visible, cur_dragging;
};
-static game_ui *new_ui(const game_state *state)
+static void reset_ui(game_ui *ui)
{
- game_ui *ui = snew(game_ui);
ui->drag_start_x = -1;
ui->drag_start_y = -1;
ui->drag_end_x = -1;
ui->drag_end_y = -1;
- ui->dragged = ui->erasing = FALSE;
ui->x1 = -1;
ui->y1 = -1;
ui->x2 = -1;
ui->y2 = -1;
+ ui->dragged = FALSE;
+}
+
+static game_ui *new_ui(const game_state *state)
+{
+ game_ui *ui = snew(game_ui);
+ reset_ui(ui);
+ ui->erasing = FALSE;
ui->cur_x = ui->cur_y = ui->cur_visible = ui->cur_dragging = 0;
return ui;
}
coord_round(FROMCOORD((float)x), FROMCOORD((float)y), &xc, &yc);
if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
- if (ui->drag_start_x >= 0 && ui->cur_dragging) {
- /*
- * If a keyboard drag is in progress, unceremoniously
- * cancel it.
- */
- ui->drag_start_x = -1;
- ui->drag_start_y = -1;
- ui->drag_end_x = -1;
- ui->drag_end_y = -1;
- ui->x1 = -1;
- ui->y1 = -1;
- ui->x2 = -1;
- ui->y2 = -1;
- ui->dragged = FALSE;
- }
+ if (ui->drag_start_x >= 0 && ui->cur_dragging)
+ reset_ui(ui); /* cancel keyboard dragging */
startdrag = TRUE;
ui->cur_visible = ui->cur_dragging = FALSE;
active = TRUE;
startdrag = TRUE;
active = TRUE;
}
+ } else if (button == '\b' || button == 27) {
+ if (!ui->cur_dragging) {
+ ui->cur_visible = FALSE;
+ } else {
+ assert(ui->cur_visible);
+ reset_ui(ui); /* cancel keyboard dragging */
+ ui->cur_dragging = FALSE;
+ }
+ return "";
} else if (button != LEFT_DRAG && button != RIGHT_DRAG) {
return NULL;
}
}
}
- ui->drag_start_x = -1;
- ui->drag_start_y = -1;
- ui->drag_end_x = -1;
- ui->drag_end_y = -1;
- ui->x1 = -1;
- ui->y1 = -1;
- ui->x2 = -1;
- ui->y2 = -1;
- ui->dragged = FALSE;
+ reset_ui(ui);
active = TRUE;
}