c1b9de87d2
Add case_sensitive attr to FilteredList
2023-02-08 03:39:43 -05:00
d0b4b1a4a5
Auto-update submodules
...
library/xml: master
2023-02-08 07:36:55 +00:00
468e9875e5
Update DFHack version to 50.07-alpha0, update xml
2023-02-08 00:00:31 -05:00
ef81a91181
only realign out-of-alignment list positions
2023-02-07 14:12:52 -08:00
b2ecb8aaab
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-07 20:53:12 +00:00
df5184d751
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-07 07:14:45 +00:00
826f918954
remove isHospital as hospitals are no longer civzones
2023-02-06 19:11:00 -05:00
ca5a17a799
explanatory comment for magic number
2023-02-06 19:09:47 -05:00
a38246aaa4
Update logic for zone type checks
2023-02-06 16:47:50 -05:00
c0358d642d
Merge pull request #2833 from myk002/myk_list_recenter
...
ensure scrollable lists are centered in the visible viewport
2023-02-06 12:57:43 -08:00
0b9b258224
ensure scrollable lists are centered in the visible viewport
2023-02-06 12:54:05 -08:00
fdf1d38b23
Merge branch 'cycle-hotkey-rev' of https://github.com/johncosker/dfhack into cycle-hotkey-rev
2023-02-06 15:13:13 -05:00
36391af27c
More cleanup
2023-02-06 15:12:47 -05:00
0769afc961
Merge branch 'develop' into cycle-hotkey-rev
2023-02-06 15:04:57 -05:00
39dc0ccc8a
Cleanup
2023-02-06 15:03:28 -05:00
e1f74ab068
Tweak to completely nil the key_back table for setText if not set
2023-02-06 14:53:26 -05:00
d09f8553a0
Delete makeown.lua
2023-02-06 13:34:31 -05:00
041909dfa7
Merge pull request #2822 from myk002/myk_rclick
...
prevent rclick from bleeding through (again)
2023-02-06 09:17:28 -08:00
448598e391
Merge pull request #2823 from myk002/myk_hotkey_guards
...
implement some Gui module hotkey guards
2023-02-06 09:17:18 -08:00
99f84fa175
Merge pull request #2811 from TaxiService/patch-3
...
increase min scrollbar height to 2 (from 1)
2023-02-06 08:10:08 -08:00
d7d6c5aea6
Backwards options for cycle hotkey working
2023-02-06 08:55:46 -05:00
9e318842a4
implement some Gui module hotkey guards
...
and clean up focus string matching logic
2023-02-06 00:58:57 -08:00
2ddd23e45d
prevent rclick from bleeding through (again)
2023-02-06 00:57:33 -08:00
526d7c1726
allow focus string generation to fall through unfocuses ZScreens
2023-02-05 18:01:46 -08:00
443fe5d813
Update library/Core.cpp
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-02-05 19:07:49 -05:00
c8d672eb05
Remove duplicate SquadEquipment entry
2023-02-05 19:04:21 -05:00
6657fb59e5
Fix pausing and warnings
2023-02-05 19:04:21 -05:00
2bf9b86c7b
Fix getCurFocus lua, use where appropriate in c++
2023-02-05 19:04:21 -05:00
36e4bba779
Fixup prefix matching
2023-02-05 19:04:21 -05:00
cece0bfca1
Remove unnecessary comment
2023-02-05 19:04:21 -05:00
14f1e4b52f
Per confirm pause maybe?
2023-02-05 19:04:21 -05:00
f7df51587c
More focus strings, correct docs
2023-02-05 19:04:21 -05:00
fdbe91e35b
Add the rest of the bottom modes
2023-02-05 19:04:21 -05:00
8f32f1ed7b
Fixup focusStrings->focusString
2023-02-05 19:04:21 -05:00
86b57380a6
fixup unnecessary changes, remove unnecessary stuff
2023-02-05 19:04:21 -05:00
dc40f7182c
Fix warning
2023-02-05 19:04:21 -05:00
085a308e99
Remove/readd comments
2023-02-05 19:04:21 -05:00
6e442a26ca
More WIP
2023-02-05 19:04:21 -05:00
a770a4cae4
WIP
2023-02-05 19:04:21 -05:00
3ca2521ce9
Merge pull request #2807 from Bumber64/patch-1
...
Update Units::isFortControlled
2023-02-05 15:43:31 -08:00
08d90de277
Merge branch 'DFHack:develop' into patch-1
2023-02-05 12:02:58 -08:00
b6196e91e4
increase min scrollbar height to 2 (from 1)
...
rationale:
- vanilla scrollbars dont get shorter than 2.
- 2-tall 'bars are easier to click on than 1-tall 'bars.
- this avoids having to make short custom graphics for 1-tall tiles, which most of the time look terrible...
cons:
- short scrollbars are cool : (
2023-02-05 19:00:38 +01:00
30a1f2f924
de-hardcoding scrollbar spritesheet definitions
...
added a new variable "SBSO", and redefined all scrollbar tile definitions as this variable + an offset.
this could make it easier to switch scrollbar graphics from within the game, if necessary.
2023-02-05 18:56:51 +01:00
1eb67ab239
Update Gui::resetDwarfmodeView
...
* Set `plotinfo->main.mode` again now that alignment is fixed
* Left note about unidentified global
* DF resets the whole `selection_rect` struct
* Comments for `ANNOUNCE_LINE_DURATION` and `ANNOUNCE_DISPLAY_TIME` constants reflect the default 50 GFPS
2023-02-04 19:56:37 -08:00
0f78509328
agitated_wilderness_creature is in unit->flags4
2023-02-04 19:29:37 -08:00
c345acd417
Update Units::isFortControlled
...
Add check for `agitated_wilderness_creature`.
2023-02-04 18:48:41 -08:00
de04cf04e0
wrong scrollbar sprites mapping fix (issue #2777 )
...
i've taken a crack at it, and this seems to fix this "issue" i filed here: https://github.com/DFHack/dfhack/issues/2777
https://i.imgur.com/aFnq80M.mp4
2023-02-04 15:18:26 +01:00
71deeb7a48
bump version to 50.05-alpha3.1
2023-02-03 15:48:09 -08:00
4a21b0843f
bump to 50.05-alpha3
2023-02-03 14:28:17 -08:00
81abd52313
include TRACE messages in the build
2023-02-03 12:25:44 -08:00
345b7d78cb
pass attributes through FilteredList
2023-02-03 00:09:10 -08:00
2316615763
react to double clicks on list items
2023-02-03 00:09:10 -08:00
49246a60f3
properly cast for unsigned comparisons
2023-02-02 23:57:52 -08:00
8c7be9a8c2
don't use negative plant indices
...
and clean up the Kitchen module a bit more
2023-02-02 23:33:24 -08:00
bb6824ec11
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-03 05:07:52 +00:00
2cf985be73
don't lose List scroll position when dragging
2023-02-02 19:42:41 -08:00
7d05a68c60
clean up changelog, update refs
2023-02-02 12:53:20 -08:00
a3f32e66ad
Merge pull request #2775 from myk002/myk_non_defocusable
...
add defocusable attribute to ZScreen
2023-02-01 17:53:21 -08:00
1debea59a8
Merge branch 'develop' into myk_non_defocusable
2023-02-01 17:51:04 -08:00
7fbd95896d
Merge branch 'develop' into myk_pause_forced
2023-02-01 17:50:45 -08:00
21f93173c3
Merge pull request #2778 from myk002/myk_halfsies
...
support offset text in graphics mode for pens
2023-02-01 17:50:24 -08:00
7468170751
Merge pull request #2771 from myk002/myk_seedwatch
...
update seedwatch
2023-02-01 17:49:57 -08:00
6513b591bd
Merge pull request #2768 from myk002/myk_textures
...
add textures used by new gui/control-panel
2023-02-01 17:49:48 -08:00
58be8cfd69
support offset text in graphics mode for pens
2023-02-01 17:39:32 -08:00
55d07a8cae
actually use the tile
2023-02-01 14:51:46 -08:00
6ae771ecb4
display PAUSE FORCED instead of a pause icon
...
if the window is forcing the game to pause. the icon looked too
clickable
2023-02-01 14:01:29 -08:00
88860f21ec
add defocusable attribute to ZScreen
2023-02-01 08:46:32 -08:00
aae5d5f411
reduce diff in Kitchen.h
2023-02-01 04:28:07 -08:00
be40d55e64
update seedwatch
2023-02-01 04:03:28 -08:00
5127f06571
expose new tiles to Lua
2023-01-31 23:55:30 -08:00
e442e23589
allow tile in Label tokens to be either pen or id
2023-01-31 23:54:27 -08:00
aa22917aeb
add new control panel textures
2023-01-31 23:52:30 -08:00
ab4c766817
Revert "allow tile list icons to be rendered properly"
...
This reverts commit 508777897b
2023-01-30 08:48:45 -08:00
4c17d79198
Auto-update submodules
...
library/xml: master
2023-01-30 02:28:17 +00:00
376526d512
Merge branch 'develop' into myk_no_stuck_df_viewscreens
2023-01-29 16:55:52 -08:00
274e995790
Merge pull request #2747 from myk002/myk_on_off
...
Add new on/off icons
2023-01-29 16:55:01 -08:00
0f07ac5a30
Merge pull request #2748 from myk002/myk_initial_pause
...
make initial pause configurable for DFHack windows
2023-01-29 16:54:50 -08:00
edb2859ad4
Merge pull request #2749 from myk002/myk_no_auto_refresh
...
don't autorefresh the enableable tools list
2023-01-29 16:54:38 -08:00
1c6235633f
add dfhack.units.getCitizens()
2023-01-29 16:28:05 -08:00
8d4990b8fd
don't autorefresh the enableable tools list
...
it just takes too long (>1s) to refresh every time.
manual refresh with script_manager.reload() is still available for devs
who need it
2023-01-29 00:55:49 -08:00
4c455224f9
make initial pause configurable
2023-01-29 00:41:02 -08:00
f420b4b77e
Merge pull request #2744 from myk002/myk_no_inception
...
Solve the inception problem: prevent screens (e.g. gui/launcher) from hanging when they attempt to dismiss and show themselves simultaneously
2023-01-29 00:38:17 -08:00
c2d6debcd8
add on/off light textures and expose to lua
2023-01-29 00:35:29 -08:00
211d18717c
test against type instead of string
2023-01-28 23:34:56 -08:00
6dc74f201d
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-29 07:13:24 +00:00
2003efc21f
Merge branch 'develop' into myk_no_stuck_df_viewscreens
2023-01-28 12:03:50 -08:00
99d1ed6828
Merge branch 'develop' into myk_no_inception
2023-01-28 11:58:37 -08:00
255307890b
Merge pull request #2735 from myk002/myk_resizable
...
only mark the border corner as resizable if the window is resizable
2023-01-28 11:55:39 -08:00
5f90756677
Merge pull request #2734 from myk002/myk_tiletypes
...
Expose tiletype setting from the tiletypes plugin to lua
2023-01-28 11:55:04 -08:00
114bc2a576
also lock down the world map
2023-01-28 08:57:24 -08:00
a931ca692d
Fix debug level typo
2023-01-28 08:21:13 -08:00
f12ca33c0b
ensure DF screens don't get "stuck" when DFHack tool windows are on top
2023-01-28 08:05:37 -08:00
863ca2ca65
solve the inception problem
...
where hideGuard smashes the viewscreen stack with multiple insertions
for the same screen
2023-01-28 08:02:46 -08:00
9080af6948
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-27 22:27:41 +00:00
18a2827385
only mark the border corner as resizable if the window is resizable
2023-01-27 14:20:21 -08:00
22dd49ce38
remove "room" checking for buildings -- there is no room
2023-01-27 13:38:21 -08:00
c6f4a7ee42
inhibit _MOUSE_L globally once _MOUSE_L_DOWN is handled
...
so the _MOUSE_L doesn't bleed through to the underlying viewscreen
2023-01-27 13:36:01 -08:00
5b83f30706
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-27 03:14:34 +00:00
2a8520fb9e
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-26 07:15:05 +00:00
be59083202
reduce spacing for CycleHotkeyLabel from 2 to 1
2023-01-25 22:59:29 -08:00
33132e5556
Auto-update submodules
...
library/xml: master
2023-01-25 19:41:45 +00:00
15ab59b12d
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-25 07:17:04 +00:00
c5f2588522
fix issues with clicks "falling through" scrollbars
2023-01-24 21:28:25 -08:00
4e35895cf4
fix build errors with channel-safely
2023-01-24 18:48:23 -08:00
018715f869
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-24 19:18:16 +00:00
83c89cfaa9
Merge pull request #2705 from myk002/myk_zscreen_redux
...
Implement new ZScreen semantics
2023-01-24 11:14:43 -08:00
0e03ac8e5b
don't use tabs in enable output
...
so they display nicely in gui/launcher
2023-01-23 23:50:08 -08:00
f39eb42889
remove references to pinnable
2023-01-23 19:34:48 -08:00
1c2f8eccbf
paint pause symbol for force-pause windows
2023-01-23 19:02:26 -08:00
0905943ecf
don't unfocus if mouse is not being passed through
2023-01-23 18:05:03 -08:00
4377065081
move pause restore to dismiss
...
and fix the condition
2023-01-23 17:46:03 -08:00
8b98ba5042
allow windows to be defocused instead of pinned
2023-01-23 17:40:16 -08:00
5ad6ce16e8
don't change definitions of deprecated frame styles
2023-01-23 16:00:10 -08:00
d0905a5e16
Merge pull request #2703 from myk002/myk_borders
...
Add new borders for various use cases
2023-01-23 11:20:28 -08:00
7329f6dee2
use new frame names
2023-01-23 04:16:38 -08:00
fcb156ed43
add compatibility frames
2023-01-23 04:03:31 -08:00
9aaa55cd7f
add textures and frames for various use cases
2023-01-23 03:58:51 -08:00
d34238918e
move helpdb from autorefresh to explicit refresh
...
this greatly speeds up the launch time of `gui/launcher`
2023-01-23 02:30:51 -08:00
a6b3de1afb
support scrolling to the beginning or end in Label
2023-01-23 02:16:07 -08:00
d82a795ef4
Merge pull request #2681 from 20k/develop
...
More civzone <-> building work, add removing zones with associated squads support
2023-01-22 17:14:24 -08:00
4559168005
update for multiple ownership
2023-01-22 22:59:25 +00:00
b15fcc93d2
remove assignments on zone destroy
2023-01-22 15:26:55 +00:00
c7ca9d0d7b
reverse squad iteration delete
2023-01-22 15:25:16 +00:00
f862e4a6b7
comment out SEC_SELECT in dialogs
2023-01-22 03:09:07 -08:00
598354d9d4
getbiometype naming, docs
2023-01-21 20:33:40 +00:00
9054efd7c8
Update miscutils to support member pointer to a variable defined in the base when passing in a derived type
2023-01-21 19:15:28 +00:00
3024c4a0df
update to remove ambiguity after structures change
2023-01-21 18:45:36 +00:00
1dbf01e5d1
Civzone interop style changes
2023-01-21 18:45:36 +00:00
8c68f54f50
update with squad removal support
2023-01-21 18:45:36 +00:00
bb16009f49
bump version to 50.05-alpha2
2023-01-20 17:13:28 -08:00
acf2b8b319
use newly narrowd relations vector
2023-01-20 14:30:48 -08:00
310940e1a2
Merge branch 'develop' into Autoclothing
2023-01-20 14:05:26 -08:00
8e6252fc2b
Small fixes to make things more clean.
2023-01-20 13:45:56 -08:00
25c3bf4a24
adjust to name change
2023-01-20 11:57:13 -08:00
b7f90d543e
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-20 19:47:11 +00:00
a1a4125fd9
properly react to lack of a mouse cursor
2023-01-20 09:31:44 -08:00
eae2cec22f
use keyboard cursor
...
and adapt to a "bad" cursor not being equal to -30000 anymore
2023-01-20 09:31:44 -08:00
4183bace4d
update autodump, only commands, add hotkeys
2023-01-20 09:31:44 -08:00
d201cf0182
Merge pull request #2662 from 20k/develop
...
Zone <-> building interactions
2023-01-20 09:30:52 -08:00
116f9bf8e6
Merge pull request #2641 from myk002/myk_buildingplan
...
minimal implementation of buildingplan
2023-01-20 09:28:26 -08:00
4d9c411358
fix flag
2023-01-19 23:33:03 +00:00
8b7c8d83b5
remove save fixup
...
Add notifyCivzoneModified
2023-01-19 21:55:20 +00:00
c05b7526b1
Update Units.cpp
...
fixes renamed value
2023-01-19 15:12:24 -05:00
d5610ab859
zone <-> building interop
2023-01-19 16:39:41 +00:00
d52aff8ff3
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-19 07:14:40 +00:00
f9ac987367
Added bounds checking to various creature name functions in the Units module.
2023-01-18 20:52:58 -08:00
452d44d985
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-18 23:55:29 +00:00
d6b69ca8fc
move useful functions from uicommon to MiscUtils
2023-01-16 23:46:47 -08:00
3958d37684
update changelog and submodules for 50.05-alpha1
2023-01-16 16:56:31 -08:00
9c36c3978f
Update xml, scripts
2023-01-16 16:06:00 -05:00
95d7db2bb4
Merge pull request #2622 from myk002/myk_datasave
...
adjust to new directory layouts
2023-01-16 11:05:33 -08:00
762cd46d14
look for init.d directories in the root instead of raw/
2023-01-15 23:28:01 -08:00
50cc6d965d
update to new save directory structure
2023-01-15 23:13:58 -08:00
fb5675ef1b
keep windows on the screen when the DF window is resized
2023-01-15 20:41:48 -08:00
20f865eba0
don't reset scroll pos when window is resized or moved
2023-01-15 15:59:09 -08:00
d14a3b2c83
ensure the untested warning doesn't bork on bad scripts
2023-01-15 00:49:48 -08:00
f82acec9d4
Auto-update submodules
...
library/xml: master
2023-01-14 09:26:48 +00:00
977946e5bc
Merge pull request #2603 from myk002/myk_resizingpanel
...
give more control over the resizing dimensions of ResizingPanels
2023-01-14 01:10:26 -08:00
fc6a8fb00b
Merge pull request #2601 from myk002/myk_dwarfmode
...
pull the useful bits out of guidm.MenuOverlay and make them available
2023-01-14 01:09:57 -08:00
2a84bb61db
Merge pull request #2599 from myk002/myk_hotspot_hotfoot
...
update behavior of hotspot menu
2023-01-14 01:09:35 -08:00
3b40621324
Merge pull request #2595 from myk002/myk_textures
...
add some more icon textures we can use
2023-01-14 01:09:23 -08:00
f19ae16c9d
give more control over the resizing dimensions of ResizingPanels
2023-01-14 01:00:38 -08:00
0e021e392d
Added a report to autoclothing, as well as some changes to DFHack::Units to enable it.
2023-01-13 21:20:01 -08:00
e450af74aa
pull the useful bits out of MenuOverlay
2023-01-13 17:05:23 -08:00
4f88d27e08
cancel EditField editing on r-click
2023-01-13 17:05:08 -08:00
21d160c478
terminology change: locked -> pinned
2023-01-13 16:07:27 -08:00
6c6c4e159f
add reminder why we can't clear mouse_lbut
2023-01-13 12:17:51 -08:00
f6372b97d1
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-13 07:14:32 +00:00
508777897b
allow tile list icons to be rendered properly
2023-01-12 22:30:47 -08:00
478b5ada39
expose icons texpos to Lua
2023-01-12 22:17:39 -08:00
ac06508d92
add some more icon textures we can use
...
contributed by TaxiService on the DFHack Discord server
2023-01-12 21:04:41 -08:00
68e373100b
Merge pull request #2591 from myk002/myk_penn
...
support foreground and background writing from pens
2023-01-12 21:00:38 -08:00
c98e389ac8
move untested warning back to run_script
...
so we don't waste our warning on the initial env scans
2023-01-12 14:15:43 -08:00
52a39438f7
don't make EditField's transparent
...
this is actually a very old bug, but now that I know how transparency
works, it's obvious how to fix this
2023-01-12 12:47:43 -08:00
15998f2ebe
add gui.TRANSPARENT_PEN for clearing the UI layer
2023-01-12 12:44:50 -08:00
079d5e4178
support foreground and background writing from pens
2023-01-12 12:30:07 -08:00
88f158921f
move warning to run_script_with_env
2023-01-11 19:48:15 -08:00
679e91d2e7
warn against running untested scripts
...
but allow after the first try
2023-01-10 23:21:30 -08:00
1d0f6b3a95
more careful bounds checking for screen tiles
2023-01-10 19:40:13 -08:00
353117d484
fix a crash in Screen when read or paint tile indices are negative
2023-01-10 19:05:04 -08:00
7cf703ef23
turn down Ruby support
2023-01-09 23:59:55 -08:00
17bcdb1f56
Merge pull request #2583 from arekatir/develop
...
Remove os.execute and io.popen
2023-01-09 23:53:32 -08:00
7a9dd02bbd
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-10 07:51:40 +00:00
c26ed36893
Merge pull request #2577 from myk002/myk_get_any
...
get rudimentary getAny(Unit|Item|Building) working
2023-01-09 23:50:02 -08:00
e1b63d8600
Merge pull request #2576 from myk002/myk_pin
...
use an actual pin texture for ZScreen pins
2023-01-09 23:49:50 -08:00
c6472560c6
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-10 07:14:21 +00:00
8ad1cafb07
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-01-10 04:52:00 +00:00
d725b813c7
Remove os.execute and io.popen
2023-01-09 23:04:43 -05:00
fecc733192
detect clicks on part of pin that sticks up
2023-01-09 12:52:26 -08:00
f39684dbfd
pass getAny calls through ZScreens
2023-01-09 09:35:55 -08:00
f8728a4388
get rudimentary getAny(Unit|Item|Building) working
2023-01-09 01:39:48 -08:00
2234328a91
use an actual pin texture for ZScreen pins
2023-01-09 00:47:13 -08:00
3e11a31070
Auto-update submodules
...
library/xml: master
2023-01-09 07:15:10 +00:00
92489ef27d
get things to compile with the recent structure updates
2023-01-08 11:33:14 -08:00
f78267351d
Auto-update submodules
...
library/xml: master
2023-01-08 18:45:17 +00:00
a983326dd6
Merge pull request #2569 from myk002/myk_set_option
...
add CycleHotkeyLabel:setOption()
2023-01-08 04:48:28 -08:00
0684b4a9ba
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-08 07:13:26 +00:00
f9cc43728f
Merge pull request #2567 from RosaryMala/develop
...
Remote Fortress Reader updates
2023-01-07 16:30:31 -08:00
95223d8197
Got archery target direction back, and cleaned up a few things.
2023-01-07 14:37:44 -08:00
72d5760ff6
add CycleHotkeyLabel:setOption()
2023-01-07 01:00:40 -08:00
f20180de47
Merge pull request #2568 from ab9rf/5005-persistence
...
fix persistence
2023-01-06 21:50:20 -08:00
51bb5589de
change order of state change event processing
...
this will cause persistent data storage to load _before_ `SC_WORLD_LOADED` events are sent to scripts and plugins
2023-01-06 21:55:42 -06:00
3e4861b54b
fix persistence for changed file structure
...
`data/save` -> `save`
2023-01-06 21:24:01 -06:00
fe9d1e186e
Merge pull request #2562 from myk002/myk_greenify
...
allow color options for CycleHotkeyLabel
2023-01-06 19:10:39 -08:00
093eac3eb2
use a black background for non-top ZScreen titles
2023-01-06 18:58:08 -08:00
810430f1a2
make windows lockable (can ignore r-click and esc)
2023-01-06 18:48:53 -08:00
1f5ae4165f
return self from raise, update docs
2023-01-06 15:43:08 -08:00
fccefd1155
don't pass through handled r-clicks
2023-01-06 15:43:08 -08:00
f43358002d
Allow dialogs to close on r-click
2023-01-06 15:43:08 -08:00
574be3fe73
provide a useful default impl of isMouseOver
2023-01-06 15:42:40 -08:00
f15e9e3577
don't revert to plain strings for pens
2023-01-06 15:42:30 -08:00
e111a73763
allow color options for CycleHotkeyLabel
...
and use the option to render `On` in green for ToggleHotkeyLabel
2023-01-06 15:42:27 -08:00
6f46ae672e
add Gui::getDFViewscreen and Lua binding
2023-01-06 12:17:36 -08:00
1540e7c294
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-06 07:13:54 +00:00
f4d059ea3d
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-06 02:43:42 +00:00
a59f1518c1
Merge pull request #2556 from myk002/myk_zscreen
...
framework for passthru, z-order swapping windows
2023-01-05 18:41:57 -08:00
9eb5165ebe
Auto-update submodules
...
library/xml: master
2023-01-06 02:11:27 +00:00
1934014659
framework for passthru, z-order swapping windows
2023-01-05 18:07:38 -08:00
3969262e44
update submodule refs
2023-01-05 17:50:49 -08:00
845391f4e6
fix overzealous "ui" -> "plotinfo" replacement
...
some comments were just talking about the UI..
2023-01-05 17:46:30 -08:00
c4a2bdd08e
update lua too
2023-01-05 17:35:33 -08:00
5e5775f5e3
rename globals according to structures update
2023-01-05 17:11:01 -08:00
a5b11065db
Merge pull request #2547 from lethosor/codegen-stl-map-stub+v50
...
[v50] Add read-only container_identity for std::map
2023-01-05 15:35:27 -08:00
412531bf03
really fix the format string this time
2023-01-04 21:29:45 -08:00
9cbcd81f63
fix format strings for vars that were size_t
2023-01-04 21:24:52 -08:00
c70c4131bd
don't include dfhack-config/ in release tarball
...
create it at runtime
move files around so no dfhack-owned files are in there
2023-01-04 19:41:58 -08:00
b62cfa3699
Merge pull request #2552 from myk002/myk_mouse
...
Get correct mouse button down behavior in Lua without overwriting enabler fields
2023-01-04 19:39:43 -08:00
78be3a6463
Merge pull request #2548 from myk002/myk_logo
...
Display DFHack logo for the hotkeys overlay widget
2023-01-04 19:06:05 -08:00
4e51e02924
move SDL shims to a new DFSDL module
2023-01-04 17:15:32 -08:00
5d04b9c4cb
add Textures module and load DFHack logo
...
undocumented for now since it's internal. in the future, perhaps this
could morph into a dynamic texture loading facility for tools
2023-01-04 13:30:18 -08:00
9fd3ef7b4b
correct mouse down behavior without hosing enabler
...
before, we inhibited multiple mouse button down events by overwriting
the values in enabler. now we keep state internally and inhibit multiple
events on our own.
also add events and state tracking for middle mouse button
2023-01-03 14:52:49 -08:00
55cdaea636
refactor EditField text insertion
2023-01-03 12:57:02 -08:00
a0343b06a6
adjust text wrap to new scrollbar width
2023-01-03 00:56:07 -08:00
fa2da54852
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-03 07:13:58 +00:00
feeefcf149
Add read-only container_identity for std::map
2023-01-03 01:16:42 -05:00
6361b0a3a4
Merge pull request #2543 from myk002/myk_prep_for_quietust
...
prep for Quietust's structure updates
2023-01-02 20:42:48 -08:00
35ce361b09
Merge pull request #2542 from myk002/myk_dwarfmode_dims
...
clear out obsolete area map and menu logic from the Gui module
2023-01-02 20:42:30 -08:00
24235694f2
Merge pull request #2539 from myk002/myk_screen_write
...
implement Screen::paintTile for both modes and readTile for graphics mode
2023-01-02 20:41:35 -08:00
3ccf6034b9
Merge pull request #2538 from myk002/myk_script_paths
...
add dfhack-config/scripts to default script paths
2023-01-02 20:41:13 -08:00
da63d6294b
ensure the scrollbar midpoint is always rendered
...
this mimics the vanilla scrollbar behavior (and looks better)
2023-01-01 17:55:06 -08:00
218fbdbd45
prep for Quietust's structure updates
2023-01-01 01:03:42 -08:00
aa091ed37e
overwrite anchored textures where we actually touch their anchor
2023-01-01 00:45:14 -08:00
7d5d2d0a9b
clear out obsolete area map and menu logic
...
in particular, return the correct map dimensions in getDwarfmodeDims()
2022-12-31 22:49:30 -08:00
a6294c24fb
implement Screen::paintTile and readTile
2022-12-31 21:16:42 -08:00
5232e2b04e
add dfhack-config/scripts to default script paths
2022-12-30 23:30:11 -08:00
bf995a0968
Merge pull request #2533 from myk002/myk_lua_input
...
adjust Lua widgets to new input scheme
2022-12-30 22:37:12 -08:00
a7dd14d699
Merge pull request #2535 from myk002/myk_smart_refresh
...
only do a full refresh when needed
2022-12-30 22:36:42 -08:00
cf65f48aa0
don't use defunct MENU_CONFIRM keybinding
2022-12-30 22:35:08 -08:00
21f137644f
remove trailing whitespace
2022-12-30 22:35:08 -08:00
3a76fc086f
fix keyboard movement of Panel widgets
2022-12-30 22:35:08 -08:00
6871bc20c4
use new KEYBOARD interface keys in move delta
2022-12-30 22:35:08 -08:00
04f2d555c6
implement context-aware mouse wheel scrolling
2022-12-30 22:35:08 -08:00
38b525bdb5
adapt lua library widgets to new keyboard keybindings
2022-12-30 22:35:08 -08:00
1d7a7c8a49
Don't leave artifats behind when dimissing mboxes
2022-12-30 22:20:50 -08:00
dd0cc087d5
Revert "consolidate full refresh logic in widgets.Panel"
...
This reverts commit 33787473f0
2022-12-30 22:13:53 -08:00
bf9db8e223
Merge pull request #2534 from myk002/myk_scrollbar
...
skin our scrollbars to look and hover like DF's
2022-12-30 21:51:25 -08:00
33787473f0
consolidate full refresh logic in widgets.Panel
2022-12-30 20:44:15 -08:00
88dcdfd158
move trigger code from Window to Panel
...
where the drag/resize code actually is. Panels can be dragged around the
parent screen without them being a Window
2022-12-30 20:01:09 -08:00
70a0f4a718
only do a full refresh when needed
...
this significantly reduces CPU utilization when DFHack-owned screens are
visible.
2022-12-30 17:06:41 -08:00
7d91f9262d
respect tile colors in pens
2022-12-30 05:36:41 -08:00
3aac79fe4f
skin our scrollbars to look and hover like DF's
2022-12-30 05:33:17 -08:00
83a8e9a45a
render bright colors correctly
2022-12-30 03:30:01 -08:00
1265d531d5
only keep the anchor flag if it's already there
2022-12-30 00:53:44 -08:00
f45eac993a
use semantically clearer div rather than bit shift
2022-12-29 22:18:35 -08:00
a4c11de4fb
returns correct mouse pos when in ascii
2022-12-29 00:01:40 -08:00
371f5be050
fix signedness of comparison var
2022-12-28 23:31:06 -08:00
cff603e243
allow Labels to write tile textures
2022-12-28 23:16:13 -08:00
d7b67e9528
remove cached USE_GRAPHICS from gui.lua
...
it's no longer constant
2022-12-28 16:27:44 -08:00
fc523f12fe
expose and document dfhack.screen.getMousePixels()
2022-12-28 16:05:27 -08:00
07f8fad787
implement Gui::getMousePos and Gui::getDepthAt
2022-12-28 16:00:10 -08:00
ada96e616a
Merge pull request #2521 from myk002/myk_hooks
...
Prepare for the hook API
2022-12-27 19:47:38 -08:00
e2a4eeb422
write textures and chars to the map
2022-12-27 17:00:50 -08:00
99ffe769fa
rendering the parent now involves a full refresh
...
in order to get the background
2022-12-27 15:23:34 -08:00
033eb2aefd
use default background colors
...
and ensure texpos_lower doesn't peek through
2022-12-27 15:05:13 -08:00
75afa88790
use tiles for our default frame
2022-12-27 14:40:35 -08:00
69c9e3ffb7
render tiles if given in the pen; otherwise text
...
this commit also smooths out many conflicts with other layers, but the
anchor layer still gives us trouble. it will overwrite us unless we
cover the upper left tile of the anchor graphic, and then the entire
anchor graphic will disappear. not ideal, but it's a start
2022-12-27 14:39:03 -08:00
4f9f8ebcf6
fix unused return value warning
2022-12-26 10:26:22 -08:00
4789637625
implement new dfhooks API
2022-12-25 18:15:55 -08:00
e2425b5c7c
Auto-update submodules
...
library/xml: master
scripts: master
2022-12-25 07:13:11 +00:00
7625dc132e
Auto-update submodules
...
library/xml: master
scripts: master
2022-12-24 07:13:19 +00:00
6a61c750e9
widgets.render_text(): error early if key is invalid
...
This helps identify _which_ key is invalid - otherwise, getKeyDisplay()
complains that it was called with `nil`, which is less helpful.
2022-12-23 13:17:26 -05:00
12804a10a6
Fix Gui/Screen to work with g_src changes ( dfhack/df-structures#487 )
2022-12-23 00:36:09 -05:00
07a0e6e511
Auto-update submodules
...
library/xml: master
2022-12-22 19:38:45 +00:00
52c1e49197
get the text rendering back
2022-12-21 22:13:05 -08:00
48a9e1c518
more new var names
2022-12-22 05:16:40 +00:00
93c875fb56
adjust to new variable names
2022-12-21 14:07:36 -08:00
839e927f9b
comment out problematic code from Renderer
2022-12-21 14:06:58 -08:00
010b18c0e4
hide "offset" tiles that we occlude
2022-12-20 20:10:14 -08:00
106b55397a
comment out problematic code in Core
2022-12-20 19:04:30 -08:00
6c5b7d9458
Auto-update submodules
...
library/xml: master
2022-12-21 02:44:29 +00:00
663e1dd541
ascii is now in color
2022-12-20 16:33:11 -08:00
d7f51e5ed8
basic text drawing
2022-12-20 11:00:49 -08:00
7f91cf6e2a
more instrumentation for eventmanager
2022-12-20 09:49:35 -08:00
999d602e79
instrument eventmanager a bit
2022-12-19 13:43:57 -08:00
d04e30406f
Auto-update submodules
...
library/xml: master
2022-12-17 23:58:29 +00:00
eef6dcb08c
Merge pull request #2504 from ab9rf/develop
...
initial 50.03 alpha branch - into the breach we go
2022-12-17 15:51:16 -06:00
607a4b34d4
update structures
2022-12-17 15:09:08 -06:00
57e599a4d9
comment out barracks reference
...
barracks appears to have gone away in 50.03
2022-12-17 13:07:37 -06:00
5cd60e10f0
comment out problematic code in Gui.cpp
2022-12-16 14:47:43 -06:00
003b74bf73
absorb Putnam's work on the windows hooks
2022-12-16 14:47:43 -06:00
768c95ecb6
absorb Putnam's work on Screen
2022-12-16 14:47:43 -06:00
ccc9e976e2
comment out problematic code in Screen.cpp
2022-12-16 14:47:43 -06:00
55351951f0
comment out problematic code in Items.cpp
2022-12-16 14:47:43 -06:00
93b8479e94
comment out problematic code in Buildings.cpp
2022-12-16 14:47:43 -06:00
7fae0fe44f
structures
2022-12-15 21:19:40 -06:00
9587dd42f8
structures update
2022-12-15 19:56:17 -06:00
e6d8f06965
update structures
2022-12-15 19:27:52 -06:00
42203b13f4
Merge pull request #2500 from myk002/myk_panel_drag
...
Support resizing for DFHack Panel widgets
2022-12-15 14:36:33 -08:00
a07d8c3b15
updates to do test builds of 50.03
2022-12-15 03:35:57 -06:00
06346c6269
implement double clicking on the title to maximize
...
also double click on a maximized window to jump to the minimum size
the location of the window isn't guaranteed to be the same after
maximizing and un-maximizing, but we could implement that if there is
call for it.
2022-12-14 19:03:38 -08:00
434e9322cc
fix error in error message formatting
2022-12-14 17:51:07 -08:00
4c6daf30d9
add widgets.Window and fix paint_frame offset
2022-12-14 12:04:29 -08:00
12e62c7f9d
highlight anchor point when resizing with keyboard
2022-12-14 10:34:06 -08:00
c030704705
implement panel resizing
2022-12-14 10:34:04 -08:00
99b599e9ab
add docs for panel dragging
2022-12-13 13:01:49 -08:00
3f43f72731
fix the math
2022-12-13 12:39:17 -08:00
38a3bec953
dragging logic
2022-12-12 18:07:05 -08:00
0b80bd41b0
partial update to build with vs2022
2022-12-12 03:06:36 -06:00
ffd646462a
ensure `enable` doesn't miss newly-added scripts
...
and add some more documentation
2022-12-10 22:13:38 -08:00
e88b1fdfe5
move script-manager into core
2022-12-10 21:59:51 -08:00
0362d76b39
list enableable scripts in the `enable` builtin
2022-12-10 21:59:51 -08:00
facdb61e42
explicitly declare namespaces and proto versions
2022-12-10 18:06:53 -08:00
6c562a3fed
fix apparent typo in Materials scanning
2022-12-09 09:21:50 -08:00
dec6d3d379
Revert "update google protobuf to 3.21.10"
...
This reverts commit 9dabf51ac7
2022-12-07 11:59:48 -08:00
9dabf51ac7
update google protobuf to 3.21.10
2022-12-07 11:59:15 -08:00
e1330a602e
Auto-update submodules
...
library/xml: master
scripts: master
2022-12-06 07:14:43 +00:00
2b87307e11
allow visible and active to be dynamic properties
2022-12-04 15:46:19 -08:00
08b579cf44
Auto-update submodules
...
library/xml: master
scripts: master
2022-12-02 17:45:32 +00:00
0836962007
Rename [xyz]CategoryActionTimers to [xyz]GroupActionTimers in action timer API
2022-12-01 23:24:04 +00:00
ae532e1452
Rename affectedActionTypeCategory to affectedActionTypeGroup in action timer API
2022-12-01 23:22:02 +00:00
76cdbfbc5c
Rename affectedActionCategory to affectedActionTypeCategory in action timer API
2022-12-01 23:19:10 +00:00
f06f17b59c
Rename affectedActionTypes to affectedActionCategory in action timer API
2022-12-01 23:17:57 +00:00
aa2cf44c4b
Use lambdas to violate DRY less in action timer API
2022-12-01 13:34:54 +00:00
a925c34413
Rename [xyz]ActionTimer functions to [xyz]ActionTimers
2022-12-01 13:34:54 +00:00
f863b9807a
Add action timer API input validation
2022-12-01 13:34:54 +00:00
cc40b80456
Protect against integer overflow when subtracting with action timer API
2022-12-01 13:34:54 +00:00
6148307e9b
Change != 0 to > 0 in action timer API core functions
2022-12-01 13:34:54 +00:00
5e0c0d22cb
Group action timer API internal functions together
2022-12-01 13:34:54 +00:00
e93d7eefb3
Factor out set and add shared action timer code into own functions
2022-12-01 13:34:54 +00:00
357b871b4f
Factor out shared unit action timer multiplication code into its own function
2022-12-01 13:34:54 +00:00
8f0b7663d9
Change ints in action timer API function signatures to int32_ts
2022-12-01 13:34:54 +00:00
4b33097e57
Remove default in action timer API switch case
2022-12-01 13:34:54 +00:00
a3b1125c28
Progress on action timer API
2022-12-01 13:34:54 +00:00
7f54a77ed9
Continue work on unit action timer API
2022-12-01 13:34:54 +00:00
16ef4f8313
Rename action_type_group to unit_timer_action_type_group
2022-12-01 13:34:54 +00:00
2cbbed6750
Use df-structures XML enums for action timer API
2022-12-01 13:34:54 +00:00
fa589b5764
Make progress with action timer API
2022-12-01 13:34:54 +00:00
0f8ce360ac
Make first pass of action timer API
2022-12-01 13:34:54 +00:00
d14a3f4970
Auto-update submodules
...
library/xml: master
scripts: master
2022-12-01 00:57:53 +00:00
018bf712d5
Merge pull request #2429 from cppcooper/patch-3
...
Updates Units::isAnimal
2022-11-29 18:43:04 -08:00
9038c1c568
Merge pull request #2437 from myk002/myk_ctest
...
Combine unit testing branches and simplify
2022-11-29 15:07:47 -08:00
aac89d4942
Merge branch 'develop' into myk_default_search_key
2022-11-29 15:07:12 -08:00
5b311163a9
Merge pull request #2431 from myk002/myk_widget_fixes
...
fix minor errors in ResizablePanel, Label, and HotkeyLabel widgets
2022-11-29 15:06:15 -08:00
757aa303b7
Update library/MiscUtils.test.cpp
...
Co-authored-by: Josh Cooper <cppcooper@users.noreply.github.com>
2022-11-29 15:05:04 -08:00
807894ac6c
Updates Units::isAnimal
...
Now checks that the unit cannot learn or speak, and has either a wilderness population source, a pet/pet_exotic token, or is trainable for war/hunting
2022-11-29 13:19:19 -08:00
d0a6a3e930
remove unnecessary target modifications
2022-11-28 17:43:55 -08:00
88074dacf0
move tests into the same dir as the main files
2022-11-28 17:31:10 -08:00
7fbeb215d7
Merge branch 'myk_unit_testing' into myk_ctest
2022-11-28 17:26:27 -08:00
f921b02a1b
Merge remote-tracking branch 'cppcooper/unit-testing' into myk_ctest
2022-11-28 17:25:10 -08:00
ae035d5836
simplify unit testing setup
2022-11-28 17:16:48 -08:00
726771c8d3
supply default search key for tokenized text
2022-11-28 16:02:47 -08:00
adb9c5ea12
fix frame size calculation when frame_inset is set
...
also fix error when clicking on HotkeyLabels where no on_activate
callback has been set
2022-11-28 15:12:22 -08:00
fb6483fe6c
allow frames to be drawn without DFHack signature
2022-11-28 15:04:28 -08:00
25f87306b4
Removes separated unit test executables
2022-11-25 09:43:04 -08:00
79551f7ef0
Updates CMake TESTING vars
2022-11-25 09:43:04 -08:00
de91fa7f28
Adds -Wno-sign-compare to test targets
2022-11-25 09:43:04 -08:00
268719ed1f
Integrates googletest
2022-11-25 09:43:04 -08:00
8e18d610f5
cmake: Add SDL dep for Linux dfhack; deprecate BUILD_TESTS
...
On Linux, libdfhack.so depends on libSDL.so, but that was not marked
inside CMake. As it's only used via LD_PRELOAD, there was no problem.
But when linking unit tests against it, this becomes necessary. It may
be wise to add a find_package(SDL) to provide the user with more
control, but just a hard-coded "SDL" should work for most installs.
The CTest module creates a BUILD_TESTING option, which clashes
(thematically, not in code) with the existing BUILD_TESTS option.
Resolve it thus:
- Deprecate BUILD_TESTS; it still works, but is marked as an advanced
option so it doesn't show in the CMake UI by default.
- Add a new BUILD_TEST_SCRIPTS that does what BUILD_TESTS used to do,
but is a "dependent" option so it goes away if BUILD_TESTING=OFF.
The up-shot is that, by default, the C++ unit tests will be built
(BUILD_TESTING=ON) and the Lua integration tests are not installed
(BUILD_TEST_SCRIPTS=OFF).
2022-11-25 09:43:04 -08:00
face558dd0
unit testing: Link test executables against libdfhack
...
Note: Hard-coded "SDL" here is wrong, but requires some refactoring in
top-level CMakeLists.txt to fix.
2022-11-25 09:43:04 -08:00
c5be87e381
unit tests: Add CTest support, and a trivial first unit test
...
If BUILD_TESTS=ON:
- Adds a 'test' target for ninja
- Adds a library/MiscUtils.test unit test executable
2022-11-25 09:43:04 -08:00
c9cf5ecca8
we kept editfield as MOUSE_L for click and drag
2022-11-21 17:51:24 -08:00
24dc879888
adapt library code to newly correct mouse events
2022-11-21 17:36:46 -08:00
e2218d0429
make mouse button event behavior conform to docs
...
before, when a mouse button was held down, we'd send a single _MOUSE_L
and _MOUSE_L_DOWN event and that's it. now we properly send a single
_MOUSE_L_DOWN event and _MOUSE_L events for as long as the button is
held down. similar for the right mouse button
2022-11-21 17:35:14 -08:00
0190cfb117
ensure foo.init runs before foo.*.init
2022-11-20 17:27:14 -08:00
ac5a1d35ae
remove duplicate function definition
2022-11-18 17:39:49 -08:00
11c27d40dd
Merge branch 'develop' into Bumber64-patch-2
2022-11-18 17:34:00 -08:00
acd561ec9c
Auto-update submodules
...
library/xml: master
scripts: master
2022-11-18 20:59:44 +00:00
822a1c8359
Auto-update submodules
...
library/xml: master
scripts: master
2022-11-15 07:17:03 +00:00
966623a919
Merge pull request #2387 from cppcooper/units-checking
...
Extends Units module
2022-11-14 16:55:42 -08:00
94c6bc8063
refactor generic lua function caller to Lua ns
2022-11-14 16:40:35 -08:00
aa5c6515e0
Removes rogue indent
2022-11-13 11:39:20 -08:00
78021ec672
Adds indentation
2022-11-13 11:35:01 -08:00
7e1bdb5302
Matches Units.h ordering in LuaApi.cpp
2022-11-12 17:05:11 -08:00
d112649886
Organizes and documents Units::is*(unit) functions
2022-11-12 16:40:20 -08:00
ebd450af0e
Adds isUnitInBox to Units module
2022-11-12 14:42:41 -08:00
afe85137c3
Merge branch 'develop' into cmake-ctest
2022-11-12 11:50:33 -08:00
5136bbbc03
Merge pull request #2383 from cppcooper/em-fixes
...
Fixes JOB_STARTED event
2022-11-11 19:58:46 -08:00
5b1ebdf72a
don't return list idx when mouse is on scrollbar
2022-11-11 10:40:10 -08:00
4d97c90f53
Auto-update submodules
...
library/xml: master
scripts: master
2022-11-10 07:18:00 +00:00
34de030ba9
Units module
...
- Updates `Lua API.rst`
- Only adds the most important additions (complicated enough to need explaining)
- Adds new functions to LuaApi.cpp
- Revises isUndead to accommodate `dfhack.units.isUndead(u)` => `Units::isUndead(u, false)` instead of taking the default value
2022-11-09 22:03:39 -08:00
f3ae193914
Update EventManager.cpp
2022-11-09 16:49:35 -08:00
eac7fac8e9
Merge pull request #2389 from myk002/myk_gui_anywhere
...
[Gui] add "anywhere" keybinding guard
2022-11-09 15:48:04 -08:00
80824f5b75
Extends Units module
2022-11-09 14:41:45 -08:00
0344595e4e
add "anywhere" keybinding guard
2022-11-09 14:32:51 -08:00
c0ffcc2f79
Updates Units::isDemon()
2022-11-09 12:37:41 -08:00
d95a5ac238
add string_to_int to MiscUtils.h
2022-11-09 11:55:29 -08:00
beee445f6f
Extends Units module
...
Adds unit check functions for
- animals
- demons
- titans
- megabeasts
- semimegabeasts
- night creatures
2022-11-09 11:44:28 -08:00
ccd43f1710
Merge pull request #2381 from myk002/myk_framed_panel
...
[widgets.Panel] support frames around panel widgets
2022-11-09 10:32:23 -08:00
9fed02435e
Merge pull request #2378 from myk002/myk_list_mouse
...
Allow widgets.List to report hover target and respond to shift-click
2022-11-09 10:32:06 -08:00
4924fd0d52
Merge pull request #2377 from myk002/myk_gui_convenience
...
Make View:getMousePos() and Screen:show() a bit more flexible
2022-11-09 10:31:58 -08:00
f2a386f0e1
Merge pull request #2375 from myk002/myk_uicommon
...
Move generally useful string functions from uicommon to MiscUtils
2022-11-09 10:31:50 -08:00
92645ccb5b
Fixes JOB_STARTED event
2022-11-08 12:43:23 -08:00
22eb9ca8b3
Merge pull request #2380 from myk002/myk_instrument_keybinding
...
instrument core keybinding resolution
2022-11-08 10:16:13 -08:00
4668d8c4a3
Add Lua::Push method for maps
2022-11-08 10:15:28 -08:00
e4d0bb9e46
move Lua push methods into LuaTools.cpp
2022-11-08 10:15:28 -08:00
b82a604c8d
factor out keys -> lua onInput code to LuaTools
2022-11-08 10:15:28 -08:00
193d29ba67
include cctype to fix build error
2022-11-08 09:53:08 -08:00
32dc80729a
support drawing frames around panels
2022-11-07 16:50:21 -08:00
351ecbfb59
instrument core keybinding resolution
2022-11-07 16:41:53 -08:00
83f560a6f4
allow shift-click to trigger submit2 for List
2022-11-07 16:14:16 -08:00
1b7b75d8ab
factor out detection of the list index under mouse
2022-11-07 16:13:45 -08:00
28aadea6af
allow an alternate ViewRect for getMousePos
2022-11-07 15:54:56 -08:00
be18f4e900
return self from Screen:show() as a convenience
2022-11-07 15:54:55 -08:00
5b9c18fc3c
migrate string fns from uicommon to MiscUtils
...
and clean up some leaky usings
2022-11-07 15:36:16 -08:00
2197aded30
Fixes segfault
2022-11-06 17:30:28 -08:00
a854e379b2
Merge pull request #2354 from myk002/myk_scrollbars_redux
...
make scrollbars more responsive when dragging
2022-10-22 20:28:52 -07:00
64b923b9eb
make the materials dialog filter lcase only
...
this allows the capital letter hotkeys to be processed by the list
widget without the special-casing of the ignore_keys attribute.
2022-10-21 12:43:53 -07:00
593b80cfa0
make scrollbars more responsive when dragging
2022-10-21 12:22:57 -07:00
1e21e6546e
fix materials selection dialog
...
where the filter was swallowing the sublist hotkeys
2022-10-19 17:31:28 -07:00
142b45ef49
move list item hotkey hint left by one tile
...
so it doesn't get covered by the scrollbar
2022-10-19 17:30:51 -07:00
666edd6d60
don't overwrite dig priority by accident
...
many callers of setDesignationAt simply didn't bother with the priority
parameter. change the default value of the priority param so that by
default we will keep the previous value instead of overwriting it
2022-10-19 16:47:54 -07:00
f94cc3fda0
add backtick to keybinding's hardcoded docs
2022-10-19 16:24:21 -07:00
4f10cd4a9b
Merge pull request #2331 from wolfboyft/constructions-find-at-tile-patch
...
Implement/change/expose to Lua constructions findAtTile & insert
2022-10-13 17:40:21 -07:00
ded5f483d6
Fix issues in construction module
2022-10-12 21:32:27 +01:00
b78af72403
record built constructions in blueprint
2022-10-12 13:31:46 -07:00
1cf9688349
Implement/change/expose constructions findAtTile & insert (not building)
2022-10-12 21:10:22 +01:00
d650ba2377
ensure scrollbar can never get ahead of the cursor
2022-10-10 16:42:32 -07:00
ba36e72b33
support click and drag for scrollbars
2022-10-07 16:27:19 -07:00
35eb4e08dd
hold down the mouse button to continue scrolling
2022-10-07 15:40:05 -07:00
2bff70a290
add unit tests for widgets.Scrollbar
2022-10-07 13:14:52 -07:00
5722d6914b
transition Label to use the new generic Scrollbar
2022-10-07 12:45:43 -07:00
24232e894a
create Scrollbar widget and integrate with List
2022-10-06 11:13:16 -07:00
9817106c30
add --exclude option for ls
2022-10-05 13:30:14 -07:00
dc535004e9
better formatting for ls output for tags
2022-10-05 12:51:30 -07:00
739792a59e
Auto-update submodules
...
library/xml: master
scripts: master
2022-10-04 07:30:12 +00:00
3f6e92eda4
finalize 0.47.05-r7 release
2022-09-30 11:58:22 -07:00
cb80f7dd75
don't cache dup civzones when scanning buildings
2022-09-25 16:04:36 -07:00
e6336e769a
Units::teleport(): set idle_area
2022-09-24 13:30:24 -04:00
278b7528ac
implement basic domain index structure
2022-09-23 08:46:50 -07:00
fae26b2375
replace die's underline with tombstones
...
easter egg suggested by thurin : )
2022-09-23 08:34:22 -07:00
b07f3b5b6c
stub help formatted same as real help
2022-09-22 17:43:56 -07:00
4d662adfe5
Fix marker checking for ruby help text
2022-09-22 17:39:54 -07:00
28b70eaee9
return map coords as a coord, not x, y, z
2022-09-18 13:27:33 -07:00
dbc5001bd8
fail if mouse cursor isn't over the map area
2022-09-18 13:27:13 -07:00
3b650c8d0b
don't let changes to the lua cursor bleed through
...
before, we could end up changing the state of whoever last called
guidm.setCursorPos()
2022-09-18 08:20:33 -07:00
1f15e4d47e
expose Gui::getMousePos() to Lua
2022-09-18 08:19:56 -07:00
215a5b0a24
add Gui::getMousePos() that always gets map coords
2022-09-18 08:19:02 -07:00
448eced17c
make Screen::getMousePos always return scr coords
2022-09-18 08:07:08 -07:00
d0a5db2a0d
set sentinel value used by TWBT
2022-09-16 21:56:05 -07:00
6fff83de5a
fix EditField rendering with TWBT
2022-09-16 15:24:33 -07:00
b88d343ddd
fix off-by-one error on scrollbar click detection
2022-09-14 09:25:43 -07:00
bb52e7bac8
list tools in categories with tags builtin
2022-09-13 23:17:19 -07:00
dde56040c3
Auto-update submodules
...
library/xml: master
scripts: master
2022-09-12 07:39:33 +00:00
d4914e7511
implement mouse click reactions for scrollbar
2022-09-11 19:33:01 -07:00
e2fbade219
fix scrollbar display when all text is visible
...
also align behavior with documentation when 'left' or 'right' is
explicitly specified (i.e. always show the scrollbar)
2022-09-11 18:56:43 -07:00
f71f034d1d
show full scrollbars instead of just scroll icons
2022-09-11 17:58:10 -07:00
23994d4f4c
dynamically wrap helpdb long help text (default 80)
2022-09-11 13:41:20 -07:00
3c99a7214f
ensure params are strings when invoking scripts
2022-09-10 10:10:28 -07:00
cae2bca0a7
add dfhack.screen.hideGuard
2022-09-10 09:49:43 -07:00
2fdbcaebf5
Accept negative indices, add vector tests
2022-09-07 09:14:09 -07:00
483652e193
Rewrite utils.df_expr_to_ref() for consistency, add tests
2022-09-07 09:14:09 -07:00
b1a8662c4a
Merge branch 'develop' into docs
2022-08-31 23:00:39 -07:00
074a6ec5cd
allow EditFields to ignore specified keys
...
like "+" and "-", so you can use them as hotkeys in the parent view
2022-08-31 10:22:41 -07:00
27e189fef2
no cursor position reset when updating list filter
2022-08-29 15:17:17 -07:00
4a1a322cd7
adapt to the new summary layout
2022-08-26 16:51:42 -07:00
0d3aa0fb28
Merge remote-tracking branch 'upstream/develop' into docs
2022-08-25 21:59:01 -07:00
8acda4d6c8
Interpret '4' & '6' as strings, not movement keys
2022-08-19 22:40:53 -07:00
751c2eb7d1
fix detection of short description start
...
now that labels are no longer bolded in the text rendering, the header
detection code needs updating
2022-08-19 16:19:19 -07:00
df9c37a8b7
Merge branch 'develop' into docs
2022-08-15 17:09:36 -07:00
8672282fd8
add helpdb, unit test, and document API
...
note that we have to dynamically sort some of the expected lists for
locale agnosticism
2022-08-15 16:31:52 -07:00
6fd0f4505f
add dfhack history repository and expose to lua
2022-08-15 16:27:43 -07:00
84cd3f0e6d
add getEntries() to the CommandHistory API
...
so we can export them to lua
also bump the default history size to 5000 from the paltry 100 we had
2022-08-15 16:27:43 -07:00
7f0791f6c3
use setText() accessor method instead of direct access
2022-08-15 16:24:34 -07:00
22f9f3b042
add unit tests for new widget functionality
2022-08-15 16:24:34 -07:00
0ae4fed3cf
add mouse support for CycleHotkeyLabel widgets
2022-08-15 16:24:34 -07:00
79b6cd13e9
support scrolling by half pages in Label
2022-08-15 16:24:34 -07:00
a5af5a1373
don't bork on no frame, set cursor to end of text
2022-08-15 16:24:34 -07:00
4e382c7b3b
make HotkeyLabels react to clicking
...
also be better about initializing EditField frame height
2022-08-15 16:24:34 -07:00
8de8b22566
click to correct cursor position on long strings
...
where the left side of the string has been trimmed
2022-08-15 16:24:34 -07:00
b7f74fe2ce
allow mouse lclick to select a List item
2022-08-15 16:24:34 -07:00
1dd3d6656b
move the cursor in an EditField on mouse lclick
2022-08-15 16:24:34 -07:00
0aa9a187cf
support cursor movement in EditFields
2022-08-15 16:24:34 -07:00
43b1abcdcf
support submit2 for EditFields
2022-08-15 16:24:34 -07:00
214dd3c579
reset scroll position when the text is changed
2022-08-15 16:24:34 -07:00
23ced99131
fix call to new functions in existing coord fn
2022-08-15 16:15:41 -07:00
a4c8535977
add argparse int checking methods, more docs
2022-08-15 16:15:41 -07:00
ef56addb14
prep for new format; accept pipe as tag separator
2022-08-07 22:13:46 -07:00
a8d0cc7980
support scrolling by half pages in Label
2022-08-06 23:48:25 -07:00
625b4d439d
fix typo in API function name
2022-08-05 22:31:39 -07:00
1a777257b4
add get_entry_types API method to helpdb
2022-08-05 22:06:02 -07:00
ebfe00b112
editing pass of short descriptions
...
and fix some short description parsing
2022-08-05 10:08:23 -07:00
03027b513a
Merge branch 'develop' into docs
2022-08-03 22:55:38 -07:00
5b26d3361b
Auto-update submodules
...
library/xml: master
scripts: master
2022-08-03 07:17:28 +00:00
56e7a15459
move dfhack.history to dfhack-config/dfhack.history
2022-08-02 22:46:04 -07:00
391a4d8883
use dfhack-config/lua.history instead of lua.history
2022-08-02 22:46:04 -07:00
aa3a389b6f
fix parsing bold text and indenting of ls output
2022-07-29 17:37:50 -07:00
507b1632a2
support backtick as a keybinding
2022-07-28 05:45:50 -07:00
a053cce444
update the "requires interactive terminal" message
...
to make it more user friendly
2022-07-27 16:30:14 -07:00
10f8417cc2
create helpdb entries for all plugins
...
even those that have no commands and are not enableable
2022-07-26 22:22:43 -07:00
5b0f9ddd4f
bump the default history size to 5000
...
100 is just too small, especially since we're not removing duplicate
entries.
2022-07-26 10:24:05 -07:00
8cf7f59c39
wrap ls and tags output
2022-07-25 17:48:39 -07:00
a567665ab2
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2022-07-24 05:41:41 +00:00
f9d4781cbc
use dfhack-config/lua.history instead of lua.history
2022-07-23 22:12:34 -07:00
5f56d79235
move dfhack.history to dfhack-config/dfhack.history
2022-07-23 21:55:49 -07:00
3c92d4f195
Fix typo
2022-07-23 16:35:40 -07:00
9b7cc6180d
don't create entries for non-enableable plugins
2022-07-22 21:21:38 -07:00
cb3e537b38
fix help message when trying to run a plugin name
2022-07-22 20:57:19 -07:00
0858b95c40
print help from helpdb on CR_WRONG_USAGE
2022-07-22 17:45:48 -07:00
4b1696f783
add '?' alias for help
2022-07-21 22:36:17 -07:00
2ce7518562
read plugin command docs from single plugin file
2022-07-21 22:33:43 -07:00
0b88922ffc
Merge remote-tracking branch 'upstream/develop' into docs
2022-07-20 16:33:50 -07:00
2f50d161d9
Auto-update submodules
...
library/xml: master
scripts: master
2022-07-20 23:31:20 +00:00
64b793b409
support EditField:setText() so scripts can use it
...
and be compatible with both the develop and docs branch
2022-07-20 15:40:49 -07:00
9dcb63da53
don't bork on no frame, set cursor to end of text
2022-07-20 15:36:17 -07:00
048b20ac45
no help entries for non-enableable plugins
2022-07-20 13:34:29 -07:00
0dd153cc0d
ensure we pick up the plugin help entry
...
even when it has a command and that command is not equal to the plugin
name
2022-07-20 12:34:40 -07:00
954e246140
reformat builtins and properly read tags
2022-07-19 23:01:25 -07:00
ddcb9b4921
add missing 'man' builtin
2022-07-19 22:35:08 -07:00
e3588cf49c
return entire tag data structure for iterating
2022-07-19 22:13:53 -07:00
e5961b45b4
Auto-update submodules
...
library/xml: master
2022-07-19 07:17:31 +00:00
a20612b0a8
Update structures
2022-07-18 17:50:41 -07:00
8173f6dd02
Merge remote-tracking branch 'upstream/develop' into docs
2022-07-18 10:59:00 -07:00
301c8e93a1
move builtin docs to individual files
2022-07-18 10:58:35 -07:00
e650bd0942
add comment about plugin docs
2022-07-17 17:05:29 -07:00
7f302888ec
make HotkeyLabels react to clicking
...
also be better about initializing EditField frame height
2022-07-17 16:04:36 -07:00
5723b76585
click to correct cursor position on long strings
...
where the left side of the string has been trimmed
2022-07-17 15:43:58 -07:00
805456e82b
allow mouse lclick to select a List item
2022-07-16 22:18:38 -07:00
f65f36ffee
move the cursor in an EditField on mouse lclick
2022-07-16 22:03:39 -07:00
27425e47f6
support cursor movement in EditFields
2022-07-15 22:22:51 -07:00
9b340a7630
support submit2 for EditFields
2022-07-15 13:46:01 -07:00
c9a87511bd
add dfhack history repository and expose to lua
2022-07-15 09:18:27 -07:00
dd6fbd53b6
add getEntries() to the CommandHistory API
...
so we can export them to lua
also bump the default history size to 5000 from the paltry 100 we had
2022-07-15 09:07:14 -07:00
193b9a4004
add missing namespace
...
which did not cause compiler errors for some reason
2022-07-14 14:08:33 -07:00
e926e1116e
replace more Core cpp code with calls to helpdb
...
also document devel/dump-rpc builtin
2022-07-14 13:19:30 -07:00
f021dd0e0a
Gui::getAnyItem(): add support for viewscreen_treasurelistst
2022-07-12 11:25:16 -04:00
4cdb0ff138
Merge branch 'rm-old-modules' into develop
2022-07-12 11:23:10 -04:00
185f49976c
ensure scripts get their entry type set
2022-07-11 17:24:53 -07:00
328d839f19
support backtick as a keybinding
...
and bind it to gui/launcher
2022-07-11 17:23:56 -07:00
a5da3c18f9
reset scroll position when the text is changed
2022-07-11 17:23:23 -07:00
4ed15ffcc4
fix parsing of first line as the short_help
2022-07-10 20:48:24 -07:00
a58b56abc4
don't error out if files cannot be read
2022-07-10 20:19:12 -07:00
e899510b8b
Use helpdb to implement help and ls built-in commands and dfhack.script_help() ( #2242 )
...
* use helpdb to implement the help and ls builtins
* use helpdb to implement dfhack.script_help()
2022-07-10 20:17:54 -07:00
4ad8e7199a
Support builtin commands in helpdb ( #2241 )
...
* support builtin commands in helpdb, implement list API, document api
2022-07-10 20:17:52 -07:00
35a4d19ac9
implement listing functions for helpdb
2022-07-10 20:14:21 -07:00
64aba7a8a3
Myk rendered help ( #2240 )
...
* implement help db
* add initial list of tags
* read tags fr help, read script short desc, filter
2022-07-10 20:14:21 -07:00
28e15162a5
reorganize init scripts into dfhack-config ( #2232 )
...
* reorganize init scripts into dfhack-config
allows player init scripts to build on defaults instead of replace them
this also moves the init scripts out of the main df directory
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* escape asterisks in docs
* remove unneeded dfhack.init file creation for test
* write the test init script to the new init dir
* create the init dir before trying to write a file
* rename default init files for clarity
* Update changelog
* Update docs/changelog.txt
Co-authored-by: Alan <lethosor@users.noreply.github.com>
* Try to get buildmaster to work with old branches
* Update changelog
* get keybindings from all init scripts
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Fix spacing in changelog
* split default loading into its own file
* update docs with new changes
* update help text wording in default init files
* Apply suggestions from code review
Co-authored-by: Alan <lethosor@users.noreply.github.com>
* Alphabetize changelog
* Update onMapLoad.default.init
* Update onMapLoad.init
* Update Core.rst
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2022-07-10 08:54:55 -07:00
e0d37a31ae
Make the manager orders library available by default ( #2233 )
...
* move orders out of examples directory
* install orders into library dir
* read orders from new library dir
* update documentation
* update dreamfort references to orders import
* update changelog
* ignore json files in pre-commit
2022-07-06 07:03:29 -07:00
aec5684897
Auto-update submodules
...
library/xml: master
scripts: master
2022-07-05 07:17:21 +00:00
739871bc0f
Remove Hooks-egg.cpp and related code and configuration options
2022-06-29 23:35:14 -04:00
1147add520
Constructions module: remove some old/unused functions/types
2022-06-29 23:35:14 -04:00
4c7caa2658
Remove unneeded dependencies on modules/Graphic.h
2022-06-29 23:35:13 -04:00
8bb047fcc6
Remove Notes module
...
Only used in a devel plugin that prints notes, and can be easily replaced
with `ui.waypoints.points`
2022-06-29 23:35:13 -04:00
0aa7ec877e
Auto-update submodules
...
library/xml: master
scripts: master
2022-06-29 15:17:13 +00:00
8a605e1903
The great de-anon-ification
2022-06-29 07:54:04 -07:00
9788a8a22a
Add default selection handler to `materials.ItemTraitsDialog` ( #2211 )
...
* add forward compatibility for future `job_item_flags`
* add default selection handler to `materials.ItemTraitsDialog`
* add a call to `error()` in 'unknown'-branch inside `setTrait`
* add `ItemTraitsDialog` improvement description to changelog.txt
2022-06-28 16:27:18 -07:00
ba629b8e0a
manually handle DestroyBuilding jobs ( #2209 )
...
* don't delete general refs from jobs that we cancel
though we still disconnect the refs if we can
* get job remove working in all cases
we apparently need to manually handle DestroyBuilding jobs
everything else we should let cancel_job handle
* update changelog
2022-06-21 16:38:04 -07:00
f33c9bc881
Update tile-material.lua ( #2218 )
...
* Update tile-material.lua
* Update changelog.txt
* Update changelog.txt
* Update changelog.txt
* Update tile-material.lua
2022-06-20 12:38:37 -07:00
88ae50b9ae
update version and changelog to 0.47.05-r6
2022-06-17 15:42:23 -07:00
d38ab1d152
Fix UNIT_NEW_ACTIVE events ( #2197 )
...
* Updates eventful.lua to use UNIT_NEW_ACTIVE
* Fixes bug #2189
* Revises activeUnits declaration/initialization
* Fixes build error
* Update changelog.txt
* reword changelog entry
* add changelog entry for event name change
Co-authored-by: Myk <myk002@yahoo.com>
2022-06-17 09:34:41 -07:00
1a629a26bf
add `ItemTraitsDialog` to materials.lua ( #2199 )
...
* add `ItemTraitDialog` to materials.lua
* rename `ItemTraitDialog` to `ItemTraitsDialog` (plural)
* Update changelog.txt
2022-06-12 07:03:04 -07:00
85d7489b3c
ensure refs are cleaned up when we remove a job ( #2184 )
...
* ensure job items are disassociated from the job
when the job is removed. the new df-provided ``cancel_job()`` doesn't do
this for us whereas the old custom implementation did.
ref: #2028
* remove trailing whitespace
* Clean up general refs before removing job
Because the game method doesn't do it itself
* Fix typo in var name
* clean up code
* update changelog
2022-06-11 07:38:22 -07:00
62e7303c68
Upgrade pre-commit-hooks to v4.3.0 (+ submodules)
...
This contains a fix on Windows that checks for the executable bit according to
Git, instead of according to Windows, which reduces false-positive
"check-executables-have-shebangs" failures.
2022-06-08 17:48:14 -04:00
ec2f2446d2
Auto-update submodules
...
library/xml: master
scripts: master
2022-06-08 07:18:16 +00:00
46438a2af3
Merge branch 'DFHack:develop' into Bumber64-patch-2
2022-06-07 04:21:56 -07:00
a7267e3c4e
Optimize report deletion
2022-06-07 04:21:48 -07:00
40a6fcdd99
Auto-update submodules
...
library/xml: master
scripts: master
2022-06-07 07:18:05 +00:00
5d08e5ae67
More constants; remove extra "using" statements
2022-06-06 01:56:11 -07:00
ad1a3408e6
Hopefully fix submodules
2022-06-06 01:41:17 -07:00
7b2cb8f9a6
Auto-update submodules
...
library/xml: master
2022-06-05 07:16:27 +00:00
ce36abce47
Fixes
2022-06-04 15:46:02 -07:00
ae4446610b
Update Gui.cpp
2022-06-04 15:36:50 -07:00
16b5cade00
Add constants, update old fns
...
Add MAX_REPORTS_SIZE, RECENT_REPORT_TICKS
Remove redundant "using df::global::world" inside fns
Update `makeAnnouncement`:
Use `word_wrap`, `pauseRecenter`, and utility fn `delete_old_reports`
Handle repeat announcements
Insert sorted into ``world->status.announcements``
Update `addCombatReportAuto`: Use utility fn `recent_report`
Update `showPopupAnnouncement`: Delete old popups at end of fn
Update `getDwarfmodeViewDims_default`: Check for ui_sidebar_mode::Default and ArenaWeather
2022-06-04 15:23:57 -07:00
23e85a0d24
Fetch and merge
2022-06-04 12:17:28 -07:00
b0b601cf0f
Remove recenterViewscreen, update revealInDwarfmodeMap
2022-06-04 11:59:04 -07:00
f290b1c804
Auto-update submodules
...
library/xml: master
scripts: master
2022-06-04 07:16:44 +00:00
f5d3b9f699
Auto-update submodules
...
library/xml: master
scripts: master
2022-06-02 04:51:00 +00:00
89d3d45e87
Allow EditField widgets to manage their own activation and keyboard focus ( #2147 )
...
* use new focus subsystem in widgets.EditField
* always eat the enter key if we have an on_submit
* add modal attribute
* give EditFields a default height of 1
so they can be autoarranged
2022-06-01 21:48:21 -07:00
ad2d9cad03
[lua] implement keyboard focus subsystem ( #2160 )
...
* implement keyboard focus subsystem
* Fix error in focus group combining
* documentation for the inputToSubviews decision
* modify unit tests to catch that last bug
2022-06-01 17:42:13 -07:00
bc0def4342
MiscUtils word_wrap: Add option to trim only leading whitespace after wrapping ( #2169 )
...
* Update changelog.txt
2022-05-30 22:58:46 -04:00
b1e118384e
Update Maps.cpp
2022-05-30 16:26:30 -07:00
574728ac5c
Move add_proper_report up with other utility fns
2022-05-30 15:04:43 -07:00
0ff0d272b5
use static instead of anon namespace; suggested changes
2022-05-30 13:51:24 -07:00
1c3ea000e1
Trim trailing whitespace
2022-05-28 15:56:49 -07:00
249ed2888f
Fix scope issue
2022-05-28 13:28:10 -07:00
e613085b0e
remove whitespace
2022-05-28 12:39:49 -07:00
2b29431806
More fixes
...
* Use word_wrap()
* add_proper_report utility fn; have addCombatReportAuto use this
* Update Lua API.rst
* Update Gui.cpp
2022-05-28 12:35:49 -07:00
ea7fe2b926
account for scroll bars when sizing message boxes
2022-05-27 15:38:13 -07:00
07f54deb0b
fix wrong `Label.frame_body.x2` value ( #2134 )
...
* fix wrong `Label.frame_body.x2` value
`update_scroll_inset` might change `frame_inset`, i.e. we need to `computeFrame` with the new values.
* add tests for Label
* add missing `local`, remove code in comments
* move `TestFramedScreen` outside test functions
2022-05-27 15:25:17 -07:00
ca10cbc9e6
Merge remote-tracking branch 'lethosor/mock-observe-func' into develop
2022-05-27 01:46:24 -04:00
888c531774
Add mock.observe_func(), improve mock.lua documentation
...
observe_func() is similar to func() but passes through all calls to a specified
function.
2022-05-27 00:33:44 -04:00
56b301164f
Auto-update submodules
...
library/xml: master
scripts: master
2022-05-25 07:18:15 +00:00
4b21e7afb4
Remove parseReportString from API (now utility fn)
...
Implementations using `word_wrap()` are commented out pending changes to that function.
2022-05-24 03:52:33 -07:00
18628ff5b8
make key_sep more configurable
...
and add more configuration to HotkeyLabel and EditField to take
advantage of it
2022-05-18 16:46:33 -07:00
53609db1f9
let CycleHotkeyLabels take numeric initial_options
...
even if all of the option values are non-numeric
2022-05-18 15:39:52 -07:00
47b87a5ac1
Auto-update submodules
...
library/xml: master
2022-05-17 07:18:04 +00:00
ce34ac8f33
Use debugfilter; remove redundant changelog entries
2022-05-16 18:41:47 -07:00
785fe9aa3a
fix "info" level described as "error" level
2022-05-14 05:56:57 -07:00
8f6522899b
Upgrade jsoncpp to 1.9.5 ( #2144 )
...
* test jsoncpp upgrade
* use new json library target name
* don't remap the output dirs
* undo warnings at the source
* set new defaults for jsoncpp
* fix typo in new options
* fix signed comparison mismatch warning
* address random(?) compile failures
saying our std::atomic is not initialized in Debug.cpp
2022-05-13 13:52:43 -07:00
bf8eaef6bc
Auto-update submodules
...
library/xml: master
plugins/isoworld: master
depends/libexpat: dfhack
depends/jsoncpp-sub: dfhack
2022-05-12 05:21:01 +00:00
15a11d1a39
Auto-update submodules
...
library/xml: master
scripts: master
2022-05-10 07:22:46 +00:00
55e4008925
MiscUtils: teach word_wrap() to optionally preserve whitespace
2022-05-09 13:42:11 -04:00
14afcc2b0a
Merge branch 'develop' into Bumber64-patch-2
2022-05-05 22:58:23 -07:00
585888c2d3
update version, changelog, modules for 0.47.05-r5
2022-05-04 17:21:31 -07:00
d4ba946d2b
Auto-update submodules
...
library/xml: master
scripts: master
2022-05-03 07:18:10 +00:00
74499ad64a
Use to_string on integer
2022-05-03 00:09:34 -07:00
5be0fe2a44
Fix issues, update changelog and docs
...
Initialize variables in LuaApi.cpp, solve changelog conflicts, hyperlink and escape char info in docs
2022-05-02 23:52:47 -07:00
621ccef996
Merge branch 'develop' into Bumber64-patch-2
2022-05-01 23:42:21 -07:00
f565de88e8
Fix stuff ( #4 )
...
* Update Lua API.rst
* Update Gui.h
* Update Gui.cpp
* Update LuaApi.cpp
2022-05-01 22:53:53 -07:00
5f1d2a08e4
Auto-update submodules
...
library/xml: master
scripts: master
2022-05-01 13:33:50 +00:00
7120988044
Auto-update submodules
...
library/xml: master
scripts: master
2022-05-01 07:17:58 +00:00
9643246b18
Auto-update submodules
...
library/xml: master
2022-04-30 19:20:07 +00:00
e9a2de08cd
Auto-update submodules
...
library/xml: master
2022-04-30 07:17:43 +00:00
e2fb15a3a5
add dwarfmode.MenuOverlay:renderMapOverlay() ( #2119 )
...
* add dwarfmode.MenuOverlay:renderMapOverlay()
* ensure we move with the viewport when bounds_rect is nil
2022-04-29 20:32:22 -07:00
24dd4d8ac0
Update init files ( #2117 )
...
* update example init files
replace onLoad.init-example with documentation on how to create scripts that run on world/map load
it was confusing to show it being loaded with sc-script since it gets autorun anyway if it is just named properly
* update changelog
* add quickfort keybinding
* move standard tweaks from dreamfort init to main
2022-04-29 20:24:09 -07:00
e603fee3ce
move sidebar mode management code to init
...
from onAboutToShow(). this allows the frames to be calculated correctly
during widget instantiation. otherwise widgets can end up with -1 width
2022-04-29 12:10:05 -07:00
af47434f52
protect against 0 width in string:wrap()
2022-04-29 11:29:19 -07:00
b9c36c1e63
Added custom-raw-tokens utility ( #2038 )
...
* Added (chain) for [CHAIN_METAL_TEXT] armours in gui/materials.lua used by gui/create-item-- again (oops)
* Added customRawData utility
* Oops, whitespace
* Revised rawStringsFieldNames
* Dialed down on lua trickery and fixed wrongly formatted changelog entry
* Fixed changelog in wrong place and made customRawData a proper module
* Fixed not caching not-present tags, revised examples and fixed error
* Fixed whitespace. Changing settings in editor!
* customRawData docs
* Added getCreatureTag for respecting caste tags, "fixed" bizarre caching error (quotes because I don't even know what was causing it) and updated docs
* Added line limiting for docs, I guess
* Added missing string convert argument
* docs indent fix, code block fix, and revision
* Major revision
* gdi, docs error
* Another? But... huh.
* ...
* Made requested changes
* Whoops
* Rearrange docs lines
* Followed example, should fix linter issues
* fix typo. linted offline this time......
* Make it so that last instance of tag is what is read from
* Added requested change
* eventful key change
* i to lenArgs
* change eventful key
* add test for broken caste selection
* Major redesign
* tags --> tokens
* Added plant growth behaviour and did some requested changes
* More error handling
* fix docs
* Added basic error suppression
* Docs clarification.
* Docs registering example and fix error
* Strip errors on frame after onWorldLoad, not on map load
* Revert "Strip errors on frame after onWorldLoad, not on map load"
This reverts commit e20a0ef8d3743f79d961077f46910b77b16f36b9.
* Revert "Docs registering example and fix error"
This reverts commit 9c848c54c3f84e0ecc1dc421137c8a8b4a52280d.
* Revert "Docs clarification."
This reverts commit 6b4b6a1aa40c50398504f37ecf1ff0f93d6459b1.
* Revert "Added basic error suppression"
This reverts commit d11cb1438cf1e56ff700469e944f0b9af64651d7.
* Use more eventful key more consistent with other files
* use onStateChange instead of eventful and remove redundant utils require
* Code review stuff
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Update docs/Lua API.rst
committing a suggestion
Co-authored-by: Alan <lethosor@users.noreply.github.com>
* Prepend examples with DFHACK_
* Remove unused parameters
* Use new ensure_key global
* Named a couple of unnamed arguments (untested)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2022-04-29 08:39:59 -07:00
f08a268e8a
add scroll icons to Label widget ( #2101 )
...
* WIP: add scroll icons to Label widget
It's an opt-out. The icons are rendered in the right-most column of the 1st and last row. They are only rendered when text can actually be scrolled in the corresponding direction.
WIP: Currently, the icons might overlay text characters, there is no mechanism preventing it
* gui.lua: expose the `parse_inset()` function
* refactor Label's scroll icon code
* since `render_scroll_icons` only works with a label, it's now a class function
* `update_scroll_inset` ensures `frame_inset.r` or `.l` is at least 1, according to `show_scroll_icons`
* `show_scroll_icons` has 4 possible values: `false` for no icons, `left` for icons on the first column on the left (also ensuring `frame_inset.l >= 1`), `right` - last column on the right, `DEFAULT_NIL` - same as `right` if text height greater than `frame_body.height`, else same as `false`.
* make `render_scroll_icons` always draw icons
The check now happens in `onRenderFrame`
* draw frame's background
calling `Label.super.onRenderFrame(self, dc, rect)` makes frame's background invisible for some reason
* remove trailing spaces
* fix scroll icons placed far above/below text
With `Label.frame_inset = 1` the text could be vertically centered with plenty of space below and above,
but not all rendered. Before this change, the scroll icons would be at the very top and bottom of the frame
instead of near the first and last rendered text line.
* always `update_scroll_inset` to react to resized window
* draw scroll icons next to text
* update `Lua API.rst` with new `Label` parameters
* move comment separator up
This way every scroll related parameter is in one group
* list default values for new parameters in docs
* add missing description of `Label.scroll_keys`
2022-04-29 06:55:08 -07:00
dcadde38d7
add new global function: ensure_key
2022-04-27 17:35:49 -07:00
6ad362d698
return a reference to the created dialogs
2022-04-27 11:51:46 -07:00
b56d9520e9
Fix trailing whitespace
2022-04-25 00:39:05 -07:00
861a0ee85e
Update LuaApi.cpp
...
Wrappers for autoDFAnnouncement, pauseRecenter, and recenterViewscreen.
2022-04-24 22:52:31 -07:00
c7be54dac0
Update Gui.cpp
...
Add reverse engineered functions: parseReportString, autoDFAnnouncement, recenterViewscreen, and pauseRecenter.
Add versions of autoDFAnnouncement that don't take a report_init struct and that log unprinted announcements.
Add utility functions: recent_report, recent_report_any, delete_old_reports, and check_repeat_report.
2022-04-24 22:45:26 -07:00
89ed9950c7
Update Gui.h
...
Added parseReportString, which parses a string using '&' as a control character (&r as newline, && as &) and cuts to a certain length w/o splitting words.
Added autoDFAnnouncement, which takes a report_init and a string, and handles them like DF does.
Added variants to log unprinted announcements and to build the report_init from arguments.
Added pauseRecenter, which recenters on an xyz coord (item style, not unit) and optionally pauses, while respecting pause_zoom_no_interface_ms.
Added variant that takes a pos.
Added recenterViewscreen, which recenters on an xyz coord using a report zoom style (item, unit, generic. revealInDwarfmodeMap calls "unit" style "center". Generic style ignores coords and just enforces valid view bounds.)
Added variants that take pos or use current cursor coords.
2022-04-24 22:32:41 -07:00
ed5523152c
factor text wrapping out of TooltipLabel into WrappedLabel
2022-04-22 09:53:10 -07:00
809f9316fd
make frame inset configurable for ListBox list
2022-04-22 08:30:53 -07:00
9c9a7ef99a
Adds consistent interface signatures for Maps module
2022-04-21 19:40:58 -07:00
b56f57c074
cmake: Add SDL dep for Linux dfhack; deprecate BUILD_TESTS
...
On Linux, libdfhack.so depends on libSDL.so, but that was not marked
inside CMake. As it's only used via LD_PRELOAD, there was no problem.
But when linking unit tests against it, this becomes necessary. It may
be wise to add a find_package(SDL) to provide the user with more
control, but just a hard-coded "SDL" should work for most installs.
The CTest module creates a BUILD_TESTING option, which clashes
(thematically, not in code) with the existing BUILD_TESTS option.
Resolve it thus:
- Deprecate BUILD_TESTS; it still works, but is marked as an advanced
option so it doesn't show in the CMake UI by default.
- Add a new BUILD_TEST_SCRIPTS that does what BUILD_TESTS used to do,
but is a "dependent" option so it goes away if BUILD_TESTING=OFF.
The up-shot is that, by default, the C++ unit tests will be built
(BUILD_TESTING=ON) and the Lua integration tests are not installed
(BUILD_TEST_SCRIPTS=OFF).
2022-04-21 18:44:33 -04:00
6daa13ad51
unit testing: Link test executables against libdfhack
...
Note: Hard-coded "SDL" here is wrong, but requires some refactoring in
top-level CMakeLists.txt to fix.
2022-04-21 10:42:19 -04:00
26a9bf9671
unit tests: Add CTest support, and a trivial first unit test
...
If BUILD_TESTS=ON:
- Adds a 'test' target for ninja
- Adds a library/MiscUtils.test unit test executable
2022-04-20 22:24:13 -04:00
62b02c2367
Auto-update submodules
...
library/xml: master
2022-04-19 07:17:48 +00:00
251f4f92c8
Fixes build errors
2022-04-18 23:53:23 -07:00
ff2bd8d953
Retypes the EventManager's constructions container
2022-04-18 23:53:23 -07:00
d6b2629cfc
Adds hash functions and operator overloads for event data structures
2022-04-18 23:53:23 -07:00
64b7de0339
Revises getVerb signature
2022-04-18 22:46:38 -07:00
018d189494
Simplifies report index safety
2022-04-18 22:46:38 -07:00
1f972d6c1c
Implements clang-tidy suggestions
2022-04-18 22:46:38 -07:00
07761e1d5d
add some more handy widgets to the library
...
TooltipLabel
HotkeyLabel
CycleHotkeyLabel
ToggleHotkeyLabel
2022-04-18 17:37:11 -07:00
cb123e5076
default unset `frame_inset` values to 0 ( #2100 )
...
* default unset `frame_inset` values to 0
This change allows writing `frame_inset = {r=1}` instead of `frame_inset = {l=0, r=1, t=0, b=0}`
2022-04-16 08:17:35 -07:00
9bf9a79a11
EventManager/Eventful - Generate event arrays ( #2097 )
...
* Replaces EventManager.cpp's event array with an auto-gen one
* Replaces eventful.cpp's event array with auto-gen one
2022-04-14 21:47:25 -07:00
0f464b13b3
Merge remote-tracking branch 'lethosor/pre-commit' into develop
2022-04-12 21:17:15 -04:00
d1f0edd33b
Apply initial pre-commit config
2022-04-12 14:48:19 -04:00
f3386d0621
Auto-update submodules
...
library/xml: master
scripts: master
2022-04-12 07:18:03 +00:00
fd1ee233a2
automatically manage sidebar modes in MenuOverlay ( #2083 )
2022-04-11 20:58:54 -07:00
10f22ecc27
add ResizingPanel class and autolayout for Panels ( #2086 )
...
* add autolayout for Panels and new ResizingPanel
2022-04-11 18:25:00 -07:00
e6299700bf
Handle punctuation in FilteredList filter matching ( #2085 )
...
* allow punctuation to be typed into a filter
and allow the filter to match keys with punctuation
2022-04-11 18:22:31 -07:00
4a383b1c84
handle number-indexed lua maps in safe_index
2022-04-11 18:02:57 -07:00
4f9608da13
Document and update argparse module ( #2089 )
...
also add unit tests and use new string fns in processArgs and allow it to recognize parameters with two dashes instead of just one
2022-04-11 16:16:55 -07:00
9a8fd12785
ensure ListBoxes always have enough height ( #2084 )
...
so they can always display an error message if the filter doesn't match anything
2022-04-11 16:15:50 -07:00
96b5b4420b
Add string:escape_pattern() utility function ( #2082 )
...
* add string:escape_pattern() to dfhack.lua
stolen from devel/query.lua. will migrate scripts to use the common implementation later
2022-04-10 21:18:01 -07:00
Robob27
DFHack-Urist via GitHub Actions
lethosor
Myk Taylor
Roxy
Myk
John Cosker
ElsaTheHobo
Ryan Williams
TaxiService
20k
Rose
cjhammel
pre-commit-ci[bot]
arekatir
Kelly Kinkade
Tachytaenius
Josh Cooper
Tim Siegel
Josh Cooper
Quietust
Timur Kelman
quarque2
Ryan Williams