X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fgadgets.c;h=50dc853129dd107128b5a6f103520758cb46c763;hb=fda8c9f42aa13663ad6b2f698da787a7280b9965;hp=57de63e72a36c581eb0a818a86fe301794d1817c;hpb=2c89261a1186ffc19bd6e5f82e9369bee1545e2f;p=rocksndiamonds.git diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c index 57de63e7..50dc8531 100644 --- a/src/libgame/gadgets.c +++ b/src/libgame/gadgets.c @@ -1316,21 +1316,33 @@ void RemapAllGadgets() MultiMapGadgets(MULTIMAP_ALL | MULTIMAP_REMAP); } -static boolean anyTextInputGadgetActive() +boolean anyTextInputGadgetActive() { return (last_gi && (last_gi->type & GD_TYPE_TEXT_INPUT) && last_gi->mapped); } -static boolean anyTextAreaGadgetActive() +boolean anyTextAreaGadgetActive() { return (last_gi && (last_gi->type & GD_TYPE_TEXT_AREA) && last_gi->mapped); } -static boolean anySelectboxGadgetActive() +boolean anySelectboxGadgetActive() { return (last_gi && (last_gi->type & GD_TYPE_SELECTBOX) && last_gi->mapped); } +boolean anyScrollbarGadgetActive() +{ + return (last_gi && (last_gi->type & GD_TYPE_SCROLLBAR) && last_gi->mapped); +} + +boolean anyTextGadgetActive() +{ + return (anyTextInputGadgetActive() || + anyTextAreaGadgetActive() || + anySelectboxGadgetActive()); +} + static boolean insideSelectboxLine(struct GadgetInfo *gi, int mx, int my) { return(gi != NULL && @@ -1347,13 +1359,6 @@ static boolean insideSelectboxArea(struct GadgetInfo *gi, int mx, int my) my >= gi->selectbox.y && my < gi->selectbox.y + gi->selectbox.height); } -boolean anyTextGadgetActive() -{ - return (anyTextInputGadgetActive() || - anyTextAreaGadgetActive() || - anySelectboxGadgetActive()); -} - void ClickOnGadget(struct GadgetInfo *gi, int button) { if (!gi->mapped)