* CMake: add USE_PANDOC, USE_DOXYGEN options #101 * README: mention rust * start integrating rust into build #101 * CMake: add USE_NETWORK option for cargo * Debian: build-dep on doxygen * rust: colloquy checks in Cargo.lock * extract NCKEY defines into their own include * colloquy: use clap to parse CLI args * CMake: unify option namespace * Python: update include path * Rust: fix up --frozen workings for -DUSE_NETWORK=off * CMake: abstract out colloquy a little * Sync direct.hh to the New Waypull/358/head
parent
e429724287
commit
e6637e81cc
@ -0,0 +1,121 @@
|
||||
#ifndef NOTCURSES_NCKEYS
|
||||
#define NOTCURSES_NCKEYS
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define suppuabize(w) ((w) + 0x100000)
|
||||
|
||||
// Special composed key defintions. These values are added to 0x100000.
|
||||
#define NCKEY_INVALID suppuabize(0)
|
||||
#define NCKEY_RESIZE suppuabize(1) // generated interally in response to SIGWINCH
|
||||
#define NCKEY_UP suppuabize(2)
|
||||
#define NCKEY_RIGHT suppuabize(3)
|
||||
#define NCKEY_DOWN suppuabize(4)
|
||||
#define NCKEY_LEFT suppuabize(5)
|
||||
#define NCKEY_INS suppuabize(6)
|
||||
#define NCKEY_DEL suppuabize(7)
|
||||
#define NCKEY_BACKSPACE suppuabize(8) // backspace (sometimes)
|
||||
#define NCKEY_PGDOWN suppuabize(9)
|
||||
#define NCKEY_PGUP suppuabize(10)
|
||||
#define NCKEY_HOME suppuabize(11)
|
||||
#define NCKEY_END suppuabize(12)
|
||||
#define NCKEY_F00 suppuabize(20)
|
||||
#define NCKEY_F01 suppuabize(21)
|
||||
#define NCKEY_F02 suppuabize(22)
|
||||
#define NCKEY_F03 suppuabize(23)
|
||||
#define NCKEY_F04 suppuabize(24)
|
||||
#define NCKEY_F05 suppuabize(25)
|
||||
#define NCKEY_F06 suppuabize(26)
|
||||
#define NCKEY_F07 suppuabize(27)
|
||||
#define NCKEY_F08 suppuabize(28)
|
||||
#define NCKEY_F09 suppuabize(29)
|
||||
#define NCKEY_F10 suppuabize(30)
|
||||
#define NCKEY_F11 suppuabize(31)
|
||||
#define NCKEY_F12 suppuabize(32)
|
||||
#define NCKEY_F13 suppuabize(33)
|
||||
#define NCKEY_F14 suppuabize(34)
|
||||
#define NCKEY_F15 suppuabize(35)
|
||||
#define NCKEY_F16 suppuabize(36)
|
||||
#define NCKEY_F17 suppuabize(37)
|
||||
#define NCKEY_F18 suppuabize(38)
|
||||
#define NCKEY_F19 suppuabize(39)
|
||||
#define NCKEY_F20 suppuabize(40)
|
||||
#define NCKEY_F21 suppuabize(41)
|
||||
#define NCKEY_F22 suppuabize(42)
|
||||
#define NCKEY_F23 suppuabize(43)
|
||||
#define NCKEY_F24 suppuabize(44)
|
||||
#define NCKEY_F25 suppuabize(45)
|
||||
#define NCKEY_F26 suppuabize(46)
|
||||
#define NCKEY_F27 suppuabize(47)
|
||||
#define NCKEY_F28 suppuabize(48)
|
||||
#define NCKEY_F29 suppuabize(49)
|
||||
#define NCKEY_F30 suppuabize(50)
|
||||
#define NCKEY_F31 suppuabize(51)
|
||||
#define NCKEY_F32 suppuabize(52)
|
||||
#define NCKEY_F33 suppuabize(53)
|
||||
#define NCKEY_F34 suppuabize(54)
|
||||
#define NCKEY_F35 suppuabize(55)
|
||||
#define NCKEY_F36 suppuabize(56)
|
||||
#define NCKEY_F37 suppuabize(57)
|
||||
#define NCKEY_F38 suppuabize(58)
|
||||
#define NCKEY_F39 suppuabize(59)
|
||||
#define NCKEY_F40 suppuabize(60)
|
||||
#define NCKEY_F41 suppuabize(61)
|
||||
#define NCKEY_F42 suppuabize(62)
|
||||
#define NCKEY_F43 suppuabize(63)
|
||||
#define NCKEY_F44 suppuabize(64)
|
||||
#define NCKEY_F45 suppuabize(65)
|
||||
#define NCKEY_F46 suppuabize(66)
|
||||
#define NCKEY_F47 suppuabize(67)
|
||||
#define NCKEY_F48 suppuabize(68)
|
||||
#define NCKEY_F49 suppuabize(69)
|
||||
#define NCKEY_F50 suppuabize(70)
|
||||
#define NCKEY_F51 suppuabize(71)
|
||||
#define NCKEY_F52 suppuabize(72)
|
||||
#define NCKEY_F53 suppuabize(73)
|
||||
#define NCKEY_F54 suppuabize(74)
|
||||
#define NCKEY_F55 suppuabize(75)
|
||||
#define NCKEY_F56 suppuabize(76)
|
||||
#define NCKEY_F57 suppuabize(77)
|
||||
#define NCKEY_F58 suppuabize(78)
|
||||
#define NCKEY_F59 suppuabize(79)
|
||||
#define NCKEY_F60 suppuabize(80)
|
||||
// ... leave room for up to 100 function keys, egads
|
||||
#define NCKEY_ENTER suppuabize(121)
|
||||
#define NCKEY_CLS suppuabize(122) // "clear-screen or erase"
|
||||
#define NCKEY_DLEFT suppuabize(123) // down + left on keypad
|
||||
#define NCKEY_DRIGHT suppuabize(124)
|
||||
#define NCKEY_ULEFT suppuabize(125) // up + left on keypad
|
||||
#define NCKEY_URIGHT suppuabize(126)
|
||||
#define NCKEY_CENTER suppuabize(127) // the most truly neutral of keypresses
|
||||
#define NCKEY_BEGIN suppuabize(128)
|
||||
#define NCKEY_CANCEL suppuabize(129)
|
||||
#define NCKEY_CLOSE suppuabize(130)
|
||||
#define NCKEY_COMMAND suppuabize(131)
|
||||
#define NCKEY_COPY suppuabize(132)
|
||||
#define NCKEY_EXIT suppuabize(133)
|
||||
#define NCKEY_PRINT suppuabize(134)
|
||||
#define NCKEY_REFRESH suppuabize(135)
|
||||
// Mouse events. We try to encode some details into the char32_t (i.e. which
|
||||
// button was pressed), but some is embedded in the ncinput event. The release
|
||||
// event is generic across buttons; callers must maintain state, if they care.
|
||||
#define NCKEY_BUTTON1 suppuabize(201)
|
||||
#define NCKEY_BUTTON2 suppuabize(202)
|
||||
#define NCKEY_BUTTON3 suppuabize(203)
|
||||
#define NCKEY_BUTTON4 suppuabize(204)
|
||||
#define NCKEY_BUTTON5 suppuabize(205)
|
||||
#define NCKEY_BUTTON6 suppuabize(206)
|
||||
#define NCKEY_BUTTON7 suppuabize(207)
|
||||
#define NCKEY_BUTTON8 suppuabize(208)
|
||||
#define NCKEY_BUTTON9 suppuabize(209)
|
||||
#define NCKEY_BUTTON10 suppuabize(210)
|
||||
#define NCKEY_BUTTON11 suppuabize(211)
|
||||
#define NCKEY_RELEASE suppuabize(212)
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif
|
@ -0,0 +1,129 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
[[package]]
|
||||
name = "ansi_term"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "atty"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"hermit-abi 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "2.33.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"yaml-rust 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "colloquy"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"notcurses 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.66"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "notcurses"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "textwrap"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "vec_map"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-i686-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "yaml-rust"
|
||||
version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[metadata]
|
||||
"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
|
||||
"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
|
||||
"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||
"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
|
||||
"checksum hermit-abi 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "e2c55f143919fbc0bc77e427fe2d74cf23786d7c1875666f2fde3ac3c659bb67"
|
||||
"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
|
||||
"checksum notcurses 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5922082c807aad44b9c62b337c18ba525aa836ac9d7e47b65879dfe3f734f262"
|
||||
"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
|
||||
"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
|
||||
"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
|
||||
"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
|
||||
"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
|
||||
"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
"checksum yaml-rust 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992"
|
@ -0,0 +1,10 @@
|
||||
[package]
|
||||
name = "colloquy"
|
||||
version = "0.1.0"
|
||||
authors = ["nick black <dankamongmen@gmail.com>"]
|
||||
edition = "2018"
|
||||
repository = "https://github.com/dankamongmen/notcurses"
|
||||
|
||||
[dependencies]
|
||||
notcurses = ">= 1.2.0"
|
||||
clap = {version = ">= 2.33.0", features = ["yaml", "color", "suggestions"]}
|
@ -0,0 +1,9 @@
|
||||
name: colloquy
|
||||
version: "0.1.0"
|
||||
about: Attractive UI widgets from the shell
|
||||
author: Nick Black <dankamongmen@gmail.com>
|
||||
args:
|
||||
- verbose:
|
||||
long: verbose
|
||||
short: v
|
||||
help: Verbose mode
|
@ -0,0 +1,5 @@
|
||||
fn main() {
|
||||
use clap::{load_yaml, App};
|
||||
let yaml = load_yaml!("cli.yml");
|
||||
let matches = App::from_yaml(yaml).get_matches();
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
#define notcurses_VERSION_MAJOR "@notcurses_VERSION_MAJOR@"
|
||||
#define notcurses_VERSION_MINOR "@notcurses_VERSION_MINOR@"
|
||||
#define notcurses_VERSION_PATCH "@notcurses_VERSION_PATCH@"
|
||||
#cmakedefine DISABLE_FFMPEG
|
||||
#cmakedefine DFSG_BUILD
|
||||
#cmakedefine USE_FFMPEG
|
||||
#define NOTCURSES_SHARE "@NOTCURSES_SHARE@"
|
||||
|
Loading…
Reference in New Issue