projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060819-3-src
[rocksndiamonds.git]
/
src
/
libgame
/
gadgets.c
diff --git
a/src/libgame/gadgets.c
b/src/libgame/gadgets.c
index e939f865a5ace5063ea78374a2b0b69c657c5758..7c140cbedffbaf8d7cb742cd6cc5f3e741327b7c 100644
(file)
--- a/
src/libgame/gadgets.c
+++ b/
src/libgame/gadgets.c
@@
-1,7
+1,7
@@
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-200
2
Artsoft Entertainment *
+* (c) 1994-200
6
Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
@@
-71,13
+71,18
@@
static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my,
struct GadgetInfo *gi;
/* first check for scrollbars in case of mouse scroll wheel button events */
struct GadgetInfo *gi;
/* first check for scrollbars in case of mouse scroll wheel button events */
- if (
button == 4 || button == 5
)
+ if (
IS_WHEEL_BUTTON(button)
)
{
{
+ /* real horizontal wheel or vertical wheel with modifier key pressed */
+ boolean check_horizontal = (IS_WHEEL_BUTTON_HORIZONTAL(button) ||
+ GetKeyModState() & KMOD_Shift);
+
/* check for the first active scrollbar with matching mouse wheel area */
for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next)
{
if (gi->mapped && gi->active &&
/* check for the first active scrollbar with matching mouse wheel area */
for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next)
{
if (gi->mapped && gi->active &&
- gi->type & GD_TYPE_SCROLLBAR &&
+ ((gi->type & GD_TYPE_SCROLLBAR_HORIZONTAL && check_horizontal) ||
+ (gi->type & GD_TYPE_SCROLLBAR_VERTICAL && !check_horizontal)) &&
mx >= gi->wheelarea.x && mx < gi->wheelarea.x + gi->wheelarea.width &&
my >= gi->wheelarea.y && my < gi->wheelarea.y + gi->wheelarea.height)
return gi;
mx >= gi->wheelarea.x && mx < gi->wheelarea.x + gi->wheelarea.width &&
my >= gi->wheelarea.y && my < gi->wheelarea.y + gi->wheelarea.height)
return gi;
@@
-763,20
+768,14
@@
static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
break;
case GDI_ACTIVE:
break;
case GDI_ACTIVE:
- /* take care here: "boolean" is typedef'ed as "unsigned char",
- which gets promoted to "int" */
gi->active = (boolean)va_arg(ap, int);
break;
case GDI_DIRECT_DRAW:
gi->active = (boolean)va_arg(ap, int);
break;
case GDI_DIRECT_DRAW:
- /* take care here: "boolean" is typedef'ed as "unsigned char",
- which gets promoted to "int" */
gi->direct_draw = (boolean)va_arg(ap, int);
break;
case GDI_CHECKED:
gi->direct_draw = (boolean)va_arg(ap, int);
break;
case GDI_CHECKED:
- /* take care here: "boolean" is typedef'ed as "unsigned char",
- which gets promoted to "int" */
gi->checked = (boolean)va_arg(ap, int);
break;
gi->checked = (boolean)va_arg(ap, int);
break;
@@
-1496,7
+1495,7
@@
boolean HandleGadgets(int mx, int my, int button)
(gadget_pressed_inside_select_line && !mouse_inside_select_area)))
{
struct GadgetInfo *gi = last_gi;
(gadget_pressed_inside_select_line && !mouse_inside_select_area)))
{
struct GadgetInfo *gi = last_gi;
- boolean gadget_changed = (
gi->event_mask & GD_EVENT_TEXT_LEAVING
);
+ boolean gadget_changed = (
(gi->event_mask & GD_EVENT_TEXT_LEAVING) != 0
);
/* check if text gadget has changed its value */
if (gi->type & GD_TYPE_TEXT_INPUT)
/* check if text gadget has changed its value */
if (gi->type & GD_TYPE_TEXT_INPUT)
@@
-1683,8
+1682,6
@@
boolean HandleGadgets(int mx, int my, int button)
last_info_gi = new_gi;
}
last_info_gi = new_gi;
}
-#if 1
-
gadget_draggable = (gi && gi->type & GD_TYPE_SCROLLBAR);
/* reset drag position for newly pressed scrollbar to "not dragging" */
gadget_draggable = (gi && gi->type & GD_TYPE_SCROLLBAR);
/* reset drag position for newly pressed scrollbar to "not dragging" */
@@
-1722,10
+1719,11
@@
boolean HandleGadgets(int mx, int my, int button)
{
int mpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? mx : my);
int gpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? gi->x : gi->y);
{
int mpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? mx : my);
int gpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? gi->x : gi->y);
+ int slider_start = gpos + gi->scrollbar.position;
+ int slider_end = gpos + gi->scrollbar.position + gi->scrollbar.size - 1;
+ boolean inside_slider = (mpos >= slider_start && mpos <= slider_end);
- if (button > 3 ||
- mpos < gpos + gi->scrollbar.position ||
- mpos >= gpos + gi->scrollbar.position + gi->scrollbar.size)
+ if (IS_WHEEL_BUTTON(button) || !inside_slider)
{
/* click scrollbar one scrollbar length up/left or down/right */
{
/* click scrollbar one scrollbar length up/left or down/right */
@@
-1734,10
+1732,13
@@
boolean HandleGadgets(int mx, int my, int button)
int item_steps = gs->items_visible - 1;
int item_direction = (mpos < gpos + gi->scrollbar.position ? -1 : +1);
int item_steps = gs->items_visible - 1;
int item_direction = (mpos < gpos + gi->scrollbar.position ? -1 : +1);
- if (
button > 3
)
+ if (
IS_WHEEL_BUTTON(button)
)
{
{
- item_steps = 3;
- item_direction = (button == 4 ? -1 : +1);
+ boolean scroll_single_step = ((GetKeyModState() & KMOD_Alt) != 0);
+
+ item_steps = (scroll_single_step ? 1 : DEFAULT_WHEEL_STEPS);
+ item_direction = (button == MB_WHEEL_UP ||
+ button == MB_WHEEL_LEFT ? -1 : +1);
}
changed_position = FALSE;
}
changed_position = FALSE;
@@
-1780,8
+1781,6
@@
boolean HandleGadgets(int mx, int my, int button)
}
}
}
}
-#endif
-
if (gadget_pressed)
{
if (gi->type == GD_TYPE_CHECK_BUTTON)
if (gadget_pressed)
{
if (gi->type == GD_TYPE_CHECK_BUTTON)
@@
-1812,10
+1811,11
@@
boolean HandleGadgets(int mx, int my, int button)
{
int mpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? mx : my);
int gpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? gi->x : gi->y);
{
int mpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? mx : my);
int gpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? gi->x : gi->y);
+ int slider_start = gpos + gi->scrollbar.position;
+ int slider_end = gpos + gi->scrollbar.position + gi->scrollbar.size - 1;
+ boolean inside_slider = (mpos >= slider_start && mpos <= slider_end);
- if (button >= 1 && button <= 3 &&
- mpos >= gpos + gi->scrollbar.position &&
- mpos < gpos + gi->scrollbar.position + gi->scrollbar.size)
+ if (!IS_WHEEL_BUTTON(button) && inside_slider)
{
/* start dragging scrollbar */
gi->scrollbar.drag_position =
{
/* start dragging scrollbar */
gi->scrollbar.drag_position =
@@
-1961,9
+1961,7
@@
boolean HandleGadgets(int mx, int my, int button)
if (gi->type & GD_TYPE_SCROLLBAR)
DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
if (gi->type & GD_TYPE_SCROLLBAR)
DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
-#if 1
gi->state = GD_BUTTON_UNPRESSED;
gi->state = GD_BUTTON_UNPRESSED;
-#endif
gi->event.type = GD_EVENT_RELEASED;
if (gi->event_mask & GD_EVENT_RELEASED &&
gi->event.type = GD_EVENT_RELEASED;
if (gi->event_mask & GD_EVENT_RELEASED &&
@@
-2006,7
+2004,7
@@
boolean HandleGadgetsKeyInput(Key key)
if (key == KSYM_Return) /* valid for both text input and selectbox */
{
if (key == KSYM_Return) /* valid for both text input and selectbox */
{
- boolean gadget_changed = (
gi->event_mask & GD_EVENT_TEXT_RETURN
);
+ boolean gadget_changed = (
(gi->event_mask & GD_EVENT_TEXT_RETURN) != 0
);
if (gi->type & GD_TYPE_TEXT_INPUT)
{
if (gi->type & GD_TYPE_TEXT_INPUT)
{