new_gadget->state = va_arg(ap, unsigned long);
break;
- case GDI_ALT_STATE:
- new_gadget->state = va_arg(ap, boolean);
+ case GDI_RADIO_NR:
+ new_gadget->radio_nr = va_arg(ap, unsigned long);
+ break;
+
+ case GDI_RADIO_PRESSED:
+ new_gadget->radio_pressed = va_arg(ap, boolean);
break;
case GDI_NUMBER_VALUE:
free(gi);
}
+/* values for DrawGadget() */
+#define DG_UNPRESSED 0
+#define DG_PRESSED 1
+#define DG_BUFFERED 0
+#define DG_DIRECT 1
+
static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
{
int state = (pressed ? 1 : 0);
- struct GadgetDesign *gd = (gi->alt_state ?
+ struct GadgetDesign *gd = (gi->radio_pressed ?
&gi->alt_design[state] :
&gi->design[state]);
- if (gi->type != GD_TYPE_NORMAL_BUTTON)
+ if (gi->type != GD_TYPE_NORMAL_BUTTON &&
+ gi->type != GD_TYPE_RADIO_BUTTON)
return;
XCopyArea(display, gd->pixmap, drawto, gc,
gd->x, gd->y, gi->width, gi->height, gi->x, gi->y);
if (direct)
- XCopyArea(display, gd->pixmap, window, gc,
- gd->x, gd->y, gi->width, gi->height, gi->x, gi->y);
+ XCopyArea(display, drawto, window, gc,
+ gi->x, gi->y, gi->width, gi->height, gi->x, gi->y);
else
redraw_mask |= REDRAW_ALL;
}
gi->mapped = TRUE;
- DrawGadget(gi, (gi->state == GD_BUTTON_PRESSED), FALSE);
+ DrawGadget(gi, (gi->state == GD_BUTTON_PRESSED), DG_BUFFERED);
}
void UnmapGadget(struct GadgetInfo *gi)
static struct GadgetInfo *gi = NULL;
static unsigned long pressed_delay = 0;
-#if 0
- static boolean pressed = FALSE;
-#endif
-
struct GadgetInfo *new_gi;
boolean gadget_pressed;
boolean gadget_pressed_repeated;
- boolean gadget_moving_inside;
- boolean gadget_moving_outside;
+ boolean gadget_moving;
+ boolean gadget_moving_off_borders;
boolean gadget_released;
+ boolean gadget_released_off_borders;
if (gadget_list_first_entry == NULL)
return;
new_gi = getGadgetInfoFromMousePosition(mx,my);
gadget_pressed =
- (button != 0 && gi == NULL && new_gi != NULL);
+ (button != 0 && gi == NULL && new_gi != NULL && !motion_status);
gadget_pressed_repeated =
(button != 0 && gi != NULL && new_gi == gi);
- gadget_moving_inside =
+ gadget_moving =
(button != 0 && gi != NULL && new_gi == gi && motion_status);
- gadget_moving_outside =
+ gadget_moving_off_borders =
(button != 0 && gi != NULL && new_gi != gi && motion_status);
gadget_released =
(button == 0 && gi != NULL && new_gi == gi);
+ gadget_released_off_borders =
+ (button == 0 && gi != NULL && new_gi != gi);
if (gadget_pressed)
gi = new_gi;
if (gadget_pressed)
{
- DrawGadget(gi, TRUE, TRUE);
+ if (gi->type == GD_TYPE_RADIO_BUTTON)
+ {
+ struct GadgetInfo *rgi = gadget_list_first_entry;
+
+ while (rgi)
+ {
+ if (rgi->mapped &&
+ rgi->type == GD_TYPE_RADIO_BUTTON &&
+ rgi->radio_nr == gi->radio_nr &&
+ rgi != gi)
+ {
+ rgi->radio_pressed = FALSE;
+ DrawGadget(rgi, DG_UNPRESSED, DG_DIRECT);
+ }
+
+ rgi = rgi->next;
+ }
+
+ gi->radio_pressed = TRUE;
+ }
+
+ DrawGadget(gi, DG_PRESSED, DG_DIRECT);
gi->state = GD_BUTTON_PRESSED;
gi->event.type = GD_EVENT_PRESSED;
gi->callback(gi);
}
- if (gadget_moving_inside)
+ if (gadget_moving)
{
if (gi->state == GD_BUTTON_UNPRESSED)
- DrawGadget(gi, TRUE, TRUE);
+ DrawGadget(gi, DG_PRESSED, DG_DIRECT);
gi->state = GD_BUTTON_PRESSED;
gi->event.type = GD_EVENT_MOVING;
gi->callback(gi);
}
- if (gadget_moving_outside)
+ if (gadget_moving_off_borders)
{
if (gi->state == GD_BUTTON_PRESSED)
- DrawGadget(gi, FALSE, TRUE);
+ DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
gi->state = GD_BUTTON_UNPRESSED;
gi->event.type = GD_EVENT_MOVING;
gi->event.off_borders = TRUE;
- if (gi->event_mask & GD_EVENT_MOVING)
+ if (gi->event_mask & GD_EVENT_MOVING &&
+ gi->event_mask & GD_EVENT_OFF_BORDERS)
gi->callback(gi);
}
if (gadget_released)
{
- DrawGadget(gi, FALSE, TRUE);
+ DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
gi->state = GD_BUTTON_UNPRESSED;
gi->event.type = GD_EVENT_RELEASED;
gi->callback(gi);
}
- if (button == 0)
- gi = NULL;
-
-
-
-#if 0
- if (button)
+ if (gadget_released_off_borders)
{
- if (!motion_status) /* mouse button just pressed */
- {
- if (new_gi != NULL)
- {
- gi = new_gi;
- gi->state = GD_BUTTON_PRESSED;
- gi->event.type = GD_EVENT_PRESSED;
- gi->event.button = button;
- DrawGadget(gi, TRUE, TRUE);
-
- /* initialize delay counter */
- pressed_delay = 0;
- DelayReached(&pressed_delay, GADGET_FRAME_DELAY);
-
-
- printf("new gadget pressed\n");
-
-
- if (gi->event_mask & GD_EVENT_PRESSED)
- gi->callback(gi);
-
- pressed = TRUE;
- }
- }
- else /* mouse movement with pressed mouse button */
- {
- if (new_gi != gi && gi != NULL)
- {
- if (pressed)
- DrawGadget(gi, FALSE, TRUE);
- gi->state = GD_BUTTON_UNPRESSED;
- gi->event.type = GD_EVENT_MOVING;
-
-
- printf("outside gadget\n");
-
-
-
-
- if (gi->event_mask & GD_EVENT_MOVING)
- gi->callback(gi);
-
- pressed = FALSE;
- }
- else if (new_gi == gi && gi != NULL)
- {
- if (!pressed)
- DrawGadget(gi, TRUE, TRUE);
- gi->state = GD_BUTTON_PRESSED;
- gi->event.type = GD_EVENT_MOVING;
-
-
- printf("inside gadget\n");
-
-
-
-
- if (gi->event_mask & GD_EVENT_MOVING)
- gi->callback(gi);
-
- pressed = TRUE;
- }
- }
-
- if (gi != NULL &&
- gi->event_mask & GD_EVENT_PRESSED_REPEATED &&
- gi->state == GD_BUTTON_PRESSED &&
- DelayReached(&pressed_delay, GADGET_FRAME_DELAY))
- {
- printf("gadget pressed (repeated)\n");
-
+ gi->event.type = GD_EVENT_RELEASED;
- gi->callback(gi);
- }
+ if (gi->event_mask & GD_EVENT_RELEASED &&
+ gi->event_mask & GD_EVENT_OFF_BORDERS)
+ gi->callback(gi);
}
- else /* mouse button just released */
- {
- if (new_gi == gi && gi != NULL && pressed)
- {
- gi->state = GD_BUTTON_UNPRESSED;
- gi->event.type = GD_EVENT_RELEASED;
- DrawGadget(gi, FALSE, TRUE);
-
-
- printf("gadget released\n");
-
-
-
- if (gi->event_mask & GD_EVENT_RELEASED)
- gi->callback(gi);
- }
+ if (button == 0)
gi = NULL;
- pressed = FALSE;
- }
-#endif
-
-
-
}
projects / rocksndiamonds.git / blobdiff