Restructure motif code a bit.

[rrace.git] / src / motif_ui.c

diff --git a/src/motif_ui.c b/src/motif_ui.c
index 4734d054958cee5a495568fb8a16a2fcb66da4af..726e24fd06033691f60d7f2af4fedd0045d0a4e2 100644 (file)
--- a/src/motif_ui.c
+++ b/src/motif_ui.c
@@ -95,7 +95,7 @@ ResizeGameArea(Widget form, XEvent *e, String *args, Cardinal *num_args)
        XtVaSetValues(goal, XmNwidth, goalsz, XmNheight, goalsz, (char *)NULL);
 }
 
-static void game_configure(Widget form)
+static void configure_mainwin(struct app_state *state, Widget form)
 {
        Widget gamearea = XtNameToWidget(form, &tree_strtab[gameArea]);
        Widget goalarea = XtNameToWidget(form, &tree_strtab[goalArea]);
@@ -104,10 +104,12 @@ static void game_configure(Widget form)
        assert(gamearea && goalarea);
        XtVaSetValues(form, XmNfractionBase, SPLIT_DENOMINATOR, (char *)NULL);
 
+       state->game = XtNameToWidget(gamearea, &tree_strtab[gameCanvas]);
        XtVaSetValues(gamearea, XmNleftAttachment, XmATTACH_FORM,
                                XmNtopAttachment, XmATTACH_FORM,
                                (char *)NULL);
 
+       state->goal = XtNameToWidget(goalarea, &tree_strtab[goalCanvas]);
        XtVaSetValues(goalarea, XmNleftAttachment, XmATTACH_WIDGET,
                                XmNleftWidget, gamearea,
                                XmNtopAttachment, XmATTACH_OPPOSITE_WIDGET,
@@ -215,52 +217,6 @@ static void goal_resize(Widget w, void *data, void *cb_data)
                x11_redraw_goal(data, -1);
 }
 
-static void do_input_move(struct app_state *state, int x, int y)
-{
-       uint_least32_t *gp = state->board.game, prev[4];
-
-       memcpy(prev, gp, sizeof prev);
-       if (game_do_move(&state->board, x, y) == 0) {
-               uint_least32_t mask;
-
-               if (game_check_goal(&state->board)) {
-                       printf("You win!\n");
-                       game_finish(&state->board);
-               }
-
-               /* Figure out which tiles changed */
-               prev[0] ^= gp[0];
-               prev[1] ^= gp[1];
-               prev[2] ^= gp[2];
-               mask = prev[0] | prev[1] | prev[2];
-
-               x11_redraw_game(state, mask);
-       }
-}
-
-static void game_input(Widget w, void *data, void *cb_data)
-{
-       XmDrawingAreaCallbackStruct *cbs = cb_data;
-       XButtonEvent *click = &cbs->event->xbutton;
-       struct app_state *state = data;
-       Dimension width, height;
-       unsigned x = -1, y = -1;
-
-       switch (cbs->event->type) {
-       case ButtonPress:
-               XtVaGetValues(w, XmNwidth, &width,
-                                XmNheight, &height,
-                                (char *)NULL);
-               x = click->x / (width/5);
-               y = click->y / (height/5);
-       }
-
-       if (x > 4 || y > 4)
-               return;
-
-       do_input_move(state, x, y);
-}
-
 /* Figure out which tiles intersect a rectangle. */
 static uint_fast32_t
 expose_mask(int rect_x, int rect_y, int rect_w, int rect_h,
@@ -314,14 +270,9 @@ void ui_initialize(struct app_state *state, Widget shell)
        help = XtNameToWidget(menubar, "helpMenu");
        XtVaSetValues(menubar, XmNmenuHelpWidget, help, (char *)NULL);
 
-       game_configure(XtNameToWidget(shell, "*game"));
-
-       state->game = XtNameToWidget(shell, "*gameCanvas");
+       configure_mainwin(state, XtNameToWidget(shell, "*game"));
        XtAddCallback(state->game, XmNresizeCallback, game_resize, state);
        XtAddCallback(state->game, XmNexposeCallback, game_expose, state);
-       XtAddCallback(state->game, XmNinputCallback,  game_input,  state);
-
-       state->goal = XtNameToWidget(shell, "*goalCanvas");
        XtAddCallback(state->goal, XmNresizeCallback, goal_resize, state);
        XtAddCallback(state->goal, XmNexposeCallback, goal_expose, state);
 }