]> git.draconx.ca Git - rrace.git/blobdiff - src/motif_ui.c
Restructure motif code a bit.
[rrace.git] / src / motif_ui.c
index adbb3e501c3909ae162a7588525b26c8fa656459..726e24fd06033691f60d7f2af4fedd0045d0a4e2 100644 (file)
@@ -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,
@@ -206,43 +208,54 @@ construct_menu(const struct ui_menuitem *root, Widget parent, unsigned i)
 static void game_resize(Widget w, void *data, void *cb_data)
 {
        if (XtIsRealized(w))
-               x11_redraw_game(data);
+               x11_redraw_game(data, -1);
 }
 
 static void goal_resize(Widget w, void *data, void *cb_data)
 {
        if (XtIsRealized(w))
-               x11_redraw_goal(data);
+               x11_redraw_goal(data, -1);
 }
 
-static void game_input(Widget w, void *data, void *cb_data)
+/* 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,
+                                    int tile_w, int tile_h)
+{
+       return board_right(rect_x / tile_w)
+            & board_below(rect_y / tile_h)
+            & board_above((rect_y + rect_h - 1) / tile_h)
+            & board_left((rect_x + rect_w - 1) / tile_w);
+}
+
+static void game_expose(Widget w, void *data, void *cb_data)
 {
        XmDrawingAreaCallbackStruct *cbs = cb_data;
-       XButtonEvent *click = &cbs->event->xbutton;
-       struct app_state *state = data;
+       XExposeEvent *e = &cbs->event->xexpose;
        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 / (width/5);
-       }
+       uint_fast32_t mask;
 
-       if (x > 4 || y > 4)
+       XtVaGetValues(w, XmNwidth, &width, XmNheight, &height, (char *)NULL);
+       if (!(width /= 5) || !(height /= 5))
                return;
 
-       if (game_do_move(&state->board, x, y) == 0) {
-               if (game_check_goal(&state->board)) {
-                       printf("You win!\n");
-                       game_finish(&state->board);
-               }
+       mask = expose_mask(e->x, e->y, e->width, e->height, width, height);
+       x11_redraw_game(data, mask);
+}
 
-               x11_redraw_game(state);
-       }
+static void goal_expose(Widget w, void *data, void *cb_data)
+{
+       XmDrawingAreaCallbackStruct *cbs = cb_data;
+       XExposeEvent *e = &cbs->event->xexpose;
+       Dimension width, height;
+       uint_fast32_t mask;
+
+       XtVaGetValues(w, XmNwidth, &width, XmNheight, &height, (char *)NULL);
+       if (!(width /= 3) || !(height /= 3))
+               return;
+
+       mask = expose_mask(e->x, e->y, e->width, e->height, width, height);
+       x11_redraw_goal(data, mask);
 }
 
 void ui_initialize(struct app_state *state, Widget shell)
@@ -257,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_resize, state);
-       XtAddCallback(state->game, XmNinputCallback,  game_input,  state);
-
-       state->goal = XtNameToWidget(shell, "*goalCanvas");
+       XtAddCallback(state->game, XmNexposeCallback, game_expose, state);
        XtAddCallback(state->goal, XmNresizeCallback, goal_resize, state);
-       XtAddCallback(state->goal, XmNexposeCallback, goal_resize, state);
+       XtAddCallback(state->goal, XmNexposeCallback, goal_expose, state);
 }