Reimplement xcounter based on pre-rendered pixmpas.

[rrace.git] / src / motif_ui.c

diff --git a/src/motif_ui.c b/src/motif_ui.c
index 3658615d917dc0870c02ca5109bb7e992f928f05..6abdbc9d6db5dbe0aca21eab9cb6d28a358056bf 100644 (file)
--- a/src/motif_ui.c
+++ b/src/motif_ui.c
@@ -116,21 +116,22 @@ void ui_timer_update(struct app_state *state, int_fast32_t ms)
        char buf[100];
 
        if (ms < 0) {
-               xcounter_simple_update(state->timer, "\n");
+               xcounter_update(state->timer, "\n");
                return;
        }
 
-       xcounter_simple_update(state->timer, timer_text(ms, buf));
+       xcounter_update(state->timer, timer_text(ms, buf));
 }
 
 static void configure_mainwin(struct app_state *state, Widget form)
 {
        Widget gamearea = XtNameToWidget(form, &tree_strtab[gameArea]);
        Widget goalarea = XtNameToWidget(form, &tree_strtab[goalArea]);
+       Widget timer = XtNameToWidget(form, &tree_strtab[timeDisplay]);
        XtActionsRec resize_rec;
        char xc_template[100];
 
-       assert(gamearea && goalarea);
+       assert(gamearea && goalarea && timer);
        XtVaSetValues(form, XmNfractionBase, SPLIT_DENOMINATOR, (char *)NULL);
 
        state->game = XtNameToWidget(gamearea, &tree_strtab[gameCanvas]);
@@ -145,15 +146,13 @@ static void configure_mainwin(struct app_state *state, Widget form)
                                XmNtopWidget, gamearea,
                                (char *)NULL);
 
-       state->timer = XtNameToWidget(form, &tree_strtab[timeDisplay]);
-       XtVaSetValues(state->timer, XmNleftAttachment, XmATTACH_WIDGET,
-                                   XmNleftWidget, gamearea,
-                                   XmNtopAttachment, XmATTACH_WIDGET,
-                                   XmNtopWidget, goalarea,
-                                   XmNrightAttachment, XmATTACH_FORM,
-                                   (char *)NULL);
-
-       xcounter_simple_setup(state->timer, timer_text(20000, xc_template));
+       XtVaSetValues(timer, XmNleftAttachment, XmATTACH_WIDGET,
+                            XmNleftWidget, gamearea,
+                            XmNtopAttachment, XmATTACH_WIDGET,
+                            XmNtopWidget, goalarea,
+                            XmNrightAttachment, XmATTACH_FORM,
+                            (char *)NULL);
+       state->timer = xcounter_simple_init(timer, timer_text(0, xc_template));
        ui_timer_update(state, -1);
 
        resize_rec.string = "ResizeGameArea";