MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'dfhack/develop' into auto_clothing

develop
JapaMala 2019-05-18 09:12:22 -05:00
parent 42226342dc f2bd697d64
commit 8ea3877ace
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/lua/gui/dwarfmode.lua
Unescape Escape View File

@ -226,7 +226,7 @@ MOVEMENT_KEYS = {
CURSOR_UP_Z_AUX = { 0, 0, 1 }, CURSOR_DOWN_Z_AUX = { 0, 0, -1 }, CURSOR_UP_Z_AUX = { 0, 0, 1 }, CURSOR_DOWN_Z_AUX = { 0, 0, -1 },
} }
local function get_movement_delta(key, delta, big_step) function get_movement_delta(key, delta, big_step)
local info = MOVEMENT_KEYS[key] local info = MOVEMENT_KEYS[key]
if info then if info then
if info[4] then if info[4] then
@ -243,7 +243,7 @@ for i,v in ipairs(df.global.ui.main.hotkeys) do
HOTKEY_KEYS['D_HOTKEY'..(i+1)] = v HOTKEY_KEYS['D_HOTKEY'..(i+1)] = v
end end
local function get_hotkey_target(key) function get_hotkey_target(key)
local hk = HOTKEY_KEYS[key] local hk = HOTKEY_KEYS[key]
if hk and hk.cmd == df.ui_hotkey.T_cmd.Zoom then if hk and hk.cmd == df.ui_hotkey.T_cmd.Zoom then
return xyz2pos(hk.x, hk.y, hk.z) return xyz2pos(hk.x, hk.y, hk.z)

2
library/xml

@ -1 +1 @@
Subproject commit 44215836d5b57c3722b126aaf481f652385f3a23 Subproject commit 2be1fc4afea4d3345b9b76d0f27f56087ac9b6e0

13
plugins/mousequery.cpp
Unescape Escape View File

@ -836,26 +836,35 @@ static command_result mousequery_cmd(color_ostream &out, vector <string> & param
else if (cmd[0] == 'p') else if (cmd[0] == 'p')
{ {
plugin_enabled = (state == "enable"); plugin_enabled = (state == "enable");
out << "mousequery: plugin " << (plugin_enabled ? "enabled" : "disabled") << endl;
} }
else if (cmd[0] == 'r') else if (cmd[0] == 'r')
{ {
rbutton_enabled = (state == "enable"); rbutton_enabled = (state == "enable");
out << "mousequery: rbutton " << (rbutton_enabled ? "enabled" : "disabled") << endl;
} }
else if (cmd[0] == 't') else if (cmd[0] == 't')
{ {
tracking_enabled = (state == "enable"); tracking_enabled = (state == "enable");
if (!tracking_enabled) if (!tracking_enabled) {
out << "mousequery: edge scrolling disabled" << endl;
active_scrolling = false; active_scrolling = false;
} }
out << "mousequery: tracking " << (tracking_enabled ? "enabled" : "disabled") << endl;
}
else if (cmd[0] == 'e') else if (cmd[0] == 'e')
{ {
active_scrolling = (state == "enable"); active_scrolling = (state == "enable");
if (active_scrolling) if (active_scrolling) {
out << "mousequery: tracking enabled" << endl;
tracking_enabled = true; tracking_enabled = true;
} }
out << "mousequery: edge scrolling " << (active_scrolling ? "enabled" : "disabled") << endl;
}
else if (cmd[0] == 'l') else if (cmd[0] == 'l')
{ {
live_view = (state == "enable"); live_view = (state == "enable");
out << "mousequery: live view " << (live_view ? "enabled" : "disabled") << endl;
} }
else if (cmd == "drag") else if (cmd == "drag")
{ {

2
scripts

@ -1 +1 @@
Subproject commit a242a7cd81ae7046146f86c3103360449e1d9ca8 Subproject commit c8394fa75ff20abcdcdbe975dbf157d21882172e