From 01c46f7a7e76b44a81ab9aa415d6d1ad5e67c61a Mon Sep 17 00:00:00 2001 From: myk002 Date: Mon, 24 Oct 2022 09:35:59 -0700 Subject: [PATCH 1/2] fix z-level jumps when clicking quickly this happens when TWBT is enabled and multilevel is > 0 getDepthAt() returns inconsistent values for the same position, leading to a mismatch when we "unshift" the coordinates to account for render depth --- docs/changelog.txt | 1 + plugins/mousequery.cpp | 30 ++++++++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index af2e6b3fa..8447ec1fa 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -37,6 +37,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## Fixes - `gui/create-item`: prevent materials list filter from intercepting sublist hotkeys +- `mousequery`: fix the cursor jumping up z levels sometimes when using TWBT - `tiletypes`: no longer resets dig priority to the default when updating other properties of a tile ## Misc Improvements diff --git a/plugins/mousequery.cpp b/plugins/mousequery.cpp index 6358262f4..4c88bd2ac 100644 --- a/plugins/mousequery.cpp +++ b/plugins/mousequery.cpp @@ -56,10 +56,12 @@ static uint32_t scroll_delay = 100; static bool awaiting_lbut_up, awaiting_rbut_up; static enum { None, Left, Right } drag_mode; -static df::coord get_mouse_pos(int32_t &mx, int32_t &my) +static df::coord get_mouse_pos(int32_t &mx, int32_t &my, int32_t &depth) { df::coord pos = Gui::getMousePos(); - pos.z -= Gui::getDepthAt(pos.x, pos.y); + + depth = Gui::getDepthAt(pos.x, pos.y); + pos.z -= depth; df::coord vpos = Gui::getViewportPos(); mx = pos.x - vpos.x + 1; @@ -291,10 +293,13 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest return false; } - bool handleLeft(df::coord &mpos, int32_t mx, int32_t my) + bool handleLeft(df::coord &mpos, int32_t mx, int32_t my, int32_t depth) { - if (!(Core::getInstance().getModstate() & DFH_MOD_SHIFT)) - mpos.z += Gui::getDepthAt(mx, my); + if (Core::getInstance().getModstate() & DFH_MOD_SHIFT) { + DEBUG(log).print("shift is down; not adjusting tile depth\n"); + } + else + mpos.z += depth; bool cursor_still_here = (last_clicked_x == mpos.x && last_clicked_y == mpos.y && last_clicked_z == mpos.z); last_clicked_x = mpos.x; @@ -444,8 +449,8 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest bool handleMouse(const set *input) { - int32_t mx, my; - auto mpos = get_mouse_pos(mx, my); + int32_t mx, my, depth; + auto mpos = get_mouse_pos(mx, my, depth); if (mpos.x == -30000) return false; @@ -458,7 +463,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest last_move_pos = mpos; } else - return handleLeft(mpos, mx, my); + return handleLeft(mpos, mx, my, depth); } else if (enabler->mouse_rbut) { @@ -531,7 +536,8 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest if (mpos.x == x && mpos.y == y && mpos.z == z) return; - DEBUG(log).print("moving cursor to %d, %d, %d\n", x, y, z); + DEBUG(log).print("moving cursor to %d, %d, %d\n", + mpos.x, mpos.y, mpos.z); Gui::setCursorCoords(mpos.x, mpos.y, mpos.z); Gui::refreshSidebar(); } @@ -568,8 +574,8 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest auto dims = Gui::getDwarfmodeViewDims(); - int32_t mx, my; - auto mpos = get_mouse_pos(mx, my); + int32_t mx, my, depth; + auto mpos = get_mouse_pos(mx, my, depth); bool mpos_valid = mpos.x != -30000 && mpos.y != -30000 && mpos.z != -30000; // Check if in lever binding mode @@ -582,7 +588,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest if (awaiting_lbut_up && !enabler->mouse_lbut_down) { awaiting_lbut_up = false; - handleLeft(mpos, mx, my); + handleLeft(mpos, mx, my, depth); } if (awaiting_rbut_up && !enabler->mouse_rbut_down) From 7b2119c4d13fb99611b3490e5b72d2216a06f7d5 Mon Sep 17 00:00:00 2001 From: myk002 Date: Mon, 24 Oct 2022 17:03:28 -0700 Subject: [PATCH 2/2] remove debug statement that doesn't help --- plugins/mousequery.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/mousequery.cpp b/plugins/mousequery.cpp index 4c88bd2ac..124664fa2 100644 --- a/plugins/mousequery.cpp +++ b/plugins/mousequery.cpp @@ -295,10 +295,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest bool handleLeft(df::coord &mpos, int32_t mx, int32_t my, int32_t depth) { - if (Core::getInstance().getModstate() & DFH_MOD_SHIFT) { - DEBUG(log).print("shift is down; not adjusting tile depth\n"); - } - else + if (!(Core::getInstance().getModstate() & DFH_MOD_SHIFT)) mpos.z += depth; bool cursor_still_here = (last_clicked_x == mpos.x && last_clicked_y == mpos.y && last_clicked_z == mpos.z);