blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 17:19:03 -04:00
Code Issues Projects Releases Wiki Activity

[tfman] change up control for horizontal structure bar #2457

Browse Source
This commit is contained in:
nick black 2021-12-16 17:10:12 -05:00 committed by nick black
parent 973175ce49
commit 59fd31c050
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -992,7 +992,6 @@ list(FILTER TESTDATA EXCLUDE REGEX ".*osp$")
install(FILES ${TESTDATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/notcurses) install(FILES ${TESTDATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/notcurses)
endif() endif()
list(FILTER MANPAGES1 EXCLUDE REGEX "tfman.1")
install(FILES ${MANPAGES1} DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man1) install(FILES ${MANPAGES1} DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man1)
install(FILES ${MANPAGES3} DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man3) install(FILES ${MANPAGES3} DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man3)
file(GLOB MARKDOWN CONFIGURE_DEPENDS *.md) file(GLOB MARKDOWN CONFIGURE_DEPENDS *.md)
@ -1003,9 +1002,9 @@ if(BUILD_EXECUTABLES)
install(TARGETS notcurses-demo DESTINATION bin) install(TARGETS notcurses-demo DESTINATION bin)
install(TARGETS notcurses-info DESTINATION bin) install(TARGETS notcurses-info DESTINATION bin)
install(TARGETS ncneofetch DESTINATION bin) install(TARGETS ncneofetch DESTINATION bin)
#if(NOT WIN32) if(NOT WIN32)
#install(TARGETS tfman DESTINATION bin) install(TARGETS tfman DESTINATION bin)
#endif() endif()
if(${USE_CXX}) if(${USE_CXX})
install(TARGETS notcurses-input DESTINATION bin) install(TARGETS notcurses-input DESTINATION bin)
install(TARGETS nctetris DESTINATION bin) install(TARGETS nctetris DESTINATION bin)

7
README.md
View File

@ -138,7 +138,7 @@ others are external.
## Included tools ## Included tools
Nine binaries are installed as part of Notcurses: Nine executables are installed as part of Notcurses:
* `ncls`: an `ls` that displays multimedia in the terminal * `ncls`: an `ls` that displays multimedia in the terminal
* `ncneofetch`: a [neofetch](https://github.com/dylanaraps/neofetch) ripoff * `ncneofetch`: a [neofetch](https://github.com/dylanaraps/neofetch) ripoff
* `ncplayer`: renders visual media (images/videos) * `ncplayer`: renders visual media (images/videos)
@ -147,6 +147,7 @@ Nine binaries are installed as part of Notcurses:
* `notcurses-info`: detect and print terminal capabilities/diagnostics * `notcurses-info`: detect and print terminal capabilities/diagnostics
* `notcurses-input`: decode and print keypresses * `notcurses-input`: decode and print keypresses
* `notcurses-tester`: unit testing * `notcurses-tester`: unit testing
* `tfman`: a swank manual browser
To run `notcurses-demo` from a checkout, provide the `data` directory via To run `notcurses-demo` from a checkout, provide the `data` directory via
the `-p` argument. Demos requiring data files will otherwise abort. The base the `-p` argument. Demos requiring data files will otherwise abort. The base
@ -276,10 +277,10 @@ If things break or seem otherwise lackluster, **please** consult the
<details> <details>
<summary>We're paying by the electron, and have no C++ compiler. Can we still <summary>We're paying by the electron, and have no C++ compiler. Can we still
enjoy Notcurses goodness?</summary> enjoy Notcurses goodness?</summary>
Some of it! You won't be able to build several binaries, nor the NCPP C++ Some of it! You won't be able to build several executables, nor the NCPP C++
wrappers, nor can you build with the OpenImageIO multimedia backend (OIIO wrappers, nor can you build with the OpenImageIO multimedia backend (OIIO
ships C++ headers). You'll be able to build the main library, though, as ships C++ headers). You'll be able to build the main library, though, as
well as <code>notcurses-demo</code> (and maybe a few other binaries). well as <code>notcurses-demo</code> (and maybe a few other programs).
Use <code>-DUSE_CXX=off</code>. Use <code>-DUSE_CXX=off</code>.
</details> </details>

3
doc/man/man1/tfman.1.md
View File

@ -41,10 +41,11 @@ The following keypresses are recognized:
* **q**: Quit. * **q**: Quit.
* **k**/**up**: Move up by one line. * **k**/**up**: Move up by one line.
* **b**/**pgup**: Move up by one page. * **b**/**pgup**: Move up by one page.
* **h**/**left**: Move up by one section.
* **j**/**down**: Move down by one line. * **j**/**down**: Move down by one line.
* **f**/**pgdown**: Move down by one page. * **f**/**pgdown**: Move down by one page.
* **l**/**right**: Move down by one section.
* **s**: Toggle the structure browser's visibility. * **s**: Toggle the structure browser's visibility.
* **Tab**: Move between the page and structure browser.
The mouse wheel can also be used to move up and down within the active browser. The mouse wheel can also be used to move up and down within the active browser.

11
src/man/main.c
View File

@ -433,8 +433,8 @@ render_troff(struct notcurses* nc, const unsigned char* map, size_t mlen,
return pman; return pman;
} }
static const char USAGE_TEXT[] = "⎥⇆/s⎢⎥b⇞k↑↓j⇟f⎢ (q)uit"; static const char USAGE_TEXT[] = "⎥h←s→l⎢⎥b⇞k↑↓j⇟f⎢ (q)uit";
static const char USAGE_TEXT_ASCII[] = "(tab/s) (bkjf) (q)uit"; static const char USAGE_TEXT_ASCII[] = "(hsl) (bkjf) (q)uit";
static int static int
draw_bar(struct ncplane* bar, pagedom* dom){ draw_bar(struct ncplane* bar, pagedom* dom){
@ -569,8 +569,11 @@ manloop(struct notcurses* nc, const char* arg, unsigned noui){
case 's': case 's':
docstructure_toggle(page, bar, dom.ds); docstructure_toggle(page, bar, dom.ds);
break; break;
case NCKEY_TAB: case L'\u21c6': case 'h': case NCKEY_LEFT:
// FIXME switch between browsers // FIXME
break;
case 'l': case NCKEY_RIGHT:
// FIXME
break; break;
case 'k': case NCKEY_UP: case 'k': case NCKEY_UP:
if(ncplane_y(page) < 1){ if(ncplane_y(page) < 1){