Skip to content

Commit

Permalink
Merge pull request #682 from o-sdn-o/gui-bridge
Browse files Browse the repository at this point in the history 
Fix keyboard focus issues
  • Loading branch information
@o-sdn-o
o-sdn-o authored Nov 19, 2024
2 parents da7b487 + af6d198 commit 5fa979d
Show file tree
Hide file tree
Showing 29 changed files with 873 additions and 1,033 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
exclude:
- os: windows-latest
cpu: x86
- os: windows-latest
cpu: arm
include:
- os: macos-latest
platform: macos
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.8)
cmake_minimum_required (VERSION 3.10)

project ("vtm")
# project ("term")
Expand All @@ -22,7 +22,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows") # WIN32 and similar checks are soft
# /utf-8 All literals in our source code are in UTF-8 format.
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /bigobj /utf-8 /Zc:preprocessor")
set (WIN32_RESOURCES ".resources/images/vtm.rc")
elseif (NOT CMAKE_SYSTEM_NAME MATCHES "Android")
else ()
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
# Static linkage
#set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static -pthread -s")
Expand Down
48 changes: 24 additions & 24 deletions doc/apps.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Attribute | Description
-----------|------------
type | Menu item type. `type=Command` is used by default.
label | Menu item label list. One or more textual representations selected by `data=` value.
notes | Tooltip.
tooltip | Tooltip text.
action | The function name which called on item activation. Inherited by the label attribute.
data | Textual parameter for function call. Inherited by the label attribute.

Expand All @@ -84,7 +84,7 @@ data | Textual parameter for function call. Inherited by the label attribu
Attribute | Description
-----------------|------------
_internal_value_ | Label display variation `label="_internal_value_"`.
notes | Tooltip. Inherited from item if not specified.
tooltip | Tooltip text. Inherited from item by default.
action | The function name which called on item activation. Inherited from item if not specified.
data | Textual parameter for function call. Inherited from item if not specified.

Expand Down Expand Up @@ -198,42 +198,42 @@ TerminalSelectionOneShot | |
<menu item*>
<item label="<" action=TerminalFindPrev> <!-- type=Command is a default item's attribute. -->
<label="\e[38:2:0:255:0m<\e[m"/>
<notes>
<tooltip>
" Previous match \n"
" LeftClick to jump to previous match or scroll \n"
" one page up if nothing to search \n"
" Match clipboard data if no selection \n"
" Left+RightClick to clear clipboard "
</notes>
</tooltip>
</item>
<item label=">" action=TerminalFindNext>
<label="\e[38:2:0:255:0m>\e[m"/>
<notes>
<tooltip>
" Next match \n"
" LeftClick to jump to next match or scroll \n"
" one page down if nothing to search \n"
" Match clipboard data if no selection \n"
" Left+RightClick to clear clipboard "
</notes>
</tooltip>
</item>
<item type="Command" action=ToggleHotkeyScheme>
<label=" Undef " data="undef"/>
<label=" Keys0 " data="off"/>
<label="\e[48:2:0:128:128;38:2:0:255:0m Keys1 \e[m" data="on"/>
<notes>
<tooltip>
" Toggle hotkey scheme \n"
" Alternative hotkey scheme allows keystrokes \n"
" to be passed through without processing "
</notes>
</tooltip>
</item>
<item label="Wrap" type="Option" action=TerminalWrapMode data="off">
<label="\e[38:2:0:255:0mWrap\e[m" data="on"/>
<notes>
<tooltip>
" Wrapping text lines on/off \n"
" - applied to selection if it is "
</notes>
</tooltip>
</item>
<item label="Selection" notes=" Text selection mode " type="Option" action=TerminalSelectionMode data="none"> <!-- type=Option means that the тext label will be selected when clicked. -->
<item label="Selection" tooltip=" Text selection mode " type="Option" action=TerminalSelectionMode data="none"> <!-- type=Option means that the тext label will be selected when clicked. -->
<label="\e[38:2:0:255:0mPlaintext\e[m" data="text"/>
<label="\e[38:2:255:255:0mANSI-text\e[m" data="ansi"/>
<label data="rich">
Expand All @@ -250,12 +250,12 @@ TerminalSelectionOneShot | |
<label="\e[38:2:0:255:255mHTML-code\e[m" data="html"/>
<label="\e[38:2:0:255:255mProtected\e[m" data="protected"/>
</item>
<item label="Log" notes=" Stdin/out logging is off " type="Option" action=TerminalStdioLog data="off">
<label="\e[38:2:0:255:0mLog\e[m" notes=" Stdin/out logging is on \n Run Logs to see output " data="on"/>
<item label="Log" tooltip=" Stdin/out logging is off " type="Option" action=TerminalStdioLog data="off">
<label="\e[38:2:0:255:0mLog\e[m" tooltip=" Stdin/out logging is on \n Run Logs to see output " data="on"/>
</item>
<item label=" " notes=" ...empty menu block/splitter for safety "/>
<item label="Clear" notes=" Clear TTY viewport " action=TerminalOutput data="\e[2J"/>
<item label="Reset" notes=" Clear scrollback and SGR-attributes " action=TerminalOutput data="\e[!p"/>
<item label=" " tooltip=" ...empty menu block/splitter for safety "/>
<item label="Clear" tooltip=" Clear TTY viewport " action=TerminalOutput data="\e[2J"/>
<item label="Reset" tooltip=" Clear scrollback and SGR-attributes " action=TerminalOutput data="\e[!p"/>
<item label="Restart" type="Command" action=TerminalRestart/>
<item label="Top" action=TerminalViewportTop/>
<item label="End" action=TerminalViewportEnd/>
Expand Down Expand Up @@ -283,32 +283,32 @@ TerminalSelectionOneShot | |
<item label="Quit" type="Command" action=TerminalQuit/>
<item label="Fullscreen" type="Command" action=TerminalToggleFullscreen/>

<item label="Hello, World!" notes=" Simulating keypresses " action=TerminalSendKey data="Hello World!"/>
<item label="Push Me" notes=" test " type="Repeat" action=TerminalOutput data="pressed ">
<item label="Hello, World!" tooltip=" Simulating keypresses " action=TerminalSendKey data="Hello World!"/>
<item label="Push Me" tooltip=" test " type="Repeat" action=TerminalOutput data="pressed ">
<label="\e[37mPush Me\e[m"/>
</item>

<item label=" HTML " data="none" type="Option" action=TerminalSelectionOneShot>
<label="\e[48:2:0:128:128;38:2:0:255:255m HTML \e[m" data="html"/>
<notes>
<tooltip>
" One-shot toggle to copy as HTML \n"
" while mouse tracking is active. "
</notes>
</tooltip>
</item>
<item label=" Text " data="none" type="Option" action=TerminalSelectionOneShot>
<label="\e[48:2:0:128:0;38:2:0:255:0m Text \e[m" data="text"/>
<notes>
<tooltip>
" One-shot toggle to copy as Text \n"
" while mouse tracking is active. "
</notes>
</tooltip>
</item>
<item label="One-Shot" data="none" type="Option" action=TerminalSelectionOneShot>
<label="\e[48:2:0:128:0;38:2:0:255:0m Text \e[m" data="text"/>
<label="\e[48:2:0:128:128;38:2:0:255:255m HTML \e[m" data="html"/>
<notes>
<tooltip>
" One-shot toggle to copy as Text/HTML \n"
" while mouse tracking is active. "
</notes>
</tooltip>
</item>
</menu>
</term>
Expand Down
Loading

0 comments on commit 5fa979d

Please sign in to comment.