Skip to content

Commit

Permalink
Small fix.
Browse files Browse the repository at this point in the history
Increments-patch-version-of: ttyr-terminal
Increments-patch-version-of: ttyr-tty
Increments-patch-version-of: misc
  • Loading branch information
dajofrey committed Jul 24, 2024
1 parent 9fd794f commit 327101e
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 5 deletions.
2 changes: 1 addition & 1 deletion external/Netzhaut
Submodule Netzhaut updated 86 files
+5 −1 README.md
+3 −3 build/automation/Makefile
+5 −5 build/automation/Makefile2
+1 −1 build/scripts/update-nhcss.sh
+1 −1 external/TTyr
+0 −34 external/Vulkan-Headers-1.3.220/.cmake-format.py
+0 −16 external/Vulkan-Headers-1.3.220/.gitattributes
+0 −32 external/Vulkan-Headers-1.3.220/.github/ISSUE_TEMPLATE/bug_report.md
+0 −6 external/Vulkan-Headers-1.3.220/.gitignore
+0 −62 external/Vulkan-Headers-1.3.220/BUILD.gn
+0 −274 external/Vulkan-Headers-1.3.220/BUILD.md
+0 −59 external/Vulkan-Headers-1.3.220/CMakeLists.txt
+0 −1 external/Vulkan-Headers-1.3.220/CODE_OF_CONDUCT.md
+0 −202 external/Vulkan-Headers-1.3.220/LICENSE.txt
+0 −78 external/Vulkan-Headers-1.3.220/README.md
+0 −126 external/Vulkan-Headers-1.3.220/cmake/Copyright_cmake.txt
+0 −21 external/Vulkan-Headers-1.3.220/cmake/cmake_uninstall.cmake.in
+0 −305 external/Vulkan-Headers-1.3.220/include/vk_video/vulkan_video_codec_h264std.h
+0 −103 external/Vulkan-Headers-1.3.220/include/vk_video/vulkan_video_codec_h264std_decode.h
+0 −132 external/Vulkan-Headers-1.3.220/include/vk_video/vulkan_video_codec_h264std_encode.h
+0 −357 external/Vulkan-Headers-1.3.220/include/vk_video/vulkan_video_codec_h265std.h
+0 −66 external/Vulkan-Headers-1.3.220/include/vk_video/vulkan_video_codec_h265std_decode.h
+0 −135 external/Vulkan-Headers-1.3.220/include/vk_video/vulkan_video_codec_h265std_encode.h
+0 −31 external/Vulkan-Headers-1.3.220/include/vk_video/vulkan_video_codecs_common.h
+0 −245 external/Vulkan-Headers-1.3.220/include/vulkan/vk_icd.h
+0 −210 external/Vulkan-Headers-1.3.220/include/vulkan/vk_layer.h
+0 −84 external/Vulkan-Headers-1.3.220/include/vulkan/vk_platform.h
+0 −69 external/Vulkan-Headers-1.3.220/include/vulkan/vk_sdk_platform.h
+0 −92 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan.h
+0 −14,209 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan.hpp
+0 −125 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_android.h
+0 −994 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_beta.h
+0 −14,817 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_core.h
+0 −54 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_directfb.h
+0 −15,741 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_enums.hpp
+0 −7,333 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_format_traits.hpp
+0 −258 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_fuchsia.h
+0 −19,869 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_funcs.hpp
+0 −58 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_ggp.h
+0 −13,613 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_handles.hpp
+0 −13,179 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_hash.hpp
+0 −47 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_ios.h
+0 −47 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_macos.h
+0 −193 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_metal.h
+0 −17,323 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_raii.hpp
+0 −54 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_screen.h
+0 −101,981 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_structs.hpp
+0 −47 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_vi.h
+0 −54 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_wayland.h
+0 −315 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_win32.h
+0 −55 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_xcb.h
+0 −55 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_xlib.h
+0 −45 external/Vulkan-Headers-1.3.220/include/vulkan/vulkan_xlib_xrandr.h
+0 −11 external/Vulkan-Headers-1.3.220/registry/apiconventions.py
+0 −424 external/Vulkan-Headers-1.3.220/registry/cgenerator.py
+0 −358 external/Vulkan-Headers-1.3.220/registry/conventions.py
+0 −1,225 external/Vulkan-Headers-1.3.220/registry/generator.py
+0 −818 external/Vulkan-Headers-1.3.220/registry/genvk.py
+0 −1,683 external/Vulkan-Headers-1.3.220/registry/reg.py
+0 −58 external/Vulkan-Headers-1.3.220/registry/spec_tools/util.py
+0 −52,054 external/Vulkan-Headers-1.3.220/registry/validusage.json
+0 −1,111 external/Vulkan-Headers-1.3.220/registry/video.xml
+0 −21,188 external/Vulkan-Headers-1.3.220/registry/vk.xml
+0 −277 external/Vulkan-Headers-1.3.220/registry/vkconventions.py
+31 −0 scripts/prepare-commit-msg.sh
+76 −79 src/bin/nhhtml/Main.c
+6 −2 src/lib/nhapi/nhcore.c
+3 −3 src/lib/nhapi/nhcss.c
+3 −3 src/lib/nhapi/nhcss.h
+2 −2 src/lib/nhapi/nhrenderer.c
+10 −10 src/lib/nhcore/Common/Initialize.c
+0 −10 src/lib/nhcore/Common/Initialize.h
+18 −8 src/lib/nhcore/Loader/Library.c
+1 −1 src/lib/nhcore/Loader/Loader.c
+7 −4 src/lib/nhcore/System/Monitor.c
+1 −1 src/lib/nhcss/Common/Data/default.css.inc
+13 −23 src/lib/nhcss/Parser/TokenParser.c
+1 −1 src/lib/nhgfx/Common/Initialize.c
+8 −7 src/lib/nhgfx/Vulkan/Host.c
+4 −8 src/lib/nhwsi/Common/Config.c
+0 −112 src/lib/nhwsi/Common/IndexMap.c
+0 −47 src/lib/nhwsi/Common/IndexMap.h
+0 −2 src/lib/nhwsi/Common/Initialize.c
+0 −2 src/lib/nhwsi/Common/Terminate.c
+1 −1 src/lib/nhwsi/Window/Window.c
+1 −1 src/lib/nhwsi/Window/Window.h
5 changes: 4 additions & 1 deletion scripts/prepare-commit-msg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,15 @@ for action in "${actions[@]}"; do
done

