Myk Taylor
fccefd1155
don't pass through handled r-clicks
2023-01-06 15:43:08 -08:00
Myk Taylor
f43358002d
Allow dialogs to close on r-click
2023-01-06 15:43:08 -08:00
Myk Taylor
574be3fe73
provide a useful default impl of isMouseOver
2023-01-06 15:42:40 -08:00
Myk Taylor
f15e9e3577
don't revert to plain strings for pens
2023-01-06 15:42:30 -08:00
Myk Taylor
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
Myk Taylor
6f46ae672e
add Gui::getDFViewscreen and Lua binding
2023-01-06 12:17:36 -08:00
DFHack-Urist via GitHub Actions
1540e7c294
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-06 07:13:54 +00:00
DFHack-Urist via GitHub Actions
f4d059ea3d
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-06 02:43:42 +00:00
Myk
a59f1518c1
Merge pull request #2556 from myk002/myk_zscreen
...
framework for passthru, z-order swapping windows
2023-01-05 18:41:57 -08:00
DFHack-Urist via GitHub Actions
9eb5165ebe
Auto-update submodules
...
library/xml: master
2023-01-06 02:11:27 +00:00
Myk Taylor
1934014659
framework for passthru, z-order swapping windows
2023-01-05 18:07:38 -08:00
Myk Taylor
3969262e44
update submodule refs
2023-01-05 17:50:49 -08:00
Myk Taylor
845391f4e6
fix overzealous "ui" -> "plotinfo" replacement
...
some comments were just talking about the UI..
2023-01-05 17:46:30 -08:00
Myk Taylor
c4a2bdd08e
update lua too
2023-01-05 17:35:33 -08:00
Myk Taylor
5e5775f5e3
rename globals according to structures update
2023-01-05 17:11:01 -08:00
Myk
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
Myk Taylor
412531bf03
really fix the format string this time
2023-01-04 21:29:45 -08:00
Myk Taylor
9cbcd81f63
fix format strings for vars that were size_t
2023-01-04 21:24:52 -08:00
Myk Taylor
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
Myk
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
Myk
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
Myk Taylor
4e51e02924
move SDL shims to a new DFSDL module
2023-01-04 17:15:32 -08:00
Myk Taylor
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
Myk Taylor
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
Myk Taylor
55cdaea636
refactor EditField text insertion
2023-01-03 12:57:02 -08:00
Myk Taylor
a0343b06a6
adjust text wrap to new scrollbar width
2023-01-03 00:56:07 -08:00
DFHack-Urist via GitHub Actions
fa2da54852
Auto-update submodules
...
library/xml: master
scripts: master
2023-01-03 07:13:58 +00:00
lethosor
feeefcf149
Add read-only container_identity for std::map
2023-01-03 01:16:42 -05:00
Myk
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
Myk
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
Myk
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
Myk
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
Myk Taylor
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
Myk Taylor
218fbdbd45
prep for Quietust's structure updates
2023-01-01 01:03:42 -08:00
Myk Taylor
aa091ed37e
overwrite anchored textures where we actually touch their anchor
2023-01-01 00:45:14 -08:00
Myk Taylor
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
Myk Taylor
a6294c24fb
implement Screen::paintTile and readTile
2022-12-31 21:16:42 -08:00
Myk Taylor
5232e2b04e
add dfhack-config/scripts to default script paths
2022-12-30 23:30:11 -08:00
Myk
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
Myk
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
Myk Taylor
cf65f48aa0
don't use defunct MENU_CONFIRM keybinding
2022-12-30 22:35:08 -08:00
Myk Taylor
21f137644f
remove trailing whitespace
2022-12-30 22:35:08 -08:00
Myk Taylor
3a76fc086f
fix keyboard movement of Panel widgets
2022-12-30 22:35:08 -08:00
Myk Taylor
6871bc20c4
use new KEYBOARD interface keys in move delta
2022-12-30 22:35:08 -08:00
Myk Taylor
04f2d555c6
implement context-aware mouse wheel scrolling
2022-12-30 22:35:08 -08:00
Myk Taylor
38b525bdb5
adapt lua library widgets to new keyboard keybindings
2022-12-30 22:35:08 -08:00
Myk Taylor
1d7a7c8a49
Don't leave artifats behind when dimissing mboxes
2022-12-30 22:20:50 -08:00
Myk Taylor
dd0cc087d5
Revert "consolidate full refresh logic in widgets.Panel"
...
This reverts commit 33787473f0
.
I've already found another use case where we need a more general
implementation -- modal dialogs that inherit from FramedScreen that
appear and disappear
2022-12-30 22:13:53 -08:00
Myk
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
Myk Taylor
33787473f0
consolidate full refresh logic in widgets.Panel
2022-12-30 20:44:15 -08:00
Myk Taylor
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
Myk Taylor
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
Myk Taylor
7d91f9262d
respect tile colors in pens
2022-12-30 05:36:41 -08:00
Myk Taylor
3aac79fe4f
skin our scrollbars to look and hover like DF's
2022-12-30 05:33:17 -08:00
Myk Taylor
83a8e9a45a
render bright colors correctly
2022-12-30 03:30:01 -08:00
Myk Taylor
1265d531d5
only keep the anchor flag if it's already there
2022-12-30 00:53:44 -08:00
Myk Taylor
f45eac993a
use semantically clearer div rather than bit shift
2022-12-29 22:18:35 -08:00
Myk Taylor
a4c11de4fb
returns correct mouse pos when in ascii
2022-12-29 00:01:40 -08:00
Myk Taylor
371f5be050
fix signedness of comparison var
2022-12-28 23:31:06 -08:00
Myk Taylor
cff603e243
allow Labels to write tile textures
2022-12-28 23:16:13 -08:00
Myk Taylor
d7b67e9528
remove cached USE_GRAPHICS from gui.lua
...
it's no longer constant
2022-12-28 16:27:44 -08:00
Myk Taylor
fc523f12fe
expose and document dfhack.screen.getMousePixels()
2022-12-28 16:05:27 -08:00
Myk Taylor
07f8fad787
implement Gui::getMousePos and Gui::getDepthAt
2022-12-28 16:00:10 -08:00
Myk
ada96e616a
Merge pull request #2521 from myk002/myk_hooks
...
Prepare for the hook API
2022-12-27 19:47:38 -08:00
Myk Taylor
e2a4eeb422
write textures and chars to the map
2022-12-27 17:00:50 -08:00
Myk Taylor
99ffe769fa
rendering the parent now involves a full refresh
...
in order to get the background
2022-12-27 15:23:34 -08:00
Myk Taylor
033eb2aefd
use default background colors
...
and ensure texpos_lower doesn't peek through
2022-12-27 15:05:13 -08:00
Myk Taylor
75afa88790
use tiles for our default frame
2022-12-27 14:40:35 -08:00
Myk Taylor
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
Myk Taylor
4f9f8ebcf6
fix unused return value warning
2022-12-26 10:26:22 -08:00
Myk Taylor
4789637625
implement new dfhooks API
2022-12-25 18:15:55 -08:00
DFHack-Urist via GitHub Actions
e2425b5c7c
Auto-update submodules
...
library/xml: master
scripts: master
2022-12-25 07:13:11 +00:00
DFHack-Urist via GitHub Actions
7625dc132e
Auto-update submodules
...
library/xml: master
scripts: master
2022-12-24 07:13:19 +00:00
lethosor
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
lethosor
12804a10a6
Fix Gui/Screen to work with g_src changes ( dfhack/df-structures#487 )
2022-12-23 00:36:09 -05:00
DFHack-Urist via GitHub Actions
07a0e6e511
Auto-update submodules
...
library/xml: master
2022-12-22 19:38:45 +00:00
Myk Taylor
52c1e49197
get the text rendering back
2022-12-21 22:13:05 -08:00
Myk Taylor
48a9e1c518
more new var names
2022-12-22 05:16:40 +00:00
Myk Taylor
93c875fb56
adjust to new variable names
2022-12-21 14:07:36 -08:00
Myk Taylor
839e927f9b
comment out problematic code from Renderer
2022-12-21 14:06:58 -08:00
Myk Taylor
010b18c0e4
hide "offset" tiles that we occlude
2022-12-20 20:10:14 -08:00
Myk Taylor
106b55397a
comment out problematic code in Core
2022-12-20 19:04:30 -08:00
DFHack-Urist via GitHub Actions
6c5b7d9458
Auto-update submodules
...
library/xml: master
2022-12-21 02:44:29 +00:00
Myk Taylor
663e1dd541
ascii is now in color
2022-12-20 16:33:11 -08:00
Myk Taylor
d7f51e5ed8
basic text drawing
2022-12-20 11:00:49 -08:00
Myk Taylor
7f91cf6e2a
more instrumentation for eventmanager
2022-12-20 09:49:35 -08:00
Myk Taylor
999d602e79
instrument eventmanager a bit
2022-12-19 13:43:57 -08:00
DFHack-Urist via GitHub Actions
d04e30406f
Auto-update submodules
...
library/xml: master
2022-12-17 23:58:29 +00:00
Kelly Kinkade
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
Kelly Kinkade
607a4b34d4
update structures
2022-12-17 15:09:08 -06:00
Kelly Kinkade
57e599a4d9
comment out barracks reference
...
barracks appears to have gone away in 50.03
2022-12-17 13:07:37 -06:00
Myk Taylor
5cd60e10f0
comment out problematic code in Gui.cpp
2022-12-16 14:47:43 -06:00
Myk Taylor
003b74bf73
absorb Putnam's work on the windows hooks
2022-12-16 14:47:43 -06:00
Myk Taylor
768c95ecb6
absorb Putnam's work on Screen
2022-12-16 14:47:43 -06:00
Myk Taylor
ccc9e976e2
comment out problematic code in Screen.cpp
2022-12-16 14:47:43 -06:00
Myk Taylor
55351951f0
comment out problematic code in Items.cpp
2022-12-16 14:47:43 -06:00
Myk Taylor
93b8479e94
comment out problematic code in Buildings.cpp
2022-12-16 14:47:43 -06:00
Kelly Kinkade
7fae0fe44f
structures
2022-12-15 21:19:40 -06:00
Kelly Kinkade
9587dd42f8
structures update
2022-12-15 19:56:17 -06:00
Kelly Kinkade
e6d8f06965
update structures
2022-12-15 19:27:52 -06:00