# Check if a command-line argument was provided
if [ $# -eq 1 ]; then
if [ $# -gt 0 ]; then
argfile="$1"
# Append the actions to the specified file
echo -e "\nAppending result to $argfile"
echo "" >> "$argfile"
for action in "${actions[@]}"; do
echo "$action" >> "$argfile"
done
else
echo "Unable to append to commit message!"
fi

8 changes: 7 additions & 1 deletion src/lib/ttyr-terminal/Common/Config.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ TTYR_TERMINAL_BEGIN()
TTYR_TERMINAL_END(TTYR_TERMINAL_SUCCESS)
}

ttyr_terminal_Config ttyr_terminal_getConfig()
static ttyr_terminal_Config ttyr_terminal_getStaticConfig()
{
TTYR_TERMINAL_BEGIN()

Expand All @@ -111,3 +111,9 @@ TTYR_TERMINAL_BEGIN()
TTYR_TERMINAL_END(Config)
}

ttyr_terminal_Config ttyr_terminal_getConfig()
{
ttyr_terminal_Config Config = ttyr_terminal_getStaticConfig();
return Config;
}

12 changes: 11 additions & 1 deletion src/lib/ttyr-tty/Common/Config.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ static TTYR_TTY_RESULT ttyr_tty_getSetting(
return TTYR_TTY_SUCCESS;
}

ttyr_tty_Config ttyr_tty_getConfig()
static ttyr_tty_Config ttyr_tty_getStaticConfig()
{
ttyr_tty_Config Config;
memset(&Config, 0, sizeof(ttyr_tty_Config));
Expand All @@ -134,3 +134,13 @@ ttyr_tty_Config ttyr_tty_getConfig()
return Config;
}

ttyr_tty_Config ttyr_tty_getConfig()
{
ttyr_tty_Config Config = ttyr_tty_getStaticConfig();
ttyr_tty_TTY *TTY_p = nh_core_getWorkloadArg();
if (((ttyr_tty_View*)TTY_p->Views.pp[0])->standardIO) {
Config.Titlebar.on = false;
}
return Config;
}

5 changes: 4 additions & 1 deletion src/lib/ttyr-tty/TTY/Draw.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ TTYR_TTY_RESULT ttyr_tty_refreshCursor(
TTYR_CHECK(ttyr_tty_getCursorPosition(TTY_p->Window_p->Tile_p, MicroTile_p, View_p->standardIO, &x, &y))
}

TTYR_CHECK(ttyr_tty_forwardCursor(View_p, x, y))
if (x > -1 && y > -1) {
// Only forward cursor with valid position.
TTYR_CHECK(ttyr_tty_forwardCursor(View_p, x, y))
}

return TTYR_TTY_SUCCESS;
}
Expand Down
1 change: 1 addition & 0 deletions src/lib/ttyr-tty/TTY/TTY.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ static TTYR_TTY_RESULT ttyr_tty_handleWindowResize(
if (TTY_p->Window_p->MouseMenu_p) {
TTY_p->Window_p->MouseMenu_p = NULL;
}

TTY_p->Window_p->refreshGrid1 = NH_TRUE;
TTY_p->Window_p->refreshGrid2 = NH_TRUE;
TTY_p->Window_p->refreshTitlebar = NH_TRUE;
Expand Down

0 comments on commit 327101e

Please sign in to comment.