on 2bec186 help sign in
.gitignore−1
since splitsnapshots
unifiedsplit
@@ -6,7 +6,6 @@ Setup
6dist
6dist
7dist-newstyle
7dist-newstyle
8cabal.project.local
8cabal.project.local
9−.ghc.environment.*
10test/benchmark
9test/benchmark
11.hpc
10.hpc
12.cabal-sandbox
11.cabal-sandbox
.travis.yml+18−100
@@ -1,109 +1,27 @@
1−# This Travis job script has been generated by a script via
2−#
3−# runghc make_travis_yml_2.hs 'vty.cabal'
4−#
5−# For more information, see https://github.com/haskell-CI/haskell-ci
6−#
7−language: c
1+language: haskell
8−sudo: false
9
2
10−git:
3+notifications:
11− submodules: false # whether to recursively clone submodules
4+ email: false
12−
13−cache:
14− directories:
15− - $HOME/.cabal/packages
16− - $HOME/.cabal/store
17−
18−before_cache:
19− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
20− # remove files that are regenerated by 'cabal update'
21− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
22− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
23− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
24− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
25− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
26−
27− - rm -rfv $HOME/.cabal/packages/head.hackage
28
5
29matrix:
6matrix:
30− include:
7+ allow_failures:
31− - compiler: "ghc-8.4.3"
8+ - env: CABALVER=head GHCVER=head
32− # env: TEST=--disable-tests BENCH=--disable-benchmarks
33− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
34− - compiler: "ghc-8.2.2"
35− # env: TEST=--disable-tests BENCH=--disable-benchmarks
36− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
37− - compiler: "ghc-8.0.2"
38− # env: TEST=--disable-tests BENCH=--disable-benchmarks
39− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
40− - compiler: "ghc-7.10.3"
41− # env: TEST=--disable-tests BENCH=--disable-benchmarks
42− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
43
9
44−before_install:
10+env:
45− - HC=${CC}
11+ - CABALVER=1.20 GHCVER=7.6.3
46− - HCPKG=${HC/ghc/ghc-pkg}
12+ - CABALVER=1.20 GHCVER=7.8.3
47− - unset CC
13+ - CABALVER=1.22 GHCVER=7.10.1
48− - ROOTDIR=$(pwd)
14+ - CABALVER=1.24 GHCVER=8.0.1
49− - mkdir -p $HOME/.local/bin
15+ - CABALVER=head GHCVER=head
50− - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
51− - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
52− - echo $HCNUMVER
53
16
54install:
17install:
55− - cabal --version
18+ - ./ci/travis_ci_install
56− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
57− - BENCH=${BENCH---enable-benchmarks}
58− - TEST=${TEST---enable-tests}
59− - HADDOCK=${HADDOCK-true}
60− - UNCONSTRAINED=${UNCONSTRAINED-true}
61− - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
62− - GHCHEAD=${GHCHEAD-false}
63− - travis_retry cabal update -v
64− - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
65− - rm -fv cabal.project cabal.project.local
66− - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
67− - "printf 'packages: \".\"\\n' > cabal.project"
68− - touch cabal.project.local
69− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- vty | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
70− - cat cabal.project || true
71− - cat cabal.project.local || true
72− - if [ -f "./configure.ac" ]; then
73− (cd "." && autoreconf -i);
74− fi
75− - rm -f cabal.project.freeze
76− - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
77− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
78− - rm -rf .ghc.environment.* "."/dist
79− - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
80
19
81−# Here starts the actual work to be performed for the package under test;
82−# any command which exits with a non-zero exit code causes the build to fail.
83script:
20script:
84− # test that source-distributions can be generated
21+ - ./ci/travis_ci_script
85− - (cd "." && cabal sdist)
86− - mv "."/dist/vty-*.tar.gz ${DISTDIR}/
87− - cd ${DISTDIR} || false
88− - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
89− - "printf 'packages: vty-*/*.cabal\\n' > cabal.project"
90− - touch cabal.project.local
91− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- vty | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
92− - cat cabal.project || true
93− - cat cabal.project.local || true
94− # this builds all libraries and executables (without tests/benchmarks)
95− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
96
22
97− # build & run tests, build benchmarks
23+before_install:
98− - cabal new-build -w ${HC} ${TEST} ${BENCH} all
24+ - sudo add-apt-repository -y ppa:hvr/ghc
99− - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi
25+ - sudo apt-get update
100−
26+ - sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER
101− # haddock
27+ - export PATH=/opt/ghc/$GHCVER/bin:$PATH
102− - rm -rf ./dist-newstyle
103− - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
104−
105− # Build without installed constraints for packages in global-db
106− - if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi
107−
108−# REGENDATA ["vty.cabal"]
109−# EOF
AUTHORS+1−1
@@ -19,4 +19,4 @@ library:
19 * Yoshikuni Jujo
19 * Yoshikuni Jujo
20 * Dmitry Ivanov
20 * Dmitry Ivanov
21
21
22−Plus others.. Check the git log and CHANGELOG.md for a full list.
22+Plus others.. Check the git log and CHANGELOG for a full list.
CHANGELOGnew file+367
@@ -0,0 +1,367 @@
1+5.14
2+ - addMaybeClippedJoin: instead of raising an exception when the join
3+ is totally clipped, just reduce the clip amount and continue
4+ - addMaybeClipped: skip blit of joins when their primary dimension is
5+ zero
6+ - 'string' and related text functions no longer treat an empty string
7+ as an empty image (thanks Chris Penner). This means that now it is
8+ possible to use 'str ""' as a non-empty image with height 1.
9+
10+5.13
11+ - Reverted changes in 5.12 due to disagreements between terminal emulators
12+ and utf8proc; for more details, please see the ticket discussion at
13+ https://github.com/coreyoconnor/vty/issues/115
14+
15+5.12
16+ - Replaced 'wcwidth' with a call to the utf8proc library's character
17+ width function, which is much more up to date (by several Unicode
18+ versions) and returns the right width for a much larger set of
19+ characters.
20+ - Added a bundled version of the utf8proc C library.
21+
22+5.11.3
23+ - Fix mouse event offsets in mouse-up events
24+
25+5.11.2
26+ - Mouse events were modified so that the upper-left corner of the window is
27+ (0,0) rather than (1,1).
28+
29+5.11.1
30+ - Add Generic instance for Image
31+ - nextEvent: stop trying to refresh on a resize event (fixes segfault
32+ on refresh with normal cursor positioning mode)
33+ - Remove redundant clause from clipForCharWidth (thanks Eric Mertens)
34+ - Update maintainer
35+
36+5.11
37+ - Vty now raises a VtyConfigurationError exception when the TERM
38+ evironment variable is missing (thanks Eric Mertens)
39+ - Graphics.Vty.Config got an explicit export list to avoid accidentally
40+ exporting internal types (thanks Eric Mertens)
41+
42+5.10
43+ - Add absolute cursor positioning mode AbsoluteCursor to Cursor. This
44+ mode provides greater control over cursor positioning by bypassing
45+ the logical positioning provided by default. Rather than positioning
46+ the cursor by looking at the widths of characters involved, this
47+ constructor lets you provide a physical row and column instead. This
48+ is useful in more sophisticated programs. (thanks Eric Mertens)
49+ - Added a new Generic-derived config parser (thanks Eric Mertens)
50+ - Fixed the MShift case in the configuration file parser (thanks Eric
51+ Mertens)
52+ - Fixed wcwidth import and matched safeWcswidth to its documented
53+ behavior. Previously vty_mk_wcwidth was being imported with
54+ the wrong type causing the -1 return value to be mapped to the
55+ wrong Int value. Additionally safeWcswidth was using the unsafe
56+ character width function and only ensuring that the final result was
57+ non-negative. (thanks Eric Mertens)
58+
59+5.9.1
60+ - Vty now only emits UTF8 charset sequences in terminals without a
61+ preexisting UTF8 declaration to avoid emitting garbage sequences
62+ (fixes #89)
63+
64+5.9
65+ - Added new Output methods supportsBell and ringTerminalBell to find out
66+ whether the output device has an audio bell and to ring it (see #102)
67+
68+5.8.1
69+ - Fixed "refresh" to work as advertised (see #104)
70+
71+5.8
72+ - API change: EvPaste input event now provides paste data as a raw
73+ ByteString rather than a String to allow the application to decode
74+ how best to decode it
75+
76+5.7.1
77+ - ModeDemo: added an explicit Control.Applicative import for older GHCs
78+
79+5.7
80+ - Mouse and paste modes are now off by default.
81+ - The Config type got new fields: mouseMode and bracketedPasteMode. These
82+ determine whether these modes are enabled initially (for terminals
83+ that support them).
84+ - Added a Mode type for modal terminal features (mouse events, bracketed
85+ paste mode) that is used with new Output interface functions:
86+ * supportsMode :: Mode -> Bool tells whether the device supports a
87+ mode
88+ * setMode :: Mode -> Bool -> IO () turns a mode on or off
89+ * getModeStatus :: Mode -> IO Bool tells you whether a mode is on or
90+ off
91+ - Added a new demo program, ModeDemo.hs, to demonstrate usage of modes
92+
93+5.6
94+ - Added support for normal and extended mouse modes in Xterm-like
95+ terminals via the MouseDown and MouseUp Event constructors
96+ - Added support for bracketed paste mode in Xterm-like terminals via
97+ the EvPaste event constructor
98+ - Added derived Show instances for Event and Button (thanks Felix
99+ Hirn)
100+ - Now TERM values containing "screen" will automatically use the
101+ XtermColor driver rather than just TerminfoBased
102+
103+5.5.0
104+ - Replaced lens dependency with microlens, microlens-mtl, microlens-th dependencies. Issue #90
105+ - Thanks Jonathan Daugherty
106+ - Cabal corrections.
107+ - Thanks Lennart Spitzner
108+
109+5.4.0
110+ - Changed eventChannel of Graphics.Vty.Input from Chan to TChan. This enables clients to query if
111+ there are no pending events. The Graphics.Vty interface nextEvent is unchanged. Clients that use
112+ eventChannel directly will require updating.
113+ https://github.com/coreyoconnor/vty/issues/60
114+5.3.1
115+ - Reverted cabal file to depend on Cabal >= 1.18 instead of 1.20 due
116+ to possibly breaking this on reasonable GHC versions
117+
118+5.3
119+ - Upgraded QuickCheck dependency to 2.7
120+ - The standard IO Config (standardIOConfig) was overriding any provided application config.
121+ In addition, the inputFd and outputFd could not be changed if mkVty was used.
122+ Fixed.
123+ - Correct handling of display attributes at end of line. The output attributes are set to default
124+ at the end of content for the line and at the start of a new line. Previously the current
125+ attribute would extend to the next start of content. This was odd to reason about and was the
126+ cause of https://github.com/coreyoconnor/vty/issues/76
127+ IIRC Yi requires the old behavior to display the selection region correctly.
128+ - shutdown of the input thread is now performed using killThread and synchronization on an MVar.
129+ For correct handling of the terminal read vmin and vtime the read must be a blocking read on an
130+ OS thread. This places a threadWaitRead, which will be interrupted by the killThread, prior to
131+ the uninterruptable read. An alternative would be to re-import the read foreign call as
132+ interruptable.
133+
134+5.2.11
135+ - deepseq bounds increased for tests.
136+ - Clean up warnings when compiling on 7.10
137+ - Thanks Eric Mertens
138+ - Avoid discarding input bytes after multi-byte encoded codepoint
139+ - Thanks Eric Mertens
140+
141+5.2.10
142+ - "str" now returns EmptyImage for empty strings to match behavior of other string-like Image constructors (fixes #74)
143+ - Thanks Jonathan Daugherty
144+
145+5.2.9
146+ - dependency version bumps
147+ - https://github.com/coreyoconnor/vty/pull/71
148+ - https://github.com/coreyoconnor/vty/pull/70
149+ - Correct/Simplify the example code
150+ - Thanks glguy
151+ - https://github.com/coreyoconnor/vty/pull/69
152+
153+5.2.8
154+ - blaze-builder, lens, utf8-string version constraint bump
155+ - Thanks glguy
156+ - https://github.com/coreyoconnor/vty/pull/67
157+ - Do not differentiate based on TERM_PROGRAM
158+ - https://github.com/coreyoconnor/vty/issues/68
159+
160+5.2.7
161+ - lens and deepseq constraint bump + misc
162+ - Thanks ethercrow
163+ - https://github.com/coreyoconnor/vty/pull/66
164+
165+5.2.6
166+ - lens constraint bump
167+ - Thanks alexander-b!
168+ - https://github.com/coreyoconnor/vty/pull/64
169+
170+5.2.5
171+ - lens and random version constraint bump.
172+ - Thanks RyanGlScott!
173+ - https://github.com/coreyoconnor/vty/pull/62
174+
175+5.2.4
176+ - removed -fpic from cc-options. No longer required.
177+ - https://github.com/coreyoconnor/vty/issues/61
178+ - https://ghc.haskell.org/trac/ghc/ticket/9657
179+ - Thanks Fuuzetsu!
180+
181+5.2.3
182+ - evaluate/compile the input parsing table once instead of each keystroke.
183+ - https://github.com/coreyoconnor/vty/pull/59
184+ - Thanks ethercrow!
185+
186+5.2.2
187+ - When looking at input for an event, don't look too deep.
188+ - https://github.com/coreyoconnor/vty/pull/57
189+ - Thanks ethercrow!
190+
191+5.2.1
192+ - Bump upper version bound for lens to 4.5. Thanks markus1189!
193+
194+5.2.0
195+ - Config structure now specifies file descriptor to use. The default is stdInput and stdOutput
196+ file descriptors. Previously Vty used stdInput for input and the follow code for output:
197+ - hDuplicate stdout >>= handleToFd >>= (`hSetBuffering` NoBuffering)
198+ - the difference was required by Vty.Inline. Now, Vty.Inline uses the Config structure options
199+ to acheive the same effect.
200+ - removed: derivedVtime, derivedVmin, inputForCurrentTerminal, inputForNameAndIO,
201+ outputForCurrentTerminal, outputForNameAndIO
202+ - added: inputForConfig, outputForConfig
203+ - updates to vty-rogue from jtdaugherty. Thanks!
204+ - the oldest version of GHC tested to support vty is 7.6.2.
205+ - the oldest version of GHC that vty compiles under is 7.4.2
206+
207+5.1.4
208+ - merged https://github.com/coreyoconnor/vty/pull/51 thanks trofi!
209+
210+5.1.1
211+ - merged https://github.com/coreyoconnor/vty/pull/48 thanks sjmielke!
212+ - jtdaugherty resolved a number of compiler warnings. Thanks!
213+
214+5.1.0
215+ - vmin and vtime can be specified however the application requires. See Graphics.Vty.Config.
216+ - fixed the processing of input when vmin is set > 1.
217+
218+5.0.0
219+ - The naming convention now matches:
220+ - http://www.haskell.org/haskellwiki/Programming_guidelines#Naming_Conventions
221+ - all projects using vty for input must be compiled with -threaded. Please notify vty author if
222+ this is not acceptable.
223+ - mkVtyEscDelay has been removed. Use "mkVty def". Which initialized vty with the default
224+ configuration.
225+ - input handling changes
226+ - KASCII is now KChar
227+ - KPN5 is now KCenter
228+ - tests exist.
229+ - Applications can add to the input tables by setting inputMap of the Config.
230+ See Graphics.Vty.Config
231+ - Users can define input table extensions that will apply to all vty applications.
232+ See Graphics.Vty.Config
233+ - terminal timing is now handled by selecting an appropriate VTIME. Previously this was
234+ implemented within Vty itself. This reduced complexity in vty but provides a different meta
235+ key behavior and implies a requirement on -threaded.
236+ - The time vty will wait to verify an ESC byte means a single ESC key is the
237+ singleEscPeriod of the Input Config structure.
238+ - removed the typeclass based terminal and display context interface in favor of a data
239+ structure of properties interface.
240+ - renamed the Terminal interface to Output
241+ - The default picture for an image now uses the "clear" background. This background fills
242+ background spans with spaces or just ends the line.
243+ - Previously the background defaulted to the space character. This causes issues copying
244+ text from a text editor. The text would end up with extra spaces at the end of the line.
245+ - Layer support
246+ - Each layer is an image.
247+ - The layers for a picture are a list of images.
248+ - The first image is the top-most layer. The images are ordered from top to bottom.
249+ - The transparent areas for a layer are the backgroundFill areas. backgroundFill is
250+ added to pad images when images of different sizes are joined.
251+ - If the background is clear there is no background layer.
252+ - If there is a background character then the bottom layer is the background layer.
253+ - emptyPicture is a Picture with no layers and no cursor
254+ - addToTop and addToBottom add a layer to the top and bottom of the given Picture.
255+ - compatibility improvements:
256+ - terminfo based terminals with no cursor support are silently accepted. The cursor
257+ visibility changes in the Picture will have no effect.
258+ - alternate (setf/setb) color maps supported. Though colors beyond the first 8 are just a
259+ guess.
260+ - added "rgbColor" for easy support of RGB specified colors.
261+ - Both applications and users can add to the mapping used to translate from input bytes to
262+ events.
263+ - Additional information about input and output process can be appended to a debug log
264+ - Set environment variable VTY_DEBUG_LOG to path of debug log
265+ - Or use "debugLog <path>" config directive
266+ - Or set 'debugLog' property of the Config provided to mkVty.
267+ - examples moved to vty-examples package. See test directory for cabal file.
268+ - vty-interactive-terminal-test
269+ - interactive test. Useful for building a bug report for vty's author.
270+ - test/interactive_terminal_test.hs
271+ - vty-event-echo
272+ - view a input event log for vty. Example of interacting with user.
273+ - test/EventEcho.hs
274+ - vty-rogue
275+ - The start of a rogue-like game. Example of layers and image build operations.
276+ - test/Rogue.hs
277+ - vty-benchmark
278+ - benchmarks vty. A series of tests that push random pictures to the terminal. The
279+ random pictures are generated using QuickCheck. The same generators used in the
280+ automated tests.
281+ - test/benchmark.hs
282+
283+4.7.0.0
284+ - API changes:
285+ - Added Graphics.Vty.Image.crop: Ensure an image is no larger than the specified size.
286+ - Added Graphics.Vty.Image.pad: Ensure an image is no smaller than the specified size.
287+ - Added Graphics.Vty.Image.translate: Offset an image.
288+ - Thanks Ben Boeckel <MathStuf@gmail.com> for these features.
289+
290+4.3.0.0
291+
292+4.2.1.0
293+ - API changes:
294+ - Attr record accessor fore_color changed to attr_fore_color
295+ - Attr record accessor back_color changed to attr_back_color
296+ - Attr record accessor style changed to attr_style
297+ - Added an "inline" display attribute changing DSL:
298+ - put_attr_change applies a display attribute change immediately to a terminal
299+ - For instance, can be used to change the display attrbiutes of text output via putStrLn
300+ and putStr. EX: "put_attr_change $ back_color red" will set the
301+ background color to red.
302+ - Changes do not apply to a Picture output via output_picture.
303+ - See Graphics.Vty.Inline
304+ - Moved all IO actions into any monad an instance of MonadIO
305+
306+4.0.0.1
307+ - binding for mk_wcswidth was incorrect. Most platforms just magically worked due to
308+ coincidence.
309+
310+4.0.0
311+ - API changes:
312+ - "getSize" has been removed. Use "terminal vty >>= display_bounds" where "vty" is an
313+ instance of the Vty data structure.
314+ - added a "terminal" field to the Vty data structure. Accesses the TerminalHandle associated
315+ with the Vty instance.
316+ - Graphics.Vty.Types has undergone a number of changes. Summary:
317+ - Partitioned into Graphics.Vty.Attributes for display attributes. Graphics.Vty.Image for
318+ image combinators. Graphics.Vty.Picture for final picture construction.
319+ - Graphics.Vty.Attributes:
320+ - "setFG" and "setBG" are now "with_fore_color" and "with_back_color"
321+ - All other "set.." equations similarly replaced.
322+ - "attr" is now "def_attr", short for "default display attributes" Also added a
323+ "current_attr" for "currently applied display attributes"
324+ - Graphics.Vty.Image:
325+ - "horzcat" is now "horiz_cat"
326+ - "vertcat" is now "vert_cat"
327+ - "renderBS" is now "utf8_bytestring"
328+ - "renderChar" is now "char"
329+ - "renderFill" is now "char_fill"
330+ - added a "utf8_string" and "string" (AKA "iso_10464_string") for UTF-8 encoded Strings
331+ and ISO-10464 encoded Strings. String literals in GHC have an ISO-10464 runtime
332+ representation.
333+ - Graphics.Vty.Picture:
334+ - exports Graphics.Vty.Image
335+ - "pic" is now "pic_for_image"
336+ - added API for setting background fill pattern.
337+ - Completely rewritten output backend.
338+ - Efficient, scanline style output span generator. Has not been fully optimized, but good
339+ enough.
340+ - The details required to display the desired picture on a terminal are well encapsulated.
341+ - Terminfo based display terminal implementation. With specialized derivitives for xterm,
342+ Terminal.app, and iTerm.app.
343+ - Attempts to robustly handle even terminals that don't support all display attributes.
344+ - I've tested the following terminals with success: iTerm.app, Terminal.app, xterm,
345+ rxvt, mlterm, Eterm, gnome-terminal, konsole, screen, linux vty. Hopefully you will be
346+ as successfull.
347+ - Improved unicode support. Double wide characters will display as expected.
348+ - 256 color support. See Graphics.Vty.Attributes.Color240. The actual output color is adjusted
349+ according to the number of colors the terminal supports.
350+ - The Graphics.Vty.Image combinators no longer require matching dimensions to arguments.
351+ Unspecified areas are filled in with a user-customizable background pattern. See
352+ Graphics.Vty.Picture.
353+ - output images are always cropped to display size.
354+ - Significant code coverage by QuickCheck tests. An interactive test for those final properties
355+ that couldn't be automatically verified.
356+
357+ issues resolved:
358+ - "gnome terminal displays non-basic attributes as strikethrough"
359+ - http://trac.haskell.org/vty/ticket/14
360+ - "Multi-byte characters are not displayed correctly on update"
361+ - http://trac.haskell.org/vty/ticket/10
362+ - "Redraw does not handle rendering a line that extends beyond screen width characters"
363+ - http://trac.haskell.org/vty/ticket/13
364+ - "The <|> and <-> combinators should be more forgiving of mismatched dimensions"
365+ - http://trac.haskell.org/vty/ticket/9
366+ - "256-color support"
367+ - http://trac.haskell.org/vty/ticket/19
CHANGELOG.mddeleted−861
@@ -1,861 +0,0 @@
1−
2−5.35.1
3−------
4−
5−Bug fixes:
6− * Fixed a build issue with a test program.
7−
8−5.35
9−----
10−
11−New features:
12− * Add support for 24-bit color (thanks @u-quark). This change
13− updates Vty to look at the `COLORTERM` environment variable that is
14− conventionally used to advertise support for truecolor escape
15− sequences. The change also updates the Vty demo to demonstrate
16− 24-bit colors. This change also adds a new data type, `ColorMode`,
17− to represent the color mode in use, as well as an `Output` interface
18− field, `outputColorMode`, to track the active color mode and use it
19− to clamp emitted color escape sequences to the active color range.
20−
21−API changes:
22− * All types in `Graphics.Vty.Input.Events` now have strict constructor
23− fields.
24− * Internal events are now wrapped in a new `InternalEvent` type to
25− improve how signal handling is done. This change modifies the `Input`
26− type's event channel API to produce `InternalEvents`, not `Events`.
27− The new `InternalEvent` either wraps `Event` with the `InputEvent`
28− constructor (the previous behavior) or indicates that Vty resumed
29− after handling a signal using the `ResumeAfterSignal` constructor.
30− This change avoids the previous use of `EvResize` with lazy exception
31− arguments as a sentinel value for `ResumeAfterSignal`.
32−
33−Other enhancements:
34− * Bracketed paste parsing performance has been greatly improved thanks
35− to benchmarking and optimization work by @iphydf. As part of that
36− work, Vty now uses bytestrings rather than Strings internally when
37− parsing input to look for events.
38− * The `\b` value is now interpreted as `KBS` (thanks @vglfr)
39−
40−5.34
41−----
42−
43−API changes:
44− * Added an `NFData` instance for `Event` (thanks Mario Lang)
45− * Removed `Monoid` and `Semigroup` instances for `Attr` and
46− `MaybeDefault`. This change removed the instances because they were
47− misbehaved; merging `Attr` and `MaybeDefault` values with these
48− instances resulted in field value losses. For example, before this
49− change,
50−```
51−(defAttr `withForeColor` blue) <> (defAttr `withBackColor` green)
52−```
53− would result in just
54−```
55− (defAttr `withBackColor` green)
56−```
57− because the instances were designed to favor the right-hand
58− arguments' fields even if they had not been explicitly set
59− (a consequence of the `MaybeDefault` `Semigroup` instance).
60− While that behavior was sensible specifically in the context of
61− `Graphics.Vty.Inline`, it wasn't a useful user-facing API and it made
62− for surprising instance behavior. Since there is actually no good way
63− to handle this in a `Semigroup` instance for `Attr` -- some choices
64− have to be made about how to merge two attributes' foreground colors,
65− and that won't be much better than what we had -- the instance was
66− just removed.
67−
68−
69−5.33
70−----
71−
72−API changes:
73−* The `Cursor` type got a new `PositionOnly` constructor for cursor
74− placement without visibility.
75−
76−Package changes:
77−* Relaxed upper bound for `random`
78−* Updated `microlens` bounds to allow 0.4.12
79−
80−Other improvements:
81−* Various hlint-driven improvements (thanks Willem Van Onsem)
82−* The implementation of `color240` was improved (thanks (Willem Van
83− Onsem)
84−
85−5.32
86−----
87−
88−New features:
89− * Meta-PageUp and Meta-PageDown are now supported (#193)
90− * Added `supportsItalics` and `supportsStrikethrough` functions to
91− check for feature support in terminfo
92−
93−Bug fixes:
94− * Detect utf-8 mode in `LANG` regardless of case (thanks Emeka
95− Nkurumeh)
96−
97−5.31
98−----
99−
100−New features and API changes:
101− * Added support for strikethrough mode. This change adds a new
102− `strikethrough` `Style` value and uses the `smxx` and `rmxx`
103− Terminfo capabilities to activate and deactivate strikethrough mode,
104− respectively. If the terminfo does not report those capabilities,
105− this style is ignored.
106− * `Output`: added the `setDisplayBounds` field to set the output
107− dimensions of the output handle; added an implementation of this for
108− the `TerminfoBased` backend.
109−
110−Other changes:
111− * The C prototype for `vty_c_get_window_size` in `gwinsz.h` was fixed.
112−
113−5.30
114−----
115−
116−New features:
117− * Added `Graphics.Vty.setWindowTitle` to emit an escape
118− sequence to set the window title, provide the terminal emulator
119− accepts Xterm-style title sequences. For details, see:
120− https://tldp.org/HOWTO/Xterm-Title-3.html
121−
122−5.29
123−----
124−
125−API changes:
126− * The Input type got a new field, 'restoreInputState'. This field
127− allows the end user to have direct access to the logic needed to
128− restore the terminal's input state flags. Prior to having this field,
129− this state restoration logic could only be invoked as part of calling
130− 'shutdownInput', but since that function does other things (like
131− killing threads) it is not advisable to call it repeatedly (which is
132− necessary in the use case this change is intended to support). This
133− can be called directly to restore the input state flags as needed,
134− although this is not required if 'shutdown' (or 'shutdownInput') is
135− called.
136−
137−Other changes:
138− * attributeControl: explicitly enable the ICRNL terminal mode flag (see
139− #187 and c572ad).
140−
141−5.28.2
142−------
143−
144−Bug fixes:
145− * Added a package dependency on `semigroups` for the
146− `vty-build-width-table` tool on older GHCs (#185)
147−
148−5.28.1
149−------
150−
151−Bug fixes:
152− * `installUnicodeWidthTable`: use `throwIO`, not `throw`
153−
154−5.28
155−----
156−
157−This release improves Vty's support for multi-column Unicode characters
158−and provides greater compatibility with a wider array of terminal
159−emulators. The following sections summarize the relevant changes, but an
160−overview of the new functionality is motivated and detailed in the new
161−"Multi-Column Character Support" README section. For
162−historical context, please also consider reading over
163−[#175](https://github.com/jtdaugherty/vty/issues/175).
164−
165−API changes:
166− * New modules were added:
167− * `Graphics.Vty.UnicodeWidthTable.Types`
168− * `Graphics.Vty.UnicodeWidthTable.IO`
169− * `Graphics.Vty.UnicodeWidthTable.Query`
170− * `Graphics.Vty.UnicodeWidthTable.Install`
171− * The `Config` type got a new field, `allowCustomUnicodeWidthTables`,
172− that controls whether `mkVty` will attempt to load a Unicode width
173− table if specified in the configuration.
174−
175−Configuration file changes:
176− * A new syntax was added to support specifying Unicode width tables on
177− a per-`TERM` basis. The syntax is `widthMap <TERM> <PATH>`. See the
178− documentation for `Graphics.Vty.Config` for details. Since prior
179− versions of this library will silently ignore any configuration file
180− lines they cannot parse, this change to user configuration files is
181− at least non-breaking for older versions of Vty.
182−
183−Other changes:
184− * The `mkVty` function now automatically attempts to load a custom
185− Unicode width table if one is specified in the configuration,
186− provided `allowCustomUnicodeWidthTables` is not set to `Just False`.
187− See the documentation for `Graphics.Vty.mkVty` for details.
188− * Vty now includes a command line tool, `vty-build-width-table`, that
189− queries the terminal emulator to construct a custom Unicode width
190− table and optionally update the Vty configuration file to use it.
191− Programs that want to use that tool's functionality may also do so
192− via the API exposed in the various modules listed above.
193−
194−5.27
195−----
196−
197−* Added `Graphics.Vty.Config.getTtyEraseChar` to support querying the
198− kernel for the current terminal's settings to obtain the character
199− assigned by the `stty erase` command. That can then be added to the
200− Vty configuration's input map to map to `KBS` (backspace) if desired.
201−
202−5.26
203−----
204−
205−* Resolved various import warnings (thanks @glguy)
206−* Removed the `MonadIO` constraint from the Output type's fields and
207− removed `MonadFail` uses (PR #177, thanks @glguy)
208−* Clarified documentation for ANSI colors (thanks Colby Jenn)
209−* `Graphics.Vty.Attributes` no longer re-exports
210− `Graphics.Vty.Attributes.Color`
211−* The `Graphics.Vty.Attributes.Color` module is now exposed (thanks
212− Colby Jenn)
213−* Raised upper bound for `microlens` to 0.4.12 (thanks Artyom Kazak)
214−* Changed from using `System.Posix.Env.getEnv` to
215− `System.Environment.lookupEnv` (thanks Jonathan Osser)
216−* Added `Graphics.Vty.Image` functions for dealing with character width
217− computations on `Text` values instead of `Strings`:
218− * `safeWctwidth`
219− * `safeWctlwidth`
220− * `wctwidth`
221− * `wctlwidth`
222−
223−5.25.1
224−------
225−
226−* Avoided a conflict with a Microlens 0.4.10 operator and added an
227− upper bound on Microlens of 0.4.11.
228−
229−5.25
230−----
231−
232−* The Vty type got a new field, isShutdown, that returns whether the
233− Vty handle has had its 'shutdown' function called (thanks Ian
234− Jeffries)
235−* Vty's shutdown function is now thread-safe.
236−
237−5.24.1
238−------
239−
240−* The "shutdown" method of Vty handles is now idempotent (#159)
241−
242−5.24
243−----
244−
245−* Add Generic and NFData instances for some types
246−* Image: remove custom Show instance, add derived Show and Read
247− instances
248−* Updated Travis build settings (thanks Eric Mertens)
249−
250−5.23.1
251−------
252−
253−* Fixed a bug where italics did not combine properly with other display
254− modes (#155, thanks Eric Mertens)
255−
256−5.23
257−----
258−
259−* Added support for italicized output when terminfo supports it. This
260− takes the form of a new Style, "italic". Note that most terminfo
261− descriptors do not report capabilities for italics, so support for
262− this will be very spotty.
263−* Updateed text/string function documentation to indicate that escapes
264− are not permitted in their inputs.
265−
266−5.22
267−----
268−
269−* Added Graphics.Vty.Attributes.Color240.color240CodeToRGB function
270− (thanks Brent Carmer)
271−* Added nextEventNonblocking function (field) to Vty type (#87)
272−
273−5.21
274−----
275−
276−* Picture and Background now provide Eq instances (thanks Jaro Reinders)
277−* #145: vty builds with microlens 0.4.9 (thanks Daniel Wagner)
278−* #142: note requirement of threaded RTS
279−
280−5.20
281−----
282−
283−API changes:
284−* Split up Monoid instances into Monoid and Semigroup for newer GHCs
285− (thanks Ryan Scott)
286−
287−5.19.1
288−------
289−
290−API changes:
291−* Cursor now provides an Eq instance (thanks Jaro Reinders)
292−
293−5.19
294−----
295−
296−API changes:
297−* URL hyperlinking (via 'withURL') is now optional and disabled by
298− default due to poor support on some common terminals. A new 'Mode'
299− constructor, 'Hyperlink', has been added to enable this feature. To
300− change the hyperlinking mode, use 'setMode' on the 'outputIface' of a
301− Vty handle.
302−
303−5.18.1
304−------
305−
306−Bug fixes:
307−* Reset the hyperlink state on line endings to avoid run-on hyperlinks
308−
309−5.18
310−----
311−
312−API changes:
313−* Added support for hyperlinking attributes (thanks Getty Ritter). This
314− change adds a new Attr field for containing the hyperlink to apply,
315− as per https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda
316−
317−5.17.1
318−------
319−
320−* withStyle now ignores zero arguments, leaving attribute styles
321− untouched if the input style is the null style
322−
323−5.17
324−----
325−
326−API changes:
327−* Add support for terminal focus events. This change adds a new mode
328− usable with setMode, Focus, that requests that the terminal send
329− events on focus lose/gain. This change also adds two new Event
330− constructors, EvLostFocus and EvGainedFocus.
331−* No longer enable UTF8 mouse event encoding. This encoding was not
332− working properly with Terminal.app, and using the other modes (SGR,
333− etc.) work.
334−* Graphics.Vty.Attributes: escape backticks in Haddock comment (fixes
335− #131)
336−
337−5.16
338−----
339−
340−API changes:
341−* Added support for mouse wheel events while in mouse mode. The Button
342− type got two new constructors as a result: BScrollUp and BScrollDown.
343− Thanks to doublescale@tutanota.com for this contribution!
344−
345−Bug fixes:
346−* charFill now clamps negative arguments to zero (thanks Eric Mertens!)
347−
348−5.15.1
349−------
350−
351−Package changes:
352−* Documentation files are now marked accordingly (thanks Michal
353− Suchánek)
354−
355−Bug fixes:
356−* translateX/Y: fix negative translations
357−
358−5.15
359−----
360−
361−Package changes:
362−* Discontinued support for GHC versions prior to 7.10.1.
363−* Removed instructions and configuration for Stack builds since they
364− are no longer supported.
365−* Clarified README mention of (lack of) Windows support (contributors
366− wanted, though!)
367−* Removed dependency on data-default (see below).
368−
369−API changes:
370−* Moved color definitions from Attributes to Color module.
371−* In lieu of data-default (Default) instances for Attr and Config, use
372− 'defAttr' and the new 'defaultConfig' (or 'mempty') instead of 'def'.
373−* Graphics.Vty.Output no longer re-exports
374− Graphics.Vty.Output.Interface.
375−* Removed Graphics.Vty.Prelude module and moved DisplayRegion and its
376− accessors to Graphics.Vty.Image.
377−* Graphics.Vty.Image no longer re-exports Graphics.Vty.Attributes.
378−* Graphics.Vty.Picture no longer re-exports Graphics.Vty.Image.
379−
380−5.14
381−----
382−
383−* addMaybeClippedJoin: instead of raising an exception when the join
384− is totally clipped, just reduce the clip amount and continue
385−* addMaybeClipped: skip blit of joins when their primary dimension is
386− zero
387−* 'string' and related text functions no longer treat an empty string
388− as an empty image (thanks Chris Penner). This means that now it is
389− possible to use 'str ""' as a non-empty image with height 1.
390−
391−5.13
392−----
393−
394−* Reverted changes in 5.12 due to disagreements between terminal
395− emulators and utf8proc; for more details, please see the ticket
396− discussion at
397− https://github.com/coreyoconnor/vty/issues/115
398−
399−5.12
400−----
401−
402−* Replaced 'wcwidth' with a call to the utf8proc library's character
403− width function, which is much more up to date (by several Unicode
404− versions) and returns the right width for a much larger set of
405− characters.
406−* Added a bundled version of the utf8proc C library.
407−
408−5.11.3
409−------
410−
411−* Fix mouse event offsets in mouse-up events
412−
413−5.11.2
414−------
415−
416−* Mouse events were modified so that the upper-left corner of the window
417− is (0,0) rather than (1,1).
418−
419−5.11.1
420−------
421−
422−* Add Generic instance for Image
423−* nextEvent: stop trying to refresh on a resize event (fixes segfault
424− on refresh with normal cursor positioning mode)
425−* Remove redundant clause from clipForCharWidth (thanks Eric Mertens)
426−* Update maintainer
427−
428−5.11
429−----
430−
431−* Vty now raises a VtyConfigurationError exception when the TERM
432− evironment variable is missing (thanks Eric Mertens)
433−* Graphics.Vty.Config got an explicit export list to avoid accidentally
434− exporting internal types (thanks Eric Mertens)
435−
436−5.10
437−----
438−
439−* Add absolute cursor positioning mode AbsoluteCursor to Cursor. This
440− mode provides greater control over cursor positioning by bypassing
441− the logical positioning provided by default. Rather than positioning
442− the cursor by looking at the widths of characters involved, this
443− constructor lets you provide a physical row and column instead. This
444− is useful in more sophisticated programs. (thanks Eric Mertens)
445−* Added a new Generic-derived config parser (thanks Eric Mertens)
446−* Fixed the MShift case in the configuration file parser (thanks Eric
447− Mertens)
448−* Fixed wcwidth import and matched safeWcswidth to its documented
449− behavior. Previously vty_mk_wcwidth was being imported with the
450− wrong type causing the -1 return value to be mapped to the wrong Int
451− value. Additionally safeWcswidth was using the unsafe character width
452− function and only ensuring that the final result was non-negative.
453− (thanks Eric Mertens)
454−
455−5.9.1
456−-----
457−
458−* Vty now only emits UTF8 charset sequences in terminals without a
459− preexisting UTF8 declaration to avoid emitting garbage sequences
460− (fixes #89)
461−
462−5.9
463−---
464−
465−* Added new Output methods supportsBell and ringTerminalBell to find out
466− whether the output device has an audio bell and to ring it (see #102)
467−
468−5.8.1
469−-----
470−
471−* Fixed "refresh" to work as advertised (see #104)
472−
473−5.8
474−---
475−
476−* API change: EvPaste input event now provides paste data as a raw
477− ByteString rather than a String to allow the application to decode how
478− best to decode it
479−
480−5.7.1
481−-----
482−
483−* ModeDemo: added an explicit Control.Applicative import for older GHCs
484−
485−5.7
486−---
487−
488−* Mouse and paste modes are now off by default.
489−* The Config type got new fields: mouseMode and bracketedPasteMode.
490− These determine whether these modes are enabled initially (for
491− terminals that support them).
492−* Added a Mode type for modal terminal features (mouse events,
493− bracketed paste mode) that is used with new Output interface
494− functions:
495− * supportsMode :: Mode -> Bool tells whether the device supports a
496− mode
497− * setMode :: Mode -> Bool -> IO () turns a mode on or off
498− * getModeStatus :: Mode -> IO Bool tells you whether a mode is on or
499− off
500−* Added a new demo program, ModeDemo.hs, to demonstrate usage of modes
501−
502−5.6
503−---
504−
505−* Added support for normal and extended mouse modes in Xterm-like
506− terminals via the MouseDown and MouseUp Event constructors
507−* Added support for bracketed paste mode in Xterm-like terminals via
508− the EvPaste event constructor
509−* Added derived Show instances for Event and Button (thanks Felix
510− Hirn)
511−* Now TERM values containing "screen" will automatically use the
512− XtermColor driver rather than just TerminfoBased
513−
514−5.5.0
515−-----
516−
517−* Replaced lens dependency with microlens, microlens-mtl, microlens-th
518− dependencies. Issue #90
519− * Thanks Jonathan Daugherty
520−* Cabal corrections.
521− * Thanks Lennart Spitzner
522−
523−5.4.0
524−-----
525−
526−* Changed eventChannel of Graphics.Vty.Input from Chan to
527− TChan. This enables clients to query if there are no pending
528− events. The Graphics.Vty interface nextEvent is unchanged.
529− Clients that use eventChannel directly will require updating.
530− https://github.com/coreyoconnor/vty/issues/60
531−
532−5.3.1
533−-----
534−
535−* Reverted cabal file to depend on Cabal >= 1.18 instead of 1.20 due to
536− possibly breaking this on reasonable GHC versions
537−
538−5.3
539−---
540−
541−* Upgraded QuickCheck dependency to 2.7
542−* The standard IO Config (standardIOConfig) was overriding any provided
543− application config. In addition, the inputFd and outputFd could not be
544− changed if mkVty was used. Fixed.
545−* Correct handling of display attributes at end of line. The output
546− attributes are set to default at the end of content for the line and
547− at the start of a new line. Previously the current attribute would
548− extend to the next start of content. This was odd to reason about and
549− was the cause of https://github.com/coreyoconnor/vty/issues/76 IIRC Yi
550− requires the old behavior to display the selection region correctly.
551−* shutdown of the input thread is now performed using killThread and
552− synchronization on an MVar. For correct handling of the terminal read
553− vmin and vtime the read must be a blocking read on an OS thread.
554− This places a threadWaitRead, which will be interrupted by the
555− killThread, prior to the uninterruptable read. An alternative would be
556− to re-import the read foreign call as interruptable.
557−
558−5.2.11
559−------
560−
561−* deepseq bounds increased for tests.
562−* Clean up warnings when compiling on 7.10
563− * Thanks Eric Mertens
564−* Avoid discarding input bytes after multi-byte encoded codepoint
565− * Thanks Eric Mertens
566−
567−5.2.10
568−------
569−
570−* "str" now returns EmptyImage for empty strings to match behavior of
571− other string-like Image constructors (fixes #74)
572− * Thanks Jonathan Daugherty
573−
574−5.2.9
575−-----
576−
577−* dependency version bumps
578− * https://github.com/coreyoconnor/vty/pull/71
579− * https://github.com/coreyoconnor/vty/pull/70
580−* Correct/Simplify the example code
581− * Thanks glguy
582− * https://github.com/coreyoconnor/vty/pull/69
583−
584−5.2.8
585−-----
586−
587−* blaze-builder, lens, utf8-string version constraint bump
588− * Thanks glguy
589− * https://github.com/coreyoconnor/vty/pull/67
590−* Do not differentiate based on TERM_PROGRAM
591− * https://github.com/coreyoconnor/vty/issues/68
592−
593−5.2.7
594−-----
595−
596−* lens and deepseq constraint bump + misc
597− * Thanks ethercrow
598− * https://github.com/coreyoconnor/vty/pull/66
599−
600−5.2.6
601−-----
602−
603−* lens constraint bump
604− * Thanks alexander-b!
605− * https://github.com/coreyoconnor/vty/pull/64
606−
607−5.2.5
608−-----
609−
610−* lens and random version constraint bump.
611− * Thanks RyanGlScott!
612− * https://github.com/coreyoconnor/vty/pull/62
613−
614−5.2.4
615−-----
616−
617−* removed -fpic from cc-options. No longer required.
618− * https://github.com/coreyoconnor/vty/issues/61
619− * https://ghc.haskell.org/trac/ghc/ticket/9657
620− * Thanks Fuuzetsu!
621−
622−5.2.3
623−-----
624−
625−* evaluate/compile the input parsing table once instead of each
626− keystroke.
627− * https://github.com/coreyoconnor/vty/pull/59
628− * Thanks ethercrow!
629−
630−5.2.2
631−-----
632−
633−* When looking at input for an event, don't look too deep.
634− * https://github.com/coreyoconnor/vty/pull/57
635− * Thanks ethercrow!
636−
637−5.2.1
638−-----
639−
640−* Bump upper version bound for lens to 4.5. Thanks markus1189!
641−
642−5.2.0
643−-----
644−
645−* Config structure now specifies file descriptor to use. The default
646− is stdInput and stdOutput file descriptors. Previously Vty used
647− stdInput for input and the follow code for output:
648− * hDuplicate stdout >>= handleToFd >>= (`hSetBuffering`
649− NoBuffering)
650− * the difference was required by Vty.Inline. Now, Vty.Inline uses
651− the Config structure options to acheive the same effect.
652−* removed: derivedVtime, derivedVmin, inputForCurrentTerminal,
653− inputForNameAndIO, outputForCurrentTerminal, outputForNameAndIO
654−* added: inputForConfig, outputForConfig
655−* updates to vty-rogue from jtdaugherty. Thanks!
656−* the oldest version of GHC tested to support vty is 7.6.2.
657−* the oldest version of GHC that vty compiles under is 7.4.2
658−
659−5.1.4
660−-----
661−
662−* merged https://github.com/coreyoconnor/vty/pull/51 thanks trofi!
663−
664−5.1.1
665−-----
666−
667−* merged https://github.com/coreyoconnor/vty/pull/48 thanks sjmielke!
668−* jtdaugherty resolved a number of compiler warnings. Thanks!
669−
670−5.1.0
671−-----
672−
673−* vmin and vtime can be specified however the application requires.
674− See Graphics.Vty.Config.
675−* fixed the processing of input when vmin is set > 1.
676−
677−5.0.0
678−-----
679−
680−* The naming convention now matches:
681− * http://www.haskell.org/haskellwiki/Programming_guidelines#Naming_Conventions
682−* all projects using vty for input must be compiled with -threaded.
683− Please notify vty author if this is not acceptable.
684−* mkVtyEscDelay has been removed. Use "mkVty def". Which initialized
685− vty with the default configuration.
686−* input handling changes
687− * KASCII is now KChar
688− * KPN5 is now KCenter
689− * tests exist.
690− * Applications can add to the input tables by setting inputMap of
691− the Config. See Graphics.Vty.Config
692− * Users can define input table extensions that will apply to all vty
693− applications. See Graphics.Vty.Config
694− * terminal timing is now handled by selecting an appropriate VTIME.
695− Previously this was implemented within Vty itself. This reduced
696− complexity in vty but provides a different meta key behavior and
697− implies a requirement on -threaded.
698− * The time vty will wait to verify an ESC byte means a single ESC
699− key is the singleEscPeriod of the Input Config structure.
700−* removed the typeclass based terminal and display context interface
701− in favor of a data structure of properties interface.
702−* renamed the Terminal interface to Output
703−* The default picture for an image now uses the "clear" background.
704− This background fills background spans with spaces or just ends the
705− line.
706− * Previously the background defaulted to the space character. This
707− causes issues copying text from a text editor. The text would end
708− up with extra spaces at the end of the line.
709−* Layer support
710− * Each layer is an image.
711− * The layers for a picture are a list of images.
712− * The first image is the top-most layer. The images are ordered from
713− top to bottom.
714− * The transparent areas for a layer are the backgroundFill areas.
715− backgroundFill is added to pad images when images of different
716− sizes are joined.
717− * If the background is clear there is no background layer.
718− * If there is a background character then the bottom layer is the
719− background layer.
720− * emptyPicture is a Picture with no layers and no cursor
721− * addToTop and addToBottom add a layer to the top and bottom of the
722− given Picture.
723−* compatibility improvements:
724− * terminfo based terminals with no cursor support are silently
725− accepted. The cursor visibility changes in the Picture will have
726− no effect.
727− * alternate (setf/setb) color maps supported. Though colors beyond
728− the first 8 are just a guess.
729− * added "rgbColor" for easy support of RGB specified colors.
730− * Both applications and users can add to the mapping used to
731− translate from input bytes to events.
732−* Additional information about input and output process can be
733− appended to a debug log
734− * Set environment variable VTY_DEBUG_LOG to path of debug log
735− * Or use "debugLog <path>" config directive
736− * Or set 'debugLog' property of the Config provided to mkVty.
737−* examples moved to vty-examples package. See test directory for cabal
738− file.
739− * vty-interactive-terminal-test
740− * interactive test. Useful for building a bug report for vty's
741− author.
742− * test/interactive_terminal_test.hs
743− * vty-event-echo
744− * view a input event log for vty. Example of interacting with
745− user.
746− * test/EventEcho.hs
747− * vty-rogue
748− * The start of a rogue-like game. Example of layers and image
749− build operations.
750− * test/Rogue.hs
751− * vty-benchmark
752− * benchmarks vty. A series of tests that push random pictures to
753− the terminal. The random pictures are generated using
754− QuickCheck. The same generators used in the automated tests.
755− * test/benchmark.hs
756−
757−4.7.0.0
758−-------
759−
760−API changes:
761−* Added Graphics.Vty.Image.crop: Ensure an image is no larger
762− than the specified size.
763−* Added Graphics.Vty.Image.pad: Ensure an image is no smaller
764− than the specified size.
765−* Added Graphics.Vty.Image.translate: Offset an image.
766−* Thanks Ben Boeckel <MathStuf@gmail.com> for these features.
767−
768−4.2.1.0
769−-------
770−
771−API changes:
772−* Attr record accessor fore_color changed to attr_fore_color
773−* Attr record accessor back_color changed to attr_back_color
774−* Attr record accessor style changed to attr_style
775−* Added an "inline" display attribute changing DSL:
776− * put_attr_change applies a display attribute change
777− immediately to a terminal
778− * For instance, can be used to change the display attrbiutes
779− of text output via putStrLn and putStr. EX:
780− "put_attr_change $ back_color red" will set the background
781− color to red.
782− * Changes do not apply to a Picture output via output_picture.
783− * See Graphics.Vty.Inline
784−* Moved all IO actions into any monad an instance of MonadIO
785−
786−4.0.0.1
787−-------
788−
789−* binding for mk_wcswidth was incorrect. Most platforms just
790− magically worked due to coincidence.
791−
792−4.0.0
793−-----
794−
795−API changes:
796−* "getSize" has been removed. Use "terminal vty >>= display_bounds"
797− where "vty" is an instance of the Vty data structure.
798−* added a "terminal" field to the Vty data structure. Accesses the
799− TerminalHandle associated with the Vty instance.
800−* Graphics.Vty.Types has undergone a number of changes. Summary:
801− * Partitioned into Graphics.Vty.Attributes for display attributes.
802− Graphics.Vty.Image for image combinators. Graphics.Vty.Picture
803− for final picture construction.
804−* Graphics.Vty.Attributes:
805− * "setFG" and "setBG" are now "with_fore_color" and
806− "with_back_color"
807− * All other "set.." equations similarly replaced.
808− * "attr" is now "def_attr", short for "default display attributes"
809− Also added a "current_attr" for "currently applied display
810− attributes"
811−* Graphics.Vty.Image:
812− * "horzcat" is now "horiz_cat"
813− * "vertcat" is now "vert_cat"
814− * "renderBS" is now "utf8_bytestring"
815− * "renderChar" is now "char"
816− * "renderFill" is now "char_fill"
817− * added a "utf8_string" and "string" (AKA "iso_10464_string") for
818− UTF-8 encoded Strings and ISO-10464 encoded Strings. String
819− literals in GHC have an ISO-10464 runtime representation.
820−* Graphics.Vty.Picture:
821− * exports Graphics.Vty.Image
822− * "pic" is now "pic_for_image"
823− * added API for setting background fill pattern.
824−* Completely rewritten output backend.
825− * Efficient, scanline style output span generator. Has not been
826− fully optimized, but good enough.
827− * The details required to display the desired picture on a
828− terminal are well encapsulated.
829− * Terminfo based display terminal implementation. With specialized
830− derivitives for xterm, Terminal.app, and iTerm.app.
831− * Attempts to robustly handle even terminals that don't
832− support all display attributes.
833− * I've tested the following terminals with success: iTerm.app,
834− Terminal.app, xterm, rxvt, mlterm, Eterm, gnome-terminal,
835− konsole, screen, linux vty. Hopefully you will be as
836− successfull.
837− * Improved unicode support. Double wide characters will display as
838− expected.
839−* 256 color support. See Graphics.Vty.Attributes.Color240. The actual
840− output color is adjusted according to the number of colors the
841− terminal supports.
842−* The Graphics.Vty.Image combinators no longer require matching
843− dimensions to arguments. Unspecified areas are filled in with a
844− user-customizable background pattern. See Graphics.Vty.Picture.
845−* output images are always cropped to display size.
846−* Significant code coverage by QuickCheck tests. An interactive test
847− for those final properties that couldn't be automatically verified.
848−
849−Issues resolved:
850−* "gnome terminal displays non-basic attributes as strikethrough"
851− * http://trac.haskell.org/vty/ticket/14
852−* "Multi-byte characters are not displayed correctly on update"
853− * http://trac.haskell.org/vty/ticket/10
854−* "Redraw does not handle rendering a line that extends beyond screen
855− width characters"
856− * http://trac.haskell.org/vty/ticket/13
857−* "The <|> and <-> combinators should be more forgiving of mismatched
858− dimensions"
859− * http://trac.haskell.org/vty/ticket/9
860−* "256-color support"
861− * http://trac.haskell.org/vty/ticket/19
docs/DESIGN → DESIGNrenamed

The content is the same.

LICENSE−2
@@ -1,5 +1,3 @@
1−BSD 3-Clause License
2−
3Copyright Stefan O'Rear 2006, Corey O'Connor 2008, Corey O'Connor 2009
1Copyright Stefan O'Rear 2006, Corey O'Connor 2008, Corey O'Connor 2009
4
2
5All rights reserved.
3All rights reserved.
README.md+64−145
@@ -1,13 +1,13 @@
1[![Build Status](https://travis-ci.org/jtdaugherty/vty.png)](https://travis-ci.org/jtdaugherty/vty)
1[![Build Status](https://travis-ci.org/jtdaugherty/vty.png)](https://travis-ci.org/jtdaugherty/vty)
2
2
3−`vty` is a terminal interface library. It provides a high-level
3+`vty` is a terminal interface library.
4−interface for doing terminal I/O. Vty is supported on GHC versions
4+
5−7.10.1 and up.
5+This project is hosted on github.com: https://github.com/jtdaugherty/vty
6
6
7Install via `git` with:
7Install via `git` with:
8
8
9```
9```
10−git clone git://github.com/jtdaugherty/vty.git
10+git clone git://github.com/coreyoconnor/vty.git
11```
11```
12
12
13Install via `cabal` with:
13Install via `cabal` with:
@@ -18,38 +18,55 @@ cabal install vty
18
18
19# Features
19# Features
20
20
21−* Supports a large number of terminals, i.e., vt100, ansi, hurd, linux,
21+* Support for a large number of terminals. vt100, ansi, hurd, linux, screen etc
22− `screen`, etc., or anything with a sufficient terminfo entry.
22+ etc. Anything with a sufficient terminfo entry.
23+
24+* Automatic handling of window resizes.
23
25
24−* Automatically handles window resizes.
26+* If the terminal support UTF-8 then vty supports Unicode output.
25
27
26−* Supports Unicode output on terminals with UTF-8 support.
28+* Handles multi-column glyphs. (Requires user to properly configure terminal.)
27
29
28−* Provides an efficient output algorithm. Output buffering and terminal
29− state changes are minimized.
30+* Efficient output. Output buffering and terminal state changes are minimized.
30
31
31−* Minimizes repaint area, which virtually eliminates the flicker
32+* Minimizes repaint area. Virtually eliminating the flicker problems that
32− problems that plague ncurses programs.
33+ plagues ncurses programs.
33
34
34−* Provides a pure, compositional interface for efficiently constructing
35+* A pure, compositional interface for efficiently constructing display images.
35− display images.
36
36
37* Automatically decodes keyboard keys into (key,[modifier]) tuples.
37* Automatically decodes keyboard keys into (key,[modifier]) tuples.
38
38
39* Automatically supports refresh on Ctrl-L.
39* Automatically supports refresh on Ctrl-L.
40
40
41−* Supports a keypress timeout after for lone ESC. The timeout is
41+* Automatically supports timeout after for lone ESC. The timeout is
42 customizable.
42 customizable.
43
43
44−* Provides extensible input and output interfaces.
44+* Interface is designed for easy compatible extension.
45+
46+* Supports ANSI graphics modes (SGR as defined in console_codes(4)) with a
47+ type-safe interface. Gracefull fallback for terminals that do not support, or
48+ partially support the standard ANSI graphics modes.
45
49
46−* Supports ANSI graphics modes (SGR as defined in `console_codes(4)`)
50+* Properly handles cleanup, but not due to signals.
47− with a type-safe interface and graceful fallback for terminals
51+
48− with limited or nonexistent support for such modes.
52+* Comprehensive test suite.
53+
54+# Known Issues
55+
56+* Terminals have numerous quirks and bugs. vty picks what works best for the
57+ author in ambigious, or buggy situations.
58+
59+* Signal handling of STOP, TERM and INT are non existent.
60+
61+* The character encoding of the terminal is assumed to be UTF-8 if
62+ unicode is used.
49
63
50−* Properly handles cleanup (but not due to signals).
64+* Terminfo is assumed to be correct unless there is an override configured.
65+ Some terminals will not have correct special key support (shifted F10 etc).
66+ See Config for customizing vty's behavior for a particular terminal.
51
67
52−* Provides a comprehensive test suite.
68+* Uses the TIOCGWINSZ ioctl to find the current window size, which appears to be
69+ limited to Linux and BSD.
53
70
54* Supports "normal" and "extended" (SGR) mouse modes as described at
71* Supports "normal" and "extended" (SGR) mouse modes as described at
55 http://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h2-Mouse-Tracking
72 http://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h2-Mouse-Tracking
@@ -57,145 +74,47 @@ cabal install vty
57* Supports bracketed paste mode as described at
74* Supports bracketed paste mode as described at
58 http://cirw.in/blog/bracketed-paste
75 http://cirw.in/blog/bracketed-paste
59
76
60−* Supports multi-column Unicode characters such as emoji characters. In
61− cases where Vty and your terminal emulator disagree on character
62− widths, Vty provides a tool `vty-build-width-table` and library
63− functionality to build a width table that will work for your terminal
64− and load it on application startup.
65−
66−# Development Notes
67−
68−Vty uses threads internally, so programs made with Vty need to be
69−compiled with the threaded runtime using the GHC `-threaded` option.
70−
71# Platform Support
77# Platform Support
72
78
73## Posix Terminals
79## Posix Terminals
74
80
75−For the most part, Vty uses `terminfo` to determine terminal protocol
81+Uses terminfo to determine terminal protocol. With some special rules to handle
76−with some special rules to handle some omissions from `terminfo`.
82+some omissions from terminfo.
77
83
78## Windows
84## Windows
79
85
80−Windows is not supported.
86+Unsupported (but contributions and testing here are very welcome!)
81−
82−# Multi-Column Character Support
83−
84−Vty supports rendering of multi-column characters such as two-column
85−Asian characters and Emoji characters. This section details how to
86−take advantage of this feature, since its behavior will depend on the
87−terminal emulator in use.
88−
89−Terminal emulators support Unicode to varying degrees, and each terminal
90−emulator relies on a table of column widths for each supported Unicode
91−character. Vty also needs to rely on such a table to compute the width
92−of Vty images to do image layout. Since those tables can disagree if
93−Vty and the terminal emulator support different versions of Unicode,
94−and since different terminal emulators will support different versions
95−of Unicode, it's likely that for some wide characters, Vty applications
96−will exhibit rendering problems. Those rendering problems arise from Vty
97−and the terminal emulator coming to different conclusions about how wide
98−some characters are.
99−
100−To address this, Vty supports loading custom character width tables
101−that are based on the terminal's behavior in order to eliminate these
102−disagreements. By default, though, Vty will use its built-in Unicode
103−character width table. Since the built-in table is likely to eventually
104−disagree with your terminal, Vty provides an API and a command-line tool
105−to generate and install custom tables.
106−
107−Custom Unicode width tables based on your terminal emulator can be
108−built by running Vty's built-in tool, `vty-build-width-table`. The tool
109−works by querying the current terminal emulator to obtain its width
110−measurements for the entire supported Unicode range. The
111−results are then saved to a disk file. These custom tables
112−can also be generated programmatically by using the API in
113−`Graphics.Vty.UnicodeWidthTable.Query`.
114−
115−Saved width tables can then be loaded in one of two ways:
116−
117−* Via the library API in `Graphics.Vty.UnicodeWidthTable.IO`
118−* By adding a `widthMap` directive to your Vty configuration file and
119− then invoking `mkVty` to initialize Vty
120−
121−The Vty configuration file supports the `widthMap` directive to allow
122−users to specify which custom width table should be loaded for a given
123−terminal type. This is done by specifying, e.g.,
124
87
125−```
88+# Development Notes
126−widthMap "xterm" "/path/to/map.dat"
127−```
128
89
129−where the first argument is the value that `TERM` must have in order for
90+## Under NixOS
130−the table to be loaded, and the second argument is the path to the table
131−file itself as generated by the two alternatives listed above. If the
132−Vty configuration file contains multiple matching `widthMap` directives
133−for the current value of `TERM`, the last one listed in the file is
134−used.
135−
136−The tables declared in the configuration file are only ever
137−automatically loaded when applications set up Vty by calling
138−`Graphics.Vty.mkVty`.
139−
140−Before a custom table has been loaded, calls to the library's character
141−width functions (e.g. `wcwidth`) will use the default built-in table.
142−Once a custom table has been loaded, the functions will use the new
143−custom table. Only one custom table load can be performed in a Vty
144−program. Once a custom table has been loaded, it cannot be replaced or
145−removed.
146−
147−Without using a custom width table, users of Vty-based applications
148−are likely to eventually experience rendering problems with with wide
149−characters. We recommend that developers of Vty-based applications either:
150−
151−* Provide the `vty-build-width-table` tool and documentation for running
152− it and updating the Vty configuration, or
153−* Have the application invoke the Vty library's table-building
154− functionality and load the table at startup without using the Vty
155− configuration.
156−
157−The best option will depend on a number of factors: the user audience,
158−the amount of risk posed by wide character rendering, the terminal
159−emulators in use, etc.
160−
161−# Contributing
162−
163−If you decide to contribute, that's great! Here are some guidelines you
164−should consider to make submitting patches easier for all concerned:
165−
166− - If you want to take on big things, talk to me first; let's have a
167− design/vision discussion before you start coding. Create a GitHub
168− issue and we can use that as the place to hash things out.
169− - If you make changes, make them consistent with the syntactic
170− conventions already used in the codebase.
171− - Please provide Haddock documentation for any changes you make.
172
91
173−# Known Issues
92+### Using cabal
174
93
175−* Terminals have numerous quirks and bugs, so mileage may vary. Please
94+After installing ncurses to user env.
176− report issues as you encounter them and provide details on your
177− terminal emulator, operating system, etc.
178
95
179−* STOP, TERM and INT signals are not handled.
96+~~~
97+LIBRARY_PATH=$HOME/.nix-profile/lib/ cabal configure --enable-tests --extra-lib-dirs=$HOME/.nix-profile/lib
98+LIBRARY_PATH=$HOME/.nix-profile/lib/ cabal build
99+LIBRARY_PATH=$HOME/.nix-profile/lib/ cabal test
100+~~~
180
101
181−* The character encoding of the terminal is assumed to be UTF-8 if
102+## Coverage
182− unicode is used.
183
103
184−* Terminfo is assumed to be correct unless there is an override
104+As of last testing, profiling causes issues with coverage when enabled. To
185− configured. Some terminals will not have correct special key support
105+evaluate coverage configure as follows:
186− (shifted F10 etc). See `Config` for customizing vty's behavior for a
187− particular terminal.
188
106
189−* Vty uses the `TIOCGWINSZ` ioctl to find the current window size, which
107+~~~
190− appears to be limited to Linux and BSD.
108+rm -rf dist ; cabal configure --enable-tests --enable-library-coverage \
109+ --disable-library-profiling \
110+ --disable-executable-profiling
111+~~~
191
112
192−# Further Reading
113+## Profiling
193
114
194−Good sources of documentation for terminal programming are:
195
115
196−* https://github.com/b4winckler/vim/blob/master/src/term.c
116+~~~
197−* http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
117+rm -rf dist ; cabal configure --enable-tests --disable-library-coverage \
198−* http://ulisse.elettra.trieste.it/services/doc/serial/config.html
118+ --enable-library-profiling \
199−* http://www.leonerd.org.uk/hacks/hints/xterm-8bit.html
119+ --enable-executable-profiling
200−* http://www.unixwiz.net/techtips/termios-vmin-vtime.html
120+~~~
201−* http://vt100.net/docs/vt100-ug/chapter3.html
TODOnew file+15
@@ -0,0 +1,15 @@
1+- Improve input handling
2+ - base off of haskeline input system. The haskeline input system appears to be excellent and
3+ satisfy all of Vty's input requirements. The current haskeline distribution does not appear to
4+ export the required modules. Either:
5+ 0. Add the required exports to the haskeline distribution.
6+ - fine for development but complicates the UI for production clients. Though, exposing
7+ the modules would only complicate the appearance of haskeline's interface.
8+ 1. Partition the backend of haskeline into a separate package usable by both vty and
9+ haskeline.
10+- use compact-string for character encoding handling
11+- Custom cursor appearance handling?
12+ - specific color?
13+ - reverse video?
14+ - auto?
15+
cbits/get_tty_erase.cdeleted−18
@@ -1,18 +0,0 @@
1−#include <termios.h>
2−#include <stdio.h>
3−#include <unistd.h>
4−#include <stdlib.h>
5−
6−// Given a file descriptor for a terminal, get the ERASE character for
7−// the terminal. If the terminal info cannot be obtained, this returns
8−// zero.
9−char vty_get_tty_erase(int fd)
10−{
11− struct termios trm;
12−
13− if (0 == tcgetattr(fd, &trm)) {
14− return (char) trm.c_cc[VERASE];
15− } else {
16− return (char) 0;
17− }
18−}
cbits/gwinsz.c+5−14
@@ -1,18 +1,9 @@
1#include <sys/ioctl.h>
1#include <sys/ioctl.h>
2
2
3unsigned long vty_c_get_window_size(int fd) {
3unsigned long vty_c_get_window_size(int fd) {
4− struct winsize w;
4+ struct winsize w;
5− if (ioctl (fd, TIOCGWINSZ, &w) >= 0)
5+ if (ioctl (fd, TIOCGWINSZ, &w) >= 0)
6− return (w.ws_row << 16) + w.ws_col;
6+ return (w.ws_row << 16) + w.ws_col;
7− else
7+ else
8− return 0x190050;
8+ return 0x190050;
9−}
10−
11−void vty_c_set_window_size(int fd, unsigned long val) {
12− struct winsize w;
13− if (ioctl(fd, TIOCGWINSZ, &w) >= 0) {
14− w.ws_row = val >> 16;
15− w.ws_col = val & 0xFFFF;
16− ioctl(fd, TIOCSWINSZ, &w);
17− }
18}
9}
cbits/gwinsz.h+1−2
@@ -1,2 +1 @@
1−unsigned long vty_c_get_window_size(int fd);
1+unsigned long vty_c_get_window_size(void);
2−unsigned long vty_c_set_window_size(int fd, unsigned long val);
cbits/mk_wcwidth.c+2−136
@@ -60,28 +60,6 @@
60 */
60 */
61
61
62#include <HsFFI.h>
62#include <HsFFI.h>
63−#include <stdlib.h>
64−#include <string.h>
65−
66−// The maximum size for a custom character width table is the total
67−// number of possible characters as dictated by the compiler.
68−#define MAX_CUSTOM_TABLE_SIZE (HS_CHAR_MAX + 1)
69−
70−// The pointer to the start of the custom character width table, if
71−// any. If this is NULL or this is set but the ready flag is false, the
72−// built-in tree search logic is used.
73−static uint8_t* custom_table = NULL;
74−
75−// The size of the custom table, in entries. This should only be set
76−// if custom_table is not NULL. Its value should be the size of the
77−// custom_table array.
78−static uint32_t custom_table_size = 0;
79−
80−// A flag indicating whether the custom table is ready for
81−// use. This should only be set once the table has been
82−// allocated with vty_init_custom_table and initialized with
83−// vty_set_custom_table_range.
84−static uint8_t custom_table_ready = 0;
85
63
86struct interval {
64struct interval {
87 int first;
65 int first;
@@ -141,7 +119,7 @@ static int vty_bisearch(HsChar ucs, const struct interval *table, int max) {
141 * in ISO 10646.
119 * in ISO 10646.
142 */
120 */
143
121
144−static HsInt builtin_wcwidth(HsChar ucs)
122+HsInt vty_mk_wcwidth(HsChar ucs)
145{
123{
146 /* sorted list of non-overlapping intervals of non-spacing characters */
124 /* sorted list of non-overlapping intervals of non-spacing characters */
147 /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
125 /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
@@ -204,7 +182,7 @@ static HsInt builtin_wcwidth(HsChar ucs)
204
182
205 /* binary search in table of non-spacing characters */
183 /* binary search in table of non-spacing characters */
206 if (vty_bisearch(ucs, combining,
184 if (vty_bisearch(ucs, combining,
207− sizeof(combining) / sizeof(struct interval) - 1))
185+ sizeof(combining) / sizeof(struct interval) - 1))
208 return 0;
186 return 0;
209
187
210 /* if we arrive here, ucs is not a combining or C0/C1 control character */
188 /* if we arrive here, ucs is not a combining or C0/C1 control character */
@@ -224,115 +202,3 @@ static HsInt builtin_wcwidth(HsChar ucs)
224 (ucs >= 0x20000 && ucs <= 0x2fffd) ||
202 (ucs >= 0x20000 && ucs <= 0x2fffd) ||
225 (ucs >= 0x30000 && ucs <= 0x3fffd)));
203 (ucs >= 0x30000 && ucs <= 0x3fffd)));
226}
204}
227−
228−// Return the width, in terminal cells, of the specified character.
229−//
230−// If the global custom width table is present, that table will be
231−// consulted for the character's width. If the character is not in
232−// the table, zero will be returned. If the custom width table is not
233−// present, the built-in width table will be used.
234−HsInt vty_mk_wcwidth(HsChar ch)
235−{
236− if (custom_table_ready) {
237− if ((ch >= 0) && (ch < custom_table_size)) {
238− return custom_table[ch];
239− } else {
240− return -1;
241− }
242− } else {
243− return builtin_wcwidth(ch);
244− }
245−}
246−
247−// Initialize a custom character width table.
248−//
249−// This allocates a new character width table of the specified size
250−// (in characters). If a custom table has already been allocated, this
251−// returns 1. Otherwise it allocates a new table, initializes all of its
252−// entries to 1, and returns zero.
253−//
254−// Note that this does *not* mark the table as ready for use. Until the
255−// table is marked ready, it will not be used by vty_mk_wcwidth. To mark
256−// the table as ready, call vty_activate_custom_table() after the table
257−// has been set up with calls to vty_set_custom_table_range.
258−int vty_init_custom_table(int size)
259−{
260− if (custom_table == NULL) {
261− if (size > 0 && size <= MAX_CUSTOM_TABLE_SIZE) {
262− custom_table_ready = 0;
263− custom_table = malloc(size);
264− memset(custom_table, 1, size);
265− custom_table_size = size;
266− return 0;
267− } else {
268− return 1;
269− }
270− } else {
271− return 1;
272− }
273−}
274−
275−// Set the specified character range in the custom width table to the
276−// specified width.
277−//
278−// This function sets 'width' as the character width for all entries
279−// in the custom character table starting at the 'start' entry and
280−// including all entries up to and including 'start + size - 1'.
281−//
282−// If this succeeds, it returns zero. If it fails, it returns 1. It
283−// fails if the table is not allocated, marked as ready (i.e. it is in
284−// use and has already been populated), or if the start or size values
285−// are not in bounds for the table.
286−int vty_set_custom_table_range(uint32_t start, uint32_t size, uint8_t width)
287−{
288− if ((custom_table == NULL) ||
289− (size >= custom_table_size) ||
290− (start >= custom_table_size) ||
291− ((start + 1) >= (custom_table_size - size)) ||
292− custom_table_ready) {
293− return 1;
294− } else {
295− memset(custom_table + start, width, size);
296− return 0;
297− }
298−}
299−
300−// Mark the allocated custom character width table as ready for use.
301−//
302−// After this call, further calls to vty_set_custom_table_range will
303−// fail.
304−//
305−// This function returns 0 if it succeeds. If it fails, it returns 1.
306−// It fails if the custom table is already ready or if it has not been
307−// allocated.
308−int vty_activate_custom_table()
309−{
310− if (custom_table_ready || (custom_table == NULL)) {
311− return 1;
312− } else {
313− custom_table_ready = 1;
314− return 0;
315− }
316−}
317−
318−// Returns whether a custom character width table has been marked ready.
319−int vty_custom_table_ready()
320−{
321− return custom_table_ready;
322−}
323−
324−// Deallocate the custom width table.
325−//
326−// This does nothing if there is no allocated custom width table, or if
327−// there is one but it is in use (marked ready). This is only useful if
328−// an initial allocation succeeds, but range population fails, after
329−// which point the application may want to deallocate the table to avoid
330−// leaving it in an intermediate state.
331−void vty_deallocate_custom_table()
332−{
333− if ((custom_table != NULL) && (!custom_table_ready)) {
334− free(custom_table);
335− custom_table = NULL;
336− custom_table_size = 0;
337− }
338−}
demos/Demo.hs+8−14
@@ -1,4 +1,5 @@
1{-# LANGUAGE FlexibleContexts #-}
1{-# LANGUAGE FlexibleContexts #-}
2+
2module Main where
3module Main where
3
4
4import Graphics.Vty
5import Graphics.Vty
@@ -7,6 +8,7 @@ import Control.Applicative hiding ((<|>))
7import Control.Arrow
8import Control.Arrow
8import Control.Monad.RWS
9import Control.Monad.RWS
9
10
11+import Data.Default (def)
10import Data.Sequence (Seq, (<|) )
12import Data.Sequence (Seq, (<|) )
11import qualified Data.Sequence as Seq
13import qualified Data.Sequence as Seq
12import Data.Foldable
14import Data.Foldable
@@ -17,8 +19,8 @@ type App = RWST Vty () (Seq String) IO
17
19
18main = do
20main = do
19 vty <- if True -- change to false for emacs-like input processing
21 vty <- if True -- change to false for emacs-like input processing
20− then mkVty defaultConfig
22+ then mkVty def
21− else mkVty (defaultConfig { vmin = Just 2, vtime = Just 300 } )
23+ else mkVty (def { vmin = Just 2, vtime = Just 300 } )
22 _ <- execRWST (vtyInteract False) vty Seq.empty
24 _ <- execRWST (vtyInteract False) vty Seq.empty
23 shutdown vty
25 shutdown vty
24
26
@@ -31,8 +33,7 @@ introText = vertCat $ map (string defAttr)
31 [ "this line is hidden by the top layer"
33 [ "this line is hidden by the top layer"
32 , "The vty demo program will echo the events generated by the pressed keys."
34 , "The vty demo program will echo the events generated by the pressed keys."
33 , "Below there is a 240 color box."
35 , "Below there is a 240 color box."
34− , "Followed by a description of the 16 color palette."
36+ , "Followed by a description of the 16 color pallete."
35− , "Followed by tones of red using a 24-bit palette."
36 , "If the 240 color box is not visible then the terminal"
37 , "If the 240 color box is not visible then the terminal"
37 , "claims 240 colors are not supported."
38 , "claims 240 colors are not supported."
38 , "Try setting TERM to xterm-256color"
39 , "Try setting TERM to xterm-256color"
@@ -43,19 +44,12 @@ introText = vertCat $ map (string defAttr)
43 , "¯\\_(ツ)_/¯ ¯\\_(ツ)_/¯ ¯\\_(ツ)_/¯ ¯\\_(ツ)_/¯"
44 , "¯\\_(ツ)_/¯ ¯\\_(ツ)_/¯ ¯\\_(ツ)_/¯ ¯\\_(ツ)_/¯"
44 ]
45 ]
45
46
46−splitColorImages :: [Image] -> [[Image]]
47−splitColorImages [] = []
48−splitColorImages is = (take 20 is ++ [string defAttr " "]) : (splitColorImages (drop 20 is))
49−
50−fullcolorbox :: Image
51−fullcolorbox = vertCat $ map horizCat $ splitColorImages colorImages
52− where
53− colorImages = map (\i -> string (currentAttr `withBackColor` linearColor i 0 0) " ") [0..255]
54−
55colorbox_240 :: Image
47colorbox_240 :: Image
56colorbox_240 = vertCat $ map horizCat $ splitColorImages colorImages
48colorbox_240 = vertCat $ map horizCat $ splitColorImages colorImages
57 where
49 where
58 colorImages = map (\i -> string (currentAttr `withBackColor` Color240 i) " ") [0..239]
50 colorImages = map (\i -> string (currentAttr `withBackColor` Color240 i) " ") [0..239]
51+ splitColorImages [] = []
52+ splitColorImages is = (take 20 is ++ [string defAttr " "]) : (splitColorImages (drop 20 is))
59
53
60colorbox_16 :: Image
54colorbox_16 :: Image
61colorbox_16 = border <|> column0 <|> border <|> column1 <|> border <|> column2 <|> border
55colorbox_16 = border <|> column0 <|> border <|> column1 <|> border <|> column2 <|> border
@@ -78,7 +72,7 @@ updateDisplay = do
78 "Press ESC to exit. Events for keys below."
72 "Press ESC to exit. Events for keys below."
79 eventLog <- foldMap (string defAttr) <$> get
73 eventLog <- foldMap (string defAttr) <$> get
80 let pic = picForImage (info <-> eventLog)
74 let pic = picForImage (info <-> eventLog)
81− `addToBottom` (introText <-> colorbox_240 <|> colorbox_16 <|> fullcolorbox)
75+ `addToBottom` (introText <-> colorbox_240 <|> colorbox_16)
82 vty <- ask
76 vty <- ask
83 liftIO $ update vty pic
77 liftIO $ update vty pic
84
78
demos/ModeDemo.hs−2
@@ -2,8 +2,6 @@ module Main where
2
2
3import Control.Applicative
3import Control.Applicative
4import Data.Monoid
4import Data.Monoid
5−import Foreign.C.Types (CInt(..), CChar(..))
6−import System.Posix.Types (Fd(..))
7
5
8import Graphics.Vty
6import Graphics.Vty
9
7
install_examplesnew file+4
@@ -0,0 +1,4 @@
1+#!/bin/bash
2+set -ex
3+cabal install
4+(cd test && cabal install)
src/Codec/Binary/UTF8/Debug.hs+6−4
@@ -1,6 +1,7 @@
1{-# OPTIONS_HADDOCK hide #-}
1{-# OPTIONS_HADDOCK hide #-}
2-- Copyright 2009 Corey O'Connor
2-- Copyright 2009 Corey O'Connor
3−module Codec.Binary.UTF8.Debug where
3+module Codec.Binary.UTF8.Debug
4+ where
4
5
5import Codec.Binary.UTF8.String ( encode )
6import Codec.Binary.UTF8.String ( encode )
6
7
@@ -8,10 +9,11 @@ import Data.Word
8
9
9import Numeric
10import Numeric
10
11
11−-- | Converts an array of ISO-10646 characters (Char type) to an array
12+-- | Converts an array of ISO-10646 characters (Char type) to an array of Word8 bytes that is the
12−-- of Word8 bytes that is the corresponding UTF8 byte sequence
13+-- corresponding UTF8 byte sequence
13utf8FromIso :: [Int] -> [Word8]
14utf8FromIso :: [Int] -> [Word8]
14utf8FromIso = encode . map toEnum
15utf8FromIso = encode . map toEnum
15
16
16ppUtf8 :: [Int] -> IO ()
17ppUtf8 :: [Int] -> IO ()
17−ppUtf8 = print . map (`showHex` "") . utf8FromIso
18+ppUtf8 = print . map (\f -> f "") . map showHex . utf8FromIso
19+
src/Data/Sequence/Extra.hs+2−2
@@ -7,7 +7,7 @@ import Data.Sequence
7import Control.Parallel.Strategies
7import Control.Parallel.Strategies
8
8
9instance NFData a => NFData (Seq a) where
9instance NFData a => NFData (Seq a) where
10− rnf = rnf' . viewl
10+ rnf = \v -> rnf' (viewl v)
11− where
11+ where
12 rnf' EmptyL = ()
12 rnf' EmptyL = ()
13 rnf' (a :< r) = rnf a >| rnf' (viewl r)
13 rnf' (a :< r) = rnf a >| rnf' (viewl r)
src/Data/Terminfo/Eval.hs+23−15
@@ -1,14 +1,18 @@
1+{-# LANGUAGE CPP #-}
1{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE NoMonomorphismRestriction #-}
3{-# LANGUAGE NoMonomorphismRestriction #-}
3{-# OPTIONS_GHC -funbox-strict-fields #-}
4{-# OPTIONS_GHC -funbox-strict-fields #-}
4{-# OPTIONS_HADDOCK hide #-}
5{-# OPTIONS_HADDOCK hide #-}
5
6
7+#ifndef MIN_VERSION_base
8+#defined MIN_VERSION_base(x,y,z) 1
9+#endif
10+
6−-- | Evaluates the paramaterized terminfo string capability with the
11+{- Evaluates the paramaterized terminfo string capability with the given parameters.
7−-- given parameters.
12+ -
13+ -}
8−module Data.Terminfo.Eval
14+module Data.Terminfo.Eval (writeCapExpr)
9− ( writeCapExpr
10− )
11−where
15+ where
12
16
13import Blaze.ByteString.Builder.Word
17import Blaze.ByteString.Builder.Word
14import Blaze.ByteString.Builder
18import Blaze.ByteString.Builder
@@ -23,6 +27,10 @@ import Data.List
23
27
24import qualified Data.Vector.Unboxed as Vector
28import qualified Data.Vector.Unboxed as Vector
25
29
30+#if !(MIN_VERSION_base(4,8,0))
31+import Data.Word
32+#endif
33+
26-- | capability evaluator state
34-- | capability evaluator state
27data EvalState = EvalState
35data EvalState = EvalState
28 { evalStack :: ![CapParam]
36 { evalStack :: ![CapParam]
@@ -42,7 +50,7 @@ pop = do
42
50
43readParam :: Word -> Eval CapParam
51readParam :: Word -> Eval CapParam
44readParam pn = do
52readParam pn = do
45− !params <- evalParams <$> get
53+ !params <- get >>= return . evalParams
46 return $! genericIndex params pn
54 return $! genericIndex params pn
47
55
48push :: CapParam -> Eval ()
56push :: CapParam -> Eval ()
@@ -64,18 +72,18 @@ writeCapExpr cap params =
64 in snd $ runWriter (runStateT (writeCapOps (capOps cap)) s0)
72 in snd $ runWriter (runStateT (writeCapOps (capOps cap)) s0)
65
73
66writeCapOps :: CapOps -> Eval ()
74writeCapOps :: CapOps -> Eval ()
67−writeCapOps = mapM_ writeCapOp
75+writeCapOps ops = mapM_ writeCapOp ops
68
76
69writeCapOp :: CapOp -> Eval ()
77writeCapOp :: CapOp -> Eval ()
70writeCapOp (Bytes !offset !count) = do
78writeCapOp (Bytes !offset !count) = do
71− !cap <- evalExpression <$> get
79+ !cap <- get >>= return . evalExpression
72 let bytes = Vector.take count $ Vector.drop offset (capBytes cap)
80 let bytes = Vector.take count $ Vector.drop offset (capBytes cap)
73 Vector.forM_ bytes $ tell.writeWord8
81 Vector.forM_ bytes $ tell.writeWord8
74writeCapOp DecOut = do
82writeCapOp DecOut = do
75 p <- pop
83 p <- pop
76 forM_ (show p) $ tell.writeWord8.toEnum.fromEnum
84 forM_ (show p) $ tell.writeWord8.toEnum.fromEnum
77writeCapOp CharOut = do
85writeCapOp CharOut = do
78− pop >>= tell.writeWord8.toEnum.fromEnum
86+ pop >>= tell.writeWord8.toEnum.fromEnum
79writeCapOp (PushParam pn) = do
87writeCapOp (PushParam pn) = do
80 readParam pn >>= push
88 readParam pn >>= push
81writeCapOp (PushValue v) = do
89writeCapOp (PushValue v) = do
@@ -83,14 +91,13 @@ writeCapOp (PushValue v) = do
83writeCapOp (Conditional expr parts) = do
91writeCapOp (Conditional expr parts) = do
84 writeCapOps expr
92 writeCapOps expr
85 writeContitionalParts parts
93 writeContitionalParts parts
86− where
94+ where
87 writeContitionalParts [] = return ()
95 writeContitionalParts [] = return ()
88 writeContitionalParts ((trueOps, falseOps) : falseParts) = do
96 writeContitionalParts ((trueOps, falseOps) : falseParts) = do
89 -- (man 5 terminfo)
97 -- (man 5 terminfo)
90− -- Usually the %? expr part pushes a value onto the stack,
98+ -- Usually the %? expr part pushes a value onto the stack, and %t pops it from the
91− -- and %t pops it from the stack, testing if it is nonzero
92− -- (true). If it is zero (false), control passes to the %e
99+ -- stack, testing if it is nonzero (true). If it is zero (false), control
93− -- (else) part.
100+ -- passes to the %e (else) part.
94 v <- pop
101 v <- pop
95 if v /= 0
102 if v /= 0
96 then writeCapOps trueOps
103 then writeCapOps trueOps
@@ -130,3 +137,4 @@ writeCapOp CompareGt = do
130 v1 <- pop
137 v1 <- pop
131 v0 <- pop
138 v0 <- pop
132 push $ if v0 > v1 then 1 else 0
139 push $ if v0 > v1 then 1 else 0
140+
src/Data/Terminfo/Parse.hs+61−61
@@ -1,22 +1,22 @@
1−{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2+{-# LANGUAGE BangPatterns #-}
3+{-# OPTIONS_HADDOCK hide #-}
3{-# LANGUAGE NoMonomorphismRestriction #-}
4{-# LANGUAGE NoMonomorphismRestriction #-}
4−{-# LANGUAGE ScopedTypeVariables #-}
5+{-# LANGUAGE NamedFieldPuns #-}
5{-# OPTIONS_GHC -funbox-strict-fields -O #-}
6{-# OPTIONS_GHC -funbox-strict-fields -O #-}
6−{-# OPTIONS_HADDOCK hide #-}
7
7
8+#ifndef MIN_VERSION_base
9+#defined MIN_VERSION_base(x,y,z) 1
10+#endif
11+
8−module Data.Terminfo.Parse
12+module Data.Terminfo.Parse ( module Data.Terminfo.Parse
9− ( module Data.Terminfo.Parse
10− , Text.Parsec.ParseError
13+ , Text.Parsec.ParseError
11− )
14+ )
12−where
15+ where
13
16
14import Control.Monad ( liftM )
17import Control.Monad ( liftM )
15import Control.DeepSeq
18import Control.DeepSeq
16
19
17−#if !(MIN_VERSION_base(4,11,0))
18−import Data.Semigroup (Semigroup(..))
19−#endif
20import Data.Word
20import Data.Word
21import qualified Data.Vector.Unboxed as Vector
21import qualified Data.Vector.Unboxed as Vector
22
22
@@ -24,6 +24,10 @@ import Numeric (showHex)
24
24
25import Text.Parsec
25import Text.Parsec
26
26
27+#if !(MIN_VERSION_base(4,8,0))
28+import Data.Monoid
29+#endif
30+
27data CapExpression = CapExpression
31data CapExpression = CapExpression
28 { capOps :: !CapOps
32 { capOps :: !CapOps
29 , capBytes :: !(Vector.Vector Word8)
33 , capBytes :: !(Vector.Vector Word8)
@@ -39,24 +43,24 @@ instance Show CapExpression where
39 ++ " <= " ++ show (sourceString c)
43 ++ " <= " ++ show (sourceString c)
40 where
44 where
41 hexDump :: [Word8] -> String
45 hexDump :: [Word8] -> String
42− hexDump = foldr showHex ""
46+ hexDump = foldr (\b s -> showHex b s) ""
43
47
44instance NFData CapExpression where
48instance NFData CapExpression where
45− rnf (CapExpression ops !_bytes !str !c !pOps)
49+ rnf (CapExpression ops !_bytes !str !c !pOps)
46 = rnf ops `seq` rnf str `seq` rnf c `seq` rnf pOps
50 = rnf ops `seq` rnf str `seq` rnf c `seq` rnf pOps
47
51
48type CapParam = Word
52type CapParam = Word
49
53
50type CapOps = [CapOp]
54type CapOps = [CapOp]
51−data CapOp =
55+data CapOp =
52 Bytes !Int !Int -- offset count
56 Bytes !Int !Int -- offset count
53 | DecOut | CharOut
57 | DecOut | CharOut
54− -- This stores a 0-based index to the parameter. However the
58+ -- This stores a 0-based index to the parameter. However the operation that implies this op is
55− -- operation that implies this op is 1-based
59+ -- 1-based
56 | PushParam !Word | PushValue !Word
60 | PushParam !Word | PushValue !Word
57− -- The conditional parts are the sequence of (%t expression, %e
61+ -- The conditional parts are the sequence of (%t expression, %e expression) pairs.
58− -- The expression) pairs. %e expression may be NOP
62+ -- The %e expression may be NOP
59− | Conditional
63+ | Conditional
60 { conditionalExpr :: !CapOps
64 { conditionalExpr :: !CapOps
61 , conditionalParts :: ![(CapOps, CapOps)]
65 , conditionalParts :: ![(CapOps, CapOps)]
62 }
66 }
@@ -68,8 +72,8 @@ data CapOp =
68instance NFData CapOp where
72instance NFData CapOp where
69 rnf (Bytes offset byteCount ) = rnf offset `seq` rnf byteCount
73 rnf (Bytes offset byteCount ) = rnf offset `seq` rnf byteCount
70 rnf (PushParam pn) = rnf pn
74 rnf (PushParam pn) = rnf pn
71− rnf (PushValue v) = rnf v
75+ rnf (PushValue v) = rnf v
72− rnf (Conditional cExpr cParts) = rnf cExpr `seq` rnf cParts
76+ rnf (Conditional cExpr cParts) = rnf cExpr `seq` rnf cParts
73 rnf BitwiseOr = ()
77 rnf BitwiseOr = ()
74 rnf BitwiseXOr = ()
78 rnf BitwiseXOr = ()
75 rnf BitwiseAnd = ()
79 rnf BitwiseAnd = ()
@@ -90,51 +94,51 @@ instance NFData ParamOp where
90 rnf IncFirstTwo = ()
94 rnf IncFirstTwo = ()
91
95
92parseCapExpression :: String -> Either ParseError CapExpression
96parseCapExpression :: String -> Either ParseError CapExpression
93−parseCapExpression capString =
97+parseCapExpression capString =
94 let v = runParser capExpressionParser
98 let v = runParser capExpressionParser
95 initialBuildState
99 initialBuildState
96− "terminfo cap"
100+ "terminfo cap"
97− capString
101+ capString
98 in case v of
102 in case v of
99 Left e -> Left e
103 Left e -> Left e
100 Right buildResults -> Right $ constructCapExpression capString buildResults
104 Right buildResults -> Right $ constructCapExpression capString buildResults
101
105
102−constructCapExpression :: String -> BuildResults -> CapExpression
106+constructCapExpression :: [Char] -> BuildResults -> CapExpression
103constructCapExpression capString buildResults =
107constructCapExpression capString buildResults =
104 let expr = CapExpression
108 let expr = CapExpression
105 { capOps = outCapOps buildResults
109 { capOps = outCapOps buildResults
106− -- The cap bytes are the lower 8 bits of the input
110+ -- The cap bytes are the lower 8 bits of the input string's characters.
107− -- string's characters.
111+ -- \todo Verify the input string actually contains an 8bit byte per character.
108 , capBytes = Vector.fromList $ map (toEnum.fromEnum) capString
112 , capBytes = Vector.fromList $ map (toEnum.fromEnum) capString
109 , sourceString = capString
113 , sourceString = capString
110 , paramCount = outParamCount buildResults
114 , paramCount = outParamCount buildResults
111 , paramOps = outParamOps buildResults
115 , paramOps = outParamOps buildResults
112− }
116+ }
113 in rnf expr `seq` expr
117 in rnf expr `seq` expr
114
118
115−type CapParser a = Parsec String BuildState a
119+type CapParser a = Parsec String BuildState a
116
120
117capExpressionParser :: CapParser BuildResults
121capExpressionParser :: CapParser BuildResults
118capExpressionParser = do
122capExpressionParser = do
119− rs <- many $ paramEscapeParser <|> bytesOpParser
123+ rs <- many $ paramEscapeParser <|> bytesOpParser
120 return $ mconcat rs
124 return $ mconcat rs
121
125
122paramEscapeParser :: CapParser BuildResults
126paramEscapeParser :: CapParser BuildResults
123paramEscapeParser = do
127paramEscapeParser = do
124 _ <- char '%'
128 _ <- char '%'
125 incOffset 1
129 incOffset 1
126− literalPercentParser <|> paramOpParser
130+ literalPercentParser <|> paramOpParser
127
131
128literalPercentParser :: CapParser BuildResults
132literalPercentParser :: CapParser BuildResults
129literalPercentParser = do
133literalPercentParser = do
130 _ <- char '%'
134 _ <- char '%'
131− startOffset <- nextOffset <$> getState
135+ startOffset <- getState >>= return . nextOffset
132 incOffset 1
136 incOffset 1
133 return $ BuildResults 0 [Bytes startOffset 1] []
137 return $ BuildResults 0 [Bytes startOffset 1] []
134
138
135paramOpParser :: CapParser BuildResults
139paramOpParser :: CapParser BuildResults
136paramOpParser
140paramOpParser
137− = incrementOpParser
141+ = incrementOpParser
138 <|> pushOpParser
142 <|> pushOpParser
139 <|> decOutParser
143 <|> decOutParser
140 <|> charOutParser
144 <|> charOutParser
@@ -154,7 +158,7 @@ incrementOpParser = do
154pushOpParser :: CapParser BuildResults
158pushOpParser :: CapParser BuildResults
155pushOpParser = do
159pushOpParser = do
156 _ <- char 'p'
160 _ <- char 'p'
157− paramN <- read . pure <$> digit
161+ paramN <- digit >>= return . (\d -> read [d])
158 incOffset 2
162 incOffset 2
159 return $ BuildResults (fromEnum paramN) [PushParam $ paramN - 1] []
163 return $ BuildResults (fromEnum paramN) [PushParam $ paramN - 1] []
160
164
@@ -175,16 +179,16 @@ conditionalOpParser = do
175 _ <- char '?'
179 _ <- char '?'
176 incOffset 1
180 incOffset 1
177 condPart <- manyExpr conditionalTrueParser
181 condPart <- manyExpr conditionalTrueParser
178− parts <- manyP
182+ parts <- manyP
179 ( do
183 ( do
180 truePart <- manyExpr $ choice [ try $ lookAhead conditionalEndParser
184 truePart <- manyExpr $ choice [ try $ lookAhead conditionalEndParser
181− , conditionalFalseParser
185+ , conditionalFalseParser
182 ]
186 ]
183 falsePart <- manyExpr $ choice [ try $ lookAhead conditionalEndParser
187 falsePart <- manyExpr $ choice [ try $ lookAhead conditionalEndParser
184 , conditionalTrueParser
188 , conditionalTrueParser
185 ]
189 ]
186 return ( truePart, falsePart )
190 return ( truePart, falsePart )
187− )
191+ )
188 conditionalEndParser
192 conditionalEndParser
189
193
190 let trueParts = map fst parts
194 let trueParts = map fst parts
@@ -204,10 +208,10 @@ conditionalOpParser = do
204
208
205 return $ BuildResults n'' [ Conditional cond condParts ] pOps
209 return $ BuildResults n'' [ Conditional cond condParts ] pOps
206
210
207− where
211+ where
208− manyP !p !end = choice
212+ manyP !p !end = choice
209 [ try end >> return []
213 [ try end >> return []
210− , do !v <- p
214+ , do !v <- p
211 !vs <- manyP p end
215 !vs <- manyP p end
212 return $! v : vs
216 return $! v : vs
213 ]
217 ]
@@ -229,7 +233,7 @@ conditionalEndParser = do
229 incOffset 2
233 incOffset 2
230
234
231bitwiseOpParser :: CapParser BuildResults
235bitwiseOpParser :: CapParser BuildResults
232−bitwiseOpParser
236+bitwiseOpParser
233 = bitwiseOrParser
237 = bitwiseOrParser
234 <|> bitwiseAndParser
238 <|> bitwiseAndParser
235 <|> bitwiseXorParser
239 <|> bitwiseXorParser
@@ -253,9 +257,9 @@ bitwiseXorParser = do
253 return $ BuildResults 0 [ BitwiseXOr ] [ ]
257 return $ BuildResults 0 [ BitwiseXOr ] [ ]
254
258
255arithOpParser :: CapParser BuildResults
259arithOpParser :: CapParser BuildResults
256−arithOpParser
260+arithOpParser
257− = plusOp
261+ = plusOp
258− <|> minusOp
262+ <|> minusOp
259 where
263 where
260 plusOp = do
264 plusOp = do
261 _ <- char '+'
265 _ <- char '+'
@@ -278,10 +282,10 @@ literalIntOpParser = do
278 return $ BuildResults 0 [ PushValue n ] [ ]
282 return $ BuildResults 0 [ PushValue n ] [ ]
279
283
280compareOpParser :: CapParser BuildResults
284compareOpParser :: CapParser BuildResults
281−compareOpParser
285+compareOpParser
282 = compareEqOp
286 = compareEqOp
283− <|> compareLtOp
287+ <|> compareLtOp
284− <|> compareGtOp
288+ <|> compareGtOp
285 where
289 where
286 compareEqOp = do
290 compareEqOp = do
287 _ <- char '='
291 _ <- char '='
@@ -299,7 +303,7 @@ compareOpParser
299bytesOpParser :: CapParser BuildResults
303bytesOpParser :: CapParser BuildResults
300bytesOpParser = do
304bytesOpParser = do
301 bytes <- many1 $ satisfy (/= '%')
305 bytes <- many1 $ satisfy (/= '%')
302− startOffset <- nextOffset <$> getState
306+ startOffset <- getState >>= return . nextOffset
303 let !c = length bytes
307 let !c = length bytes
304 !s <- getState
308 !s <- getState
305 let s' = s { nextOffset = startOffset + c }
309 let s' = s { nextOffset = startOffset + c }
@@ -309,14 +313,14 @@ bytesOpParser = do
309charConstParser :: CapParser BuildResults
313charConstParser :: CapParser BuildResults
310charConstParser = do
314charConstParser = do
311 _ <- char '\''
315 _ <- char '\''
312− charValue <- liftM (toEnum . fromEnum) anyChar
316+ charValue <- liftM (toEnum . fromEnum) anyChar
313 _ <- char '\''
317 _ <- char '\''
314 incOffset 3
318 incOffset 3
315 return $ BuildResults 0 [ PushValue charValue ] [ ]
319 return $ BuildResults 0 [ PushValue charValue ] [ ]
316
320
317−data BuildState = BuildState
321+data BuildState = BuildState
318 { nextOffset :: Int
322 { nextOffset :: Int
319− }
323+ }
320
324
321incOffset :: Int -> CapParser ()
325incOffset :: Int -> CapParser ()
322incOffset n = do
326incOffset n = do
@@ -333,16 +337,12 @@ data BuildResults = BuildResults
333 , outParamOps :: !ParamOps
337 , outParamOps :: !ParamOps
334 }
338 }
335
339
336−instance Semigroup BuildResults where
340+instance Monoid BuildResults where
341+ mempty = BuildResults 0 [] []
337− v0 <> v1
342+ v0 `mappend` v1
338 = BuildResults
343 = BuildResults
339− { outParamCount = outParamCount v0 `max` outParamCount v1
344+ { outParamCount = (outParamCount v0) `max` (outParamCount v1)
340− , outCapOps = outCapOps v0 <> outCapOps v1
345+ , outCapOps = (outCapOps v0) `mappend` (outCapOps v1)
341− , outParamOps = outParamOps v0 <> outParamOps v1
346+ , outParamOps = (outParamOps v0) `mappend` (outParamOps v1)
342 }
347 }
343
348
344−instance Monoid BuildResults where
345− mempty = BuildResults 0 [] []
346−#if !(MIN_VERSION_base(4,11,0))
347− mappend = (<>)
348−#endif
src/Graphics/Text/Width.hs+16−51
@@ -1,64 +1,29 @@
1-- Copyright 2009 Corey O'Connor
1-- Copyright 2009 Corey O'Connor
2{-# OPTIONS_GHC -D_XOPEN_SOURCE #-}
2{-# OPTIONS_GHC -D_XOPEN_SOURCE #-}
3{-# LANGUAGE ForeignFunctionInterface #-}
3{-# LANGUAGE ForeignFunctionInterface #-}
4−-- | This module provides functions to measure the terminal column width
5−-- of characters and strings.
6−--
7−-- The functions provided in this module all ultimately make calls to
8−-- the C implementation in @cbits/mk_wcwidth.c@. That code manages some
9−-- global state that carries a table of Unicode character widths. For
10−-- more details, see 'Graphics.Vty.UnicodeWidthTable.Install', the C
11−-- code, and the "Multi-Column Character Support" section of the project
12−-- @README@.
13−module Graphics.Text.Width
4+module Graphics.Text.Width ( wcwidth
14− ( wcwidth
15− , wcswidth
5+ , wcswidth
16− , wctwidth
17− , wctlwidth
18− , safeWcwidth
6+ , safeWcwidth
19− , safeWcswidth
7+ , safeWcswidth
20− , safeWctwidth
21− , safeWctlwidth
22− )
8+ )
23−where
9+ where
24−
25−import Data.List (foldl')
26−import qualified Data.Text as T
27−import qualified Data.Text.Lazy as TL
28
10
29foreign import ccall unsafe "vty_mk_wcwidth" wcwidth :: Char -> Int
11foreign import ccall unsafe "vty_mk_wcwidth" wcwidth :: Char -> Int
30
12
31wcswidth :: String -> Int
13wcswidth :: String -> Int
32−wcswidth = foldl' (\l c -> wcwidth c + l) 0
14+wcswidth = sum . map wcwidth
33−{-# INLINE [1] wcswidth #-}
34−
35−wctwidth :: T.Text -> Int
36−wctwidth = T.foldl' (\l c -> wcwidth c + l) 0
37−
38−wctlwidth :: TL.Text -> Int
39−wctlwidth = TL.foldl' (\l c -> wcwidth c + l) 0
40
15
41−{-# RULES
16+-- XXX: Characters with unknown widths occupy 1 column?
42−"wcswidth/unpack" forall x. wcswidth (T.unpack x) = wctwidth x
17+--
43−"wcswidth/lazy-unpack" forall x. wcswidth (TL.unpack x) = wctlwidth x
18+-- Not sure if this is actually correct. I presume there is a replacement character that is output
44− #-}
19+-- by the terminal instead of the character and this replacement character is 1 column wide. If this
20+-- is not true for all terminals then a per-terminal replacement character width needs to be
21+-- implemented.
45
22
46−-- | Returns the display width of a character. Assumes all characters
23+-- | Returns the display width of a character. Assumes all characters with unknown widths are 0 width
47−-- with unknown widths are 0 width.
48safeWcwidth :: Char -> Int
24safeWcwidth :: Char -> Int
49safeWcwidth = max 0 . wcwidth
25safeWcwidth = max 0 . wcwidth
50
26
51−-- | Returns the display width of a string. Assumes all characters with
27+-- | Returns the display width of a string. Assumes all characters with unknown widths are 0 width
52−-- unknown widths are 0 width.
53safeWcswidth :: String -> Int
28safeWcswidth :: String -> Int
54−safeWcswidth = foldl' (\l c -> safeWcwidth c + l) 0
29+safeWcswidth = sum . map safeWcwidth
55−
56−-- | Returns the display width of a text. Assumes all characters with
57−-- unknown widths are 0 width.
58−safeWctwidth :: T.Text -> Int
59−safeWctwidth = T.foldl' (\l c -> safeWcwidth c + l) 0
60−
61−-- | Returns the display width of a lazy text. Assumes all characters
62−-- with unknown widths are 0 width.
63−safeWctlwidth :: TL.Text -> Int
64−safeWctlwidth = TL.foldl' (\l c -> safeWcwidth c + l) 0
src/Graphics/Vty.hs+90−173
@@ -1,20 +1,17 @@
1−{-# LANGUAGE CPP #-}
1+-- | Vty supports input and output to terminal devices.
2−{-# LANGUAGE ScopedTypeVariables #-}
2+--
3−
3+-- - Input to the terminal is provided to the app as a sequence of 'Event's.
4−-- | Vty provides interfaces for both terminal input and terminal
5−-- output.
6--
4--
7−-- - Input to the terminal is provided to the Vty application as a
5+-- - The output is defined by a 'Picture'. Which is one or more layers of 'Image's.
8−-- sequence of 'Event's.
9--
6--
10−-- - Output is provided to Vty by the application in the form of a
7+-- - The module "Graphics.Vty.Image" provides a number of constructor equations that will build
11−-- 'Picture'. A 'Picture' is one or more layers of 'Image's.
8+-- correct 'Image' values. See 'string', '<|>', and '<->' for starters.
12−-- 'Image' values can be built by the various constructors in
13−-- "Graphics.Vty.Image". Output can be syled using 'Attr' (attribute)
14−-- values in the "Graphics.Vty.Attributes" module.
15--
9--
16−-- Vty uses threads internally, so programs made with Vty need to be
10+-- - The constructors in "Graphics.Vty.Image.Internal" should not be used.
17−-- compiled with the threaded runtime using the GHC @-threaded@ option.
11+--
12+-- - 'Image's can be styled using 'Attr'. See "Graphics.Vty.Attributes".
13+--
14+-- See the vty-examples package for a number of examples.
18--
15--
19-- @
16-- @
20-- import "Graphics.Vty"
17-- import "Graphics.Vty"
@@ -31,153 +28,103 @@
31-- 'shutdown' vty
28-- 'shutdown' vty
32-- 'print' (\"Last event was: \" '++' 'show' e)
29-- 'print' (\"Last event was: \" '++' 'show' e)
33-- @
30-- @
31+--
32+-- Good sources of documentation for terminal programming are:
33+--
34+-- - <https://github.com/b4winckler/vim/blob/master/src/term.c>
35+--
36+-- - <http://invisible-island.net/xterm/ctlseqs/ctlseqs.html>
37+--
38+-- - <http://ulisse.elettra.trieste.it/services/doc/serial/config.html>
39+--
40+-- - <http://www.leonerd.org.uk/hacks/hints/xterm-8bit.html>
41+--
42+-- - <http://www.unixwiz.net/techtips/termios-vmin-vtime.html>
43+--
44+-- - <http://vt100.net/docs/vt100-ug/chapter3.html vt100 control sequences>
34−module Graphics.Vty
45+module Graphics.Vty ( Vty(..)
35− ( Vty(..)
36− , mkVty
46+ , mkVty
37− , setWindowTitle
38− , Mode(..)
39− , module Graphics.Vty.Config
47+ , module Graphics.Vty.Config
40− , module Graphics.Vty.Input
48+ , module Graphics.Vty.Input
41− , module Graphics.Vty.Output
42− , module Graphics.Vty.Output.Interface
49+ , module Graphics.Vty.Output
43− , module Graphics.Vty.Picture
50+ , module Graphics.Vty.Picture
44− , module Graphics.Vty.Image
51+ , DisplayRegion
45− , module Graphics.Vty.Attributes
52+ , Mode(..)
46− )
53+ )
47−where
54+ where
55+
56+import Graphics.Vty.Prelude
48
57
49import Graphics.Vty.Config
58import Graphics.Vty.Config
50import Graphics.Vty.Input
59import Graphics.Vty.Input
51−import Graphics.Vty.Input.Events
52import Graphics.Vty.Output
60import Graphics.Vty.Output
53import Graphics.Vty.Output.Interface
61import Graphics.Vty.Output.Interface
54import Graphics.Vty.Picture
62import Graphics.Vty.Picture
55−import Graphics.Vty.Image
56−import Graphics.Vty.Attributes
57−import Graphics.Vty.UnicodeWidthTable.IO
58−import Graphics.Vty.UnicodeWidthTable.Install
59
63
60−import Data.Char (isPrint, showLitChar)
61−import qualified Data.ByteString.Char8 as BS8
62−
63−import qualified Control.Exception as E
64−import Control.Monad (when)
65import Control.Concurrent.STM
64import Control.Concurrent.STM
66
65
67import Data.IORef
66import Data.IORef
68−#if !(MIN_VERSION_base(4,11,0))
69−import Data.Semigroup ((<>))
67+import Data.Monoid
70−#endif
71
68
72−-- | A Vty value represents a handle to the Vty library that the
69+-- | The main object. At most one should be created.
73−-- application must create in order to use Vty.
74--
70--
75-- The use of Vty typically follows this process:
71-- The use of Vty typically follows this process:
76--
72--
77−-- 1. Initialize vty with 'mkVty' (this takes control of the terminal).
73+-- 0. initialize vty
78−--
74+--
79−-- 2. Use 'update' to display a picture.
75+-- 1. use the update equation of Vty to display a picture
76+--
77+-- 2. repeat
80−--
78+--
81−-- 3. Use 'nextEvent' to get the next input event.
79+-- 3. shutdown vty.
82−--
80+--
83−-- 4. Depending on the event, go to 2 or 5.
81+-- An alternative to tracking the Vty instance is to use 'withVty' in "Graphics.Vty.Inline.Unsafe".
84−--
85−-- 5. Shutdown vty and restore the terminal state with 'shutdown'. At
86−-- this point the 'Vty' handle cannot be used again.
87−--
82+--
88−-- Operations on Vty handles are not thread-safe.
83+-- This does not assure any thread safety. In theory, as long as an update action is not executed
84+-- when another update action is already then it's safe to call this on multiple threads.
85+--
86+-- \todo Remove explicit `shutdown` requirement.
89−data Vty =
87+data Vty = Vty
90− Vty { update :: Picture -> IO ()
91− -- ^ Outputs the given 'Picture'.
88+ { -- | Outputs the given Picture. Equivalent to 'outputPicture' applied to a display context
92− , nextEvent :: IO Event
89+ -- implicitly managed by Vty. The managed display context is reset on resize.
93− -- ^ Return the next 'Event' or block until one becomes
90+ update :: Picture -> IO ()
94− -- available.
91+ -- | Get one Event object, blocking if necessary. This will refresh the terminal if the event
95− , nextEventNonblocking :: IO (Maybe Event)
92+ -- is a 'EvResize'.
96− -- ^ Non-blocking version of 'nextEvent'.
93+ , nextEvent :: IO Event
94+ -- | The input interface. See 'Input'
97− , inputIface :: Input
95+ , inputIface :: Input
98− -- ^ The input interface. See 'Input'.
96+ -- | The output interface. See 'Output'
99− , outputIface :: Output
97+ , outputIface :: Output
100− -- ^ The output interface. See 'Output'.
98+ -- | Refresh the display. 'nextEvent' will refresh the display if a resize occurs.
101− , refresh :: IO ()
102− -- ^ Refresh the display. If other programs output to the
103− -- terminal and mess up the display then the application might
99+ -- If other programs output to the terminal and mess up the display then the application might
104− -- want to force a refresh using this function.
100+ -- want to force a refresh.
105− , shutdown :: IO ()
101+ , refresh :: IO ()
106− -- ^ Clean up after vty. A call to this function is necessary to
102+ -- | Clean up after vty.
107− -- cleanly restore the terminal state before application exit.
108− -- The above methods will throw an exception if executed after
103+ -- The above methods will throw an exception if executed after this is executed.
109− -- this is executed. Idempotent.
104+ , shutdown :: IO ()
110− , isShutdown :: IO Bool
111− }
105+ }
112
106
113−-- | Create a Vty handle. At most one handle should be created at a time
107+-- | Set up the state object for using vty. At most one state object should be
114−-- for a given terminal device.
108+-- created at a time for a given terminal device.
115--
109--
116−-- The specified configuration is added to the the configuration
117−-- loaded by 'userConfig' with the 'userConfig' configuration taking
110+-- The specified config is added to the 'userConfig'. With the 'userConfig' taking precedence.
118−-- precedence. See "Graphics.Vty.Config".
111+-- See "Graphics.Vty.Config"
119--
112--
120−-- For most applications @mkVty defaultConfig@ is sufficient.
113+-- For most applications @mkVty def@ is sufficient.
121mkVty :: Config -> IO Vty
114mkVty :: Config -> IO Vty
122mkVty appConfig = do
115mkVty appConfig = do
123 config <- (<> appConfig) <$> userConfig
116 config <- (<> appConfig) <$> userConfig
117+ input <- inputForConfig config
118+ out <- outputForConfig config
119+ intMkVty input out
124
120
125− when (allowCustomUnicodeWidthTables config /= Just False) $
126− installCustomWidthTable config
127−
128− input <- inputForConfig config
129− out <- outputForConfig config
130− internalMkVty input out
131−
132−installCustomWidthTable :: Config -> IO ()
133−installCustomWidthTable c = do
134− let doLog s = case debugLog c of
135− Nothing -> return ()
136− Just path -> appendFile path $ "installWidthTable: " <> s <> "\n"
137−
138− customInstalled <- isCustomTableReady
139− when (not customInstalled) $ do
140− mTerm <- currentTerminalName
141− case mTerm of
142− Nothing ->
143− doLog "No current terminal name available"
144− Just currentTerm ->
145− case lookup currentTerm (termWidthMaps c) of
146− Nothing ->
147− doLog "Current terminal not found in custom character width mapping list"
148− Just path -> do
149− tableResult <- E.try $ readUnicodeWidthTable path
150− case tableResult of
151− Left (e::E.SomeException) ->
152− doLog $ "Error reading custom character width table " <>
153− "at " <> show path <> ": " <> show e
154− Right (Left msg) ->
155− doLog $ "Error reading custom character width table " <>
156− "at " <> show path <> ": " <> msg
157− Right (Right table) -> do
158− installResult <- E.try $ installUnicodeWidthTable table
159− case installResult of
160− Left (e::E.SomeException) ->
161− doLog $ "Error installing unicode table (" <>
162− show path <> ": " <> show e
163− Right () ->
164− doLog $ "Successfully installed Unicode width table " <>
165− " from " <> show path
166−
167−internalMkVty :: Input -> Output -> IO Vty
121+intMkVty :: Input -> Output -> IO Vty
168−internalMkVty input out = do
122+intMkVty input out = do
169 reserveDisplay out
123 reserveDisplay out
170−
171− shutdownVar <- newTVarIO False
172 let shutdownIo = do
124 let shutdownIo = do
173− alreadyShutdown <- atomically $ swapTVar shutdownVar True
174− when (not alreadyShutdown) $ do
175− shutdownInput input
125+ shutdownInput input
176− releaseDisplay out
126+ releaseDisplay out
177− releaseTerminal out
127+ releaseTerminal out
178−
179− let shutdownStatus = readTVarIO shutdownVar
180−
181 lastPicRef <- newIORef Nothing
128 lastPicRef <- newIORef Nothing
182 lastUpdateRef <- newIORef Nothing
129 lastUpdateRef <- newIORef Nothing
183
130
@@ -209,47 +156,17 @@ internalMkVty input out = do
209 mPic <- readIORef lastPicRef
156 mPic <- readIORef lastPicRef
210 maybe (return ()) innerUpdate mPic
157 maybe (return ()) innerUpdate mPic
211
158
212− let mkResize = uncurry EvResize <$> displayBounds out
213−
214− translateInternalEvent ResumeAfterSignal = mkResize
215− translateInternalEvent (InputEvent e) = return e
216−
217− gkey = do
218− e <- atomically $ readTChan $ _eventChannel input
159+ let gkey = do k <- atomically $ readTChan $ _eventChannel input
219− translateInternalEvent e
220− gkey' = do
221− mEv <- atomically $ tryReadTChan $ _eventChannel input
222− case mEv of
160+ case k of
223− Just e -> Just <$> translateInternalEvent e
161+ (EvResize _ _) -> displayBounds out
162+ >>= return . (\(w,h)-> EvResize w h)
224− Nothing -> return Nothing
163+ _ -> return k
225
164
226 return $ Vty { update = innerUpdate
165 return $ Vty { update = innerUpdate
227 , nextEvent = gkey
166 , nextEvent = gkey
228− , nextEventNonblocking = gkey'
229 , inputIface = input
167 , inputIface = input
230 , outputIface = out
168 , outputIface = out
231 , refresh = innerRefresh
169 , refresh = innerRefresh
232 , shutdown = shutdownIo
170 , shutdown = shutdownIo
233− , isShutdown = shutdownStatus
234 }
171 }
235
172
236−-- | Set the terminal window title string.
237−--
238−-- This function emits an Xterm-compatible escape sequence that we
239−-- anticipate will work for essentially all modern terminal emulators.
240−-- Ideally we'd use a terminal capability for this, but there does not
241−-- seem to exist a termcap for setting window titles. If you find that
242−-- this function does not work for a given terminal emulator, please
243−-- report the issue.
244−--
245−-- For details, see:
246−--
247−-- https://tldp.org/HOWTO/Xterm-Title-3.html
248−setWindowTitle :: Vty -> String -> IO ()
249−setWindowTitle vty title = do
250− let sanitize :: String -> String
251− sanitize = concatMap sanitizeChar
252− sanitizeChar c | not (isPrint c) = showLitChar c ""
253− | otherwise = [c]
254− let buf = BS8.pack $ "\ESC]2;" <> sanitize title <> "\007"
255− outputByteBuffer (outputIface vty) buf
src/Graphics/Vty/Attributes.hs+120−121
@@ -1,89 +1,68 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2−{-# LANGUAGE DeriveGeneric #-}
2+{-# LANGUAGE StandaloneDeriving #-}
3+{-# LANGUAGE GADTs #-}
3−{-# LANGUAGE DeriveAnyClass #-}
4+{-# LANGUAGE RankNTypes #-}
5+
6+#ifndef MIN_VERSION_base
7+#defined MIN_VERSION_base(x,y,z) 1
8+#endif
4
9
5-- | Display attributes
10-- | Display attributes
6--
11--
7−-- Attributes have three components: a foreground color, a background
12+-- Typically the values 'defAttr' or 'currentAttr' are modified to form attributes:
8−-- color, and a style mask. The simplest attribute is the default
9−-- attribute, or 'defAttr'. Attributes can be modified with
10−-- 'withForeColor', 'withBackColor', and 'withStyle', e.g.,
11--
13--
12-- @
14-- @
13−-- defAttr \`withForeColor\` red
15+-- defAttr `withForeColor` red
14-- @
16-- @
15--
17--
16−-- 'Image' constructors often require an 'Attr' to indicate the
18+-- Is the attribute that will set the foreground color to red and the background color to the
17−-- attributes used in the image, e.g.,
19+-- default.
20+--
21+-- This can then be used to build an image with a red foreground like so:
18--
22--
19-- @
23-- @
20−-- string (defAttr \`withForeColor\` red) "this text will be red"
24+-- string (defAttr `withForeColor` red) "this text will be red"
21-- @
25-- @
22--
26--
23−-- The appearance of 'Image's using 'defAttr' is determined by the The
27+-- The default attributes set by 'defAttr' have a presentation determined by the terminal. This is
24−-- terminal, so this is not something VTY can control. The user is free
25−-- to The define the color scheme of the terminal as they see fit.
28+-- not something VTY can control. The user is free to define the color scheme of the terminal as
29+-- they see fit. Up to the limits of the terminal anyways.
26−--
30+--
27−-- The value 'currentAttr' will keep the attributes of whatever was
31+-- The value 'currentAttr' will keep the attributes of whatever was output previously.
28−-- output previously.
32+--
33+-- \todo This API is very verbose IMO. I'd like something more succinct.
29−module Graphics.Vty.Attributes
34+module Graphics.Vty.Attributes ( module Graphics.Vty.Attributes
30− ( module Graphics.Vty.Attributes.Color
35+ , module Graphics.Vty.Attributes.Color
31−
36+ , module Graphics.Vty.Attributes.Color240
32− , Attr(..)
33− , FixedAttr(..)
34− , MaybeDefault(..)
35− , defAttr
36− , currentAttr
37−
38− -- * Styles
39− , Style
40− , withStyle
41− , standout
42− , italic
43− , strikethrough
44− , underline
45− , reverseVideo
46− , blink
47− , dim
48− , bold
49− , defaultStyleMask
50− , styleMask
51− , hasStyle
52−
53− -- * Setting attribute colors
54− , withForeColor
55− , withBackColor
56−
57− -- * Setting hyperlinks
58− , withURL
59− )
37+ )
60−where
38+ where
61−
39+
62−import Control.DeepSeq
63import Data.Bits
40import Data.Bits
64−import Data.Text (Text)
41+import Data.Default
65import Data.Word
42import Data.Word
66−import GHC.Generics
67
43
68import Graphics.Vty.Attributes.Color
44import Graphics.Vty.Attributes.Color
45+import Graphics.Vty.Attributes.Color240
46+
47+#if !(MIN_VERSION_base(4,8,0))
48+import Data.Monoid
49+#endif
69
50
70−-- | A display attribute defines the Color and Style of all the
51+-- | A display attribute defines the Color and Style of all the characters rendered after the
71−-- characters rendered after the attribute is applied.
52+-- attribute is applied.
72--
53--
73−-- At most 256 colors, picked from a 240 and 16 color palette, are
54+-- At most 256 colors, picked from a 240 and 16 color palette, are possible for the background and
74−-- possible for the background and foreground. The 240 colors and
75−-- 16 colors are points in different palettes. See Color for more
55+-- foreground. The 240 colors and 16 colors are points in different palettes. See Color for more
76−-- information.
56+-- information.
77data Attr = Attr
57data Attr = Attr
78 { attrStyle :: !(MaybeDefault Style)
58 { attrStyle :: !(MaybeDefault Style)
79 , attrForeColor :: !(MaybeDefault Color)
59 , attrForeColor :: !(MaybeDefault Color)
80 , attrBackColor :: !(MaybeDefault Color)
60 , attrBackColor :: !(MaybeDefault Color)
81− , attrURL :: !(MaybeDefault Text)
82− } deriving ( Eq, Show, Read, Generic, NFData )
61+ } deriving ( Eq, Show, Read )
83
62
84−-- This could be encoded into a single 32 bit word. The 32 bit word is
63+-- This could be encoded into a single 32 bit word. The 32 bit word is first divided
85−-- first divided into 4 groups of 8 bits where: The first group codes
64+-- into 4 groups of 8 bits where: The first group codes what action should be taken with regards to
86−-- what action should be taken with regards to the other groups.
65+-- the other groups.
87-- XXYYZZ__
66-- XXYYZZ__
88-- XX - style action
67-- XX - style action
89-- 00 => reset to default
68-- 00 => reset to default
@@ -100,47 +79,85 @@ data Attr = Attr
100-- __ - unused
79-- __ - unused
101--
80--
102-- Next is the style flags
81-- Next is the style flags
103−-- SURBDOI_
82+-- SURBDO__
104-- S - standout
83-- S - standout
105-- U - underline
84-- U - underline
106-- R - reverse video
85-- R - reverse video
107-- B - blink
86-- B - blink
108-- D - dim
87-- D - dim
109-- O - bold
88-- O - bold
110−-- I - italic
111−-- _ - unused
89+-- __ - unused
112--
90--
113-- Then the foreground color encoded into 8 bits.
91-- Then the foreground color encoded into 8 bits.
114-- Then the background color encoded into 8 bits.
92-- Then the background color encoded into 8 bits.
115
93
94+instance Monoid Attr where
95+ mempty = Attr mempty mempty mempty
96+ mappend attr0 attr1 =
97+ Attr ( attrStyle attr0 `mappend` attrStyle attr1 )
98+ ( attrForeColor attr0 `mappend` attrForeColor attr1 )
99+ ( attrBackColor attr0 `mappend` attrBackColor attr1 )
100+
116−-- | Specifies the display attributes such that the final style and
101+-- | Specifies the display attributes such that the final style and color values do not depend on
117−-- color values do not depend on the previously applied display
118−-- attribute. The display attributes can still depend on the terminal's
102+-- the previously applied display attribute. The display attributes can still depend on the
119−-- default colors (unfortunately).
103+-- terminal's default colors (unfortunately).
120data FixedAttr = FixedAttr
104data FixedAttr = FixedAttr
121 { fixedStyle :: !Style
105 { fixedStyle :: !Style
122 , fixedForeColor :: !(Maybe Color)
106 , fixedForeColor :: !(Maybe Color)
123 , fixedBackColor :: !(Maybe Color)
107 , fixedBackColor :: !(Maybe Color)
124− , fixedURL :: !(Maybe Text)
125 } deriving ( Eq, Show )
108 } deriving ( Eq, Show )
126
109
127−-- | The style and color attributes can either be the terminal defaults.
110+-- | The style and color attributes can either be the terminal defaults. Or be equivalent to the
128−-- Or be equivalent to the previously applied style. Or be a specific
111+-- previously applied style. Or be a specific value.
129−-- value.
130−data MaybeDefault v = Default | KeepCurrent | SetTo !v
112+data MaybeDefault v where
131− deriving (Eq, Read, Show)
113+ Default :: MaybeDefault v
132−
114+ KeepCurrent :: MaybeDefault v
115+ SetTo :: forall v . ( Eq v, Show v, Read v ) => !v -> MaybeDefault v
116+
117+deriving instance Eq v => Eq (MaybeDefault v)
118+deriving instance Eq v => Show (MaybeDefault v)
119+deriving instance (Eq v, Show v, Read v) => Read (MaybeDefault v)
120+
133−instance (NFData v) => NFData (MaybeDefault v) where
121+instance Eq v => Monoid ( MaybeDefault v ) where
134− rnf Default = ()
122+ mempty = KeepCurrent
123+ mappend Default Default = Default
124+ mappend Default KeepCurrent = Default
125+ mappend Default ( SetTo v ) = SetTo v
126+ mappend KeepCurrent Default = Default
135− rnf KeepCurrent = ()
127+ mappend KeepCurrent KeepCurrent = KeepCurrent
136− rnf (SetTo v) = rnf v
128+ mappend KeepCurrent ( SetTo v ) = SetTo v
137−
129+ mappend ( SetTo _v ) Default = Default
130+ mappend ( SetTo v ) KeepCurrent = SetTo v
131+ mappend ( SetTo _ ) ( SetTo v ) = SetTo v
132+
133+-- | Standard 8-color ANSI terminal color codes.
134+black, red, green, yellow, blue, magenta, cyan, white :: Color
135+black = ISOColor 0
136+red = ISOColor 1
137+green = ISOColor 2
138+yellow = ISOColor 3
139+blue = ISOColor 4
140+magenta= ISOColor 5
141+cyan = ISOColor 6
142+white = ISOColor 7
143+
144+-- | Bright/Vivid variants of the standard 8-color ANSI
145+brightBlack, brightRed, brightGreen, brightYellow :: Color
146+brightBlue, brightMagenta, brightCyan, brightWhite :: Color
147+brightBlack = ISOColor 8
148+brightRed = ISOColor 9
149+brightGreen = ISOColor 10
150+brightYellow = ISOColor 11
151+brightBlue = ISOColor 12
152+brightMagenta= ISOColor 13
153+brightCyan = ISOColor 14
154+brightWhite = ISOColor 15
155+
138−-- | Styles are represented as an 8 bit word. Each bit in the word is 1
156+-- | Styles are represented as an 8 bit word. Each bit in the word is 1 if the style attribute
139−-- if the style attribute assigned to that bit should be applied and 0
140−-- if the style attribute should not be applied.
157+-- assigned to that bit should be applied and 0 if the style attribute should not be applied.
141type Style = Word8
158type Style = Word8
142
159
143−-- | Valid style attributes include:
160+-- | The 6 possible style attributes:
144--
161--
145-- * standout
162-- * standout
146--
163--
@@ -154,27 +171,21 @@ type Style = Word8
154--
171--
155-- * bold/bright
172-- * bold/bright
156--
173--
157−-- * italic
158−--
159−-- * strikethrough (via the smxx/rmxx terminfo capabilities)
160−--
161−-- (The invisible, protect, and altcharset display attributes some
174+-- ( The invisible, protect, and altcharset display attributes some terminals support are not
162−-- terminals support are not supported via VTY.)
175+-- supported via VTY.)
163−standout, underline, reverseVideo, blink, dim, bold, italic, strikethrough :: Style
176+standout, underline, reverseVideo, blink, dim, bold :: Style
164standout = 0x01
177standout = 0x01
165underline = 0x02
178underline = 0x02
166−reverseVideo = 0x04
179+reverseVideo = 0x04
167blink = 0x08
180blink = 0x08
168dim = 0x10
181dim = 0x10
169bold = 0x20
182bold = 0x20
170−italic = 0x40
171−strikethrough = 0x80
172
183
173defaultStyleMask :: Style
184defaultStyleMask :: Style
174defaultStyleMask = 0x00
185defaultStyleMask = 0x00
175
186
176styleMask :: Attr -> Word8
187styleMask :: Attr -> Word8
177−styleMask attr
188+styleMask attr
178 = case attrStyle attr of
189 = case attrStyle attr of
179 Default -> 0
190 Default -> 0
180 KeepCurrent -> 0
191 KeepCurrent -> 0
@@ -194,35 +205,23 @@ withBackColor attr c = attr { attrBackColor = SetTo c }
194
205
195-- | Add the given style attribute
206-- | Add the given style attribute
196withStyle :: Attr -> Style -> Attr
207withStyle :: Attr -> Style -> Attr
197−withStyle attr 0 = attr
198withStyle attr styleFlag = attr { attrStyle = SetTo $ styleMask attr .|. styleFlag }
208withStyle attr styleFlag = attr { attrStyle = SetTo $ styleMask attr .|. styleFlag }
199
209
200−-- | Add a hyperlinked URL using the proposed [escape sequences for
201−-- hyperlinked
202−-- URLs](https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda).
203−-- These escape sequences are comparatively new and aren't widely
204−-- supported in terminal emulators yet, but most terminal emulators
205−-- that don't know about these sequences will ignore these sequences,
206−-- and therefore this should fall back sensibly. In some cases they
207−-- won't and this will result in garbage, so this is why hyperlinking is
208−-- disabled by default, in which case this combinator has no observable
209−-- effect. To enable it, enable 'Hyperlink' mode on your Vty output
210−-- interface.
211−withURL :: Attr -> Text -> Attr
212−withURL attr url = attr { attrURL = SetTo url }
213−
214−-- | Sets the style, background color and foreground color to the
210+-- | Sets the style, background color and foreground color to the default values for the terminal.
215−-- default values for the terminal. There is no easy way to determine
216−-- what the default background and foreground colors are.
211+-- There is no easy way to determine what the default background and foreground colors are.
217defAttr :: Attr
212defAttr :: Attr
218−defAttr = Attr Default Default Default Default
213+defAttr = Attr Default Default Default
214+
215+instance Default Attr where
216+ def = defAttr
219
217
220−-- | Keeps the style, background color and foreground color that was
218+-- | Keeps the style, background color and foreground color that was previously set. Used to
221−-- previously set. Used to override some part of the previous style.
219+-- override some part of the previous style.
222--
220--
223-- EG: current_style `withForeColor` brightMagenta
221-- EG: current_style `withForeColor` brightMagenta
224--
222--
225−-- Would be the currently applied style (be it underline, bold, etc) but
223+-- Would be the currently applied style (be it underline, bold, etc) but with the foreground color
226−-- with the foreground color set to brightMagenta.
224+-- set to brightMagenta.
227currentAttr :: Attr
225currentAttr :: Attr
228−currentAttr = Attr KeepCurrent KeepCurrent KeepCurrent KeepCurrent
226+currentAttr = Attr KeepCurrent KeepCurrent KeepCurrent
227+
src/Graphics/Vty/Attributes/Color.hs+22−162
@@ -1,75 +1,16 @@
1−{-# LANGUAGE DeriveGeneric #-}
2−{-# LANGUAGE DeriveAnyClass #-}
3−{-# LANGUAGE MultiWayIf #-}
4−{-# LANGUAGE ScopedTypeVariables #-}
5−
6−module Graphics.Vty.Attributes.Color
1+module Graphics.Vty.Attributes.Color where
7− ( Color(..)
8− , ColorMode(..)
9−
10− -- * Detecting Terminal Color Support
11− , detectColorMode
12−
13− -- ** Fixed Colors
14− -- | Standard 8-color ANSI terminal color codes.
15− --
16− -- Note that these map to colors in the terminal's custom palette. For
17− -- instance, `white` maps to whatever the terminal color theme uses for
18− -- white.
19− --
20− -- Use these functions if you want to make apps that fit the terminal theme.
21− -- If you want access to more/stronger colors use `rgbColor`
22− , black
23− , red
24− , green
25− , yellow
26− , blue
27− , magenta
28− , cyan
29− , white
30−
31− -- | Bright/Vivid variants of the standard 8-color ANSI
32− , brightBlack
33− , brightRed
34− , brightGreen
35− , brightYellow
36− , brightBlue
37− , brightMagenta
38− , brightCyan
39− , brightWhite
40− -- ** Creating Colors From RGB
41− , linearColor
42− , srgbColor
43− , rgbColor
44− , color240
45− , module Graphics.Vty.Attributes.Color240
46− )
47−where
48−
49import Data.Word
2import Data.Word
50−import GHC.Generics
51−import Control.DeepSeq
52−import System.Environment (lookupEnv)
53−
54−import qualified System.Console.Terminfo as Terminfo
55−import Control.Exception (catch)
56−import Data.Maybe
57−
58−import Graphics.Vty.Attributes.Color240
59
3
60-- | Abstract data type representing a color.
4-- | Abstract data type representing a color.
5+--
6+-- Currently the foreground and background color are specified as points in either a:
61--
7--
62−-- Currently the foreground and background color are specified as points
63−-- in either a:
64−--
65−-- * 16 color palette. Where the first 8 colors are equal to the 8
8+-- * 16 color palette. Where the first 8 colors are equal to the 8 colors of the ISO 6429 (ANSI) 8
66−-- colors of the ISO 6429 (ANSI) 8 color palette and the second 8
67−-- colors are bright/vivid versions of the first 8 colors.
9+-- color palette and the second 8 colors are bright/vivid versions of the first 8 colors.
68−--
69−-- * 240 color palette. This palette is a regular sampling of the full
70−-- RGB colorspace for the first 224 colors. The remaining 16 colors is
71−-- a greyscale palette.
72--
10--
11+-- * 240 color palette. This palette is a regular sampling of the full RGB colorspace for the first
12+-- 224 colors. The remaining 16 colors is a greyscale palette.
13+--
73-- The 8 ISO 6429 (ANSI) colors are as follows:
14-- The 8 ISO 6429 (ANSI) colors are as follows:
74--
15--
75-- 0. black
16-- 0. black
@@ -88,104 +29,23 @@ import Graphics.Vty.Attributes.Color240
88--
29--
89-- 7. white
30-- 7. white
90--
31--
91−-- The mapping from points in the 240 color palette to colors actually
32+-- The mapping from points in the 240 color palette to colors actually displayable by the terminal
92−-- displayable by the terminal depends on the number of colors the
93−-- terminal claims to support. Which is usually determined by the
33+-- depends on the number of colors the terminal claims to support. Which is usually determined by
94−-- terminfo "colors" property. If this property is not being accurately
34+-- the terminfo "colors" property. If this property is not being accurately reported then the color
95−-- reported then the color reproduction will be incorrect.
35+-- reproduction will be incorrect.
96--
36--
97−-- If the terminal reports <= 16 colors then the 240 color palette
37+-- If the terminal reports <= 16 colors then the 240 color palette points are only mapped to the 8
98−-- points are only mapped to the 8 color palette. I'm not sure of
99−-- the RGB points for the "bright" colors which is why they are not
38+-- color pallete. I'm not sure of the RGB points for the "bright" colors which is why they are not
100−-- addressable via the 240 color palette.
39+-- addressable via the 240 color palette.
101--
40--
102−-- If the terminal reports > 16 colors then the 240 color palette
41+-- If the terminal reports > 16 colors then the 240 color palette points are mapped to the nearest
103−-- points are mapped to the nearest points in a ("color count" - 16)
104−-- subsampling of the 240 color palette.
42+-- points in a ("color count" - 16) subsampling of the 240 color palette.
105--
43--
106−-- All of this assumes the terminals are behaving similarly to xterm and
44+-- All of this assumes the terminals are behaving similarly to xterm and rxvt when handling colors.
107−-- rxvt when handling colors. And that the individual colors have not
108−-- been remapped by the user. There may be a way to verify this through
45+-- And that the individual colors have not been remapped by the user. There may be a way to verify
109−-- terminfo but I don't know it.
46+-- this through terminfo but I don't know it.
110--
47--
111-- Seriously, terminal color support is INSANE.
48-- Seriously, terminal color support is INSANE.
112−data Color = ISOColor !Word8 | Color240 !Word8 | RGBColor !Word8 !Word8 !Word8
49+data Color = ISOColor !Word8 | Color240 !Word8
113− deriving ( Eq, Show, Read, Generic, NFData )
50+ deriving ( Eq, Show, Read )
114−
115−data ColorMode
116− = NoColor
117− | ColorMode8
118− | ColorMode16
119− | ColorMode240 !Word8
120− | FullColor
121− deriving ( Eq, Show )
122−
123−detectColorMode :: String -> IO ColorMode
124−detectColorMode termName' = do
125− term <- catch (Just <$> Terminfo.setupTerm termName')
126− (\(_ :: Terminfo.SetupTermError) -> return Nothing)
127− let getCap cap = term >>= \t -> Terminfo.getCapability t cap
128− termColors = fromMaybe 0 $ getCap (Terminfo.tiGetNum "colors")
129− colorterm <- lookupEnv "COLORTERM"
130− return $ if
131− | termColors < 8 -> NoColor
132− | termColors < 16 -> ColorMode8
133− | termColors == 16 -> ColorMode16
134− | termColors < 256 -> ColorMode240 (fromIntegral termColors - 16)
135− | colorterm == Just "truecolor" -> FullColor
136− | colorterm == Just "24bit" -> FullColor
137− | otherwise -> ColorMode240 240
138−
139−black, red, green, yellow, blue, magenta, cyan, white :: Color
140−black = ISOColor 0
141−red = ISOColor 1
142−green = ISOColor 2
143−yellow = ISOColor 3
144−blue = ISOColor 4
145−magenta= ISOColor 5
146−cyan = ISOColor 6
147−white = ISOColor 7
148−
149−brightBlack, brightRed, brightGreen, brightYellow :: Color
150−brightBlue, brightMagenta, brightCyan, brightWhite :: Color
151−brightBlack = ISOColor 8
152−brightRed = ISOColor 9
153−brightGreen = ISOColor 10
154−brightYellow = ISOColor 11
155−brightBlue = ISOColor 12
156−brightMagenta= ISOColor 13
157−brightCyan = ISOColor 14
158−brightWhite = ISOColor 15
159−
160−linearColor :: Integral i => i -> i -> i -> Color
161−linearColor r g b = RGBColor r' g' b'
162− where
163− r' = fromIntegral (clamp r) :: Word8
164− g' = fromIntegral (clamp g) :: Word8
165− b' = fromIntegral (clamp b) :: Word8
166− clamp = min 255 . max 0
167−
168−srgbColor :: Integral i => i -> i -> i -> Color
169−srgbColor r g b =
170− -- srgb to rgb transformation as described at
171− -- https://en.wikipedia.org/wiki/SRGB#The_reverse_transformation
172− --
173− -- TODO: it may be worth translating this to a lookup table, as with color240
174− let shrink n = fromIntegral n / 255 :: Double
175− -- called gamma^-1 in wiki
176− gamma u
177− | u <= 0.04045 = u/12.92
178− | otherwise = ((u + 0.055) / 1.055) ** 2.4
179− -- TODO: this is a slightly inaccurate conversion. is it worth doing proterly?
180− expand n = round (255 * n)
181− convert = expand . gamma . shrink
182− in RGBColor (convert r) (convert g) (convert b)
183−
184−color240 :: Integral i => i -> i -> i -> Color
185−color240 r g b = Color240 (rgbColorToColor240 r g b)
186
51
187−-- | Create a Vty 'Color' (in the 240 color set) from an RGB triple.
188−-- This function is lossy in the sense that we only internally support 240 colors but the
189−-- #RRGGBB format supports 16^3 colors.
190−rgbColor :: Integral i => i -> i -> i -> Color
191−rgbColor = color240
src/Graphics/Vty/Attributes/Color240.hs+254−291
@@ -1,298 +1,261 @@
1+{-
1−-- This header file was generated by ./256colres.pl
2+ - This header file was generated by ./256colres.pl
3+ -}
2−module Graphics.Vty.Attributes.Color240
4+module Graphics.Vty.Attributes.Color240 where
3− ( rgbColorToColor240
4− , color240CodeToRGB
5− )
6−where
7
5
8−import Data.Word (Word8)
6+import Graphics.Vty.Attributes.Color
9−import Text.Printf
10
7
11−-- Note: rgbColor's mapping from RGB to 240 colors was generated from
8+import Text.Printf
12−-- 256colres.pl which is forked from xterm 256colres.pl.
13
9
14−-- | Create a value in the Color240 set from an RGB triple
10+-- | RGB color to 240 color palette.
11+--
12+-- generated from 256colres.pl which is forked from xterm 256colres.pl
13+-- todo: all values get clamped high.
15−rgbColorToColor240 :: Integral i => i -> i -> i -> Word8
14+rgbColor :: Integral i => i -> i -> i -> Color
16−rgbColorToColor240 r g b
15+rgbColor r g b
17 | r < 0 && g < 0 && b < 0 = error "rgbColor with negative color component intensity"
16 | r < 0 && g < 0 && b < 0 = error "rgbColor with negative color component intensity"
18− | r == 8 && g == 8 && b == 8 = 216
17+ | r == 8 && g == 8 && b == 8 = Color240 216
19− | r == 18 && g == 18 && b == 18 = 217
18+ | r == 18 && g == 18 && b == 18 = Color240 217
20− | r == 28 && g == 28 && b == 28 = 218
19+ | r == 28 && g == 28 && b == 28 = Color240 218
21− | r == 38 && g == 38 && b == 38 = 219
20+ | r == 38 && g == 38 && b == 38 = Color240 219
22− | r == 48 && g == 48 && b == 48 = 220
21+ | r == 48 && g == 48 && b == 48 = Color240 220
23− | r == 58 && g == 58 && b == 58 = 221
22+ | r == 58 && g == 58 && b == 58 = Color240 221
24− | r == 68 && g == 68 && b == 68 = 222
23+ | r == 68 && g == 68 && b == 68 = Color240 222
25− | r == 78 && g == 78 && b == 78 = 223
24+ | r == 78 && g == 78 && b == 78 = Color240 223
26− | r == 88 && g == 88 && b == 88 = 224
25+ | r == 88 && g == 88 && b == 88 = Color240 224
27− | r == 98 && g == 98 && b == 98 = 225
26+ | r == 98 && g == 98 && b == 98 = Color240 225
28− | r == 108 && g == 108 && b == 108 = 226
27+ | r == 108 && g == 108 && b == 108 = Color240 226
29− | r == 118 && g == 118 && b == 118 = 227
28+ | r == 118 && g == 118 && b == 118 = Color240 227
30− | r == 128 && g == 128 && b == 128 = 228
29+ | r == 128 && g == 128 && b == 128 = Color240 228
31− | r == 138 && g == 138 && b == 138 = 229
30+ | r == 138 && g == 138 && b == 138 = Color240 229
32− | r == 148 && g == 148 && b == 148 = 230
31+ | r == 148 && g == 148 && b == 148 = Color240 230
33− | r == 158 && g == 158 && b == 158 = 231
32+ | r == 158 && g == 158 && b == 158 = Color240 231
34− | r == 168 && g == 168 && b == 168 = 232
33+ | r == 168 && g == 168 && b == 168 = Color240 232
35− | r == 178 && g == 178 && b == 178 = 233
34+ | r == 178 && g == 178 && b == 178 = Color240 233
36− | r == 188 && g == 188 && b == 188 = 234
35+ | r == 188 && g == 188 && b == 188 = Color240 234
37− | r == 198 && g == 198 && b == 198 = 235
36+ | r == 198 && g == 198 && b == 198 = Color240 235
38− | r == 208 && g == 208 && b == 208 = 236
37+ | r == 208 && g == 208 && b == 208 = Color240 236
39− | r == 218 && g == 218 && b == 218 = 237
38+ | r == 218 && g == 218 && b == 218 = Color240 237
40− | r == 228 && g == 228 && b == 228 = 238
39+ | r == 228 && g == 228 && b == 228 = Color240 238
41− | r == 238 && g == 238 && b == 238 = 239
40+ | r == 238 && g == 238 && b == 238 = Color240 239
42− | otherwise = 36 * go r + 6 * go g + go b
41+ | r <= 0 && g <= 0 && b <= 0 = Color240 0
43− where go = simpleColor_ (error (printf "RGB color %d %d %d does not map to 240 palette."
42+ | r <= 0 && g <= 0 && b <= 95 = Color240 1
43+ | r <= 0 && g <= 0 && b <= 135 = Color240 2
44+ | r <= 0 && g <= 0 && b <= 175 = Color240 3
45+ | r <= 0 && g <= 0 && b <= 215 = Color240 4
46+ | r <= 0 && g <= 0 && b <= 255 = Color240 5
47+ | r <= 0 && g <= 95 && b <= 0 = Color240 6
48+ | r <= 0 && g <= 95 && b <= 95 = Color240 7
49+ | r <= 0 && g <= 95 && b <= 135 = Color240 8
50+ | r <= 0 && g <= 95 && b <= 175 = Color240 9
51+ | r <= 0 && g <= 95 && b <= 215 = Color240 10
52+ | r <= 0 && g <= 95 && b <= 255 = Color240 11
53+ | r <= 0 && g <= 135 && b <= 0 = Color240 12
54+ | r <= 0 && g <= 135 && b <= 95 = Color240 13
55+ | r <= 0 && g <= 135 && b <= 135 = Color240 14
56+ | r <= 0 && g <= 135 && b <= 175 = Color240 15
57+ | r <= 0 && g <= 135 && b <= 215 = Color240 16
58+ | r <= 0 && g <= 135 && b <= 255 = Color240 17
59+ | r <= 0 && g <= 175 && b <= 0 = Color240 18
60+ | r <= 0 && g <= 175 && b <= 95 = Color240 19
61+ | r <= 0 && g <= 175 && b <= 135 = Color240 20
62+ | r <= 0 && g <= 175 && b <= 175 = Color240 21
63+ | r <= 0 && g <= 175 && b <= 215 = Color240 22
64+ | r <= 0 && g <= 175 && b <= 255 = Color240 23
65+ | r <= 0 && g <= 215 && b <= 0 = Color240 24
66+ | r <= 0 && g <= 215 && b <= 95 = Color240 25
67+ | r <= 0 && g <= 215 && b <= 135 = Color240 26
68+ | r <= 0 && g <= 215 && b <= 175 = Color240 27
69+ | r <= 0 && g <= 215 && b <= 215 = Color240 28
70+ | r <= 0 && g <= 215 && b <= 255 = Color240 29
71+ | r <= 0 && g <= 255 && b <= 0 = Color240 30
72+ | r <= 0 && g <= 255 && b <= 95 = Color240 31
73+ | r <= 0 && g <= 255 && b <= 135 = Color240 32
74+ | r <= 0 && g <= 255 && b <= 175 = Color240 33
75+ | r <= 0 && g <= 255 && b <= 215 = Color240 34
76+ | r <= 0 && g <= 255 && b <= 255 = Color240 35
77+ | r <= 95 && g <= 0 && b <= 0 = Color240 36
78+ | r <= 95 && g <= 0 && b <= 95 = Color240 37
79+ | r <= 95 && g <= 0 && b <= 135 = Color240 38
80+ | r <= 95 && g <= 0 && b <= 175 = Color240 39
81+ | r <= 95 && g <= 0 && b <= 215 = Color240 40
82+ | r <= 95 && g <= 0 && b <= 255 = Color240 41
83+ | r <= 95 && g <= 95 && b <= 0 = Color240 42
84+ | r <= 95 && g <= 95 && b <= 95 = Color240 43
85+ | r <= 95 && g <= 95 && b <= 135 = Color240 44
86+ | r <= 95 && g <= 95 && b <= 175 = Color240 45
87+ | r <= 95 && g <= 95 && b <= 215 = Color240 46
88+ | r <= 95 && g <= 95 && b <= 255 = Color240 47
89+ | r <= 95 && g <= 135 && b <= 0 = Color240 48
90+ | r <= 95 && g <= 135 && b <= 95 = Color240 49
91+ | r <= 95 && g <= 135 && b <= 135 = Color240 50
92+ | r <= 95 && g <= 135 && b <= 175 = Color240 51
93+ | r <= 95 && g <= 135 && b <= 215 = Color240 52
94+ | r <= 95 && g <= 135 && b <= 255 = Color240 53
95+ | r <= 95 && g <= 175 && b <= 0 = Color240 54
96+ | r <= 95 && g <= 175 && b <= 95 = Color240 55
97+ | r <= 95 && g <= 175 && b <= 135 = Color240 56
98+ | r <= 95 && g <= 175 && b <= 175 = Color240 57
99+ | r <= 95 && g <= 175 && b <= 215 = Color240 58
100+ | r <= 95 && g <= 175 && b <= 255 = Color240 59
101+ | r <= 95 && g <= 215 && b <= 0 = Color240 60
102+ | r <= 95 && g <= 215 && b <= 95 = Color240 61
103+ | r <= 95 && g <= 215 && b <= 135 = Color240 62
104+ | r <= 95 && g <= 215 && b <= 175 = Color240 63
105+ | r <= 95 && g <= 215 && b <= 215 = Color240 64
106+ | r <= 95 && g <= 215 && b <= 255 = Color240 65
107+ | r <= 95 && g <= 255 && b <= 0 = Color240 66
108+ | r <= 95 && g <= 255 && b <= 95 = Color240 67
109+ | r <= 95 && g <= 255 && b <= 135 = Color240 68
110+ | r <= 95 && g <= 255 && b <= 175 = Color240 69
111+ | r <= 95 && g <= 255 && b <= 215 = Color240 70
112+ | r <= 95 && g <= 255 && b <= 255 = Color240 71
113+ | r <= 135 && g <= 0 && b <= 0 = Color240 72
114+ | r <= 135 && g <= 0 && b <= 95 = Color240 73
115+ | r <= 135 && g <= 0 && b <= 135 = Color240 74
116+ | r <= 135 && g <= 0 && b <= 175 = Color240 75
117+ | r <= 135 && g <= 0 && b <= 215 = Color240 76
118+ | r <= 135 && g <= 0 && b <= 255 = Color240 77
119+ | r <= 135 && g <= 95 && b <= 0 = Color240 78
120+ | r <= 135 && g <= 95 && b <= 95 = Color240 79
121+ | r <= 135 && g <= 95 && b <= 135 = Color240 80
122+ | r <= 135 && g <= 95 && b <= 175 = Color240 81
123+ | r <= 135 && g <= 95 && b <= 215 = Color240 82
124+ | r <= 135 && g <= 95 && b <= 255 = Color240 83
125+ | r <= 135 && g <= 135 && b <= 0 = Color240 84
126+ | r <= 135 && g <= 135 && b <= 95 = Color240 85
127+ | r <= 135 && g <= 135 && b <= 135 = Color240 86
128+ | r <= 135 && g <= 135 && b <= 175 = Color240 87
129+ | r <= 135 && g <= 135 && b <= 215 = Color240 88
130+ | r <= 135 && g <= 135 && b <= 255 = Color240 89
131+ | r <= 135 && g <= 175 && b <= 0 = Color240 90
132+ | r <= 135 && g <= 175 && b <= 95 = Color240 91
133+ | r <= 135 && g <= 175 && b <= 135 = Color240 92
134+ | r <= 135 && g <= 175 && b <= 175 = Color240 93
135+ | r <= 135 && g <= 175 && b <= 215 = Color240 94
136+ | r <= 135 && g <= 175 && b <= 255 = Color240 95
137+ | r <= 135 && g <= 215 && b <= 0 = Color240 96
138+ | r <= 135 && g <= 215 && b <= 95 = Color240 97
139+ | r <= 135 && g <= 215 && b <= 135 = Color240 98
140+ | r <= 135 && g <= 215 && b <= 175 = Color240 99
141+ | r <= 135 && g <= 215 && b <= 215 = Color240 100
142+ | r <= 135 && g <= 215 && b <= 255 = Color240 101
143+ | r <= 135 && g <= 255 && b <= 0 = Color240 102
144+ | r <= 135 && g <= 255 && b <= 95 = Color240 103
145+ | r <= 135 && g <= 255 && b <= 135 = Color240 104
146+ | r <= 135 && g <= 255 && b <= 175 = Color240 105
147+ | r <= 135 && g <= 255 && b <= 215 = Color240 106
148+ | r <= 135 && g <= 255 && b <= 255 = Color240 107
149+ | r <= 175 && g <= 0 && b <= 0 = Color240 108
150+ | r <= 175 && g <= 0 && b <= 95 = Color240 109
151+ | r <= 175 && g <= 0 && b <= 135 = Color240 110
152+ | r <= 175 && g <= 0 && b <= 175 = Color240 111
153+ | r <= 175 && g <= 0 && b <= 215 = Color240 112
154+ | r <= 175 && g <= 0 && b <= 255 = Color240 113
155+ | r <= 175 && g <= 95 && b <= 0 = Color240 114
156+ | r <= 175 && g <= 95 && b <= 95 = Color240 115
157+ | r <= 175 && g <= 95 && b <= 135 = Color240 116
158+ | r <= 175 && g <= 95 && b <= 175 = Color240 117
159+ | r <= 175 && g <= 95 && b <= 215 = Color240 118
160+ | r <= 175 && g <= 95 && b <= 255 = Color240 119
161+ | r <= 175 && g <= 135 && b <= 0 = Color240 120
162+ | r <= 175 && g <= 135 && b <= 95 = Color240 121
163+ | r <= 175 && g <= 135 && b <= 135 = Color240 122
164+ | r <= 175 && g <= 135 && b <= 175 = Color240 123
165+ | r <= 175 && g <= 135 && b <= 215 = Color240 124
166+ | r <= 175 && g <= 135 && b <= 255 = Color240 125
167+ | r <= 175 && g <= 175 && b <= 0 = Color240 126
168+ | r <= 175 && g <= 175 && b <= 95 = Color240 127
169+ | r <= 175 && g <= 175 && b <= 135 = Color240 128
170+ | r <= 175 && g <= 175 && b <= 175 = Color240 129
171+ | r <= 175 && g <= 175 && b <= 215 = Color240 130
172+ | r <= 175 && g <= 175 && b <= 255 = Color240 131
173+ | r <= 175 && g <= 215 && b <= 0 = Color240 132
174+ | r <= 175 && g <= 215 && b <= 95 = Color240 133
175+ | r <= 175 && g <= 215 && b <= 135 = Color240 134
176+ | r <= 175 && g <= 215 && b <= 175 = Color240 135
177+ | r <= 175 && g <= 215 && b <= 215 = Color240 136
178+ | r <= 175 && g <= 215 && b <= 255 = Color240 137
179+ | r <= 175 && g <= 255 && b <= 0 = Color240 138
180+ | r <= 175 && g <= 255 && b <= 95 = Color240 139
181+ | r <= 175 && g <= 255 && b <= 135 = Color240 140
182+ | r <= 175 && g <= 255 && b <= 175 = Color240 141
183+ | r <= 175 && g <= 255 && b <= 215 = Color240 142
184+ | r <= 175 && g <= 255 && b <= 255 = Color240 143
185+ | r <= 215 && g <= 0 && b <= 0 = Color240 144
186+ | r <= 215 && g <= 0 && b <= 95 = Color240 145
187+ | r <= 215 && g <= 0 && b <= 135 = Color240 146
188+ | r <= 215 && g <= 0 && b <= 175 = Color240 147
189+ | r <= 215 && g <= 0 && b <= 215 = Color240 148
190+ | r <= 215 && g <= 0 && b <= 255 = Color240 149
191+ | r <= 215 && g <= 95 && b <= 0 = Color240 150
192+ | r <= 215 && g <= 95 && b <= 95 = Color240 151
193+ | r <= 215 && g <= 95 && b <= 135 = Color240 152
194+ | r <= 215 && g <= 95 && b <= 175 = Color240 153
195+ | r <= 215 && g <= 95 && b <= 215 = Color240 154
196+ | r <= 215 && g <= 95 && b <= 255 = Color240 155
197+ | r <= 215 && g <= 135 && b <= 0 = Color240 156
198+ | r <= 215 && g <= 135 && b <= 95 = Color240 157
199+ | r <= 215 && g <= 135 && b <= 135 = Color240 158
200+ | r <= 215 && g <= 135 && b <= 175 = Color240 159
201+ | r <= 215 && g <= 135 && b <= 215 = Color240 160
202+ | r <= 215 && g <= 135 && b <= 255 = Color240 161
203+ | r <= 215 && g <= 175 && b <= 0 = Color240 162
204+ | r <= 215 && g <= 175 && b <= 95 = Color240 163
205+ | r <= 215 && g <= 175 && b <= 135 = Color240 164
206+ | r <= 215 && g <= 175 && b <= 175 = Color240 165
207+ | r <= 215 && g <= 175 && b <= 215 = Color240 166
208+ | r <= 215 && g <= 175 && b <= 255 = Color240 167
209+ | r <= 215 && g <= 215 && b <= 0 = Color240 168
210+ | r <= 215 && g <= 215 && b <= 95 = Color240 169
211+ | r <= 215 && g <= 215 && b <= 135 = Color240 170
212+ | r <= 215 && g <= 215 && b <= 175 = Color240 171
213+ | r <= 215 && g <= 215 && b <= 215 = Color240 172
214+ | r <= 215 && g <= 215 && b <= 255 = Color240 173
215+ | r <= 215 && g <= 255 && b <= 0 = Color240 174
216+ | r <= 215 && g <= 255 && b <= 95 = Color240 175
217+ | r <= 215 && g <= 255 && b <= 135 = Color240 176
218+ | r <= 215 && g <= 255 && b <= 175 = Color240 177
219+ | r <= 215 && g <= 255 && b <= 215 = Color240 178
220+ | r <= 215 && g <= 255 && b <= 255 = Color240 179
221+ | r <= 255 && g <= 0 && b <= 0 = Color240 180
222+ | r <= 255 && g <= 0 && b <= 95 = Color240 181
223+ | r <= 255 && g <= 0 && b <= 135 = Color240 182
224+ | r <= 255 && g <= 0 && b <= 175 = Color240 183
225+ | r <= 255 && g <= 0 && b <= 215 = Color240 184
226+ | r <= 255 && g <= 0 && b <= 255 = Color240 185
227+ | r <= 255 && g <= 95 && b <= 0 = Color240 186
228+ | r <= 255 && g <= 95 && b <= 95 = Color240 187
229+ | r <= 255 && g <= 95 && b <= 135 = Color240 188
230+ | r <= 255 && g <= 95 && b <= 175 = Color240 189
231+ | r <= 255 && g <= 95 && b <= 215 = Color240 190
232+ | r <= 255 && g <= 95 && b <= 255 = Color240 191
233+ | r <= 255 && g <= 135 && b <= 0 = Color240 192
234+ | r <= 255 && g <= 135 && b <= 95 = Color240 193
235+ | r <= 255 && g <= 135 && b <= 135 = Color240 194
236+ | r <= 255 && g <= 135 && b <= 175 = Color240 195
237+ | r <= 255 && g <= 135 && b <= 215 = Color240 196
238+ | r <= 255 && g <= 135 && b <= 255 = Color240 197
239+ | r <= 255 && g <= 175 && b <= 0 = Color240 198
240+ | r <= 255 && g <= 175 && b <= 95 = Color240 199
241+ | r <= 255 && g <= 175 && b <= 135 = Color240 200
242+ | r <= 255 && g <= 175 && b <= 175 = Color240 201
243+ | r <= 255 && g <= 175 && b <= 215 = Color240 202
244+ | r <= 255 && g <= 175 && b <= 255 = Color240 203
245+ | r <= 255 && g <= 215 && b <= 0 = Color240 204
246+ | r <= 255 && g <= 215 && b <= 95 = Color240 205
247+ | r <= 255 && g <= 215 && b <= 135 = Color240 206
248+ | r <= 255 && g <= 215 && b <= 175 = Color240 207
249+ | r <= 255 && g <= 215 && b <= 215 = Color240 208
250+ | r <= 255 && g <= 215 && b <= 255 = Color240 209
251+ | r <= 255 && g <= 255 && b <= 0 = Color240 210
252+ | r <= 255 && g <= 255 && b <= 95 = Color240 211
253+ | r <= 255 && g <= 255 && b <= 135 = Color240 212
254+ | r <= 255 && g <= 255 && b <= 175 = Color240 213
255+ | r <= 255 && g <= 255 && b <= 215 = Color240 214
256+ | r <= 255 && g <= 255 && b <= 255 = Color240 215
257+ | otherwise = error (printf "RGB color %d %d %d does not map to 240 palette."
44 (fromIntegral r :: Int)
258 (fromIntegral r :: Int)
45 (fromIntegral g :: Int)
259 (fromIntegral g :: Int)
46− (fromIntegral b :: Int)))
260+ (fromIntegral b :: Int))
47−
48−simpleColor_ :: Integral i => Word8 -> i -> Word8
49−simpleColor_ e c
50− | c <= 0 = 0
51− | c <= 95 = 1
52− | c <= 255 = fromIntegral ((c-16) `div` 40)
53− | otherwise = e
54
261
55−-- | Create a RGB triple from a value in the Color240 set.
56−color240CodeToRGB :: Word8 -> Maybe (Int, Int, Int)
57−color240CodeToRGB n = case n of
58− 0 -> Just (0, 0, 0)
59− 1 -> Just (0, 0, 95)
60− 2 -> Just (0, 0, 135)
61− 3 -> Just (0, 0, 175)
62− 4 -> Just (0, 0, 215)
63− 5 -> Just (0, 0, 255)
64− 6 -> Just (0, 95, 0)
65− 7 -> Just (0, 95, 95)
66− 8 -> Just (0, 95, 135)
67− 9 -> Just (0, 95, 175)
68− 10 -> Just (0, 95, 215)
69− 11 -> Just (0, 95, 255)
70− 12 -> Just (0, 135, 0)
71− 13 -> Just (0, 135, 95)
72− 14 -> Just (0, 135, 135)
73− 15 -> Just (0, 135, 175)
74− 16 -> Just (0, 135, 215)
75− 17 -> Just (0, 135, 255)
76− 18 -> Just (0, 175, 0)
77− 19 -> Just (0, 175, 95)
78− 20 -> Just (0, 175, 135)
79− 21 -> Just (0, 175, 175)
80− 22 -> Just (0, 175, 215)
81− 23 -> Just (0, 175, 255)
82− 24 -> Just (0, 215, 0)
83− 25 -> Just (0, 215, 95)
84− 26 -> Just (0, 215, 135)
85− 27 -> Just (0, 215, 175)
86− 28 -> Just (0, 215, 215)
87− 29 -> Just (0, 215, 255)
88− 30 -> Just (0, 255, 0)
89− 31 -> Just (0, 255, 95)
90− 32 -> Just (0, 255, 135)
91− 33 -> Just (0, 255, 175)
92− 34 -> Just (0, 255, 215)
93− 35 -> Just (0, 255, 255)
94− 36 -> Just (95, 0, 0)
95− 37 -> Just (95, 0, 95)
96− 38 -> Just (95, 0, 135)
97− 39 -> Just (95, 0, 175)
98− 40 -> Just (95, 0, 215)
99− 41 -> Just (95, 0, 255)
100− 42 -> Just (95, 95, 0)
101− 43 -> Just (95, 95, 95)
102− 44 -> Just (95, 95, 135)
103− 45 -> Just (95, 95, 175)
104− 46 -> Just (95, 95, 215)
105− 47 -> Just (95, 95, 255)
106− 48 -> Just (95, 135, 0)
107− 49 -> Just (95, 135, 95)
108− 50 -> Just (95, 135, 135)
109− 51 -> Just (95, 135, 175)
110− 52 -> Just (95, 135, 215)
111− 53 -> Just (95, 135, 255)
112− 54 -> Just (95, 175, 0)
113− 55 -> Just (95, 175, 95)
114− 56 -> Just (95, 175, 135)
115− 57 -> Just (95, 175, 175)
116− 58 -> Just (95, 175, 215)
117− 59 -> Just (95, 175, 255)
118− 60 -> Just (95, 215, 0)
119− 61 -> Just (95, 215, 95)
120− 62 -> Just (95, 215, 135)
121− 63 -> Just (95, 215, 175)
122− 64 -> Just (95, 215, 215)
123− 65 -> Just (95, 215, 255)
124− 66 -> Just (95, 255, 0)
125− 67 -> Just (95, 255, 95)
126− 68 -> Just (95, 255, 135)
127− 69 -> Just (95, 255, 175)
128− 70 -> Just (95, 255, 215)
129− 71 -> Just (95, 255, 255)
130− 72 -> Just (135, 0, 0)
131− 73 -> Just (135, 0, 95)
132− 74 -> Just (135, 0, 135)
133− 75 -> Just (135, 0, 175)
134− 76 -> Just (135, 0, 215)
135− 77 -> Just (135, 0, 255)
136− 78 -> Just (135, 95, 0)
137− 79 -> Just (135, 95, 95)
138− 80 -> Just (135, 95, 135)
139− 81 -> Just (135, 95, 175)
140− 82 -> Just (135, 95, 215)
141− 83 -> Just (135, 95, 255)
142− 84 -> Just (135, 135, 0)
143− 85 -> Just (135, 135, 95)
144− 86 -> Just (135, 135, 135)
145− 87 -> Just (135, 135, 175)
146− 88 -> Just (135, 135, 215)
147− 89 -> Just (135, 135, 255)
148− 90 -> Just (135, 175, 0)
149− 91 -> Just (135, 175, 95)
150− 92 -> Just (135, 175, 135)
151− 93 -> Just (135, 175, 175)
152− 94 -> Just (135, 175, 215)
153− 95 -> Just (135, 175, 255)
154− 96 -> Just (135, 215, 0)
155− 97 -> Just (135, 215, 95)
156− 98 -> Just (135, 215, 135)
157− 99 -> Just (135, 215, 175)
158− 100 -> Just (135, 215, 215)
159− 101 -> Just (135, 215, 255)
160− 102 -> Just (135, 255, 0)
161− 103 -> Just (135, 255, 95)
162− 104 -> Just (135, 255, 135)
163− 105 -> Just (135, 255, 175)
164− 106 -> Just (135, 255, 215)
165− 107 -> Just (135, 255, 255)
166− 108 -> Just (175, 0, 0)
167− 109 -> Just (175, 0, 95)
168− 110 -> Just (175, 0, 135)
169− 111 -> Just (175, 0, 175)
170− 112 -> Just (175, 0, 215)
171− 113 -> Just (175, 0, 255)
172− 114 -> Just (175, 95, 0)
173− 115 -> Just (175, 95, 95)
174− 116 -> Just (175, 95, 135)
175− 117 -> Just (175, 95, 175)
176− 118 -> Just (175, 95, 215)
177− 119 -> Just (175, 95, 255)
178− 120 -> Just (175, 135, 0)
179− 121 -> Just (175, 135, 95)
180− 122 -> Just (175, 135, 135)
181− 123 -> Just (175, 135, 175)
182− 124 -> Just (175, 135, 215)
183− 125 -> Just (175, 135, 255)
184− 126 -> Just (175, 175, 0)
185− 127 -> Just (175, 175, 95)
186− 128 -> Just (175, 175, 135)
187− 129 -> Just (175, 175, 175)
188− 130 -> Just (175, 175, 215)
189− 131 -> Just (175, 175, 255)
190− 132 -> Just (175, 215, 0)
191− 133 -> Just (175, 215, 95)
192− 134 -> Just (175, 215, 135)
193− 135 -> Just (175, 215, 175)
194− 136 -> Just (175, 215, 215)
195− 137 -> Just (175, 215, 255)
196− 138 -> Just (175, 255, 0)
197− 139 -> Just (175, 255, 95)
198− 140 -> Just (175, 255, 135)
199− 141 -> Just (175, 255, 175)
200− 142 -> Just (175, 255, 215)
201− 143 -> Just (175, 255, 255)
202− 144 -> Just (215, 0, 0)
203− 145 -> Just (215, 0, 95)
204− 146 -> Just (215, 0, 135)
205− 147 -> Just (215, 0, 175)
206− 148 -> Just (215, 0, 215)
207− 149 -> Just (215, 0, 255)
208− 150 -> Just (215, 95, 0)
209− 151 -> Just (215, 95, 95)
210− 152 -> Just (215, 95, 135)
211− 153 -> Just (215, 95, 175)
212− 154 -> Just (215, 95, 215)
213− 155 -> Just (215, 95, 255)
214− 156 -> Just (215, 135, 0)
215− 157 -> Just (215, 135, 95)
216− 158 -> Just (215, 135, 135)
217− 159 -> Just (215, 135, 175)
218− 160 -> Just (215, 135, 215)
219− 161 -> Just (215, 135, 255)
220− 162 -> Just (215, 175, 0)
221− 163 -> Just (215, 175, 95)
222− 164 -> Just (215, 175, 135)
223− 165 -> Just (215, 175, 175)
224− 166 -> Just (215, 175, 215)
225− 167 -> Just (215, 175, 255)
226− 168 -> Just (215, 215, 0)
227− 169 -> Just (215, 215, 95)
228− 170 -> Just (215, 215, 135)
229− 171 -> Just (215, 215, 175)
230− 172 -> Just (215, 215, 215)
231− 173 -> Just (215, 215, 255)
232− 174 -> Just (215, 255, 0)
233− 175 -> Just (215, 255, 95)
234− 176 -> Just (215, 255, 135)
235− 177 -> Just (215, 255, 175)
236− 178 -> Just (215, 255, 215)
237− 179 -> Just (215, 255, 255)
238− 180 -> Just (255, 0, 0)
239− 181 -> Just (255, 0, 95)
240− 182 -> Just (255, 0, 135)
241− 183 -> Just (255, 0, 175)
242− 184 -> Just (255, 0, 215)
243− 185 -> Just (255, 0, 255)
244− 186 -> Just (255, 95, 0)
245− 187 -> Just (255, 95, 95)
246− 188 -> Just (255, 95, 135)
247− 189 -> Just (255, 95, 175)
248− 190 -> Just (255, 95, 215)
249− 191 -> Just (255, 95, 255)
250− 192 -> Just (255, 135, 0)
251− 193 -> Just (255, 135, 95)
252− 194 -> Just (255, 135, 135)
253− 195 -> Just (255, 135, 175)
254− 196 -> Just (255, 135, 215)
255− 197 -> Just (255, 135, 255)
256− 198 -> Just (255, 175, 0)
257− 199 -> Just (255, 175, 95)
258− 200 -> Just (255, 175, 135)
259− 201 -> Just (255, 175, 175)
260− 202 -> Just (255, 175, 215)
261− 203 -> Just (255, 175, 255)
262− 204 -> Just (255, 215, 0)
263− 205 -> Just (255, 215, 95)
264− 206 -> Just (255, 215, 135)
265− 207 -> Just (255, 215, 175)
266− 208 -> Just (255, 215, 215)
267− 209 -> Just (255, 215, 255)
268− 210 -> Just (255, 255, 0)
269− 211 -> Just (255, 255, 95)
270− 212 -> Just (255, 255, 135)
271− 213 -> Just (255, 255, 175)
272− 214 -> Just (255, 255, 215)
273− 215 -> Just (255, 255, 255)
274− 216 -> Just (8, 8, 8)
275− 217 -> Just (18, 18, 18)
276− 218 -> Just (28, 28, 28)
277− 219 -> Just (38, 38, 38)
278− 220 -> Just (48, 48, 48)
279− 221 -> Just (58, 58, 58)
280− 222 -> Just (68, 68, 68)
281− 223 -> Just (78, 78, 78)
282− 224 -> Just (88, 88, 88)
283− 225 -> Just (98, 98, 98)
284− 226 -> Just (108, 108, 108)
285− 227 -> Just (118, 118, 118)
286− 228 -> Just (128, 128, 128)
287− 229 -> Just (138, 138, 138)
288− 230 -> Just (148, 148, 148)
289− 231 -> Just (158, 158, 158)
290− 232 -> Just (168, 168, 168)
291− 233 -> Just (178, 178, 178)
292− 234 -> Just (188, 188, 188)
293− 235 -> Just (198, 198, 198)
294− 236 -> Just (208, 208, 208)
295− 237 -> Just (218, 218, 218)
296− 238 -> Just (228, 228, 228)
297− 239 -> Just (238, 238, 238)
298− _ -> Nothing
src/Graphics/Vty/Config.hs+111−290
@@ -3,13 +3,21 @@
3{-# LANGUAGE FlexibleContexts, FlexibleInstances #-}
3{-# LANGUAGE FlexibleContexts, FlexibleInstances #-}
4{-# LANGUAGE TypeOperators #-}
4{-# LANGUAGE TypeOperators #-}
5{-# LANGUAGE ScopedTypeVariables #-}
5{-# LANGUAGE ScopedTypeVariables #-}
6−{-# LANGUAGE LambdaCase, MultiWayIf #-}
7−-- | Vty supports a configuration file format and associated 'Config'
8−-- data type. The 'Config' can be provided to 'mkVty' to customize the
6+-- | A 'Config' can be provided to mkVty to customize the applications use of vty. A config file can
9−-- application's use of Vty.
7+-- be used to customize vty for a user's system.
10--
8--
9+-- The 'Config' provided is mappend'd to 'Config's loaded from @'getAppUserDataDirectory'/config@
10+-- and @$VTY_CONFIG_FILE@. The @$VTY_CONFIG_FILE@ takes precedence over the @config@ file or the
11+-- application provided 'Config'.
12+--
11−-- Lines in config files that fail to parse are ignored. Later entries
13+-- Lines in config files that fail to parse are ignored. Later entries take precedence over
12−-- take precedence over earlier ones.
14+-- earlier.
15+--
16+-- For all directives:
17+--
18+-- @
19+-- string := \"\\\"\" chars+ \"\\\"\"
20+-- @
13--
21--
14-- = Debug
22-- = Debug
15--
23--
@@ -21,8 +29,8 @@
21-- \"debugLog\" string
29-- \"debugLog\" string
22-- @
30-- @
23--
31--
24−-- The value of the environment variable @VTY_DEBUG_LOG@ is equivalent
32+-- The value of the environment variable @VTY_DEBUG_LOG@ is equivalent to a debugLog entry at the
25−-- to a debugLog entry at the end of the last config file.
33+-- end of the last config file.
26--
34--
27-- = Input Processing
35-- = Input Processing
28--
36--
@@ -32,14 +40,14 @@
32--
40--
33-- @
41-- @
34-- \"map\" term string key modifier_list
42-- \"map\" term string key modifier_list
35−-- where
43+-- where
36-- key := KEsc | KChar Char | KBS ... (same as 'Key')
44-- key := KEsc | KChar Char | KBS ... (same as 'Key')
37-- modifier_list := \"[\" modifier+ \"]\"
45-- modifier_list := \"[\" modifier+ \"]\"
38-- modifier := MShift | MCtrl | MMeta | MAlt
46-- modifier := MShift | MCtrl | MMeta | MAlt
39-- term := "_" | string
47-- term := "_" | string
40-- @
48-- @
41--
49--
42−-- E.g., if the contents are
50+-- EG: If the contents are
43--
51--
44-- @
52-- @
45-- map _ \"\\ESC[B\" KUp []
53-- map _ \"\\ESC[B\" KUp []
@@ -47,41 +55,16 @@
47-- map \"xterm\" \"\\ESC[D\" KLeft []
55-- map \"xterm\" \"\\ESC[D\" KLeft []
48-- @
56-- @
49--
57--
50−-- Then the bytes @\"\\ESC[B\"@ will result in the KUp event on all
58+-- Then the bytes @\"\\ESC[B\"@ will result in the KUp event on all terminals. The bytes
51−-- terminals. The bytes @\"\\ESC[1;3B\"@ will result in the event KDown
52−-- with the MAlt modifier on all terminals. The bytes @\"\\ESC[D\"@ will
59+-- @\"\\ESC[1;3B\"@ will result in the event KDown with the MAlt modifier on all terminals.
53−-- result in the KLeft event when @TERM@ is @xterm@.
60+-- The bytes @\"\\ESC[D\"@ will result in the KLeft event when @TERM@ is @xterm@.
54−--
55−-- If a debug log is requested then vty will output the current input
56−-- table to the log in the above format. A workflow for using this is
57−-- to set @VTY_DEBUG_LOG@. Run the application. Check the debug log for
58−-- incorrect mappings. Add corrected mappings to @$HOME\/.vty\/config@.
59−--
60−-- = Unicode Character Width Maps
61−--
62−-- == @widthMap@
63−--
64−-- Format:
65−--
66−-- @
67−-- \"widthMap\" string string
68−-- @
69--
61--
70−-- E.g.,
62+-- If a debug log is requested then vty will output the current input table to the log in the above
63+-- format.
71--
64--
72−-- @
65+-- Set VTY_DEBUG_LOG. Run vty. Check debug log for incorrect mappings. Add corrected mappings to
73−-- widthMap \"xterm\" \"\/home\/user\/.vty\/xterm\_map.dat\"
66+-- .vty/config
74−-- @
75--
67--
76−-- This directive specifies the path to a Unicode character width
77−-- map (the second argument) that should be loaded and used when
78−-- the value of TERM matches the first argument. Unicode character
79−-- width maps can be produced either by running the provided binary
80−-- @vty-build-width-table@ or by calling the library routine
81−-- 'Graphics.Vty.UnicodeWidthTable.Query.buildUnicodeWidthTable'. The
82−-- 'Graphics.Vty.mkVty' function will use these configuration settings
83−-- to attempt to load and install the specified width map. See the
84−-- documentation for 'Graphics.Vty.mkVty' for details.
85module Graphics.Vty.Config
68module Graphics.Vty.Config
86 ( InputMap
69 ( InputMap
87 , Config(..)
70 , Config(..)
@@ -91,22 +74,13 @@ module Graphics.Vty.Config
91 , standardIOConfig
74 , standardIOConfig
92 , runParseConfig
75 , runParseConfig
93 , parseConfigFile
76 , parseConfigFile
94− , defaultConfig
95− , getTtyEraseChar
96− , currentTerminalName
97−
98− , vtyConfigPath
99− , widthTableFilename
100− , vtyDataDirectory
101− , terminalWidthTablePath
102− , vtyConfigFileEnvName
103−
104− , ConfigUpdateResult(..)
105− , addConfigWidthMap
106− )
107−where
77+ ) where
108
78
79+#if __GLASGOW_HASKELL__ > 704
109import Prelude
80import Prelude
81+#else
82+import Prelude hiding (catch)
83+#endif
110
84
111import Control.Applicative hiding (many)
85import Control.Applicative hiding (many)
112
86
@@ -114,186 +88,113 @@ import Control.Exception (catch, IOException, Exception(..), throwIO)
114import Control.Monad (liftM, guard, void)
88import Control.Monad (liftM, guard, void)
115
89
116import qualified Data.ByteString as BS
90import qualified Data.ByteString as BS
117−#if !(MIN_VERSION_base(4,8,0))
118−import Data.Monoid (Monoid(..))
91+import Data.Default
119−#endif
120−#if !(MIN_VERSION_base(4,11,0))
121−import Data.Semigroup (Semigroup(..))
92+import Data.Monoid
122−#endif
123import Data.Typeable (Typeable)
93import Data.Typeable (Typeable)
124
94
125import Graphics.Vty.Input.Events
95import Graphics.Vty.Input.Events
126−import Graphics.Vty.Attributes.Color (ColorMode(..), detectColorMode)
127
96
128import GHC.Generics
97import GHC.Generics
129
98
130−import System.Directory ( getAppUserDataDirectory, doesFileExist
99+import System.Directory (getAppUserDataDirectory)
131− , createDirectoryIfMissing
132− )
133−import System.Environment (lookupEnv)
100+import System.Posix.Env (getEnv)
134−import System.FilePath ((</>), takeDirectory)
135import System.Posix.IO (stdInput, stdOutput)
101import System.Posix.IO (stdInput, stdOutput)
136import System.Posix.Types (Fd(..))
102import System.Posix.Types (Fd(..))
137−import Foreign.C.Types (CInt(..), CChar(..))
138
103
139import Text.Parsec hiding ((<|>))
104import Text.Parsec hiding ((<|>))
140import Text.Parsec.Token ( GenLanguageDef(..) )
105import Text.Parsec.Token ( GenLanguageDef(..) )
141import qualified Text.Parsec.Token as P
106import qualified Text.Parsec.Token as P
142
107
143-- | Type of errors that can be thrown when configuring VTY
108-- | Type of errors that can be thrown when configuring VTY
144−data VtyConfigurationError =
109+data VtyConfigurationError
145− VtyMissingTermEnvVar
146− -- ^ TERM environment variable not set
110+ = VtyMissingTermEnvVar -- ^ TERM environment variable not set
147− deriving (Show, Eq, Typeable)
111+ deriving (Show, Eq, Typeable)
148
112
149instance Exception VtyConfigurationError where
113instance Exception VtyConfigurationError where
114+#if MIN_VERSION_base(4,8,0)
150− displayException VtyMissingTermEnvVar = "TERM environment variable not set"
115+ displayException VtyMissingTermEnvVar = "TERM environment variable not set"
116+#endif
151
117
152−-- | Mappings from input bytes to event in the order specified. Later
118+-- | Mappings from input bytes to event in the order specified. Later entries take precedence over
153−-- entries take precedence over earlier in the case multiple entries
119+-- earlier in the case multiple entries have the same byte string.
154−-- have the same byte string.
155type InputMap = [(Maybe String, String, Event)]
120type InputMap = [(Maybe String, String, Event)]
156
121
157−-- | A Vty configuration.
158−data Config =
122+data Config = Config
123+ {
124+ -- | The default is 1 character.
159− Config { vmin :: Maybe Int
125+ vmin :: Maybe Int
160− -- ^ The default is 1 character.
161− , vtime :: Maybe Int
162− -- ^ The default is 100 milliseconds, 0.1 seconds.
126+ -- | The default is 100 milliseconds, 0.1 seconds.
163− , mouseMode :: Maybe Bool
127+ , vtime :: Maybe Int
164− -- ^ The default is False.
128+ -- | The default is False.
165− , bracketedPasteMode :: Maybe Bool
129+ , mouseMode :: Maybe Bool
166− -- ^ The default is False.
130+ -- | The default is False.
167− , debugLog :: Maybe FilePath
131+ , bracketedPasteMode :: Maybe Bool
168− -- ^ Debug information is appended to this file if not
132+ -- | Debug information is appended to this file if not Nothing.
169− -- Nothing.
133+ , debugLog :: Maybe FilePath
170− , inputMap :: InputMap
171− -- ^ The (input byte, output event) pairs extend the internal
134+ -- | The (input byte, output event) pairs extend the internal input table of VTY and the table
172− -- input table of VTY and the table from terminfo.
135+ -- from terminfo.
173− --
136+ --
174− -- See "Graphics.Vty.Config" module documentation for
137+ -- See "Graphics.Vty.Config" module documentation for documentation of the @map@ directive.
175− -- documentation of the @map@ directive.
138+ , inputMap :: InputMap
176− , inputFd :: Maybe Fd
177− -- ^ The input file descriptor to use. The default is
139+ -- | The input file descriptor to use. The default is 'System.Posix.IO.stdInput'
178− -- 'System.Posix.IO.stdInput'
179− , outputFd :: Maybe Fd
140+ , inputFd :: Maybe Fd
180− -- ^ The output file descriptor to use. The default is
141+ -- | The output file descriptor to use. The default is 'System.Posix.IO.stdOutput'
181− -- 'System.Posix.IO.stdOutput'
142+ , outputFd :: Maybe Fd
182− , termName :: Maybe String
183− -- ^ The terminal name used to look up terminfo capabilities.
143+ -- | The terminal name used to look up terminfo capabilities.
184− -- The default is the value of the TERM environment variable.
144+ -- The default is the value of the TERM environment variable.
185− , termWidthMaps :: [(String, FilePath)]
145+ , termName :: Maybe String
186− -- ^ Terminal width map files.
187− , allowCustomUnicodeWidthTables :: Maybe Bool
188− -- ^ Whether to permit custom Unicode width table loading by
189− -- 'Graphics.Vty.mkVty'. @'Just' 'False'@ indicates that
190− -- table loading should not be performed. Other values permit
191− -- table loading.
192− --
193− -- If a table load is attempted and fails, information
194− -- about the failure will be logged to the debug log if the
195− -- configuration specifies one. If no custom table is loaded
196− -- (or if a load fails), the built-in character width table
197− -- will be used.
198− , colorMode :: Maybe ColorMode
199− -- ^ The color mode used to know how many colors the terminal
200− -- supports.
201− }
202− deriving (Show, Eq)
146+ } deriving (Show, Eq)
203−
147+
204−defaultConfig :: Config
205−defaultConfig = mempty
206−
207−instance Semigroup Config where
148+instance Default Config where
208− c0 <> c1 =
149+ def = mempty
209− -- latter config takes priority for everything but inputMap
210− Config { vmin = vmin c1 <|> vmin c0
211− , vtime = vtime c1 <|> vtime c0
212− , mouseMode = mouseMode c1
213− , bracketedPasteMode = bracketedPasteMode c1
214− , debugLog = debugLog c1 <|> debugLog c0
215− , inputMap = inputMap c0 <> inputMap c1
216− , inputFd = inputFd c1 <|> inputFd c0
217− , outputFd = outputFd c1 <|> outputFd c0
218− , termName = termName c1 <|> termName c0
219− , termWidthMaps = termWidthMaps c1 <|> termWidthMaps c0
220− , allowCustomUnicodeWidthTables =
221− allowCustomUnicodeWidthTables c1 <|> allowCustomUnicodeWidthTables c0
222− , colorMode = colorMode c1 <|> colorMode c0
223− }
224
150
225instance Monoid Config where
151instance Monoid Config where
226− mempty =
152+ mempty = Config
227− Config { vmin = Nothing
153+ { vmin = Nothing
228− , vtime = Nothing
154+ , vtime = Nothing
229− , mouseMode = Nothing
155+ , mouseMode = Nothing
230− , bracketedPasteMode = Nothing
156+ , bracketedPasteMode = Nothing
231− , debugLog = mempty
157+ , debugLog = mempty
232− , inputMap = mempty
158+ , inputMap = mempty
233− , inputFd = Nothing
159+ , inputFd = Nothing
234− , outputFd = Nothing
160+ , outputFd = Nothing
235− , termName = Nothing
161+ , termName = Nothing
236− , termWidthMaps = []
237− , allowCustomUnicodeWidthTables = Nothing
238− , colorMode = Nothing
239− }
162+ }
240−#if !(MIN_VERSION_base(4,11,0))
241− mappend = (<>)
163+ mappend c0 c1 = Config
242−#endif
164+ -- latter config takes priority for everything but inputMap
243−
165+ { vmin = vmin c1 <|> vmin c0
244−vtyDataDirectory :: IO FilePath
166+ , vtime = vtime c1 <|> vtime c0
245−vtyDataDirectory = getAppUserDataDirectory "vty"
167+ , mouseMode = mouseMode c1
246−
168+ , bracketedPasteMode = bracketedPasteMode c1
247−vtyConfigPath :: IO FilePath
169+ , debugLog = debugLog c1 <|> debugLog c0
248−vtyConfigPath = do
170+ , inputMap = inputMap c0 <> inputMap c1
249− dir <- vtyDataDirectory
171+ , inputFd = inputFd c1 <|> inputFd c0
250− return $ dir </> "config"
172+ , outputFd = outputFd c1 <|> outputFd c0
251−
173+ , termName = termName c1 <|> termName c0
252−vtyConfigFileEnvName :: String
174+ }
253−vtyConfigFileEnvName = "VTY_CONFIG_FILE"
175+
254−
255−-- | Load a configuration from 'vtyConfigPath' and @$VTY_CONFIG_FILE@.
176+-- | Config from @'getAppUserDataDirectory'/config@ and @$VTY_CONFIG_FILE@
256userConfig :: IO Config
177userConfig :: IO Config
257userConfig = do
178userConfig = do
258− configFile <- vtyConfigPath >>= parseConfigFile
179+ configFile <- (mappend <$> getAppUserDataDirectory "vty" <*> pure "/config") >>= parseConfigFile
259− overrideConfig <- maybe (return defaultConfig) parseConfigFile =<<
180+ overrideConfig <- maybe (return def) parseConfigFile =<< getEnv "VTY_CONFIG_FILE"
260− lookupEnv vtyConfigFileEnvName
261 let base = configFile <> overrideConfig
181 let base = configFile <> overrideConfig
262 mappend base <$> overrideEnvConfig
182 mappend base <$> overrideEnvConfig
263
183
264−widthTableFilename :: String -> String
265−widthTableFilename term = "width_table_" <> term <> ".dat"
266−
267−termVariable :: String
268−termVariable = "TERM"
269−
270−currentTerminalName :: IO (Maybe String)
271−currentTerminalName = lookupEnv termVariable
272−
273−terminalWidthTablePath :: IO (Maybe FilePath)
274−terminalWidthTablePath = do
275− dataDir <- vtyDataDirectory
276− result <- lookupEnv termVariable
277− case result of
278− Nothing -> return Nothing
279− Just term -> do
280− return $ Just $ dataDir </> widthTableFilename term
281−
282overrideEnvConfig :: IO Config
184overrideEnvConfig :: IO Config
283overrideEnvConfig = do
185overrideEnvConfig = do
284− d <- lookupEnv "VTY_DEBUG_LOG"
186+ d <- getEnv "VTY_DEBUG_LOG"
285− return $ defaultConfig { debugLog = d }
187+ return $ def { debugLog = d }
286
188
287−-- | Configures VTY using defaults suitable for terminals. This function
189+-- | Configures VTY using defaults suitable for terminals. This action
288-- can raise 'VtyConfigurationError'.
190-- can raise 'VtyConfigurationError'.
289standardIOConfig :: IO Config
191standardIOConfig :: IO Config
290standardIOConfig = do
192standardIOConfig = do
291− mb <- lookupEnv termVariable
193+ mb <- getEnv "TERM"
292 case mb of
194 case mb of
293 Nothing -> throwIO VtyMissingTermEnvVar
195 Nothing -> throwIO VtyMissingTermEnvVar
294− Just t -> do
196+ Just t ->
295− mcolorMode <- detectColorMode t
296− return defaultConfig
197+ return def
297 { vmin = Just 1
198 { vmin = Just 1
298 , mouseMode = Just False
199 , mouseMode = Just False
299 , bracketedPasteMode = Just False
200 , bracketedPasteMode = Just False
@@ -301,24 +202,25 @@ standardIOConfig = do
301 , inputFd = Just stdInput
202 , inputFd = Just stdInput
302 , outputFd = Just stdOutput
203 , outputFd = Just stdOutput
303 , termName = Just t
204 , termName = Just t
304− , colorMode = Just mcolorMode
305 }
205 }
306
206
307parseConfigFile :: FilePath -> IO Config
207parseConfigFile :: FilePath -> IO Config
308parseConfigFile path = do
208parseConfigFile path = do
309 catch (runParseConfig path <$> BS.readFile path)
209 catch (runParseConfig path <$> BS.readFile path)
310− (\(_ :: IOException) -> return defaultConfig)
210+ (\(_ :: IOException) -> return def)
311
211
312runParseConfig :: String -> BS.ByteString -> Config
212runParseConfig :: String -> BS.ByteString -> Config
313runParseConfig name cfgTxt =
213runParseConfig name cfgTxt =
314 case runParser parseConfig () name cfgTxt of
214 case runParser parseConfig () name cfgTxt of
315 Right cfg -> cfg
215 Right cfg -> cfg
316− Left{} -> defaultConfig
216+ Left{} -> def
317
217
318------------------------------------------------------------------------
218------------------------------------------------------------------------
319
219
320type Parser = Parsec BS.ByteString ()
220type Parser = Parsec BS.ByteString ()
321
221
222+-- I tried to use the haskellStyle here but that was specialized (without requirement?) to the
223+-- String stream type.
322configLanguage :: Monad m => P.GenLanguageDef BS.ByteString () m
224configLanguage :: Monad m => P.GenLanguageDef BS.ByteString () m
323configLanguage = LanguageDef
225configLanguage = LanguageDef
324 { commentStart = "{-"
226 { commentStart = "{-"
@@ -345,20 +247,13 @@ mapDecl = do
345 bytes <- P.stringLiteral configLexer
247 bytes <- P.stringLiteral configLexer
346 key <- parseValue
248 key <- parseValue
347 modifiers <- parseValue
249 modifiers <- parseValue
348− return defaultConfig { inputMap = [(termIdent, bytes, EvKey key modifiers)] }
250+ return def { inputMap = [(termIdent, bytes, EvKey key modifiers)] }
349
251
350debugLogDecl :: Parser Config
252debugLogDecl :: Parser Config
351debugLogDecl = do
253debugLogDecl = do
352 "debugLog" <- P.identifier configLexer
254 "debugLog" <- P.identifier configLexer
353 path <- P.stringLiteral configLexer
255 path <- P.stringLiteral configLexer
354− return defaultConfig { debugLog = Just path }
256+ return def { debugLog = Just path }
355−
356−widthMapDecl :: Parser Config
357−widthMapDecl = do
358− "widthMap" <- P.identifier configLexer
359− tName <- P.stringLiteral configLexer
360− path <- P.stringLiteral configLexer
361− return defaultConfig { termWidthMaps = [(tName, path)] }
362
257
363ignoreLine :: Parser ()
258ignoreLine :: Parser ()
364ignoreLine = void $ manyTill anyChar newline
259ignoreLine = void $ manyTill anyChar newline
@@ -366,8 +261,8 @@ ignoreLine = void $ manyTill anyChar newline
366parseConfig :: Parser Config
261parseConfig :: Parser Config
367parseConfig = liftM mconcat $ many $ do
262parseConfig = liftM mconcat $ many $ do
368 P.whiteSpace configLexer
263 P.whiteSpace configLexer
369− let directives = [try mapDecl, try debugLogDecl, try widthMapDecl]
264+ let directives = [try mapDecl, try debugLogDecl]
370− choice directives <|> (ignoreLine >> return defaultConfig)
265+ choice directives <|> (ignoreLine >> return def)
371
266
372class Parse a where parseValue :: Parser a
267class Parse a where parseValue :: Parser a
373instance Parse Char where parseValue = P.charLiteral configLexer
268instance Parse Char where parseValue = P.charLiteral configLexer
@@ -412,77 +307,3 @@ instance (GParseAlts f, GParseAlts g) => GParseAlts (f :+: g) where
412 gparseAlts con = L1 <$> gparseAlts con <|> R1 <$> gparseAlts con
307 gparseAlts con = L1 <$> gparseAlts con <|> R1 <$> gparseAlts con
413
308
414instance GParseAlts V1 where gparseAlts _ = fail "GParse: V1"
309instance GParseAlts V1 where gparseAlts _ = fail "GParse: V1"
415−
416−foreign import ccall "vty_get_tty_erase" cGetTtyErase :: Fd -> IO CChar
417−
418−-- | Get the "erase" character for the terminal attached to the
419−-- specified file descriptor. This is the character configured by 'stty
420−-- erase'. If the call to 'tcgetattr' fails, this will return 'Nothing'.
421−-- Otherwise it will return the character that has been configured to
422−-- indicate the canonical mode ERASE behavior. That character can then
423−-- be added to the table of strings that we interpret to mean Backspace.
424−--
425−-- For more details, see:
426−--
427−-- * https://www.gnu.org/software/libc/manual/html_node/Canonical-or-Not.html
428−-- * https://www.gsp.com/cgi-bin/man.cgi?section=1&topic=stty
429−-- * https://github.com/matterhorn-chat/matterhorn/issues/565
430−getTtyEraseChar :: Fd -> IO (Maybe Char)
431−getTtyEraseChar fd = do
432− c <- cGetTtyErase fd
433− if c /= 0
434− then return $ Just $ toEnum $ fromEnum c
435− else return Nothing
436−
437−data ConfigUpdateResult =
438− ConfigurationCreated
439− | ConfigurationModified
440− | ConfigurationConflict String
441− | ConfigurationRedundant
442− deriving (Eq, Show)
443−
444−-- | Add a @widthMap@ directive to the Vty configuration file at the
445−-- specified path.
446−--
447−-- If the configuration path refers to a configuration that already
448−-- contains the directive for the specified map and terminal type, the
449−-- configuration file will not be modified. If the file does not contain
450−-- the directive, it will be appended to the file.
451−--
452−-- If the configuration path does not exist, a new configuration file
453−-- will be created and any directories in the path will also be created.
454−--
455−-- This returns @True@ if the configuration was created or modified and
456−-- @False@ otherwise. This does not handle exceptions raised by file or
457−-- directory permissions issues.
458−addConfigWidthMap :: FilePath
459− -- ^ The configuration file path of the configuration
460− -- to modify or create.
461− -> String
462− -- ^ The @TERM@ value for the @widthMap@ directive.
463− -> FilePath
464− -- ^ The width table file path for the directive.
465− -> IO ConfigUpdateResult
466−addConfigWidthMap configPath term tablePath = do
467− configEx <- doesFileExist configPath
468− if configEx
469− then updateConfig
470− else createConfig >> return ConfigurationCreated
471−
472− where
473− directive = "widthMap " <> show term <> " " <> show tablePath <> "\n"
474−
475− createConfig = do
476− let dir = takeDirectory configPath
477− createDirectoryIfMissing True dir
478− writeFile configPath directive
479−
480− updateConfig = do
481− config <- parseConfigFile configPath
482− if (term, tablePath) `elem` termWidthMaps config
483− then return ConfigurationRedundant
484− else case lookup term (termWidthMaps config) of
485− Just other -> return $ ConfigurationConflict other
486− Nothing -> do
487− appendFile configPath directive
488− return ConfigurationModified
src/Graphics/Vty/Debug.hs+14−13
@@ -1,29 +1,29 @@
1-- Copyright 2009-2010 Corey O'Connor
1-- Copyright 2009-2010 Corey O'Connor
2−module Graphics.Vty.Debug
2+module Graphics.Vty.Debug ( module Graphics.Vty.Debug
3− ( module Graphics.Vty.Debug
4− , module Graphics.Vty.Debug.Image
3+ , module Graphics.Vty.Debug.Image
5− )
4+ )
6where
5where
7
6
7+import Graphics.Vty.Prelude
8+
8import Graphics.Vty.Attributes
9import Graphics.Vty.Attributes
9−import Graphics.Vty.Image (DisplayRegion)
10import Graphics.Vty.Debug.Image
10import Graphics.Vty.Debug.Image
11import Graphics.Vty.Span
11import Graphics.Vty.Span
12
12
13−import qualified Data.Vector as Vector
13+import qualified Data.Vector as Vector
14
14
15−rowOpsAffectedColumns :: DisplayOps -> [Int]
15+rowOpsEffectedColumns :: DisplayOps -> [Int]
16−rowOpsAffectedColumns ops
16+rowOpsEffectedColumns ops
17− = Vector.toList $ Vector.map spanOpsAffectedColumns ops
17+ = Vector.toList $ Vector.map spanOpsEffectedColumns ops
18
18
19allSpansHaveWidth :: DisplayOps -> Int -> Bool
19allSpansHaveWidth :: DisplayOps -> Int -> Bool
20allSpansHaveWidth ops expected
20allSpansHaveWidth ops expected
21− = all (== expected) $ Vector.toList $ Vector.map spanOpsAffectedColumns ops
21+ = all (== expected) $ Vector.toList $ Vector.map spanOpsEffectedColumns ops
22
22
23−spanOpsAffectedRows :: DisplayOps -> Int
23+spanOpsEffectedRows :: DisplayOps -> Int
24−spanOpsAffectedRows ops
24+spanOpsEffectedRows ops
25 = toEnum $ length (filter (not . null . Vector.toList) (Vector.toList ops))
25 = toEnum $ length (filter (not . null . Vector.toList) (Vector.toList ops))
26−
26+
27type SpanConstructLog = [SpanConstructEvent]
27type SpanConstructLog = [SpanConstructEvent]
28data SpanConstructEvent = SpanSetAttr Attr
28data SpanConstructEvent = SpanSetAttr Attr
29
29
@@ -37,3 +37,4 @@ data MockWindow = MockWindow Int Int
37
37
38regionForWindow :: MockWindow -> DisplayRegion
38regionForWindow :: MockWindow -> DisplayRegion
39regionForWindow (MockWindow w h) = (w,h)
39regionForWindow (MockWindow w h) = (w,h)
40+
src/Graphics/Vty/Debug/Image.hs+1−1
@@ -19,7 +19,7 @@ data ImageOp = ImageOp ImageEndo ImageEndo
19type ImageEndo = Image -> Image
19type ImageEndo = Image -> Image
20
20
21debugImageOps :: [ImageOp]
21debugImageOps :: [ImageOp]
22−debugImageOps =
22+debugImageOps =
23 [ idImageOp
23 [ idImageOp
24 -- , renderSingleColumnCharOp
24 -- , renderSingleColumnCharOp
25 -- , renderDoubleColumnCharOp
25 -- , renderDoubleColumnCharOp
src/Graphics/Vty/DisplayAttributes.hs+33−64
@@ -1,30 +1,31 @@
1-- Copyright 2009-2010 Corey O'Connor
1-- Copyright 2009-2010 Corey O'Connor
2−{-# LANGUAGE BangPatterns #-}
3{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
3+{-# LANGUAGE BangPatterns #-}
4+
5+#ifndef MIN_VERSION_base
6+#defined MIN_VERSION_base(x,y,z) 1
7+#endif
4
8
5−module Graphics.Vty.DisplayAttributes where
9+module Graphics.Vty.DisplayAttributes
10+ where
6
11
7import Graphics.Vty.Attributes
12import Graphics.Vty.Attributes
8
13
9import Data.Bits ((.&.))
14import Data.Bits ((.&.))
10−import Data.ByteString (ByteString)
15+
11−#if !(MIN_VERSION_base(4,11,0))
16+#if !(MIN_VERSION_base(4,8,0))
12−import Data.Semigroup (Semigroup(..))
17+import Data.Monoid (Monoid(..), mconcat)
13#endif
18#endif
14−import Data.Text (Text)
15−import Data.Text.Encoding (encodeUtf8)
16
19
17−-- | Given the previously applied display attributes as a FixedAttr and
20+-- | Given the previously applied display attributes as a FixedAttr and the current display
18−-- the current display attributes as an Attr produces a FixedAttr that
19−-- represents the current display attributes. This is done by using the
21+-- attributes as an Attr produces a FixedAttr that represents the current display attributes. This
20−-- previously applied display attributes to remove the "KeepCurrent"
22+-- is done by using the previously applied display attributes to remove the "KeepCurrent"
21-- abstraction.
23-- abstraction.
22fixDisplayAttr :: FixedAttr -> Attr -> FixedAttr
24fixDisplayAttr :: FixedAttr -> Attr -> FixedAttr
23fixDisplayAttr fattr attr
25fixDisplayAttr fattr attr
24 = FixedAttr (fixStyle (fixedStyle fattr) (attrStyle attr))
26 = FixedAttr (fixStyle (fixedStyle fattr) (attrStyle attr))
25 (fixColor (fixedForeColor fattr) (attrForeColor attr))
27 (fixColor (fixedForeColor fattr) (attrForeColor attr))
26 (fixColor (fixedBackColor fattr) (attrBackColor attr))
28 (fixColor (fixedBackColor fattr) (attrBackColor attr))
27− (fixURL (fixedURL fattr) (attrURL attr))
28 where
29 where
29 fixStyle _s Default = defaultStyleMask
30 fixStyle _s Default = defaultStyleMask
30 fixStyle s KeepCurrent = s
31 fixStyle s KeepCurrent = s
@@ -32,56 +33,43 @@ fixDisplayAttr fattr attr
32 fixColor _c Default = Nothing
33 fixColor _c Default = Nothing
33 fixColor c KeepCurrent = c
34 fixColor c KeepCurrent = c
34 fixColor _c (SetTo c) = Just c
35 fixColor _c (SetTo c) = Just c
35− fixURL c KeepCurrent = c
36− fixURL _c (SetTo n) = Just n
37− fixURL _c Default = Nothing
38
36
39−-- | difference between two display attributes. Used in the calculation
37+-- | difference between two display attributes. Used in the calculation of the operations required
40−-- of the operations required to go from one display attribute to the
38+-- to go from one display attribute to the next.
41−-- next.
42--
39--
43−-- Previously, vty would reset display attributes to default then apply
40+-- Previously, vty would reset display attributes to default then apply the new display attributes.
44−-- the new display attributes. This turned out to be very expensive: A
45−-- *lot* more data would be sent to the terminal than required.
41+-- This turned out to be very expensive: A *lot* more data would be sent to the terminal than
42+-- required.
46data DisplayAttrDiff = DisplayAttrDiff
43data DisplayAttrDiff = DisplayAttrDiff
47 { styleDiffs :: [StyleStateChange]
44 { styleDiffs :: [StyleStateChange]
48 , foreColorDiff :: DisplayColorDiff
45 , foreColorDiff :: DisplayColorDiff
49 , backColorDiff :: DisplayColorDiff
46 , backColorDiff :: DisplayColorDiff
50− , urlDiff :: URLDiff
51 }
47 }
52 deriving (Show)
48 deriving (Show)
53
49
54−instance Semigroup DisplayAttrDiff where
50+instance Monoid DisplayAttrDiff where
51+ mempty = DisplayAttrDiff [] NoColorChange NoColorChange
55− d0 <> d1 =
52+ mappend d0 d1 =
56 let ds = simplifyStyleDiffs (styleDiffs d0) (styleDiffs d1)
53 let ds = simplifyStyleDiffs (styleDiffs d0) (styleDiffs d1)
57 fcd = simplifyColorDiffs (foreColorDiff d0) (foreColorDiff d1)
54 fcd = simplifyColorDiffs (foreColorDiff d0) (foreColorDiff d1)
58 bcd = simplifyColorDiffs (backColorDiff d0) (backColorDiff d1)
55 bcd = simplifyColorDiffs (backColorDiff d0) (backColorDiff d1)
59− ud = simplifyUrlDiffs (urlDiff d0) (urlDiff d1)
60− in DisplayAttrDiff ds fcd bcd ud
56+ in DisplayAttrDiff ds fcd bcd
61−
62−instance Monoid DisplayAttrDiff where
63− mempty = DisplayAttrDiff [] NoColorChange NoColorChange NoLinkChange
64−#if !(MIN_VERSION_base(4,11,0))
65− mappend = (<>)
66−#endif
67
57
68-- | Used in the computation of a final style attribute change.
58-- | Used in the computation of a final style attribute change.
59+--
60+-- TODO(corey): not really a simplify but a monoid instance.
69simplifyStyleDiffs :: [StyleStateChange] -> [StyleStateChange] -> [StyleStateChange]
61simplifyStyleDiffs :: [StyleStateChange] -> [StyleStateChange] -> [StyleStateChange]
70simplifyStyleDiffs cs0 cs1 = cs0 `mappend` cs1
62simplifyStyleDiffs cs0 cs1 = cs0 `mappend` cs1
71
63
72−-- | Consider two display color attributes diffs. What display color
64+-- | Consider two display color attributes diffs. What display color attribute diff are these
73−-- attribute diff are these equivalent to?
65+-- equivalent to?
66+--
67+-- TODO(corey): not really a simplify but a monoid instance.
74simplifyColorDiffs :: DisplayColorDiff -> DisplayColorDiff -> DisplayColorDiff
68simplifyColorDiffs :: DisplayColorDiff -> DisplayColorDiff -> DisplayColorDiff
75simplifyColorDiffs _cd ColorToDefault = ColorToDefault
69simplifyColorDiffs _cd ColorToDefault = ColorToDefault
76simplifyColorDiffs cd NoColorChange = cd
70simplifyColorDiffs cd NoColorChange = cd
77simplifyColorDiffs _cd (SetColor !c) = SetColor c
71simplifyColorDiffs _cd (SetColor !c) = SetColor c
78
72
79−-- | Consider two URL changes, which are mostly going to be the latter
80−-- unless the latter specifies no change.
81−simplifyUrlDiffs :: URLDiff -> URLDiff -> URLDiff
82−simplifyUrlDiffs ud NoLinkChange = ud
83−simplifyUrlDiffs _ ud = ud
84−
85-- | Difference between two display color attribute changes.
73-- | Difference between two display color attribute changes.
86data DisplayColorDiff
74data DisplayColorDiff
87 = ColorToDefault
75 = ColorToDefault
@@ -89,15 +77,11 @@ data DisplayColorDiff
89 | SetColor !Color
77 | SetColor !Color
90 deriving (Show, Eq)
78 deriving (Show, Eq)
91
79
92−-- | Style attribute changes are transformed into a sequence of
80+-- | Style attribute changes are transformed into a sequence of apply/removes of the individual
93−-- apply/removes of the individual attributes.
81+-- attributes.
94−data StyleStateChange
82+data StyleStateChange
95 = ApplyStandout
83 = ApplyStandout
96 | RemoveStandout
84 | RemoveStandout
97− | ApplyItalic
98− | RemoveItalic
99− | ApplyStrikethrough
100− | RemoveStrikethrough
101 | ApplyUnderline
85 | ApplyUnderline
102 | RemoveUnderline
86 | RemoveUnderline
103 | ApplyReverseVideo
87 | ApplyReverseVideo
@@ -110,28 +94,15 @@ data StyleStateChange
110 | RemoveBold
94 | RemoveBold
111 deriving (Show, Eq)
95 deriving (Show, Eq)
112
96
113−-- Setting and unsetting hyperlinks
114−data URLDiff
115− = LinkTo !ByteString
116− | NoLinkChange
117− | EndLink
118− deriving (Show, Eq)
119−
120−-- | Determines the diff between two display&color attributes. This diff
97+-- | Determines the diff between two display&color attributes. This diff determines the operations
121−-- determines the operations that actually get output to the terminal.
98+-- that actually get output to the terminal.
122displayAttrDiffs :: FixedAttr -> FixedAttr -> DisplayAttrDiff
99displayAttrDiffs :: FixedAttr -> FixedAttr -> DisplayAttrDiff
123displayAttrDiffs attr attr' = DisplayAttrDiff
100displayAttrDiffs attr attr' = DisplayAttrDiff
124 { styleDiffs = diffStyles (fixedStyle attr) (fixedStyle attr')
101 { styleDiffs = diffStyles (fixedStyle attr) (fixedStyle attr')
125 , foreColorDiff = diffColor (fixedForeColor attr) (fixedForeColor attr')
102 , foreColorDiff = diffColor (fixedForeColor attr) (fixedForeColor attr')
126 , backColorDiff = diffColor (fixedBackColor attr) (fixedBackColor attr')
103 , backColorDiff = diffColor (fixedBackColor attr) (fixedBackColor attr')
127− , urlDiff = diffURL (fixedURL attr) (fixedURL attr')
128 }
104 }
129
105
130−diffURL :: Maybe Text -> Maybe Text -> URLDiff
131−diffURL Nothing Nothing = NoLinkChange
132−diffURL (Just _) Nothing = EndLink
133−diffURL _ (Just url) = LinkTo (encodeUtf8 url)
134−
135diffColor :: Maybe Color -> Maybe Color -> DisplayColorDiff
106diffColor :: Maybe Color -> Maybe Color -> DisplayColorDiff
136diffColor Nothing (Just c') = SetColor c'
107diffColor Nothing (Just c') = SetColor c'
137diffColor (Just c) (Just c')
108diffColor (Just c) (Just c')
@@ -145,8 +116,6 @@ diffStyles prev cur
145 = mconcat
116 = mconcat
146 [ styleDiff standout ApplyStandout RemoveStandout
117 [ styleDiff standout ApplyStandout RemoveStandout
147 , styleDiff underline ApplyUnderline RemoveUnderline
118 , styleDiff underline ApplyUnderline RemoveUnderline
148− , styleDiff italic ApplyItalic RemoveItalic
149− , styleDiff strikethrough ApplyStrikethrough RemoveStrikethrough
150 , styleDiff reverseVideo ApplyReverseVideo RemoveReverseVideo
119 , styleDiff reverseVideo ApplyReverseVideo RemoveReverseVideo
151 , styleDiff blink ApplyBlink RemoveBlink
120 , styleDiff blink ApplyBlink RemoveBlink
152 , styleDiff dim ApplyDim RemoveDim
121 , styleDiff dim ApplyDim RemoveDim
src/Graphics/Vty/Error.hs+3−3
@@ -1,8 +1,8 @@
1−module Graphics.Vty.Error where
1+module Graphics.Vty.Error
2+ where
2
3
3-- | The type of exceptions specific to vty.
4-- | The type of exceptions specific to vty.
4--
5--
5−-- These have fully qualified names by default since, IMO, exception
6+-- These have fully qualified names by default since, IMO, exception handling requires this.
6−-- handling requires this.
7data VtyException
7data VtyException
8 = VtyFailure String -- ^ Uncategorized failure specific to vty.
8 = VtyFailure String -- ^ Uncategorized failure specific to vty.
src/Graphics/Vty/Image.hs+119−198
@@ -1,63 +1,48 @@
1-- Copyright 2009-2010 Corey O'Connor
1-- Copyright 2009-2010 Corey O'Connor
2+{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE NamedFieldPuns #-}
3{-# LANGUAGE NamedFieldPuns #-}
3{-# LANGUAGE DisambiguateRecordFields #-}
4{-# LANGUAGE DisambiguateRecordFields #-}
4−-- | A Vty program makes 'Picture's from 'Image's. This module provides
5−-- the core constructors for creating, combining, and modifying
6−-- 'Image's.
7−module Graphics.Vty.Image
5+module Graphics.Vty.Image ( DisplayText
8− (
9− -- * Images
10− Image
6+ , Image
11− , imageWidth
7+ , imageWidth
12− , imageHeight
8+ , imageHeight
13− -- * Image constructors
14− , emptyImage
15− , char
16− , string
17− , iso10646String
18− , utf8String
19− , text
20− , text'
21− , backgroundFill
22− , utf8Bytestring
23− , utf8Bytestring'
24− , charFill
25− -- * Combinators
26− , horizJoin
9+ , horizJoin
27− , (<|>)
10+ , (<|>)
28− , vertJoin
11+ , vertJoin
29− , (<->)
12+ , (<->)
30− , horizCat
13+ , horizCat
31− , vertCat
14+ , vertCat
32− -- * Image modifications
15+ , backgroundFill
16+ , text
17+ , text'
18+ , char
19+ , string
20+ , iso10646String
21+ , utf8String
22+ , utf8Bytestring
23+ , utf8Bytestring'
24+ , charFill
25+ , emptyImage
26+ , safeWcwidth
27+ , safeWcswidth
28+ , wcwidth
29+ , wcswidth
33− , crop
30+ , crop
34− , cropRight
31+ , cropRight
35− , cropLeft
32+ , cropLeft
36− , cropBottom
33+ , cropBottom
37− , cropTop
34+ , cropTop
38− , pad
35+ , pad
39− , resize
36+ , resize
40− , resizeWidth
37+ , resizeWidth
41− , resizeHeight
38+ , resizeHeight
42− , translate
39+ , translate
43− , translateX
40+ , translateX
44− , translateY
41+ , translateY
45− -- * Character width functions
42+ -- | The possible display attributes used in constructing an `Image`.
46− , safeWcwidth
43+ , module Graphics.Vty.Attributes
47− , safeWcswidth
48− , safeWctwidth
49− , safeWctlwidth
50− , wcwidth
51− , wcswidth
52− , wctwidth
53− , wctlwidth
54− -- * Display Regions
55− , DisplayText
56− , DisplayRegion
57− , regionWidth
58− , regionHeight
59− )
44+ )
60−where
45+ where
61
46
62import Graphics.Vty.Attributes
47import Graphics.Vty.Attributes
63import Graphics.Vty.Image.Internal
48import Graphics.Vty.Image.Internal
@@ -71,163 +56,115 @@ import qualified Data.Text.Lazy as TL
71import qualified Data.Text.Lazy.Encoding as TL
56import qualified Data.Text.Lazy.Encoding as TL
72import Data.Word
57import Data.Word
73
58
74−-- | A region of the display (first width, then height)
75−type DisplayRegion = (Int,Int)
76−
77−regionWidth :: DisplayRegion -> Int
78−regionWidth = fst
79−
80−regionHeight :: DisplayRegion -> Int
81−regionHeight = snd
82−
83infixr 5 <|>
59infixr 5 <|>
84infixr 4 <->
60infixr 4 <->
85
61
86−-- | An area of the picture's background (See 'Background').
62+-- | An area of the picture's bacground (See Background) of w columns and h rows.
87−backgroundFill :: Int
63+backgroundFill :: Int -> Int -> Image
88− -- ^ Fill width in columns
89− -> Int
90− -- ^ Fill height in rows
91− -> Image
92−backgroundFill w h
64+backgroundFill w h
93 | w == 0 = EmptyImage
65 | w == 0 = EmptyImage
94 | h == 0 = EmptyImage
66 | h == 0 = EmptyImage
95 | otherwise = BGFill w h
67 | otherwise = BGFill w h
96
68
97−-- | Combines two images horizontally. This is an alias for 'horizJoin'.
69+-- | Combines two images horizontally. Alias for horizJoin
98--
70--
99-- infixr 5
71-- infixr 5
100(<|>) :: Image -> Image -> Image
72(<|>) :: Image -> Image -> Image
101(<|>) = horizJoin
73(<|>) = horizJoin
102
74
103−-- | Combines two images vertically. This is an alias for 'vertJoin'.
75+-- | Combines two images vertically. Alias for vertJoin
104--
76--
105-- infixr 4
77-- infixr 4
106(<->) :: Image -> Image -> Image
78(<->) :: Image -> Image -> Image
107(<->) = vertJoin
79(<->) = vertJoin
108
80
109−-- | Compose any number of images together horizontally, with the first
81+-- | Compose any number of images horizontally.
110−-- in the list being leftmost.
111horizCat :: [Image] -> Image
82horizCat :: [Image] -> Image
112horizCat = foldr horizJoin EmptyImage
83horizCat = foldr horizJoin EmptyImage
113
84
114−-- | Compose any number of images vertically, with the first in the list
85+-- | Compose any number of images vertically.
115−-- being topmost.
116vertCat :: [Image] -> Image
86vertCat :: [Image] -> Image
117vertCat = foldr vertJoin EmptyImage
87vertCat = foldr vertJoin EmptyImage
118
88
119−-- | Make an 'Image' from a lazy text value. The text value should be
89+-- | A Data.Text.Lazy value
120−-- sanitized of escape sequences (ASCII 27) and carriage returns;
121−-- otherwise layout and attribute problems may result.
122text :: Attr -> TL.Text -> Image
90text :: Attr -> TL.Text -> Image
123−text a txt = let displayWidth = safeWctlwidth txt
91+text a txt = let displayWidth = safeWcswidth (TL.unpack txt)
124 in HorizText a txt displayWidth (fromIntegral $! TL.length txt)
92 in HorizText a txt displayWidth (fromIntegral $! TL.length txt)
125
93
126−-- | Make an 'Image' from a text value. The text value should be
94+-- | A Data.Text value
127−-- sanitized of escape sequences (ASCII 27) and carriage returns;
128−-- otherwise layout and attribute problems may result.
129text' :: Attr -> T.Text -> Image
95text' :: Attr -> T.Text -> Image
130−text' a txt = let displayWidth = safeWctwidth txt
96+text' a txt = let displayWidth = safeWcswidth (T.unpack txt)
131 in HorizText a (TL.fromStrict txt) displayWidth (T.length txt)
97 in HorizText a (TL.fromStrict txt) displayWidth (T.length txt)
132
98
133−-- | Make an image from a single character. This is a standard Haskell
99+-- | an image of a single character. This is a standard Haskell 31-bit character assumed to be in
134−-- 31-bit character assumed to be in the ISO-10646 encoding.
100+-- the ISO-10646 encoding.
135char :: Attr -> Char -> Image
101char :: Attr -> Char -> Image
136char a c =
102char a c =
137 let displayWidth = safeWcwidth c
103 let displayWidth = safeWcwidth c
138 in HorizText a (TL.singleton c) displayWidth 1
104 in HorizText a (TL.singleton c) displayWidth 1
139
105
140−-- | Make an image from a string of characters laid out on a single
141−-- row with the same display attribute. The string is assumed to be a
106+-- | A string of characters layed out on a single row with the same display attribute. The string is
142−-- sequence of ISO-10646 characters. The input string should be
107+-- assumed to be a sequence of ISO-10646 characters.
143−-- sanitized of escape sequences (ASCII 27) and carriage returns;
144−-- otherwise layout and attribute problems may result.
145--
108--
146−-- Note: depending on how the Haskell compiler represents string
109+-- Note: depending on how the Haskell compiler represents string literals a string literal in a
147−-- literals, a string literal in a UTF-8 encoded source file, for
148−-- example, may be represented as a ISO-10646 string. That is, I think,
110+-- UTF-8 encoded source file, for example, may be represented as a ISO-10646 string.
149−-- the case with GHC 6.10. This means, for the most part, you don't need
111+-- That is, I think, the case with GHC 6.10. This means, for the most part, you don't need to worry
150−-- to worry about the encoding format when outputting string literals.
112+-- about the encoding format when outputting string literals. Just provide the string literal
151−-- Just provide the string literal directly to iso10646String or string.
113+-- directly to iso10646String or string.
114+--
152iso10646String :: Attr -> String -> Image
115iso10646String :: Attr -> String -> Image
153iso10646String a str =
116iso10646String a str =
154 let displayWidth = safeWcswidth str
117 let displayWidth = safeWcswidth str
155 in HorizText a (TL.pack str) displayWidth (length str)
118 in HorizText a (TL.pack str) displayWidth (length str)
156
119
157−-- | Make an 'Image' from a 'String'.
120+-- | Alias for iso10646String. Since the usual case is that a literal string like "foo" is
121+-- represented internally as a list of ISO 10646 31 bit characters.
158--
122--
159−-- This is an alias for iso10646String since the usual case is that a
160−-- literal string like "foo" is represented internally as a list of ISO
161−-- 10646 31 bit characters.
162−--
163−-- Note: Keep in mind that GHC will compile source encoded as UTF-8
123+-- Note: Keep in mind that GHC will compile source encoded as UTF-8 but the literal strings, while
164−-- but the literal strings, while UTF-8 encoded in the source, will be
165−-- transcoded to a ISO 10646 31 bit characters runtime representation.
124+-- UTF-8 encoded in the source, will be transcoded to a ISO 10646 31 bit characters runtime
125+-- representation.
166string :: Attr -> String -> Image
126string :: Attr -> String -> Image
167string = iso10646String
127string = iso10646String
168
128
169−-- | Make an 'Image' from a string of characters layed out on a single
129+-- | A string of characters layed out on a single row. The input is assumed to be the bytes for
170−-- row. The input is assumed to be the bytes for UTF-8 encoded text.
130+-- UTF-8 encoded text.
171utf8String :: Attr -> [Word8] -> Image
131utf8String :: Attr -> [Word8] -> Image
172utf8String a bytes = utf8Bytestring a (BL.pack bytes)
132utf8String a bytes = utf8Bytestring a (BL.pack bytes)
173
133
174−-- | Make an 'Image' from a UTF-8 encoded lazy bytestring.
134+-- | Renders a UTF-8 encoded lazy bytestring.
175utf8Bytestring :: Attr -> BL.ByteString -> Image
135utf8Bytestring :: Attr -> BL.ByteString -> Image
176utf8Bytestring a bs = text a (TL.decodeUtf8 bs)
136utf8Bytestring a bs = text a (TL.decodeUtf8 bs)
177
137
178−-- | Make an 'Image' from a UTF-8 encoded strict bytestring.
138+-- | Renders a UTF-8 encoded strict bytestring.
179utf8Bytestring' :: Attr -> B.ByteString -> Image
139utf8Bytestring' :: Attr -> B.ByteString -> Image
180utf8Bytestring' a bs = text' a (T.decodeUtf8 bs)
140utf8Bytestring' a bs = text' a (T.decodeUtf8 bs)
181
141
182−-- | Make an image filling a region with the specified character.
142+-- | creates a fill of the specified character. The dimensions are in number of characters wide and
183−--
143+-- number of rows high.
184−-- If either the width or height are less than or equal to 0, then
185−-- the result is the empty image.
186−charFill :: Integral d
144+charFill :: Integral d => Attr -> Char -> d -> d -> Image
187− => Attr
145+charFill _a _c 0 _h = EmptyImage
188− -- ^ The attribute to use.
146+charFill _a _c _w 0 = EmptyImage
189− -> Char
190− -- ^ The character to use in filling the region.
191− -> d
192− -- ^ The region width.
193− -> d
194− -- ^ The region height.
195− -> Image
196−charFill a c w h
147+charFill a c w h =
197− | w <= 0 || h <= 0 = EmptyImage
198− | otherwise = vertCat
199− $ replicate (fromIntegral h)
200− $ HorizText a txt displayWidth charWidth
148+ vertCat $ replicate (fromIntegral h) $ HorizText a txt displayWidth charWidth
201− where
149+ where
202− txt = TL.replicate charWidth (TL.singleton c)
150+ txt = TL.replicate (fromIntegral w) (TL.singleton c)
203− displayWidth = safeWcwidth c * charWidth
151+ displayWidth = safeWcwidth c * (fromIntegral w)
204−
205− charWidth :: Num a => a
206− charWidth = fromIntegral w
152+ charWidth = fromIntegral w
207−
153+
208−-- | The empty image. Useful for fold combinators. These occupy no space
154+-- | The empty image. Useful for fold combinators. These occupy no space nor define any display
209−-- and do not affect display attributes.
155+-- attributes.
210−emptyImage :: Image
156+emptyImage :: Image
211emptyImage = EmptyImage
157emptyImage = EmptyImage
212
158
213−-- | Pad the given image. This adds background character fills to the
159+-- | pad the given image. This adds background character fills to the left, top, right, bottom.
214−-- left, top, right, bottom.
160+-- The pad values are how many display columns or rows to add.
215−pad :: Int
161+pad :: Int -> Int -> Int -> Int -> Image -> Image
216− -- ^ How much padding to add to the left side of the image.
217− -> Int
218− -- ^ How much padding to add to the top of the image.
219− -> Int
220− -- ^ How much padding to add to the right side of the image.
221− -> Int
222− -- ^ How much padding to add to the bottom of the image.
223− -> Image
224− -- ^ The image to pad.
225− -> Image
226pad 0 0 0 0 i = i
162pad 0 0 0 0 i = i
227pad inL inT inR inB inImage
163pad inL inT inR inB inImage
228 | inL < 0 || inT < 0 || inR < 0 || inB < 0 = error "cannot pad by negative amount"
164 | inL < 0 || inT < 0 || inR < 0 || inB < 0 = error "cannot pad by negative amount"
229 | otherwise = go inL inT inR inB inImage
165 | otherwise = go inL inT inR inB inImage
230− where
166+ where
167+ -- TODO: uh.
231 go 0 0 0 0 i = i
168 go 0 0 0 0 i = i
232 go 0 0 0 b i = VertJoin i (BGFill w b) w h
169 go 0 0 0 b i = VertJoin i (BGFill w b) w h
233 where w = imageWidth i
170 where w = imageWidth i
@@ -242,53 +179,40 @@ pad inL inT inR inB inImage
242 where w = imageWidth i + l
179 where w = imageWidth i + l
243 h = imageHeight i
180 h = imageHeight i
244
181
245−-- | Translates an image by padding or cropping the left and top.
182+-- | translates an image by padding or cropping the left and top. First param is amount to translate
183+-- left. Second param is amount to translate top.
246--
184--
247−-- If translation offsets are negative then the image is cropped.
185+-- This can have an unexpected effect: Translating an image to less than (0,0) then to greater than
186+-- (0,0) will crop the image.
248−translate :: Int
187+translate :: Int -> Int -> Image -> Image
249− -- ^ The horizontal translation offset (can be negative)
250− -> Int
251− -- ^ The vertical translation offset (can be negative)
252− -> Image
253− -- ^ The image to translate.
254− -> Image
255translate x y i = translateX x (translateY y i)
188translate x y i = translateX x (translateY y i)
256
189
257−-- | Translates an image by padding or cropping its left side.
190+-- | translates an image by padding or cropping the left
258translateX :: Int -> Image -> Image
191translateX :: Int -> Image -> Image
259translateX x i
192translateX x i
260− | x < 0 && (abs x > imageWidth i) = emptyImage
261 | x < 0 = let s = abs x in CropLeft i s (imageWidth i - s) (imageHeight i)
193 | x < 0 = let s = abs x in CropLeft i s (imageWidth i - s) (imageHeight i)
262 | x == 0 = i
194 | x == 0 = i
263 | otherwise = let h = imageHeight i in HorizJoin (BGFill x h) i (imageWidth i + x) h
195 | otherwise = let h = imageHeight i in HorizJoin (BGFill x h) i (imageWidth i + x) h
264
196
265−-- | Translates an image by padding or cropping its top.
197+-- | translates an image by padding or cropping the top
266translateY :: Int -> Image -> Image
198translateY :: Int -> Image -> Image
267translateY y i
199translateY y i
268− | y < 0 && (abs y > imageHeight i) = emptyImage
269 | y < 0 = let s = abs y in CropTop i s (imageWidth i) (imageHeight i - s)
200 | y < 0 = let s = abs y in CropTop i s (imageWidth i) (imageHeight i - s)
270 | y == 0 = i
201 | y == 0 = i
271 | otherwise = let w = imageWidth i in VertJoin (BGFill w y) i w (imageHeight i + y)
202 | otherwise = let w = imageWidth i in VertJoin (BGFill w y) i w (imageHeight i + y)
272
203
273−-- | Ensure an image is no larger than the provided size. If the image
204+-- | Ensure an image is no larger than the provided size. If the image is larger then crop the right
274−-- is larger then crop the right or bottom.
205+-- or bottom.
275--
206--
276−-- This is equivalent to a vertical crop from the bottom followed by
207+-- This is transformed to a vertical crop from the bottom followed by horizontal crop from the
277−-- horizontal crop from the right.
208+-- right.
278−crop :: Int
209+crop :: Int -> Int -> Image -> Image
279− -- ^ Cropping width
280− -> Int
281− -- ^ Cropping height
282− -> Image
283− -- ^ The image to crop
284− -> Image
285crop 0 _ _ = EmptyImage
210crop 0 _ _ = EmptyImage
286crop _ 0 _ = EmptyImage
211crop _ 0 _ = EmptyImage
287crop w h i = cropBottom h (cropRight w i)
212crop w h i = cropBottom h (cropRight w i)
288
213
289−-- | Crop an image's height. If the image's height is less than or equal
214+-- | crop the display height. If the image is less than or equal in height then this operation has
290−-- to the specified height then this operation has no effect. Otherwise
291−-- the image is cropped from the bottom.
215+-- no effect. Otherwise the image is cropped from the bottom.
292cropBottom :: Int -> Image -> Image
216cropBottom :: Int -> Image -> Image
293cropBottom 0 _ = EmptyImage
217cropBottom 0 _ = EmptyImage
294cropBottom h inI
218cropBottom h inI
@@ -303,9 +227,8 @@ cropBottom h inI
303 | h >= imageHeight i = i
227 | h >= imageHeight i = i
304 | otherwise = CropBottom i (imageWidth i) h
228 | otherwise = CropBottom i (imageWidth i) h
305
229
306−-- | Crop an image's width. If the image's width is less than or equal
230+-- | ensure the image is no wider than the given width. If the image is wider then crop the right
307−-- to the specified width then this operation has no effect. Otherwise
231+-- side.
308−-- the image is cropped from the right.
309cropRight :: Int -> Image -> Image
232cropRight :: Int -> Image -> Image
310cropRight 0 _ = EmptyImage
233cropRight 0 _ = EmptyImage
311cropRight w inI
234cropRight w inI
@@ -320,9 +243,8 @@ cropRight w inI
320 | w >= imageWidth i = i
243 | w >= imageWidth i = i
321 | otherwise = CropRight i w (imageHeight i)
244 | otherwise = CropRight i w (imageHeight i)
322
245
323−-- | Crop an image's width. If the image's width is less than or equal
246+-- | ensure the image is no wider than the given width. If the image is wider then crop the left
324−-- to the specified width then this operation has no effect. Otherwise
247+-- side.
325−-- the image is cropped from the left.
326cropLeft :: Int -> Image -> Image
248cropLeft :: Int -> Image -> Image
327cropLeft 0 _ = EmptyImage
249cropLeft 0 _ = EmptyImage
328cropLeft w inI
250cropLeft w inI
@@ -339,9 +261,8 @@ cropLeft w inI
339 | imageWidth i <= w = i
261 | imageWidth i <= w = i
340 | otherwise = CropLeft i (imageWidth i - w) w (imageHeight i)
262 | otherwise = CropLeft i (imageWidth i - w) w (imageHeight i)
341
263
342−-- | Crop an image's height. If the image's height is less than or equal
264+-- | crop the display height. If the image is less than or equal in height then this operation has
343−-- to the specified height then this operation has no effect. Otherwise
344−-- the image is cropped from the top.
265+-- no effect. Otherwise the image is cropped from the top.
345cropTop :: Int -> Image -> Image
266cropTop :: Int -> Image -> Image
346cropTop 0 _ = EmptyImage
267cropTop 0 _ = EmptyImage
347cropTop h inI
268cropTop h inI
@@ -358,24 +279,24 @@ cropTop h inI
358 | imageHeight i <= h = i
279 | imageHeight i <= h = i
359 | otherwise = CropTop i (imageHeight i - h) (imageWidth i) h
280 | otherwise = CropTop i (imageHeight i - h) (imageWidth i) h
360
281
361−-- | Generic resize. Pads and crops are added to ensure that the
282+-- | Generic resize. Pads and crops as required to assure the given display width and height.
362−-- resulting image matches the specified dimensions. This is biased to
363−-- pad/crop the right and bottom.
283+-- This is biased to pad/crop the right and bottom.
364resize :: Int -> Int -> Image -> Image
284resize :: Int -> Int -> Image -> Image
365resize w h i = resizeHeight h (resizeWidth w i)
285resize w h i = resizeHeight h (resizeWidth w i)
366
286
367−-- | Resize the width. Pads and crops as required to assure the given
287+-- | Resize the width. Pads and crops as required to assure the given display width.
368−-- display width. This is biased to pad/crop on the right.
288+-- This is biased to pad/crop the right.
369resizeWidth :: Int -> Image -> Image
289resizeWidth :: Int -> Image -> Image
370resizeWidth w i = case w `compare` imageWidth i of
290resizeWidth w i = case w `compare` imageWidth i of
371 LT -> cropRight w i
291 LT -> cropRight w i
372 EQ -> i
292 EQ -> i
373 GT -> i <|> BGFill (w - imageWidth i) (imageHeight i)
293 GT -> i <|> BGFill (w - imageWidth i) (imageHeight i)
374
294
375−-- | Resize the height. Pads and crops as required to assure the given
295+-- | Resize the height. Pads and crops as required to assure the given display height.
376−-- display height. This is biased to pad/crop on the bottom.
296+-- This is biased to pad/crop the bottom.
377resizeHeight :: Int -> Image -> Image
297resizeHeight :: Int -> Image -> Image
378resizeHeight h i = case h `compare` imageHeight i of
298resizeHeight h i = case h `compare` imageHeight i of
379 LT -> cropBottom h i
299 LT -> cropBottom h i
380 EQ -> i
300 EQ -> i
381 GT -> i <-> BGFill (imageWidth i) (h - imageHeight i)
301 GT -> i <-> BGFill (imageWidth i) (h - imageHeight i)
302+
src/Graphics/Vty/Image/Internal.hs+92−72
@@ -3,6 +3,10 @@
3{-# LANGUAGE DeriveGeneric #-}
3{-# LANGUAGE DeriveGeneric #-}
4{-# OPTIONS_HADDOCK hide #-}
4{-# OPTIONS_HADDOCK hide #-}
5
5
6+#ifndef MIN_VERSION_base
7+#defined MIN_VERSION_base(x,y,z) 1
8+#endif
9+
6module Graphics.Vty.Image.Internal where
10module Graphics.Vty.Image.Internal where
7
11
8import Graphics.Vty.Attributes
12import Graphics.Vty.Attributes
@@ -12,14 +16,24 @@ import GHC.Generics
12
16
13import Control.DeepSeq
17import Control.DeepSeq
14
18
15−#if !(MIN_VERSION_base(4,11,0))
16−import Data.Semigroup (Semigroup(..))
17−#endif
18import qualified Data.Text.Lazy as TL
19import qualified Data.Text.Lazy as TL
19
20
21+#if !(MIN_VERSION_base(4,8,0))
22+import Data.Monoid
23+#endif
24+
20-- | A display text is a Data.Text.Lazy
25-- | A display text is a Data.Text.Lazy
26+--
27+-- TODO(corey): hm. there is an explicit equation for each type which goes to a lazy text. Each
28+-- application probably uses a single type. Perhaps parameterize the entire vty interface by the
29+-- input text type?
30+-- TODO: Try using a builder instead of a TL.Text instance directly. That might improve performance
31+-- for the usual case of appending a bunch of characters with the same attribute together.
21type DisplayText = TL.Text
32type DisplayText = TL.Text
22
33
34+-- TODO: store a skip list in HorizText(?)
35+-- TODO: represent display strings containing chars that are not 1 column chars as a separate
36+-- display string value?
23clipText :: DisplayText -> Int -> Int -> DisplayText
37clipText :: DisplayText -> Int -> Int -> DisplayText
24clipText txt leftSkip rightClip =
38clipText txt leftSkip rightClip =
25 -- CPS would clarify this I think
39 -- CPS would clarify this I think
@@ -28,8 +42,8 @@ clipText txt leftSkip rightClip =
28 (toTake,padSuffix) = clipForCharWidth rightClip txt' 0
42 (toTake,padSuffix) = clipForCharWidth rightClip txt' 0
29 txt'' = TL.append (TL.take toTake txt') (if padSuffix then TL.singleton '…' else TL.empty)
43 txt'' = TL.append (TL.take toTake txt') (if padSuffix then TL.singleton '…' else TL.empty)
30 -- Note: some characters and zero-width and combining characters
44 -- Note: some characters and zero-width and combining characters
31− -- combine to the left, so keep taking characters even if the
45+ -- combine to the left, so keep taking characters even if the width
32− -- width is zero.
46+ -- is zero.
33 clipForCharWidth w t n
47 clipForCharWidth w t n
34 | TL.null t = (n, False)
48 | TL.null t = (n, False)
35 | w < cw = (n, w /= 0)
49 | w < cw = (n, w /= 0)
@@ -37,8 +51,8 @@ clipText txt leftSkip rightClip =
37 where cw = safeWcwidth (TL.head t)
51 where cw = safeWcwidth (TL.head t)
38 in txt''
52 in txt''
39
53
40−-- | This is the internal representation of Images. Use the constructors
54+-- | This is the internal representation of Images. Use the constructors in "Graphics.Vty.Image" to
41−-- in "Graphics.Vty.Image" to create instances.
55+-- create instances.
42--
56--
43-- Images are:
57-- Images are:
44--
58--
@@ -51,61 +65,49 @@ clipText txt leftSkip rightClip =
51-- * a cropped image
65-- * a cropped image
52--
66--
53-- * an empty image of no size or content.
67-- * an empty image of no size or content.
54−data Image =
68+data Image =
55 -- | A horizontal text span has a row height of 1.
69 -- | A horizontal text span has a row height of 1.
56 HorizText
70 HorizText
57 { attr :: Attr
71 { attr :: Attr
58− -- | The text to display. The display width of the text is always
72+ -- | The text to display. The display width of the text is always outputWidth.
59− -- outputWidth.
60 , displayText :: DisplayText
73 , displayText :: DisplayText
61 -- | The number of display columns for the text.
74 -- | The number of display columns for the text.
62 , outputWidth :: Int
75 , outputWidth :: Int
63 -- | the number of characters in the text.
76 -- | the number of characters in the text.
64 , charWidth :: Int
77 , charWidth :: Int
65 }
78 }
66− -- | A horizontal join can be constructed between any two images.
79+ -- | A horizontal join can be constructed between any two images. However a HorizJoin instance is
67− -- However a HorizJoin instance is required to be between two images
68− -- of equal height. The horizJoin constructor adds background fills
80+ -- required to be between two images of equal height. The horizJoin constructor adds background
69− -- to the provided images that assure this is true for the HorizJoin
81+ -- fills to the provided images that assure this is true for the HorizJoin value produced.
70− -- value produced.
71 | HorizJoin
82 | HorizJoin
72− { partLeft :: Image
83+ { partLeft :: Image
73 , partRight :: Image
84 , partRight :: Image
74− , outputWidth :: Int
75− -- ^ imageWidth partLeft == imageWidth partRight. Always > 0
85+ , outputWidth :: Int -- ^ imageWidth partLeft == imageWidth partRight. Always > 0
76− , outputHeight :: Int
77− -- ^ imageHeight partLeft == imageHeight partRight. Always > 0
86+ , outputHeight :: Int -- ^ imageHeight partLeft == imageHeight partRight. Always > 0
78 }
87 }
79− -- | A veritical join can be constructed between any two images.
88+ -- | A veritical join can be constructed between any two images. However a VertJoin instance is
80− -- However a VertJoin instance is required to be between two images
81− -- of equal width. The vertJoin constructor adds background fills
89+ -- required to be between two images of equal width. The vertJoin constructor adds background
82− -- to the provides images that assure this is true for the VertJoin
90+ -- fills to the provides images that assure this is true for the VertJoin value produced.
83− -- value produced.
84 | VertJoin
91 | VertJoin
85 { partTop :: Image
92 { partTop :: Image
86 , partBottom :: Image
93 , partBottom :: Image
87− , outputWidth :: Int
88− -- ^ imageWidth partTop == imageWidth partBottom. always > 0
94+ , outputWidth :: Int -- ^ imageWidth partTop == imageWidth partBottom. always > 0
89− , outputHeight :: Int
90− -- ^ imageHeight partTop == imageHeight partBottom. always > 1
95+ , outputHeight :: Int -- ^ imageHeight partTop == imageHeight partBottom. always > 1
91 }
96 }
92− -- | A background fill will be filled with the background char. The
97+ -- | A background fill will be filled with the background char. The background char is
93− -- background char is defined as a property of the Picture this
98+ -- defined as a property of the Picture this Image is used to form.
94− -- Image is used to form.
95 | BGFill
99 | BGFill
96 { outputWidth :: Int -- ^ always > 0
100 { outputWidth :: Int -- ^ always > 0
97 , outputHeight :: Int -- ^ always > 0
101 , outputHeight :: Int -- ^ always > 0
98 }
102 }
99− -- | Crop an image horizontally to a size by reducing the size from
103+ -- | Crop an image horizontally to a size by reducing the size from the right.
100− -- the right.
101 | CropRight
104 | CropRight
102 { croppedImage :: Image
105 { croppedImage :: Image
103 -- | Always < imageWidth croppedImage > 0
106 -- | Always < imageWidth croppedImage > 0
104 , outputWidth :: Int
107 , outputWidth :: Int
105 , outputHeight :: Int -- ^ imageHeight croppedImage
108 , outputHeight :: Int -- ^ imageHeight croppedImage
106 }
109 }
107− -- | Crop an image horizontally to a size by reducing the size from
110+ -- | Crop an image horizontally to a size by reducing the size from the left.
108− -- the left.
109 | CropLeft
111 | CropLeft
110 { croppedImage :: Image
112 { croppedImage :: Image
111 -- | Always < imageWidth croppedImage > 0
113 -- | Always < imageWidth croppedImage > 0
@@ -114,8 +116,7 @@ data Image =
114 , outputWidth :: Int
116 , outputWidth :: Int
115 , outputHeight :: Int
117 , outputHeight :: Int
116 }
118 }
117− -- | Crop an image vertically to a size by reducing the size from
119+ -- | Crop an image vertically to a size by reducing the size from the bottom
118− -- the bottom
119 | CropBottom
120 | CropBottom
120 { croppedImage :: Image
121 { croppedImage :: Image
121 -- | imageWidth croppedImage
122 -- | imageWidth croppedImage
@@ -123,8 +124,7 @@ data Image =
123 -- | height image is cropped to. Always < imageHeight croppedImage > 0
124 -- | height image is cropped to. Always < imageHeight croppedImage > 0
124 , outputHeight :: Int
125 , outputHeight :: Int
125 }
126 }
126− -- | Crop an image vertically to a size by reducing the size from
127+ -- | Crop an image vertically to a size by reducing the size from the top
127− -- the top
128 | CropTop
128 | CropTop
129 { croppedImage :: Image
129 { croppedImage :: Image
130 -- | Always < imageHeight croppedImage > 0
130 -- | Always < imageHeight croppedImage > 0
@@ -136,17 +136,43 @@ data Image =
136 }
136 }
137 -- | The empty image
137 -- | The empty image
138 --
138 --
139− -- The combining operators identity constant.
139+ -- The combining operators identity constant.
140 -- EmptyImage <|> a = a
140 -- EmptyImage <|> a = a
141 -- EmptyImage <-> a = a
141 -- EmptyImage <-> a = a
142− --
142+ --
143 -- Any image of zero size equals the empty image.
143 -- Any image of zero size equals the empty image.
144 | EmptyImage
144 | EmptyImage
145− deriving (Eq, Generic, Show, Read)
145+ deriving (Eq, Generic)
146+
147+instance Show Image where
148+ show ( HorizText { attr, displayText, outputWidth, charWidth } )
149+ = "HorizText " ++ show displayText
150+ ++ "@(" ++ show attr ++ ","
151+ ++ show outputWidth ++ ","
152+ ++ show charWidth ++ ")"
153+ show ( BGFill { outputWidth, outputHeight } )
154+ = "BGFill (" ++ show outputWidth ++ "," ++ show outputHeight ++ ")"
155+ show ( HorizJoin { partLeft = l, partRight = r, outputWidth = c } )
156+ = "HorizJoin " ++ show c ++ " (" ++ show l ++ " <|> " ++ show r ++ ")"
157+ show ( VertJoin { partTop = t, partBottom = b, outputWidth = c, outputHeight = r } )
158+ = "VertJoin [" ++ show c ++ ", " ++ show r ++ "] (" ++ show t ++ ") <-> (" ++ show b ++ ")"
159+ show ( CropRight { croppedImage, outputWidth, outputHeight } )
160+ = "CropRight [" ++ show outputWidth ++ "," ++ show outputHeight ++ "]"
161+ ++ " (" ++ show croppedImage ++ ")"
162+ show ( CropLeft { croppedImage, leftSkip, outputWidth, outputHeight } )
163+ = "CropLeft [" ++ show leftSkip ++ "," ++ show outputWidth ++ "," ++ show outputHeight ++ "]"
164+ ++ " (" ++ show croppedImage ++ ")"
165+ show ( CropBottom { croppedImage, outputWidth, outputHeight } )
166+ = "CropBottom [" ++ show outputWidth ++ "," ++ show outputHeight ++ "]"
167+ ++ " (" ++ show croppedImage ++ ")"
168+ show ( CropTop { croppedImage, topSkip, outputWidth, outputHeight } )
169+ = "CropTop [" ++ show topSkip ++ "," ++ show outputWidth ++ "," ++ show outputHeight ++ "]"
170+ ++ " (" ++ show croppedImage ++ ")"
171+ show ( EmptyImage ) = "EmptyImage"
146
172
147-- | pretty print just the structure of an image.
173-- | pretty print just the structure of an image.
148ppImageStructure :: Image -> String
174ppImageStructure :: Image -> String
149−ppImageStructure = go 0
175+ppImageStructure inImg = go 0 inImg
150 where
176 where
151 go indent img = tab indent ++ pp indent img
177 go indent img = tab indent ++ pp indent img
152 tab indent = concat $ replicate indent " "
178 tab indent = concat $ replicate indent " "
@@ -172,7 +198,7 @@ ppImageStructure = go 0
172 = "CropTop("++ show outputWidth ++ "," ++ show topSkip ++ "->" ++ show outputHeight ++ ")\n"
198 = "CropTop("++ show outputWidth ++ "," ++ show topSkip ++ "->" ++ show outputHeight ++ ")\n"
173 ++ go (i+1) croppedImage
199 ++ go (i+1) croppedImage
174 pp _ EmptyImage = "EmptyImage"
200 pp _ EmptyImage = "EmptyImage"
175−
201+
176instance NFData Image where
202instance NFData Image where
177 rnf EmptyImage = ()
203 rnf EmptyImage = ()
178 rnf (CropRight i w h) = i `deepseq` w `seq` h `seq` ()
204 rnf (CropRight i w h) = i `deepseq` w `seq` h `seq` ()
@@ -184,8 +210,7 @@ instance NFData Image where
184 rnf (HorizJoin l r w h) = l `deepseq` r `deepseq` w `seq` h `seq` ()
210 rnf (HorizJoin l r w h) = l `deepseq` r `deepseq` w `seq` h `seq` ()
185 rnf (HorizText a s w cw) = a `seq` s `deepseq` w `seq` cw `seq` ()
211 rnf (HorizText a s w cw) = a `seq` s `deepseq` w `seq` cw `seq` ()
186
212
187−-- | The width of an Image. This is the number display columns the image
213+-- | The width of an Image. This is the number display columns the image will occupy.
188−-- will occupy.
189imageWidth :: Image -> Int
214imageWidth :: Image -> Int
190imageWidth HorizText { outputWidth = w } = w
215imageWidth HorizText { outputWidth = w } = w
191imageWidth HorizJoin { outputWidth = w } = w
216imageWidth HorizJoin { outputWidth = w } = w
@@ -197,8 +222,7 @@ imageWidth CropBottom { outputWidth = w } = w
197imageWidth CropTop { outputWidth = w } = w
222imageWidth CropTop { outputWidth = w } = w
198imageWidth EmptyImage = 0
223imageWidth EmptyImage = 0
199
224
200−-- | The height of an Image. This is the number of display rows the
225+-- | The height of an Image. This is the number of display rows the image will occupy.
201−-- image will occupy.
202imageHeight :: Image -> Int
226imageHeight :: Image -> Int
203imageHeight HorizText {} = 1
227imageHeight HorizText {} = 1
204imageHeight HorizJoin { outputHeight = h } = h
228imageHeight HorizJoin { outputHeight = h } = h
@@ -210,32 +234,27 @@ imageHeight CropBottom { outputHeight = h } = h
210imageHeight CropTop { outputHeight = h } = h
234imageHeight CropTop { outputHeight = h } = h
211imageHeight EmptyImage = 0
235imageHeight EmptyImage = 0
212
236
213−-- | Append in the 'Semigroup' instance is equivalent to '<->'.
214−instance Semigroup Image where
215− (<>) = vertJoin
216−
217−-- | Append in the 'Monoid' instance is equivalent to '<->'.
237+-- | Append in the Monoid instance is equivalent to <->.
218instance Monoid Image where
238instance Monoid Image where
219 mempty = EmptyImage
239 mempty = EmptyImage
220−#if !(MIN_VERSION_base(4,11,0))
221− mappend = (<>)
240+ mappend = vertJoin
222−#endif
223
241
224-- | combines two images side by side
242-- | combines two images side by side
225--
243--
226−-- Combines text chunks where possible. Assures outputWidth and
244+-- Combines text chunks where possible. Assures outputWidth and outputHeight properties are not
227−-- outputHeight properties are not violated.
245+-- violated.
246+--
247+-- The result image will have a width equal to the sum of the two images width. And the height will
248+-- equal the largest height of the two images. The area not defined in one image due to a height
249+-- missmatch will be filled with the background pattern.
228--
250--
229−-- The result image will have a width equal to the sum of the two images
251+-- TODO: the bg fill is biased towards top to bottom languages(?)
230−-- width. And the height will equal the largest height of the two
231−-- images. The area not defined in one image due to a height mismatch
232−-- will be filled with the background pattern.
233horizJoin :: Image -> Image -> Image
252horizJoin :: Image -> Image -> Image
234horizJoin EmptyImage i = i
253horizJoin EmptyImage i = i
235horizJoin i EmptyImage = i
254horizJoin i EmptyImage = i
236horizJoin i0@(HorizText a0 t0 w0 cw0) i1@(HorizText a1 t1 w1 cw1)
255horizJoin i0@(HorizText a0 t0 w0 cw0) i1@(HorizText a1 t1 w1 cw1)
237 | a0 == a1 = HorizText a0 (TL.append t0 t1) (w0 + w1) (cw0 + cw1)
256 | a0 == a1 = HorizText a0 (TL.append t0 t1) (w0 + w1) (cw0 + cw1)
238− -- assumes horiz text height is always 1
257+ -- TODO: assumes horiz text height is always 1
239 | otherwise = HorizJoin i0 i1 (w0 + w1) 1
258 | otherwise = HorizJoin i0 i1 (w0 + w1) 1
240horizJoin i0 i1
259horizJoin i0 i1
241 -- If the images are of the same height then no padding is required
260 -- If the images are of the same height then no padding is required
@@ -257,19 +276,19 @@ horizJoin _ _ = error "horizJoin applied to undefined values."
257
276
258-- | combines two images vertically
277-- | combines two images vertically
259--
278--
260−-- The result image will have a height equal to the sum of the heights
279+-- The result image will have a height equal to the sum of the heights of both images.
261−-- of both images. The width will equal the largest width of the two
280+-- The width will equal the largest width of the two images.
262−-- images. The area not defined in one image due to a width mismatch
281+-- The area not defined in one image due to a width missmatch will be filled with the background
263−-- will be filled with the background pattern.
282+-- pattern.
283+--
284+-- TODO: the bg fill is biased towards right to left languages(?)
264vertJoin :: Image -> Image -> Image
285vertJoin :: Image -> Image -> Image
265vertJoin EmptyImage i = i
286vertJoin EmptyImage i = i
266vertJoin i EmptyImage = i
287vertJoin i EmptyImage = i
267vertJoin i0 i1
288vertJoin i0 i1
268− -- If the images are of the same width then no background padding is
289+ -- If the images are of the same width then no background padding is required
269− -- required
270 | w0 == w1 = VertJoin i0 i1 w0 h
290 | w0 == w1 = VertJoin i0 i1 w0 h
271− -- Otherwise one of the images needs to be padded to the size of the
291+ -- Otherwise one of the images needs to be padded to the size of the other image.
272− -- other image.
273 | w0 < w1
292 | w0 < w1
274 = let padAmount = w1 - w0
293 = let padAmount = w1 - w0
275 in VertJoin (HorizJoin i0 (BGFill padAmount h0) w1 h0) i1 w1 h
294 in VertJoin (HorizJoin i0 (BGFill padAmount h0) w1 h0) i1 w1 h
@@ -283,3 +302,4 @@ vertJoin i0 i1
283 h1 = imageHeight i1
302 h1 = imageHeight i1
284 h = h0 + h1
303 h = h0 + h1
285vertJoin _ _ = error "vertJoin applied to undefined values."
304vertJoin _ _ = error "vertJoin applied to undefined values."
305+
src/Graphics/Vty/Inline.hs+55−62
@@ -1,41 +1,45 @@
1−-- | The inline module provides a limited interface to changing the
1+-- | The inline module provides a limited interface to changing the style of terminal output. The
2−-- style of terminal output. The intention is for this interface to be
3−-- used inline with other output systems.
2+-- intention is for this interface to be used inline with other output systems.
4--
3--
5−-- The changes specified by the InlineM monad are applied to the
4+-- The changes specified by the InlineM monad are applied to the terminals display attributes. These
6−-- terminal's display attributes. These display attributes affect the
7−-- display of all following text output to the terminal file descriptor.
5+-- display attributes effect the display of all following text output to the terminal file
6+-- descriptor.
8--
7--
9−-- For example, in an IO monad the following code will print the text
8+-- For example, in an IO monad the following code with print the text \"Not styled. \" Followed by the
10−-- \"Not styled. \" Followed by the text \" Styled! \" drawn over a red
11−-- background and underlined.
9+-- text \" Styled! \" drawn over a red background and underlined.
12--
10--
13-- @
11-- @
14-- putStr \"Not styled. \"
12-- putStr \"Not styled. \"
15-- putAttrChange_ $ do
13-- putAttrChange_ $ do
16−-- backColor red
14+-- backColor red
17-- applyStyle underline
15-- applyStyle underline
18-- putStr \" Styled! \"
16-- putStr \" Styled! \"
19-- putAttrChange_ $ defaultAll
17-- putAttrChange_ $ defaultAll
20-- putStrLn \"Not styled.\"
18-- putStrLn \"Not styled.\"
21-- @
19-- @
22--
20--
23−-- 'putAttrChange' emits the control codes to the terminal device
21+-- 'putAttrChange' outputs the control codes to the terminal device 'Handle'. This is a duplicate
24−-- attached to 'Handle'. This is a duplicate of the 'stdout' handle when
25−-- the 'terminalHandle' was (first) acquired. If 'stdout' has since been
22+-- of the 'stdout' handle when the 'terminalHandle' was (first) acquired. If 'stdout' has since been
26−-- changed then 'putStr', 'putStrLn', 'print' etc. will output to a
23+-- changed then 'putStr', 'putStrLn', 'print' etc.. will output to a different 'Handle' than
27−-- different 'Handle' than 'putAttrChange'.
24+-- 'putAttrChange'
28--
25--
29-- Copyright 2009-2010 Corey O'Connor
26-- Copyright 2009-2010 Corey O'Connor
27+{-# LANGUAGE CPP #-}
28+{-# LANGUAGE BangPatterns #-}
29+
30+#ifndef MIN_VERSION_base
31+#defined MIN_VERSION_base(x,y,z) 1
32+#endif
33+
30−module Graphics.Vty.Inline
34+module Graphics.Vty.Inline ( module Graphics.Vty.Inline
31− ( module Graphics.Vty.Inline
32− , withVty
35+ , withVty
33− )
36+ )
34−where
37+ where
35
38
36import Graphics.Vty
39import Graphics.Vty
37import Graphics.Vty.DisplayAttributes
40import Graphics.Vty.DisplayAttributes
38import Graphics.Vty.Inline.Unsafe
41import Graphics.Vty.Inline.Unsafe
42+import Graphics.Vty.Output.Interface
39
43
40import Blaze.ByteString.Builder (writeToByteString)
44import Blaze.ByteString.Builder (writeToByteString)
41
45
@@ -46,55 +50,44 @@ import Data.IORef
46
50
47import System.IO
51import System.IO
48
52
49−type InlineM v = State InlineState v
53+#if !(MIN_VERSION_base(4,8,0))
54+import Control.Applicative
55+import Data.Monoid ( mappend )
56+#endif
50
57
51−data InlineState =
58+type InlineM v = State Attr v
52− InlineState { inlineAttr :: Attr
53− , inlineUrlsEnabled :: Bool
54− }
55
59
56−-- | Set the background color to the provided 'Color'.
60+-- | Set the background color to the provided 'Color'
57backColor :: Color -> InlineM ()
61backColor :: Color -> InlineM ()
58−backColor c = modify $ \s ->
62+backColor c = modify $ flip mappend ( currentAttr `withBackColor` c )
59− s { inlineAttr = inlineAttr s `withBackColor` c
60− }
61
63
62−-- | Set the foreground color to the provided 'Color'.
64+-- | Set the foreground color to the provided 'Color'
63foreColor :: Color -> InlineM ()
65foreColor :: Color -> InlineM ()
64−foreColor c = modify $ \s ->
66+foreColor c = modify $ flip mappend ( currentAttr `withForeColor` c )
65− s { inlineAttr = inlineAttr s `withForeColor` c
66− }
67
67
68−-- | Attempt to change the 'Style' of the following text..
68+-- | Attempt to change the 'Style' of the following text.
69--
69--
70−-- If the terminal does not support the style change then no error is
70+-- If the terminal does not support the style change no error is produced. The style can still be
71−-- produced. The style can still be removed.
71+-- removed.
72applyStyle :: Style -> InlineM ()
72applyStyle :: Style -> InlineM ()
73−applyStyle st = modify $ \s ->
73+applyStyle s = modify $ flip mappend ( currentAttr `withStyle` s )
74− s { inlineAttr = inlineAttr s `withStyle` st
75− }
76
74
77−-- | Attempt to remove the specified 'Style' from the display of the
75+-- | Attempt to remove the specified 'Style' from the display of the following text.
78−-- following text.
79--
76--
80−-- This will fail if 'applyStyle' for the given style has not been
77+-- This will fail if applyStyle for the given style has not been previously called.
81−-- previously called.
82removeStyle :: Style -> InlineM ()
78removeStyle :: Style -> InlineM ()
83−removeStyle sMask = modify $ \s ->
79+removeStyle sMask = modify $ \attr ->
84− s { inlineAttr =
85− let style' = case attrStyle (inlineAttr s) of
80+ let style' = case attrStyle attr of
86− Default -> error "Graphics.Vty.Inline: Cannot removeStyle if applyStyle never used."
81+ Default -> error $ "Graphics.Vty.Inline: Cannot removeStyle if applyStyle never used."
87− KeepCurrent -> error "Graphics.Vty.Inline: Cannot removeStyle if applyStyle never used."
82+ KeepCurrent -> error $ "Graphics.Vty.Inline: Cannot removeStyle if applyStyle never used."
88− SetTo st -> st .&. complement sMask
83+ SetTo s -> s .&. complement sMask
89− in (inlineAttr s) { attrStyle = SetTo style' }
84+ in attr { attrStyle = SetTo style' }
90− }
85+
91−
92−-- | Reset the display attributes.
86+-- | Reset the display attributes
93defaultAll :: InlineM ()
87defaultAll :: InlineM ()
94−defaultAll = modify $ \s -> s { inlineAttr = defAttr }
88+defaultAll = put defAttr
95
89
96−-- | Apply the provided display attribute changes to the given terminal
90+-- | Apply the provided display attribute changes to the given terminal output device.
97−-- output device.
98--
91--
99-- This does not flush the terminal.
92-- This does not flush the terminal.
100putAttrChange :: ( Applicative m, MonadIO m ) => Output -> InlineM () -> m ()
93putAttrChange :: ( Applicative m, MonadIO m ) => Output -> InlineM () -> m ()
@@ -104,19 +97,19 @@ putAttrChange out c = liftIO $ do
104 mfattr <- prevFattr <$> readIORef (assumedStateRef out)
97 mfattr <- prevFattr <$> readIORef (assumedStateRef out)
105 fattr <- case mfattr of
98 fattr <- case mfattr of
106 Nothing -> do
99 Nothing -> do
107− liftIO $ outputByteBuffer out $ writeToByteString $ writeDefaultAttr dc False
100+ liftIO $ outputByteBuffer out $ writeToByteString $ writeDefaultAttr dc
108− return $ FixedAttr defaultStyleMask Nothing Nothing Nothing
101+ return $ FixedAttr defaultStyleMask Nothing Nothing
109 Just v -> return v
102 Just v -> return v
110− let InlineState attr urlsEnabled = execState c (InlineState currentAttr False)
103+ let attr = execState c currentAttr
111 attr' = limitAttrForDisplay out attr
104 attr' = limitAttrForDisplay out attr
112 fattr' = fixDisplayAttr fattr attr'
105 fattr' = fixDisplayAttr fattr attr'
113 diffs = displayAttrDiffs fattr fattr'
106 diffs = displayAttrDiffs fattr fattr'
114− outputByteBuffer out $ writeToByteString $ writeSetAttr dc urlsEnabled fattr attr' diffs
107+ outputByteBuffer out $ writeToByteString $ writeSetAttr dc fattr attr' diffs
115 modifyIORef (assumedStateRef out) $ \s -> s { prevFattr = Just fattr' }
108 modifyIORef (assumedStateRef out) $ \s -> s { prevFattr = Just fattr' }
116 inlineHack dc
109 inlineHack dc
117
110
118−-- | Apply the provided display attributes changes to the terminal
111+-- | Apply the provided display attributes changes to the terminal output device that was current at
119−-- output device.
112+-- the time this was first used. Which, for most use cases, is the current terminal.
120--
113--
121-- This will flush the terminal output.
114-- This will flush the terminal output.
122putAttrChange_ :: ( Applicative m, MonadIO m ) => InlineM () -> m ()
115putAttrChange_ :: ( Applicative m, MonadIO m ) => InlineM () -> m ()
src/Graphics/Vty/Inline/Unsafe.hs+14−4
@@ -1,9 +1,16 @@
1+{-# LANGUAGE CPP #-}
1{-# OPTIONS_HADDOCK hide #-}
2{-# OPTIONS_HADDOCK hide #-}
2
3
4+#ifndef MIN_VERSION_base
5+#defined MIN_VERSION_base(x,y,z) 1
6+#endif
7+
3module Graphics.Vty.Inline.Unsafe where
8module Graphics.Vty.Inline.Unsafe where
4
9
5import Graphics.Vty
10import Graphics.Vty
6
11
12+import Data.Default
13+import Data.Monoid
7import Data.IORef
14import Data.IORef
8
15
9import GHC.IO.Handle (hDuplicate)
16import GHC.IO.Handle (hDuplicate)
@@ -14,6 +21,10 @@ import System.IO.Unsafe
14
21
15import System.Posix.IO (handleToFd)
22import System.Posix.IO (handleToFd)
16
23
24+#if !(MIN_VERSION_base(4,8,0))
25+import Control.Applicative
26+#endif
27+
17globalVty :: IORef (Maybe Vty)
28globalVty :: IORef (Maybe Vty)
18{-# NOINLINE globalVty #-}
29{-# NOINLINE globalVty #-}
19globalVty = unsafePerformIO $ newIORef Nothing
30globalVty = unsafePerformIO $ newIORef Nothing
@@ -28,11 +39,10 @@ mkDupeConfig = do
28 hSetBuffering stdin NoBuffering
39 hSetBuffering stdin NoBuffering
29 stdinDupe <- hDuplicate stdin >>= handleToFd
40 stdinDupe <- hDuplicate stdin >>= handleToFd
30 stdoutDupe <- hDuplicate stdout >>= handleToFd
41 stdoutDupe <- hDuplicate stdout >>= handleToFd
31− return $ defaultConfig { inputFd = Just stdinDupe, outputFd = Just stdoutDupe }
42+ return $ def { inputFd = Just stdinDupe, outputFd = Just stdoutDupe }
32
43
33−-- | This will create a Vty instance using 'mkVty' and execute an IO
44+-- | This will create a Vty instance using 'mkVty' and execute an IO action provided that instance.
34−-- action provided that instance. The created Vty instance will be
35−-- stored to the unsafe 'IORef' 'globalVty'.
45+-- The created Vty instance will be stored to the unsafe 'IORef' 'globalVty'.
36--
46--
37-- This instance will use duplicates of the stdin and stdout Handles.
47-- This instance will use duplicates of the stdin and stdout Handles.
38withVty :: (Vty -> IO b) -> IO b
48withVty :: (Vty -> IO b) -> IO b
src/Graphics/Vty/Input.hs+127−97
@@ -1,125 +1,135 @@
1−{-# LANGUAGE RecordWildCards, CPP #-}
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE RecordWildCards #-}
2
3
3−-- | This module provides the input layer for Vty, including methods
4+#ifndef MIN_VERSION_base
5+#defined MIN_VERSION_base(x,y,z) 1
6+#endif
7+
4−-- for initializing an 'Input' structure and reading 'Event's from the
8+-- | The input layer for VTY. This provides methods for initializing an 'Input' structure which can
5−-- terminal.
9+-- then be used to read 'Event's from the terminal.
6−--
10+--
7−-- Note that due to the evolution of terminal emulators, some keys
11+-- The history of terminals has resulted in a broken input process. Some keys and combinations will
8−-- and combinations will not reliably map to the expected events by
12+-- not reliably map to the expected events by any terminal program. Even those not using vty. There
9−-- any terminal program. There is no 1:1 mapping from key events to
10−-- bytes read from the terminal input device. In very limited cases the
13+-- is no 1:1 mapping from key events to bytes read from the terminal input device. In very limited
11−-- terminal and vty's input process can be customized to resolve these
14+-- cases the terminal and vty's input process can be customized to resolve these issues.
15+--
12−-- issues; see "Graphics.Vty.Config" for how to configure vty's input
16+-- See "Graphics.Vty.Config" for how to configure vty's input processing. Customizing terminfo and
13−-- processing.
17+-- the terminal is beyond the scope of this documentation.
14--
18--
15-- = VTY's Implementation
19-- = VTY's Implementation
16--
20--
21+-- One can get the brain rot trying to understand all this. So, as far as I can care...
22+--
17-- There are two input modes:
23-- There are two input modes:
18--
24--
19−-- 1. 7-bit
25+-- 1. 7 bit
20--
26--
21−-- 2. 8-bit
27+-- 2. 8 bit
22--
28--
23−-- The 7-bit input mode is the default and the expected mode in most use
29+-- 7 bit input is the default and the expected in most use cases. This is what vty uses.
24−-- cases. This is what Vty uses.
25--
30--
26−-- == 7-bit input encoding
31+-- == 7 bit input encoding
27--
32--
28−-- Control key combinations are represented by masking the two high bits
33+-- Control key combinations are represented by masking the two high bits of the 7bit input. Back in
29−-- of the 7-bit input. Historically the control key actually grounded
30−-- the two high bit wires: 6 and 7. This is why control key combos
34+-- the day the control key actually grounded the two high bit wires: 6 and 7. This is why
31−-- map to single character events: the input bytes are identical. The
35+-- control key combos map to single character events: The input bytes are identical. The input byte
32−-- input byte is the bit encoding of the character with bits 6 and 7
36+-- is the bit encoding of the character with bits 6 and 7 masked. Bit 6 is set by shift. Bit 6 and
33−-- masked. Bit 6 is set by shift. Bit 6 and 7 are masked by control. For
37+-- 7 are masked by control. EG:
34−-- example,
35--
38--
36−-- * Control-I is 'i', `01101001`, and has bit 6 and 7 masked to become
39+-- * Control-I is 'i', `01101001`, has bit 6 and 7 masked to become `00001001`. Which is the ASCII
37−-- `00001001`, which is the ASCII and UTF-8 encoding of the Tab key.
40+-- and UTF-8 encoding of the tab key.
38--
41--
39−-- * Control+Shift-C is 'C', `01000011`, with bit 6 and 7 set to zero
42+-- * Control+Shift-C is 'C', `01000011`, with bit 6 and 7 set to zero which makes `0000011` and
40−-- which is `0000011` and is the "End of Text" code.
43+-- is the "End of Text" code.
41--
44--
42−-- * Hypothesis: This is why capital-A, 'A', has value 65 in ASCII: this
45+-- * Hypothesis: This is why capital-A, 'A', has value 65 in ASCII: This is the value 1 with bit 7
43−-- is the value 1 with bit 7 set and 6 unset.
46+-- set and 6 unset.
44--
47--
45−-- * Hypothesis: Bit 6 is unset by upper case letters because,
48+-- * Hypothesis: Bit 6 is unset by upper case letters because, initially, there were only upper case
46−-- initially, there were only upper case letters used and a 5 bit
49+-- letters used and a 5 bit encoding.
47−-- encoding.
48--
50--
49−-- == 8-bit encoding
51+-- == 8 bit encoding
50--
52--
51−-- The 8th bit was originally used for parity checking which is useless
53+-- The 8th bit was originally used for parity checking. Useless for emulators. Some terminal
52−-- for terminal emulators. Some terminal emulators support an 8-bit
53−-- input encoding. While this provides some advantages, the actual usage
54+-- emulators support a 8 bit input encoding. While this provides some advantages the actual usage is
54−-- is low. Most systems use 7-bit mode but recognize 8-bit control
55+-- low. Most systems use 7bit mode but recognize 8bit control characters when escaped. This is what
55−-- characters when escaped. This is what Vty does.
56+-- vty does.
56--
57--
57-- == Escaped Control Keys
58-- == Escaped Control Keys
58--
59--
59−-- Using 7-bit input encoding, the @ESC@ byte can signal the start of
60+-- Using 7 bit input encoding the @ESC@ byte can signal the start of an encoded control key. To
60−-- an encoded control key. To differentiate a single @ESC@ event from a
61−-- control key, the timing of the input is used.
61+-- differentiate a single @ESC@ eventfrom a control key the timing of the input is used.
62--
62--
63−-- 1. @ESC@ individually: @ESC@ byte; no bytes following for a period of
63+-- 1. @ESC@ individually: @ESC@ byte; no bytes for 'singleEscPeriod'.
64−-- 'VMIN' milliseconds.
65--
64--
66−-- 2. Control keys that contain @ESC@ in their encoding: The @ESC byte
65+-- 2. control keys that contain @ESC@ in their encoding: The @ESC byte; followed by more bytes read
67−-- is followed by more bytes read within 'VMIN' milliseconds. All bytes
68−-- up until the next valid input block are passed to the classifier.
66+-- within 'singleEscPeriod'. All bytes up until the next valid input block are passed to the
67+-- classifier.
69--
68--
70−-- If the current runtime is the threaded runtime then the terminal's
69+-- If the current runtime is the threaded runtime then the terminal's @VMIN@ and @VTIME@ behavior
71−-- @VMIN@ and @VTIME@ behavior reliably implement the above rules. If
72−-- the current runtime does not support 'forkOS' then there is currently
70+-- reliably implement the above rules. If the current runtime does not support forkOS then there is
73−-- no implementation.
71+-- currently no implementation.
72+--
73+-- Vty used to emulate @VMIN@ and @VTIME@. This was a input loop which did tricky things with
74+-- non-blocking reads and timers. The implementation was not reliable. A reliable implementation is
75+-- possible, but there are no plans to implement this.
74--
76--
75-- == Unicode Input and Escaped Control Key Sequences
77-- == Unicode Input and Escaped Control Key Sequences
76--
78--
77−-- The input encoding determines how UTF-8 encoded characters are
79+-- The input encoding determines how UTF-8 encoded characters are recognize.
78−-- recognized.
79--
80--
80−-- * 7-bit mode: UTF-8 can be input unambiguously. UTF-8 input is
81+-- * 7 bit mode: UTF-8 can be input unambiguiously. UTF-8 input is a superset of ASCII. UTF-8 does
81−-- a superset of ASCII. UTF-8 does not overlap escaped control key
82−-- sequences. However, the escape key must be differentiated from
82+-- not overlap escaped control key sequences. However, the escape key must be differentiated from
83-- escaped control key sequences by the timing of the input bytes.
83-- escaped control key sequences by the timing of the input bytes.
84--
84--
85−-- * 8-bit mode: UTF-8 cannot be input unambiguously. This does not
85+-- * 8 bit mode: UTF-8 cannot be input unambiguously. This does not require using the timing of
86−-- require using the timing of input bytes to differentiate the escape
87−-- key. Many terminals do not support 8-bit mode.
86+-- input bytes to differentiate the escape key. Many terminals do not support 8 bit mode.
88--
87--
89-- == Terminfo
88-- == Terminfo
90--
89--
91−-- The terminfo system is used to determine how some keys are encoded.
90+-- The terminfo system is used to determine how some keys are encoded. Terminfo is incomplete. In
92−-- Terminfo is incomplete and in some cases terminfo is incorrect. Vty
93−-- assumes terminfo is correct but provides a mechanism to override
91+-- some cases terminfo is incorrect. Vty assumes terminfo is correct but provides a mechanism to
94−-- terminfo; see "Graphics.Vty.Config", specifically 'inputOverrides'.
92+-- override terminfo. See "Graphics.Vty.Config" specifically 'inputOverrides'.
95--
93--
96-- == Terminal Input is Broken
94-- == Terminal Input is Broken
97--
95--
98−-- Clearly terminal input has fundamental issues. There is no easy way
96+-- Clearly terminal input has fundemental issues. There is no easy way to reliably resolve these
99−-- to reliably resolve these issues.
97+-- issues.
98+--
99+-- One resolution would be to ditch standard terminal interfaces entirely and just go directly to
100+-- scancodes. A reasonable option for vty if everybody used the linux kernel console. I hear GUIs
101+-- are popular these days. Sadly, GUI terminal emulators don't provide access to scancodes AFAIK.
102+--
103+-- All is lost? Not really. "Graphics.Vty.Config" supports customizing the input byte to event
104+-- mapping and xterm supports customizing the scancode to input byte mapping. With a lot of work a
105+-- user's system can be set up to encode all the key combos in an almost-sane manner.
106+--
107+-- There are other tricky work arounds that can be done. I have no interest in implementing most of
108+-- these. They are not really worth the time.
100--
109--
101−-- One resolution would be to ditch standard terminal interfaces
110+-- == Terminal Output is Also Broken
102−-- entirely and just go directly to scancodes. This would be a
103−-- reasonable option for Vty if everybody used the linux kernel console
104−-- but for obvious reasons this is not possible.
105--
111--
106−-- The "Graphics.Vty.Config" module supports customizing the
112+-- This isn't the only odd aspect of terminals due to historical aspects that no longer apply. EG:
107−-- input-byte-to-event mapping and xterm supports customizing the
113+-- Some terminfo capabilities specify millisecond delays. (Capabilities are how terminfo describes
108−-- scancode-to-input-byte mapping. With a lot of work a user's system
114+-- the control sequence to output red, for instance) This is to account for the slow speed of
109−-- can be set up to encode all the key combos in an almost-sane manner.
115+-- hardcopy teletype interfaces. Cause, uh, we totally still use those.
116+--
117+-- The output encoding of colors and attributes are also rife with issues.
110--
118--
111-- == See also
119-- == See also
112--
120--
113-- * http://www.leonerd.org.uk/hacks/fixterms/
121-- * http://www.leonerd.org.uk/hacks/fixterms/
122+--
123+-- In my experience this cannot resolve the issues without changes to the terminal emulator and
124+-- device.
114−module Graphics.Vty.Input
125+module Graphics.Vty.Input ( Key(..)
115− ( Key(..)
116− , Modifier(..)
126+ , Modifier(..)
117− , Button(..)
127+ , Button(..)
118− , Event(..)
128+ , Event(..)
119− , Input(..)
129+ , Input(..)
120− , inputForConfig
130+ , inputForConfig
121− )
131+ )
122−where
132+ where
123
133
124import Graphics.Vty.Config
134import Graphics.Vty.Config
125import Graphics.Vty.Input.Events
135import Graphics.Vty.Input.Events
@@ -132,19 +142,42 @@ import Lens.Micro
132import qualified System.Console.Terminfo as Terminfo
142import qualified System.Console.Terminfo as Terminfo
133import System.Posix.Signals.Exts
143import System.Posix.Signals.Exts
134
144
135−#if !MIN_VERSION_base(4,11,0)
145+#if !(MIN_VERSION_base(4,8,0))
146+import Data.Functor ((<$>))
147+import Data.Monoid
148+#else
136import Data.Monoid ((<>))
149import Data.Monoid ((<>))
137#endif
150#endif
138
151
139−-- | Set up the terminal with file descriptor `inputFd` for input.
152+-- | Set up the terminal with file descriptor `inputFd` for input. Returns a 'Input'.
140−-- Returns an 'Input'.
153+--
154+-- The table used to determine the 'Events' to produce for the input bytes comes from
155+-- 'classifyMapForTerm'. Which is then overridden by the the applicable entries from
156+-- 'inputMap'.
157+--
158+-- The terminal device is configured with the attributes:
159+--
160+-- * IXON disabled
161+-- - disables software flow control on outgoing data. This stops the process from being
162+-- suspended if the output terminal cannot keep up. I presume this has little effect these
163+-- days. I hope this means that output will be buffered if the terminal cannot keep up. In the
164+-- old days the output might of been dropped?
165+--
166+-- "raw" mode is used for input.
167+--
168+-- * ISIG disabled
169+-- - enables keyboard combinations that result in signals. TODO: should probably be a dynamic
170+-- option.
141--
171--
142−-- The table used to determine the 'Events' to produce for the input
172+-- * ECHO disabled
143−-- bytes comes from 'classifyMapForTerm' which is then overridden by
173+-- - input is not echod to the output. TODO: should be a dynamic option.
144−-- the the applicable entries from the configuration's 'inputMap'.
174+--
175+-- * ICANON disabled
176+-- - canonical mode (line mode) input is not used. TODO: should be a dynamic option.
177+--
178+-- * IEXTEN disabled
179+-- - extended functions are disabled. TODO: I don't know what those are.
145--
180--
146−-- The terminal device's mode flags are configured by the
147−-- 'attributeControl' function.
148inputForConfig :: Config -> IO Input
181inputForConfig :: Config -> IO Input
149inputForConfig config@Config{ termName = Just termName
182inputForConfig config@Config{ termName = Just termName
150 , inputFd = Just termFd
183 , inputFd = Just termFd
@@ -154,23 +187,20 @@ inputForConfig config@Config{ termName = Just termName
154 terminal <- Terminfo.setupTerm termName
187 terminal <- Terminfo.setupTerm termName
155 let inputOverrides = [(s,e) | (t,s,e) <- inputMap, t == Nothing || t == Just termName]
188 let inputOverrides = [(s,e) | (t,s,e) <- inputMap, t == Nothing || t == Just termName]
156 activeInputMap = classifyMapForTerm termName terminal `mappend` inputOverrides
189 activeInputMap = classifyMapForTerm termName terminal `mappend` inputOverrides
157− (setAttrs, unsetAttrs) <- attributeControl termFd
190+ (setAttrs,unsetAttrs) <- attributeControl termFd
158 setAttrs
191 setAttrs
159 input <- initInput config activeInputMap
192 input <- initInput config activeInputMap
160 let pokeIO = Catch $ do
193 let pokeIO = Catch $ do
194+ let e = error "vty internal failure: this value should not propagate to users"
161 setAttrs
195 setAttrs
162− atomically $ writeTChan (input^.eventChannel) ResumeAfterSignal
196+ atomically $ writeTChan (input^.eventChannel) (EvResize e e)
163 _ <- installHandler windowChange pokeIO Nothing
197 _ <- installHandler windowChange pokeIO Nothing
164 _ <- installHandler continueProcess pokeIO Nothing
198 _ <- installHandler continueProcess pokeIO Nothing
165−
166− let restore = unsetAttrs
167−
168 return $ input
199 return $ input
169 { shutdownInput = do
200 { shutdownInput = do
170 shutdownInput input
201 shutdownInput input
171 _ <- installHandler windowChange Ignore Nothing
202 _ <- installHandler windowChange Ignore Nothing
172 _ <- installHandler continueProcess Ignore Nothing
203 _ <- installHandler continueProcess Ignore Nothing
173− restore
204+ unsetAttrs
174− , restoreInputState = restoreInputState input >> restore
175 }
205 }
176inputForConfig config = (<> config) <$> standardIOConfig >>= inputForConfig
206inputForConfig config = (<> config) <$> standardIOConfig >>= inputForConfig
src/Graphics/Vty/Input/Classify.hs+45−69
@@ -1,108 +1,84 @@
1{-# OPTIONS_HADDOCK hide #-}
1{-# OPTIONS_HADDOCK hide #-}
2−-- This makes a kind of trie. Has space efficiency issues with large
2+-- This makes a kind of tri. Has space efficiency issues with large input blocks.
3−-- input blocks. Likely building a parser and just applying that would
3+-- Likely building a parser and just applying that would be better.
4−-- be better.
4+-- I did not write this so I might just rewrite it for better understanding. Which is not the best
5+-- of reasons.
6+-- TODO: measure and rewrite if required.
7+-- TODO: The ClassifyMap interface requires this code to always assure later entries override
8+-- earlier.
5module Graphics.Vty.Input.Classify
9module Graphics.Vty.Input.Classify
6− ( classify
10+ ( classify
7− , KClass(..)
11+ , KClass(..)
8− , ClassifierState(..)
9− )
10−where
12+ ) where
11
13
12import Graphics.Vty.Input.Events
14import Graphics.Vty.Input.Events
13import Graphics.Vty.Input.Mouse
15import Graphics.Vty.Input.Mouse
14−import Graphics.Vty.Input.Focus
15import Graphics.Vty.Input.Paste
16import Graphics.Vty.Input.Paste
16import Graphics.Vty.Input.Classify.Types
17import Graphics.Vty.Input.Classify.Types
17
18
18import Codec.Binary.UTF8.Generic (decode)
19import Codec.Binary.UTF8.Generic (decode)
19
20
20−import Control.Arrow (first)
21+import Data.List (inits)
21import qualified Data.Map as M( fromList, lookup )
22import qualified Data.Map as M( fromList, lookup )
22import Data.Maybe ( mapMaybe )
23import Data.Maybe ( mapMaybe )
23import qualified Data.Set as S( fromList, member )
24import qualified Data.Set as S( fromList, member )
24
25
26+import Data.Char
25import Data.Word
27import Data.Word
26
28
27−import qualified Data.ByteString as BS
28−import qualified Data.ByteString.Char8 as BS8
29−import Data.ByteString.Char8 (ByteString)
30−
31−-- | Whether the classifier is currently processing a chunked format.
32−-- Currently, only bracketed pastes use this.
33−data ClassifierState
34− = ClassifierStart
35− -- ^ Not processing a chunked format.
36− | ClassifierInChunk ByteString [ByteString]
37− -- ^ Currently processing a chunked format. The initial chunk is in the
38− -- first argument and a reversed remainder of the chunks is collected in
39− -- the second argument. At the end of the processing, the chunks are
40− -- reversed and concatenated with the final chunk.
41−
42−compile :: ClassifyMap -> ByteString -> KClass
29+compile :: ClassifyMap -> [Char] -> KClass
43compile table = cl' where
30compile table = cl' where
44 -- take all prefixes and create a set of these
31 -- take all prefixes and create a set of these
45− prefixSet = S.fromList $ concatMap (init . BS.inits . BS8.pack . fst) table
32+ prefixSet = S.fromList $ concatMap (init . inits . fst) $ table
46 maxValidInputLength = maximum (map (length . fst) table)
33 maxValidInputLength = maximum (map (length . fst) table)
47− eventForInput = M.fromList $ map (first BS8.pack) table
34+ eventForInput = M.fromList table
48− cl' inputBlock | BS8.null inputBlock = Prefix
35+ cl' [] = Prefix
49 cl' inputBlock = case M.lookup inputBlock eventForInput of
36 cl' inputBlock = case M.lookup inputBlock eventForInput of
50− -- if the inputBlock is exactly what is expected for an
37+ -- if the inputBlock is exactly what is expected for an event then consume the whole
51− -- event then consume the whole block and return the event
38+ -- block and return the event
52− Just e -> Valid e BS8.empty
39+ Just e -> Valid e []
53 Nothing -> case S.member inputBlock prefixSet of
40 Nothing -> case S.member inputBlock prefixSet of
54 True -> Prefix
41 True -> Prefix
55− -- look up progressively smaller tails of the input
42+ -- look up progressively smaller tails of the input block until an event is found
56− -- block until an event is found The assumption is that
57− -- the event that consumes the most input bytes should
43+ -- The assumption is that the event that consumes the most input bytes should be
58− -- be produced.
44+ -- produced.
59 -- The test verifyFullSynInputToEvent2x verifies this.
45 -- The test verifyFullSynInputToEvent2x verifies this.
60− -- H: There will always be one match. The prefixSet
46+ -- H: There will always be one match. The prefixSet contains, by definition, all
61− -- contains, by definition, all prefixes of an event.
47+ -- prefixes of an event.
62 False ->
48 False ->
63− let inputPrefixes = reverse . take maxValidInputLength . tail . BS8.inits $ inputBlock
49+ let inputPrefixes = reverse $ take maxValidInputLength $ tail $ inits inputBlock
64 in case mapMaybe (\s -> (,) s `fmap` M.lookup s eventForInput) inputPrefixes of
50 in case mapMaybe (\s -> (,) s `fmap` M.lookup s eventForInput) inputPrefixes of
65− (s,e) : _ -> Valid e (BS8.drop (BS8.length s) inputBlock)
51+ (s,e) : _ -> Valid e (drop (length s) inputBlock)
66 -- neither a prefix or a full event.
52 -- neither a prefix or a full event.
53+ -- TODO: debug log
67 [] -> Invalid
54 [] -> Invalid
68
55
69−classify :: ClassifyMap -> ClassifierState -> ByteString -> KClass
56+classify :: ClassifyMap -> [Char] -> KClass
70−classify table = process
57+classify table =
71− where
72− standardClassifier = compile table
58+ let standardClassifier = compile table
73−
74− process ClassifierStart s =
75− case BS.uncons s of
59+ in \s -> case s of
76− _ | bracketedPasteStarted s ->
60+ _ | bracketedPasteStarted s ->
77− if bracketedPasteFinished s
78− then parseBracketedPaste s
79− else Chunk
80− _ | isMouseEvent s -> classifyMouseEvent s
81− _ | isFocusEvent s -> classifyFocusEvent s
82− Just (c,cs) | c >= 0xC2 -> classifyUtf8 c cs
83− _ -> standardClassifier s
84−
85− process (ClassifierInChunk p ps) s | bracketedPasteStarted p =
86 if bracketedPasteFinished s
61 if bracketedPasteFinished s
87− then parseBracketedPaste $ BS.concat $ p:reverse (s:ps)
62+ then parseBracketedPaste s
88− else Chunk
63+ else Prefix
89− process ClassifierInChunk{} _ = Invalid
64+ _ | isMouseEvent s -> classifyMouseEvent s
65+ c:cs | ord c >= 0xC2 -> classifyUtf8 c cs
66+ _ -> standardClassifier s
90
67
91−classifyUtf8 :: Word8 -> ByteString -> KClass
68+classifyUtf8 :: Char -> [Char] -> KClass
92classifyUtf8 c cs =
69classifyUtf8 c cs =
93− let n = utf8Length c
70+ let n = utf8Length (ord c)
94− (codepoint,rest) = BS8.splitAt (n - 1) cs
71+ (codepoint,rest) = splitAt n (c:cs)
95
72
96 codepoint8 :: [Word8]
73 codepoint8 :: [Word8]
97− codepoint8 = c:BS.unpack codepoint
74+ codepoint8 = map (fromIntegral . ord) codepoint
98
75
99 in case decode codepoint8 of
76 in case decode codepoint8 of
100− _ | n < BS.length codepoint + 1 -> Prefix
77+ _ | n < length codepoint -> Prefix
101− Just (unicodeChar, _) -> Valid (EvKey (KChar unicodeChar) []) rest
78+ Just (unicodeChar, _) -> Valid (EvKey (KChar unicodeChar) []) rest
102− -- something bad happened; just ignore and continue.
79+ Nothing -> Invalid -- something bad happened; just ignore and continue.
103− Nothing -> Invalid
104
80
105−utf8Length :: Word8 -> Int
81+utf8Length :: (Num t, Ord a, Num a) => a -> t
106utf8Length c
82utf8Length c
107 | c < 0x80 = 1
83 | c < 0x80 = 1
108 | c < 0xE0 = 2
84 | c < 0xE0 = 2
src/Graphics/Vty/Input/Classify/Parse.hs+14−18
@@ -1,14 +1,13 @@
1-- | This module provides a simple parser for parsing input event
1-- | This module provides a simple parser for parsing input event
2-- control sequences.
2-- control sequences.
3module Graphics.Vty.Input.Classify.Parse
3module Graphics.Vty.Input.Classify.Parse
4− ( Parser
4+ ( Parser
5− , runParser
5+ , runParser
6− , failParse
6+ , failParse
7− , readInt
7+ , readInt
8− , readChar
8+ , readChar
9− , expectChar
9+ , expectChar
10− )
11−where
10+ ) where
12
11
13import Graphics.Vty.Input.Events
12import Graphics.Vty.Input.Events
14import Graphics.Vty.Input.Classify.Types
13import Graphics.Vty.Input.Classify.Types
@@ -16,15 +15,12 @@ import Graphics.Vty.Input.Classify.Types
16import Control.Monad.Trans.Maybe
15import Control.Monad.Trans.Maybe
17import Control.Monad.State
16import Control.Monad.State
18
17
19−import qualified Data.ByteString.Char8 as BS8
20−import Data.ByteString.Char8 (ByteString)
21−
22−type Parser a = MaybeT (State ByteString) a
18+type Parser a = MaybeT (State String) a
23
19
24-- | Run a parser on a given input string. If the parser fails, return
20-- | Run a parser on a given input string. If the parser fails, return
25-- 'Invalid'. Otherwise return the valid event ('Valid') and the
21-- 'Invalid'. Otherwise return the valid event ('Valid') and the
26-- remaining unparsed characters.
22-- remaining unparsed characters.
27−runParser :: ByteString -> Parser Event -> KClass
23+runParser :: String -> Parser Event -> KClass
28runParser s parser =
24runParser s parser =
29 case runState (runMaybeT parser) s of
25 case runState (runMaybeT parser) s of
30 (Nothing, _) -> Invalid
26 (Nothing, _) -> Invalid
@@ -39,9 +35,9 @@ failParse = fail "invalid parse"
39-- return '123' and consume those characters.
35-- return '123' and consume those characters.
40readInt :: Parser Int
36readInt :: Parser Int
41readInt = do
37readInt = do
42− s <- BS8.unpack <$> get
38+ s <- get
43 case (reads :: ReadS Int) s of
39 case (reads :: ReadS Int) s of
44− [(i, rest)] -> put (BS8.pack rest) >> return i
40+ [(i, rest)] -> put rest >> return i
45 _ -> failParse
41 _ -> failParse
46
42
47-- | Read a character from the input stream. If one cannot be read (e.g.
43-- | Read a character from the input stream. If one cannot be read (e.g.
@@ -49,9 +45,9 @@ readInt = do
49readChar :: Parser Char
45readChar :: Parser Char
50readChar = do
46readChar = do
51 s <- get
47 s <- get
52− case BS8.uncons s of
48+ case s of
53− Just (c,rest) -> put rest >> return c
49+ c:rest -> put rest >> return c
54− Nothing -> failParse
50+ _ -> failParse
55
51
56-- | Read a character from the input stream and fail parsing if it is
52-- | Read a character from the input stream and fail parsing if it is
57-- not the specified character.
53-- not the specified character.
src/Graphics/Vty/Input/Classify/Types.hs+3−10
@@ -1,17 +1,13 @@
1-- | This module exports the input classification type to avoid import
1-- | This module exports the input classification type to avoid import
2-- cycles between other modules that need this.
2-- cycles between other modules that need this.
3−{-# LANGUAGE StrictData #-}
4module Graphics.Vty.Input.Classify.Types
3module Graphics.Vty.Input.Classify.Types
5− ( KClass(..)
4+ ( KClass(..)
6− )
7−where
5+ ) where
8
6
9import Graphics.Vty.Input.Events
7import Graphics.Vty.Input.Events
10
8
11−import Data.ByteString.Char8 (ByteString)
12−
13data KClass
9data KClass
14− = Valid Event ByteString
10+ = Valid Event [Char]
15 -- ^ A valid event was parsed. Any unused characters from the input
11 -- ^ A valid event was parsed. Any unused characters from the input
16 -- stream are also provided.
12 -- stream are also provided.
17 | Invalid
13 | Invalid
@@ -19,7 +15,4 @@ data KClass
19 | Prefix
15 | Prefix
20 -- ^ The input characters form the prefix of a valid event character
16 -- ^ The input characters form the prefix of a valid event character
21 -- sequence.
17 -- sequence.
22− | Chunk
23− -- ^ The input characters are either start of a bracketed paste chunk
24− -- or in the middle of a bracketed paste chunk.
25 deriving(Show, Eq)
18 deriving(Show, Eq)
src/Graphics/Vty/Input/Events.hs+14−38
@@ -1,44 +1,34 @@
1{-# Language DeriveGeneric #-}
1{-# Language DeriveGeneric #-}
2−{-# Language StrictData #-}
3module Graphics.Vty.Input.Events where
2module Graphics.Vty.Input.Events where
4
3
5−import Control.DeepSeq
6import Data.ByteString
4import Data.ByteString
7import GHC.Generics
5import GHC.Generics
8
6
9-- | Representations of non-modifier keys.
7-- | Representations of non-modifier keys.
10--
8--
11−-- * KFun is indexed from 0 to 63. Range of supported FKeys varies by
9+-- * KFun is indexed from 0 to 63. Range of supported FKeys varies by terminal and keyboard.
12−-- terminal and keyboard.
13--
10--
14−-- * KUpLeft, KUpRight, KDownLeft, KDownRight, KCenter support varies by
11+-- * KUpLeft, KUpRight, KDownLeft, KDownRight, KCenter support varies by terminal and keyboard.
15−-- terminal and keyboard.
16--
12--
17−-- * Actually, support for most of these but KEsc, KChar, KBS, and
13+-- * Actually, support for most of these but KEsc, KChar, KBS, and KEnter vary by terminal and
18−-- KEnter vary by terminal and keyboard.
14+-- keyboard.
19−data Key = KEsc | KChar {-# UNPACK #-} Char | KBS | KEnter
15+data Key = KEsc | KChar Char | KBS | KEnter
20 | KLeft | KRight | KUp | KDown
16 | KLeft | KRight | KUp | KDown
21 | KUpLeft | KUpRight | KDownLeft | KDownRight | KCenter
17 | KUpLeft | KUpRight | KDownLeft | KDownRight | KCenter
22− | KFun {-# UNPACK #-} Int | KBackTab | KPrtScr | KPause | KIns
18+ | KFun Int | KBackTab | KPrtScr | KPause | KIns
23 | KHome | KPageUp | KDel | KEnd | KPageDown | KBegin | KMenu
19 | KHome | KPageUp | KDel | KEnd | KPageDown | KBegin | KMenu
24 deriving (Eq,Show,Read,Ord,Generic)
20 deriving (Eq,Show,Read,Ord,Generic)
25
21
26−instance NFData Key
27−
28−-- | Modifier keys. Key codes are interpreted such that users are more
22+-- | Modifier keys. Key codes are interpreted such that users are more likely to
29−-- likely to have Meta than Alt; for instance on the PC Linux console,
23+-- have Meta than Alt; for instance on the PC Linux console, 'MMeta' will
30−-- 'MMeta' will generally correspond to the physical Alt key.
24+-- generally correspond to the physical Alt key.
31data Modifier = MShift | MCtrl | MMeta | MAlt
25data Modifier = MShift | MCtrl | MMeta | MAlt
32 deriving (Eq,Show,Read,Ord,Generic)
26 deriving (Eq,Show,Read,Ord,Generic)
33
27
34−instance NFData Modifier
35−
36-- | Mouse buttons.
28-- | Mouse buttons.
37−data Button = BLeft | BMiddle | BRight | BScrollUp | BScrollDown
29+data Button = BLeft | BMiddle | BRight
38 deriving (Eq,Show,Read,Ord,Generic)
30 deriving (Eq,Show,Read,Ord,Generic)
39
31
40−instance NFData Button
41−
42-- | Events.
32-- | Events.
43data Event
33data Event
44 = EvKey Key [Modifier]
34 = EvKey Key [Modifier]
@@ -52,8 +42,10 @@ data Event
52 -- without specifying which one; in that case, Nothing is provided.
42 -- without specifying which one; in that case, Nothing is provided.
53 -- Otherwise Just the button released is included in the event.
43 -- Otherwise Just the button released is included in the event.
54 | EvResize Int Int
44 | EvResize Int Int
55− -- The terminal window was resized and the size is provided in the
45+ -- ^ If read from 'eventChannel' this is the size at the time of the
56− -- integer fields (width, height).
46+ -- signal. If read from 'nextEvent' this is the size at the time the
47+ -- event was processed by Vty. Typically these are the same, but if
48+ -- somebody is resizing the terminal quickly they can be different.
57 | EvPaste ByteString
49 | EvPaste ByteString
58 -- ^ A paste event occurs when a bracketed paste input sequence is
50 -- ^ A paste event occurs when a bracketed paste input sequence is
59 -- received. For terminals that support bracketed paste mode, these
51 -- received. For terminals that support bracketed paste mode, these
@@ -62,22 +54,6 @@ data Event
62 -- input (which is probably bad, so beware!) Note that the data is
54 -- input (which is probably bad, so beware!) Note that the data is
63 -- provided in raw form and you'll have to decode (e.g. as UTF-8) if
55 -- provided in raw form and you'll have to decode (e.g. as UTF-8) if
64 -- that's what your application expects.
56 -- that's what your application expects.
65− | EvLostFocus
66− -- ^ The terminal running the application lost input focus.
67− | EvGainedFocus
68− -- ^ The terminal running the application gained input focus.
69 deriving (Eq,Show,Read,Ord,Generic)
57 deriving (Eq,Show,Read,Ord,Generic)
70
58
71−instance NFData Event
72−
73type ClassifyMap = [(String,Event)]
59type ClassifyMap = [(String,Event)]
74−
75−-- | The type of internal events that drive the internal Vty event
76−-- dispatching to the application.
77−data InternalEvent =
78− ResumeAfterSignal
79− -- ^ Vty resumed operation after the process was interrupted with a
80− -- signal. In practice this translates into a screen redraw in the
81− -- input event loop.
82− | InputEvent Event
83− -- ^ An input event was received.
src/Graphics/Vty/Input/Focus.hsdeleted−49
@@ -1,49 +0,0 @@
1−module Graphics.Vty.Input.Focus
2− ( requestFocusEvents
3− , disableFocusEvents
4− , isFocusEvent
5− , classifyFocusEvent
6− )
7−where
8−
9−import Graphics.Vty.Input.Events
10−import Graphics.Vty.Input.Classify.Types
11−import Graphics.Vty.Input.Classify.Parse
12−
13−import Control.Monad.State
14−
15−import qualified Data.ByteString.Char8 as BS8
16−import Data.ByteString.Char8 (ByteString)
17−
18−-- | These sequences set xterm-based terminals to send focus event
19−-- sequences.
20−requestFocusEvents :: ByteString
21−requestFocusEvents = BS8.pack "\ESC[?1004h"
22−
23−-- | These sequences disable focus events.
24−disableFocusEvents :: ByteString
25−disableFocusEvents = BS8.pack "\ESC[?1004l"
26−
27−-- | Does the specified string begin with a focus event?
28−isFocusEvent :: ByteString -> Bool
29−isFocusEvent s = BS8.isPrefixOf focusIn s ||
30− BS8.isPrefixOf focusOut s
31−
32−focusIn :: ByteString
33−focusIn = BS8.pack "\ESC[I"
34−
35−focusOut :: ByteString
36−focusOut = BS8.pack "\ESC[O"
37−
38−-- | Attempt to classify an input string as a focus event.
39−classifyFocusEvent :: ByteString -> KClass
40−classifyFocusEvent s = runParser s $ do
41− when (not $ isFocusEvent s) failParse
42−
43− expectChar '\ESC'
44− expectChar '['
45− ty <- readChar
46− case ty of
47− 'I' -> return EvGainedFocus
48− 'O' -> return EvLostFocus
49− _ -> failParse
src/Graphics/Vty/Input/Loop.hs+47−109
@@ -1,18 +1,14 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE NoMonomorphismRestriction #-}
3{-# LANGUAGE RecordWildCards #-}
1{-# LANGUAGE RecordWildCards #-}
4−{-# LANGUAGE ScopedTypeVariables #-}
5−{-# LANGUAGE TemplateHaskell #-}
6{-# OPTIONS_HADDOCK hide #-}
2{-# OPTIONS_HADDOCK hide #-}
3+{-# LANGUAGE NoMonomorphismRestriction #-}
4+{-# LANGUAGE TemplateHaskell #-}
5+{-# LANGUAGE CPP #-}
7−-- | The input layer used to be a single function that correctly
6+-- | The input layer used to be a single function that correctly accounted for the non-threaded
8−-- accounted for the non-threaded runtime by emulating the terminal
9−-- VMIN adn VTIME handling. This has been removed and replace with a
7+-- runtime by emulating the terminal VMIN adn VTIME handling. This has been removed and replace with
10−-- more straightforward parser. The non-threaded runtime is no longer
8+-- a more straightforward parser. The non-threaded runtime is no longer supported.
11−-- supported.
12--
9--
13−-- This is an example of an algorithm where code coverage could be high,
10+-- This is an example of an algorithm where code coverage could be high, even 100%, but the
14−-- even 100%, but the behavior is still under tested. I should collect
11+-- behavior is still under tested. I should collect more of these examples...
15−-- more of these examples...
16--
12--
17-- reference: http://www.unixwiz.net/techtips/termios-vmin-vtime.html
13-- reference: http://www.unixwiz.net/techtips/termios-vmin-vtime.html
18module Graphics.Vty.Input.Loop where
14module Graphics.Vty.Input.Loop where
@@ -25,7 +21,8 @@ import Control.Applicative
25import Control.Concurrent
21import Control.Concurrent
26import Control.Concurrent.STM
22import Control.Concurrent.STM
27import Control.Exception (mask, try, SomeException)
23import Control.Exception (mask, try, SomeException)
24+import Data.Monoid
28−import Lens.Micro hiding ((<>~))
25+import Lens.Micro
29import Lens.Micro.Mtl
26import Lens.Micro.Mtl
30import Lens.Micro.TH
27import Lens.Micro.TH
31import Control.Monad (when, mzero, forM_)
28import Control.Monad (when, mzero, forM_)
@@ -34,15 +31,12 @@ import Control.Monad.Trans.State (StateT(..), evalStateT)
34import Control.Monad.State.Class (MonadState, modify)
31import Control.Monad.State.Class (MonadState, modify)
35import Control.Monad.Trans.Reader (ReaderT(..))
32import Control.Monad.Trans.Reader (ReaderT(..))
36
33
37−import qualified Data.ByteString.Char8 as BS8
34+import Data.Char
38−import qualified Data.ByteString as BS
39−import Data.ByteString.Char8 (ByteString)
40import Data.IORef
35import Data.IORef
41import Data.Word (Word8)
36import Data.Word (Word8)
42
37
43−import Foreign (allocaArray)
38+import Foreign ( allocaArray, peekArray, Ptr )
44import Foreign.C.Types (CInt(..))
39import Foreign.C.Types (CInt(..))
45−import Foreign.Ptr (Ptr, castPtr)
46
40
47import System.IO
41import System.IO
48import System.Posix.IO (fdReadBuf, setFdOption, FdOption(..))
42import System.Posix.IO (fdReadBuf, setFdOption, FdOption(..))
@@ -52,18 +46,12 @@ import System.Posix.Types (Fd(..))
52import Text.Printf (hPrintf)
46import Text.Printf (hPrintf)
53
47
54data Input = Input
48data Input = Input
55− { -- | Channel of events direct from input processing. Unlike
49+ { -- | Channel of events direct from input processing. Unlike 'nextEvent' this will not refresh
56− -- 'nextEvent' this will not refresh the display if the next event
50+ -- the display if the next event is an 'EvResize'.
57− -- is an 'EvResize'.
58− _eventChannel :: TChan InternalEvent
51+ _eventChannel :: TChan Event
59− -- | Shuts down the input processing. As part of shutting down the
52+ -- | Shuts down the input processing. This should return the terminal input state to before
60− -- input, this should also restore the input state.
53+ -- the input initialized.
61 , shutdownInput :: IO ()
54 , shutdownInput :: IO ()
62− -- | Restore the terminal's input state to what it was prior
63− -- to configuring input for Vty. This should be done as part of
64− -- 'shutdownInput' but is exposed in case you need to access it
65− -- directly.
66− , restoreInputState :: IO ()
67 -- | Changes to this value are reflected after the next event.
55 -- | Changes to this value are reflected after the next event.
68 , _configRef :: IORef Config
56 , _configRef :: IORef Config
69 -- | input debug log
57 -- | input debug log
@@ -80,11 +68,10 @@ data InputBuffer = InputBuffer
80makeLenses ''InputBuffer
68makeLenses ''InputBuffer
81
69
82data InputState = InputState
70data InputState = InputState
83− { _unprocessedBytes :: ByteString
71+ { _unprocessedBytes :: String
84− , _classifierState :: ClassifierState
85 , _appliedConfig :: Config
72 , _appliedConfig :: Config
86 , _inputBuffer :: InputBuffer
73 , _inputBuffer :: InputBuffer
87− , _classifier :: ClassifierState -> ByteString -> KClass
74+ , _classifier :: String -> KClass
88 }
75 }
89
76
90makeLenses ''InputState
77makeLenses ''InputState
@@ -99,8 +86,7 @@ logMsg msg = do
99 Just h -> liftIO $ hPutStrLn h msg >> hFlush h
86 Just h -> liftIO $ hPutStrLn h msg >> hFlush h
100
87
101-- this must be run on an OS thread dedicated to this input handling.
88-- this must be run on an OS thread dedicated to this input handling.
102−-- otherwise the terminal timing read behavior will block the execution
89+-- otherwise the terminal timing read behavior will block the execution of the lightweight threads.
103−-- of the lightweight threads.
104loopInputProcessor :: InputM ()
90loopInputProcessor :: InputM ()
105loopInputProcessor = do
91loopInputProcessor = do
106 readFromDevice >>= addBytesToProcess
92 readFromDevice >>= addBytesToProcess
@@ -109,20 +95,20 @@ loopInputProcessor = do
109 dropInvalid
95 dropInvalid
110 loopInputProcessor
96 loopInputProcessor
111
97
112−addBytesToProcess :: ByteString -> InputM ()
98+addBytesToProcess :: String -> InputM ()
113addBytesToProcess block = unprocessedBytes <>= block
99addBytesToProcess block = unprocessedBytes <>= block
114
100
115emit :: Event -> InputM ()
101emit :: Event -> InputM ()
116emit event = do
102emit event = do
117 logMsg $ "parsed event: " ++ show event
103 logMsg $ "parsed event: " ++ show event
118− view eventChannel >>= liftIO . atomically . flip writeTChan (InputEvent event)
104+ view eventChannel >>= liftIO . atomically . flip writeTChan event
119
105
120−-- The timing requirements are assured by the VMIN and VTIME set for the
106+-- The timing requirements are assured by the VMIN and VTIME set for the device.
121−-- device.
122--
107--
123−-- Precondition: Under the threaded runtime. Only current use is from a
108+-- Precondition: Under the threaded runtime. Only current use is from a forkOS thread. That case
124−-- forkOS thread. That case satisfies precondition.
109+-- satisfies precondition.
110+-- TODO: When under the non-threaded runtime emulate VMIN and VTIME
125−readFromDevice :: InputM ByteString
111+readFromDevice :: InputM String
126readFromDevice = do
112readFromDevice = do
127 newConfig <- view configRef >>= liftIO . readIORef
113 newConfig <- view configRef >>= liftIO . readIORef
128 oldConfig <- use appliedConfig
114 oldConfig <- use appliedConfig
@@ -134,18 +120,16 @@ readFromDevice = do
134 bufferPtr <- use $ inputBuffer.ptr
120 bufferPtr <- use $ inputBuffer.ptr
135 maxBytes <- use $ inputBuffer.size
121 maxBytes <- use $ inputBuffer.size
136 stringRep <- liftIO $ do
122 stringRep <- liftIO $ do
137− -- The killThread used in shutdownInput will not interrupt the
123+ -- The killThread used in shutdownInput will not interrupt the foreign call fdReadBuf uses
138− -- foreign call fdReadBuf uses this provides a location to be
139− -- interrupted prior to the foreign call. If there is input on
124+ -- this provides a location to be interrupted prior to the foreign call. If there is input
140− -- the FD then the fdReadBuf will return in a finite amount of
125+ -- on the FD then the fdReadBuf will return in a finite amount of time due to the vtime
141− -- time due to the vtime terminal setting.
126+ -- terminal setting.
142 threadWaitRead fd
127 threadWaitRead fd
143 bytesRead <- fdReadBuf fd bufferPtr (fromIntegral maxBytes)
128 bytesRead <- fdReadBuf fd bufferPtr (fromIntegral maxBytes)
144 if bytesRead > 0
129 if bytesRead > 0
145− then BS.packCStringLen (castPtr bufferPtr, fromIntegral bytesRead)
130+ then fmap (map $ chr . fromIntegral) $ peekArray (fromIntegral bytesRead) bufferPtr
146− else return BS.empty
131+ else return []
147− when (not $ BS.null stringRep) $
148− logMsg $ "input bytes: " ++ show (BS8.unpack stringRep)
132+ when (not $ null stringRep) $ logMsg $ "input bytes: " ++ show stringRep
149 return stringRep
133 return stringRep
150
134
151applyConfig :: Fd -> Config -> IO ()
135applyConfig :: Fd -> Config -> IO ()
@@ -156,86 +140,41 @@ applyConfig _ _ = fail "(vty) applyConfig was not provided a complete configurat
156parseEvent :: InputM Event
140parseEvent :: InputM Event
157parseEvent = do
141parseEvent = do
158 c <- use classifier
142 c <- use classifier
159− s <- use classifierState
160 b <- use unprocessedBytes
143 b <- use unprocessedBytes
161− case c s b of
144+ case c b of
162 Valid e remaining -> do
145 Valid e remaining -> do
163 logMsg $ "valid parse: " ++ show e
146 logMsg $ "valid parse: " ++ show e
164 logMsg $ "remaining: " ++ show remaining
147 logMsg $ "remaining: " ++ show remaining
165− classifierState .= ClassifierStart
166 unprocessedBytes .= remaining
148 unprocessedBytes .= remaining
167 return e
149 return e
168− _ -> mzero
150+ _ -> mzero
169
151
170dropInvalid :: InputM ()
152dropInvalid :: InputM ()
171dropInvalid = do
153dropInvalid = do
172 c <- use classifier
154 c <- use classifier
173− s <- use classifierState
174 b <- use unprocessedBytes
155 b <- use unprocessedBytes
175− case c s b of
176− Chunk -> do
177− classifierState .=
178− case s of
179− ClassifierStart -> ClassifierInChunk b []
180− ClassifierInChunk p bs -> ClassifierInChunk p (b:bs)
181− unprocessedBytes .= BS8.empty
182− Invalid -> do
156+ when (c b == Invalid) $ do
183− logMsg "dropping input bytes"
157+ logMsg "dropping input bytes"
184− classifierState .= ClassifierStart
185− unprocessedBytes .= BS8.empty
158+ unprocessedBytes .= []
186− _ -> return ()
187
159
188runInputProcessorLoop :: ClassifyMap -> Input -> IO ()
160runInputProcessorLoop :: ClassifyMap -> Input -> IO ()
189runInputProcessorLoop classifyTable input = do
161runInputProcessorLoop classifyTable input = do
190 let bufferSize = 1024
162 let bufferSize = 1024
191 allocaArray bufferSize $ \(bufferPtr :: Ptr Word8) -> do
163 allocaArray bufferSize $ \(bufferPtr :: Ptr Word8) -> do
192− s0 <- InputState BS8.empty ClassifierStart
193− <$> readIORef (_configRef input)
164+ s0 <- InputState [] <$> readIORef (_configRef input)
194− <*> pure (InputBuffer bufferPtr bufferSize)
165+ <*> pure (InputBuffer bufferPtr bufferSize)
195− <*> pure (classify classifyTable)
166+ <*> pure (classify classifyTable)
196 runReaderT (evalStateT loopInputProcessor s0) input
167 runReaderT (evalStateT loopInputProcessor s0) input
197
168
198−-- | Construct two IO actions: one to configure the terminal for Vty and
199−-- one to restore the terminal mode flags to the values they had at the
200−-- time this function was called.
201−--
202−-- This function constructs a configuration action to clear the
203−-- following terminal mode flags:
204−--
205−-- * IXON disabled: disables software flow control on outgoing data.
206−-- This stops the process from being suspended if the output terminal
207−-- cannot keep up.
208−--
209−-- * Raw mode is used for input.
210−--
211−-- * ISIG (enables keyboard combinations that result in
212−-- signals)
213−--
214−-- * ECHO (input is not echoed to the output)
215−--
216−-- * ICANON (canonical mode (line mode) input is not used)
217−--
218−-- * IEXTEN (extended functions are disabled)
219−--
220−-- The configuration action also explicitly sets these flags:
221−--
222−-- * ICRNL (input carriage returns are mapped to newlines)
223attributeControl :: Fd -> IO (IO (), IO ())
169attributeControl :: Fd -> IO (IO (), IO ())
224attributeControl fd = do
170attributeControl fd = do
225 original <- getTerminalAttributes fd
171 original <- getTerminalAttributes fd
226− let vtyMode = foldl withMode clearedFlags flagsToSet
227− clearedFlags = foldl withoutMode original flagsToUnset
228− flagsToSet = [ MapCRtoLF -- ICRNL
229− ]
230− flagsToUnset = [ StartStopOutput -- IXON
231− , KeyboardInterrupts -- ISIG
172+ let vtyMode = foldl withoutMode original [ StartStopOutput, KeyboardInterrupts
232− , EnableEcho -- ECHO
233− , ProcessInput -- ICANON
234− , ExtendedFunctions -- IEXTEN
173+ , EnableEcho, ProcessInput, ExtendedFunctions
235− ]
174+ ]
236 let setAttrs = setTerminalAttributes fd vtyMode Immediately
175 let setAttrs = setTerminalAttributes fd vtyMode Immediately
237 unsetAttrs = setTerminalAttributes fd original Immediately
176 unsetAttrs = setTerminalAttributes fd original Immediately
238− return (setAttrs, unsetAttrs)
177+ return (setAttrs,unsetAttrs)
239
178
240logInitialInputState :: Input -> ClassifyMap -> IO()
179logInitialInputState :: Input -> ClassifyMap -> IO()
241logInitialInputState input classifyTable = case _inputDebug input of
180logInitialInputState input classifyTable = case _inputDebug input of
@@ -243,7 +182,7 @@ logInitialInputState input classifyTable = case _inputDebug input of
243 Just h -> do
182 Just h -> do
244 Config{ vmin = Just theVmin
183 Config{ vmin = Just theVmin
245 , vtime = Just theVtime
184 , vtime = Just theVtime
246− , termName = Just theTerm } <- readIORef $ _configRef input
185+ , termName = Just theTerm, .. } <- readIORef $ _configRef input
247 _ <- hPrintf h "initial (vmin,vtime): %s\n" (show (theVmin, theVtime))
186 _ <- hPrintf h "initial (vmin,vtime): %s\n" (show (theVmin, theVtime))
248 forM_ classifyTable $ \i -> case i of
187 forM_ classifyTable $ \i -> case i of
249 (inBytes, EvKey k mods) -> hPrintf h "map %s %s %s %s\n" (show theTerm)
188 (inBytes, EvKey k mods) -> hPrintf h "map %s %s %s %s\n" (show theTerm)
@@ -259,7 +198,6 @@ initInput config classifyTable = do
259 applyConfig fd config
198 applyConfig fd config
260 stopSync <- newEmptyMVar
199 stopSync <- newEmptyMVar
261 input <- Input <$> atomically newTChan
200 input <- Input <$> atomically newTChan
262− <*> pure (return ())
263 <*> pure (return ())
201 <*> pure (return ())
264 <*> newIORef config
202 <*> newIORef config
265 <*> maybe (return Nothing)
203 <*> maybe (return Nothing)
src/Graphics/Vty/Input/Mouse.hs+23−34
@@ -3,24 +3,21 @@
3--
3--
4-- http://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h2-Mouse-Tracking
4-- http://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h2-Mouse-Tracking
5module Graphics.Vty.Input.Mouse
5module Graphics.Vty.Input.Mouse
6− ( requestMouseEvents
6+ ( requestMouseEvents
7− , disableMouseEvents
7+ , disableMouseEvents
8− , isMouseEvent
8+ , isMouseEvent
9− , classifyMouseEvent
9+ , classifyMouseEvent
10− )
11−where
10+ ) where
12
11
13import Graphics.Vty.Input.Events
12import Graphics.Vty.Input.Events
14import Graphics.Vty.Input.Classify.Types
13import Graphics.Vty.Input.Classify.Types
15import Graphics.Vty.Input.Classify.Parse
14import Graphics.Vty.Input.Classify.Parse
16
15
17import Control.Monad.State
16import Control.Monad.State
17+import Data.List (isPrefixOf)
18import Data.Maybe (catMaybes)
18import Data.Maybe (catMaybes)
19import Data.Bits ((.&.))
19import Data.Bits ((.&.))
20
20
21−import qualified Data.ByteString.Char8 as BS8
22−import Data.ByteString.Char8 (ByteString)
23−
24-- A mouse event in SGR extended mode is
21-- A mouse event in SGR extended mode is
25--
22--
26-- '\ESC' '[' '<' B ';' X ';' Y ';' ('M'|'m')
23-- '\ESC' '[' '<' B ';' X ';' Y ';' ('M'|'m')
@@ -34,28 +31,28 @@ import Data.ByteString.Char8 (ByteString)
34
31
35-- | These sequences set xterm-based terminals to send mouse event
32-- | These sequences set xterm-based terminals to send mouse event
36-- sequences.
33-- sequences.
37−requestMouseEvents :: ByteString
34+requestMouseEvents :: String
38−requestMouseEvents = BS8.pack "\ESC[?1000h\ESC[?1002h\ESC[?1006h"
35+requestMouseEvents = "\ESC[?1000h\ESC[?1002h\ESC[?1006h\ESC[?1005h"
39
36
40-- | These sequences disable mouse events.
37-- | These sequences disable mouse events.
41−disableMouseEvents :: ByteString
38+disableMouseEvents :: String
42−disableMouseEvents = BS8.pack "\ESC[?1000l\ESC[?1002l\ESC[?1006l"
39+disableMouseEvents = "\ESC[?1000l\ESC[?1002l\ESC[?1006l\ESC[?1005l"
43
40
44-- | Does the specified string begin with a mouse event?
41-- | Does the specified string begin with a mouse event?
45−isMouseEvent :: ByteString -> Bool
42+isMouseEvent :: String -> Bool
46isMouseEvent s = isSGREvent s || isNormalEvent s
43isMouseEvent s = isSGREvent s || isNormalEvent s
47
44
48−isSGREvent :: ByteString -> Bool
45+isSGREvent :: String -> Bool
49−isSGREvent = BS8.isPrefixOf sgrPrefix
46+isSGREvent = isPrefixOf sgrPrefix
50
47
51−sgrPrefix :: ByteString
48+sgrPrefix :: String
52−sgrPrefix = BS8.pack "\ESC[M"
49+sgrPrefix = "\ESC[M"
53
50
54−isNormalEvent :: ByteString -> Bool
51+isNormalEvent :: String -> Bool
55−isNormalEvent = BS8.isPrefixOf normalPrefix
52+isNormalEvent = isPrefixOf normalPrefix
56
53
57−normalPrefix :: ByteString
54+normalPrefix :: String
58−normalPrefix = BS8.pack "\ESC[<"
55+normalPrefix = "\ESC[<"
59
56
60-- Modifier bits:
57-- Modifier bits:
61shiftBit :: Int
58shiftBit :: Int
@@ -69,7 +66,7 @@ ctrlBit = 16
69
66
70-- These bits indicate the buttons involved:
67-- These bits indicate the buttons involved:
71buttonMask :: Int
68buttonMask :: Int
72−buttonMask = 67
69+buttonMask = 3
73
70
74leftButton :: Int
71leftButton :: Int
75leftButton = 0
72leftButton = 0
@@ -80,17 +77,11 @@ middleButton = 1
80rightButton :: Int
77rightButton :: Int
81rightButton = 2
78rightButton = 2
82
79
83−scrollUp :: Int
84−scrollUp = 64
85−
86−scrollDown :: Int
87−scrollDown = 65
88−
89hasBitSet :: Int -> Int -> Bool
80hasBitSet :: Int -> Int -> Bool
90hasBitSet val bit = val .&. bit > 0
81hasBitSet val bit = val .&. bit > 0
91
82
92−-- | Attempt to classify an input string as a mouse event.
83+-- | Attempt to lassify an input string as a mouse event.
93−classifyMouseEvent :: ByteString -> KClass
84+classifyMouseEvent :: String -> KClass
94classifyMouseEvent s = runParser s $ do
85classifyMouseEvent s = runParser s $ do
95 when (not $ isMouseEvent s) failParse
86 when (not $ isMouseEvent s) failParse
96
87
@@ -102,14 +93,12 @@ classifyMouseEvent s = runParser s $ do
102 'M' -> classifyNormalMouseEvent
93 'M' -> classifyNormalMouseEvent
103 _ -> failParse
94 _ -> failParse
104
95
105−-- Given a modifier/button value, determine which button was indicated
96+-- Given a modifer/button value, determine which button was indicated
106getSGRButton :: Int -> Parser Button
97getSGRButton :: Int -> Parser Button
107getSGRButton mods =
98getSGRButton mods =
108 let buttonMap = [ (leftButton, BLeft)
99 let buttonMap = [ (leftButton, BLeft)
109 , (middleButton, BMiddle)
100 , (middleButton, BMiddle)
110 , (rightButton, BRight)
101 , (rightButton, BRight)
111− , (scrollUp, BScrollUp)
112− , (scrollDown, BScrollDown)
113 ]
102 ]
114 in case lookup (mods .&. buttonMask) buttonMap of
103 in case lookup (mods .&. buttonMask) buttonMap of
115 Nothing -> failParse
104 Nothing -> failParse
src/Graphics/Vty/Input/Paste.hs+28−21
@@ -2,40 +2,47 @@
2--
2--
3-- http://cirw.in/blog/bracketed-paste
3-- http://cirw.in/blog/bracketed-paste
4module Graphics.Vty.Input.Paste
4module Graphics.Vty.Input.Paste
5− ( parseBracketedPaste
5+ ( parseBracketedPaste
6− , bracketedPasteStarted
6+ , bracketedPasteStarted
7− , bracketedPasteFinished
7+ , bracketedPasteFinished
8− )
9−where
8+ ) where
10
9
11import qualified Data.ByteString.Char8 as BS8
10import qualified Data.ByteString.Char8 as BS8
12−import Data.ByteString.Char8 (ByteString)
13
11
14import Graphics.Vty.Input.Events
12import Graphics.Vty.Input.Events
15import Graphics.Vty.Input.Classify.Types
13import Graphics.Vty.Input.Classify.Types
16
14
17−bracketedPasteStart :: ByteString
15+import Data.List (isPrefixOf, isInfixOf)
18−bracketedPasteStart = BS8.pack "\ESC[200~"
19
16
17+bracketedPasteStart :: String
18+bracketedPasteStart = "\ESC[200~"
19+
20−bracketedPasteEnd :: ByteString
20+bracketedPasteEnd :: String
21−bracketedPasteEnd = BS8.pack "\ESC[201~"
21+bracketedPasteEnd = "\ESC[201~"
22
22
23-- | Does the input start a bracketed paste?
23-- | Does the input start a bracketed paste?
24−bracketedPasteStarted :: ByteString -> Bool
24+bracketedPasteStarted :: String -> Bool
25−bracketedPasteStarted = BS8.isPrefixOf bracketedPasteStart
25+bracketedPasteStarted = isPrefixOf bracketedPasteStart
26
26
27-- | Does the input contain a complete bracketed paste?
27-- | Does the input contain a complete bracketed paste?
28−bracketedPasteFinished :: ByteString -> Bool
28+bracketedPasteFinished :: String -> Bool
29−bracketedPasteFinished = BS8.isInfixOf bracketedPasteEnd
29+bracketedPasteFinished = isInfixOf bracketedPasteEnd
30
30
31-- | Parse a bracketed paste. This should only be called on a string if
31-- | Parse a bracketed paste. This should only be called on a string if
32-- both 'bracketedPasteStarted' and 'bracketedPasteFinished' return
32-- both 'bracketedPasteStarted' and 'bracketedPasteFinished' return
33-- 'True'.
33-- 'True'.
34−parseBracketedPaste :: ByteString -> KClass
34+parseBracketedPaste :: String -> KClass
35parseBracketedPaste s =
35parseBracketedPaste s =
36+ let (p, rest) = takeUntil (drop (length bracketedPasteStart) s) bracketedPasteEnd
37+ rest' = if bracketedPasteEnd `isPrefixOf` rest
38+ then drop (length bracketedPasteEnd) rest
39+ else rest
36− Valid (EvPaste p) (BS8.drop endLen rest')
40+ in Valid (EvPaste $ BS8.pack p) rest'
37− where
41+
38− startLen = BS8.length bracketedPasteStart
42+takeUntil :: (Eq a) => [a] -> [a] -> ([a],[a])
39− endLen = BS8.length bracketedPasteEnd
43+takeUntil [] _ = ([], [])
40− (_, rest ) = BS8.breakSubstring bracketedPasteStart s
44+takeUntil cs sub
41− (p, rest') = BS8.breakSubstring bracketedPasteEnd . BS8.drop startLen $ rest
45+ | length cs < length sub = (cs, [])
46+ | take (length sub) cs == sub = ([], drop (length sub) cs)
47+ | otherwise = let (pre, suf) = takeUntil (tail cs) sub
48+ in (head cs:pre, suf)
src/Graphics/Vty/Input/Terminfo.hs+33−34
@@ -7,8 +7,8 @@ import qualified Graphics.Vty.Input.Terminfo.ANSIVT as ANSIVT
7import Control.Arrow
7import Control.Arrow
8import System.Console.Terminfo
8import System.Console.Terminfo
9
9
10−-- | Queries the terminal for all capability-based input sequences and
10+-- | queries the terminal for all capability based input sequences then adds on a terminal dependent
11−-- then adds on a terminal-dependent input sequence mapping.
11+-- input sequence mapping.
12--
12--
13-- For reference see:
13-- For reference see:
14--
14--
@@ -20,29 +20,29 @@ import System.Console.Terminfo
20--
20--
21-- * http://aperiodic.net/phil/archives/Geekery/term-function-keys.html
21-- * http://aperiodic.net/phil/archives/Geekery/term-function-keys.html
22--
22--
23−-- Terminfo is incomplete. The vim source implies that terminfo is also
23+-- This is painful. Terminfo is incomplete. The vim source implies that terminfo is also incorrect.
24−-- incorrect. Vty assumes that the internal terminfo table added to the
24+-- Vty assumes that the an internal terminfo table added to the system provided terminfo table is
25−-- system-provided terminfo table is correct.
25+-- correct.
26--
26--
27−-- The procedure used here is:
27+-- 1. build terminfo table for all caps. Missing caps are not added.
28--
28--
29−-- 1. Build terminfo table for all caps. Missing caps are not added.
29+-- 2. add tables for visible chars, esc, del plus ctrl and meta
30--
30--
31−-- 2. Add tables for visible chars, esc, del, ctrl, and meta.
31+-- 3. add internally defined table for given terminal type.
32--
32--
33−-- 3. Add internally-defined table for given terminal type.
33+-- Precedence is currently implicit in the 'compile' algorithm. Which is a bit odd.
34--
34--
35−-- Precedence is currently implicit in the 'compile' algorithm.
35+-- \todo terminfo meta is not supported.
36+-- \todo no 8bit
36classifyMapForTerm :: String -> Terminal -> ClassifyMap
37classifyMapForTerm :: String -> Terminal -> ClassifyMap
37classifyMapForTerm termName term =
38classifyMapForTerm termName term =
38 concat $ capsClassifyMap term keysFromCapsTable
39 concat $ capsClassifyMap term keysFromCapsTable
39 : universalTable
40 : universalTable
40 : termSpecificTables termName
41 : termSpecificTables termName
41
42
42−-- | The key table applicable to all terminals.
43+-- | key table applicable to all terminals.
43--
44--
44−-- Note that some of these entries are probably only applicable to
45+-- TODO: some probably only applicable to ANSI/VT100 terminals.
45−-- ANSI/VT100 terminals.
46universalTable :: ClassifyMap
46universalTable :: ClassifyMap
47universalTable = concat [visibleChars, ctrlChars, ctrlMetaChars, specialSupportKeys]
47universalTable = concat [visibleChars, ctrlChars, ctrlMetaChars, specialSupportKeys]
48
48
@@ -50,31 +50,31 @@ capsClassifyMap :: Terminal -> [(String,Event)] -> ClassifyMap
50capsClassifyMap terminal table = [(x,y) | (Just x,y) <- map extractCap table]
50capsClassifyMap terminal table = [(x,y) | (Just x,y) <- map extractCap table]
51 where extractCap = first (getCapability terminal . tiGetStr)
51 where extractCap = first (getCapability terminal . tiGetStr)
52
52
53−-- | Tables specific to a given terminal that are not derivable from
53+-- | tables specific to a given terminal that are not derivable from terminfo.
54−-- terminfo.
55--
54--
56−-- Note that this adds the ANSI/VT100/VT50 tables regardless of term
55+-- TODO: Adds the ANSI/VT100/VT50 tables regardless of term identifier.
57−-- identifier.
58termSpecificTables :: String -> [ClassifyMap]
56termSpecificTables :: String -> [ClassifyMap]
59termSpecificTables _termName = ANSIVT.classifyTable
57termSpecificTables _termName = ANSIVT.classifyTable
60
58
61-- | Visible characters in the ISO-8859-1 and UTF-8 common set.
59-- | Visible characters in the ISO-8859-1 and UTF-8 common set.
62--
60--
63−-- We limit to < 0xC1. The UTF8 sequence detector will catch all values
61+-- we limit to < 0xC1. The UTF8 sequence detector will catch all values 0xC2 and above before this
64−-- 0xC2 and above before this classify table is reached.
62+-- classify table is reached.
63+--
64+-- TODO: resolve
65+-- 1. start at ' '. The earlier characters are all 'ctrlChar'
65visibleChars :: ClassifyMap
66visibleChars :: ClassifyMap
66visibleChars = [ ([x], EvKey (KChar x) [])
67visibleChars = [ ([x], EvKey (KChar x) [])
67 | x <- [' ' .. toEnum 0xC1]
68 | x <- [' ' .. toEnum 0xC1]
68 ]
69 ]
69
70
70−-- | Non-printable characters in the ISO-8859-1 and UTF-8 common set
71+-- | Non visible characters in the ISO-8859-1 and UTF-8 common set translated to ctrl + char.
71−-- translated to ctrl + char.
72--
72--
73−-- This treats CTRL-i the same as tab.
73+-- \todo resolve CTRL-i is the same as tab
74ctrlChars :: ClassifyMap
74ctrlChars :: ClassifyMap
75ctrlChars =
75ctrlChars =
76 [ ([toEnum x],EvKey (KChar y) [MCtrl])
76 [ ([toEnum x],EvKey (KChar y) [MCtrl])
77− | (x,y) <- zip [0..31] ('@':['a'..'z']++['['..'_'])
77+ | (x,y) <- zip ([0..31]) ('@':['a'..'z']++['['..'_'])
78 , y /= 'i' -- Resolve issue #3 where CTRL-i hides TAB.
78 , y /= 'i' -- Resolve issue #3 where CTRL-i hides TAB.
79 , y /= 'h' -- CTRL-h should not hide BS
79 , y /= 'h' -- CTRL-h should not hide BS
80 ]
80 ]
@@ -83,23 +83,22 @@ ctrlChars =
83ctrlMetaChars :: ClassifyMap
83ctrlMetaChars :: ClassifyMap
84ctrlMetaChars = map (\(s,EvKey c m) -> ('\ESC':s, EvKey c (MMeta:m))) ctrlChars
84ctrlMetaChars = map (\(s,EvKey c m) -> ('\ESC':s, EvKey c (MMeta:m))) ctrlChars
85
85
86−-- | Esc, meta-esc, delete, meta-delete, enter, meta-enter.
86+-- | esc, meta esc, delete, meta delete, enter, meta enter
87specialSupportKeys :: ClassifyMap
87specialSupportKeys :: ClassifyMap
88specialSupportKeys =
88specialSupportKeys =
89− [ ("\ESC\ESC[5~",EvKey KPageUp [MMeta])
90− , ("\ESC\ESC[6~",EvKey KPageDown [MMeta])
91− -- special support for ESC
89+ [ -- special support for ESC
92− , ("\ESC",EvKey KEsc []), ("\ESC\ESC",EvKey KEsc [MMeta])
90+ ("\ESC",EvKey KEsc []), ("\ESC\ESC",EvKey KEsc [MMeta])
93 -- Special support for backspace
91 -- Special support for backspace
94− , ("\DEL",EvKey KBS []), ("\ESC\DEL",EvKey KBS [MMeta]), ("\b",EvKey KBS [])
92+ , ("\DEL",EvKey KBS []), ("\ESC\DEL",EvKey KBS [MMeta])
95 -- Special support for Enter
93 -- Special support for Enter
96 , ("\ESC\^J",EvKey KEnter [MMeta]), ("\^J",EvKey KEnter [])
94 , ("\ESC\^J",EvKey KEnter [MMeta]), ("\^J",EvKey KEnter [])
97 -- explicit support for tab
95 -- explicit support for tab
98 , ("\t", EvKey (KChar '\t') [])
96 , ("\t", EvKey (KChar '\t') [])
99 ]
97 ]
100
98
101−-- | A classification table directly generated from terminfo cap
99+-- | classify table directly generated from terminfo cap strings
102−-- strings. These are:
100+--
101+-- these are:
103--
102--
104-- * ka1 - keypad up-left
103-- * ka1 - keypad up-left
105--
104--
@@ -114,7 +113,7 @@ specialSupportKeys =
114-- * kcbt - back tab
113-- * kcbt - back tab
115--
114--
116-- * kc1 - keypad left-down
115-- * kc1 - keypad left-down
117−--
116+--
118-- * kc3 - keypad right-down
117-- * kc3 - keypad right-down
119--
118--
120-- * kdch1 - delete
119-- * kdch1 - delete
@@ -122,7 +121,7 @@ specialSupportKeys =
122-- * kcud1 - down
121-- * kcud1 - down
123--
122--
124-- * kend - end
123-- * kend - end
125−--
124+--
126-- * kent - enter
125-- * kent - enter
127--
126--
128-- * kf0 - kf63 - function keys
127-- * kf0 - kf63 - function keys
@@ -181,6 +180,6 @@ keysFromCapsTable =
181 , ("kcuu1", EvKey KUp [])
180 , ("kcuu1", EvKey KUp [])
182 ] ++ functionKeyCapsTable
181 ] ++ functionKeyCapsTable
183
182
184−-- | Cap names for function keys.
183+-- | cap names for function keys
185functionKeyCapsTable :: ClassifyMap
184functionKeyCapsTable :: ClassifyMap
186functionKeyCapsTable = flip map [0..63] $ \n -> ("kf" ++ show n, EvKey (KFun n) [])
185functionKeyCapsTable = flip map [0..63] $ \n -> ("kf" ++ show n, EvKey (KFun n) [])
src/Graphics/Vty/Input/Terminfo/ANSIVT.hs+20−21
@@ -1,15 +1,15 @@
1−-- | Input mappings for ANSI/VT100/VT50 terminals that is missing from
1+-- | Input mappings for ANSI/VT100/VT50 terminals that is missing from terminfo.
2−-- terminfo.
3−--
2+--
4−-- Or that are sent regardless of terminfo by terminal emulators. EG:
3+-- Or that are sent regardless of terminfo by terminal emulators. EG: Terminal emulators will often
5−-- Terminal emulators will often use VT50 input bytes regardless of
6−-- declared terminal type. This provides compatibility with programs
4+-- use VT50 input bytes regardless of declared terminal type. This provides compatibility with
7−-- that don't follow terminfo.
5+-- programs that don't follow terminfo.
8module Graphics.Vty.Input.Terminfo.ANSIVT where
6module Graphics.Vty.Input.Terminfo.ANSIVT where
9
7
10import Graphics.Vty.Input.Events
8import Graphics.Vty.Input.Events
11
9
12-- | Encoding for navigation keys.
10-- | Encoding for navigation keys.
11+--
12+-- TODO: This is not the same as the input bytes pulled from teh caps table.
13navKeys0 :: ClassifyMap
13navKeys0 :: ClassifyMap
14navKeys0 =
14navKeys0 =
15 [ k "G" KCenter
15 [ k "G" KCenter
@@ -30,10 +30,8 @@ navKeys1 =
30 [("\ESC[" ++ charCnt ++ show mc++c,EvKey s m)
30 [("\ESC[" ++ charCnt ++ show mc++c,EvKey s m)
31 | charCnt <- ["1;", ""], -- we can have a count or not
31 | charCnt <- ["1;", ""], -- we can have a count or not
32 (m,mc) <- [([MShift],2::Int), ([MCtrl],5), ([MMeta],3),
32 (m,mc) <- [([MShift],2::Int), ([MCtrl],5), ([MMeta],3),
33− -- modifiers and their codes
34− ([MShift, MCtrl],6), ([MShift, MMeta],4)],
33+ ([MShift, MCtrl],6), ([MShift, MMeta],4)], -- modifiers and their codes
35− -- directions and their codes
36− (c,s) <- [("A", KUp), ("B", KDown), ("C", KRight), ("D", KLeft), ("H", KHome), ("F", KEnd)]
34+ (c,s) <- [("A", KUp), ("B", KDown), ("C", KRight), ("D", KLeft), ("H", KHome), ("F", KEnd)] -- directions and their codes
37 ]
35 ]
38
36
39-- | encoding for ins, del, pageup, pagedown, home, end
37-- | encoding for ins, del, pageup, pagedown, home, end
@@ -51,26 +49,26 @@ navKeys3 =
51 [KIns,KDel,KPageUp,KPageDown,KHome,KEnd]
49 [KIns,KDel,KPageUp,KPageDown,KHome,KEnd]
52
50
53-- | encoding for shift plus function keys
51-- | encoding for shift plus function keys
54−--
52+--
55−-- According to
53+-- According to
56--
54--
57-- * http://aperiodic.net/phil/archives/Geekery/term-function-keys.html
55-- * http://aperiodic.net/phil/archives/Geekery/term-function-keys.html
58--
56--
59-- This encoding depends on the terminal.
57-- This encoding depends on the terminal.
60functionKeys1 :: ClassifyMap
58functionKeys1 :: ClassifyMap
61functionKeys1 =
59functionKeys1 =
62− let f ff nrs m = [ ("\ESC["++show n++"~",EvKey (KFun $ n-head nrs+ff) m) | n <- nrs ] in
60+ let f ff nrs m = [ ("\ESC["++show n++"~",EvKey (KFun $ n-(nrs!!0)+ff) m) | n <- nrs ] in
63 concat [f 1 [25,26] [MShift], f 3 [28,29] [MShift], f 5 [31..34] [MShift] ]
61 concat [f 1 [25,26] [MShift], f 3 [28,29] [MShift], f 5 [31..34] [MShift] ]
64
62
65-- | encoding for meta plus char
63-- | encoding for meta plus char
66--
64--
65+-- TODO: resolve -
66+--
67−-- 1. removed 'ESC' from second list due to duplication with
67+-- 1. removed 'ESC' from second list due to duplication with "special_support_keys".
68−-- "special_support_keys".
69−-- 2. removed '[' from second list due to conflict with 7-bit encoding
68+-- 2. removed '[' from second list due to conflict with 7-bit encoding for ESC. Whether meta+[ is
70−-- for ESC. Whether meta+[ is the same as ESC should examine km and
69+-- the same as ESC should examine km and current encoding.
71−-- current encoding.
72−-- 3. stopped enumeration at '~' instead of '\DEL'. The latter is mapped
70+-- 3. stopped enumeration at '~' instead of '\DEL'. The latter is mapped to KBS by
73−-- to KBS by special_support_keys.
71+-- special_support_keys.
74functionKeys2 :: ClassifyMap
72functionKeys2 :: ClassifyMap
75functionKeys2 = [ ('\ESC':[x],EvKey (KChar x) [MMeta])
73functionKeys2 = [ ('\ESC':[x],EvKey (KChar x) [MMeta])
76 | x <- '\t':[' ' .. '~']
74 | x <- '\t':[' ' .. '~']
@@ -86,3 +84,4 @@ classifyTable =
86 , functionKeys1
84 , functionKeys1
87 , functionKeys2
85 , functionKeys2
88 ]
86 ]
87+
src/Graphics/Vty/Output.hs+52−53
@@ -1,69 +1,70 @@
1−{-# LANGUAGE RecordWildCards, CPP #-}
1+{-# LANGUAGE RecordWildCards #-}
2−-- | This module provides functions for accessing the current terminal
2+{-# LANGUAGE NamedFieldPuns #-}
3−-- or a specific terminal device.
3+-- | Output interface.
4--
4--
5−-- See also:
5+-- Access to the current terminal or a specific terminal device.
6--
6--
7−-- 1. "Graphics.Vty.Output": This instantiates an abtract interface
7+-- See also:
8−-- to the terminal based on the @TERM@ and @COLORTERM@ environment
9−-- variables.
10--
8--
11−-- 2. "Graphics.Vty.Output.Interface": Defines the generic interface all
9+-- 1. "Graphics.Vty.Output": This instantiates an abtract interface to the terminal interface based
12−-- terminal modules need to implement.
10+-- on the TERM and COLORTERM environment variables.
13--
11--
14−-- 3. "Graphics.Vty.Output.TerminfoBased": Defines a terminal instance
12+-- 2. "Graphics.Vty.Output.Interface": Defines the generic interface all terminals need to implement.
15−-- that uses terminfo for all control strings. No attempt is made to
16−-- change the character set to UTF-8 for these terminals.
17--
13--
14+-- 3. "Graphics.Vty.Output.TerminfoBased": Defines a terminal instance that uses terminfo for all
15+-- control strings. No attempt is made to change the character set to UTF-8 for these terminals.
16+-- I don't know a way to reliably determine if that is required or how to do so.
17+--
18−-- 4. "Graphics.Vty.Output.XTermColor": This module contains an
18+-- 4. "Graphics.Vty.Output.XTermColor": This module contains an interface suitable for xterm-like
19−-- interface suitable for xterm-like terminals. These are the terminals
20−-- where @TERM@ begins with @xterm@. This does use terminfo for as many
19+-- terminals. These are the terminals where TERM == xterm. This does use terminfo for as many
21−-- control codes as possible.
20+-- control codes as possible.
22−module Graphics.Vty.Output
21+module Graphics.Vty.Output ( module Graphics.Vty.Output
23− ( outputForConfig
22+ , Output(..) -- \todo hide constructors
24− , setCursorPos
23+ , AssumedState(..)
25− , hideCursor
24+ , DisplayContext(..) -- \todo hide constructors
26− , showCursor
25+ , outputPicture
26+ , displayContext
27− )
27+ )
28−where
28+ where
29
29
30−import Control.Monad (when)
30+import Graphics.Vty.Prelude
31
31
32import Graphics.Vty.Config
32import Graphics.Vty.Config
33−import Graphics.Vty.Image (regionWidth, regionHeight)
33+
34import Graphics.Vty.Output.Interface
34import Graphics.Vty.Output.Interface
35import Graphics.Vty.Output.XTermColor as XTermColor
35import Graphics.Vty.Output.XTermColor as XTermColor
36import Graphics.Vty.Output.TerminfoBased as TerminfoBased
36import Graphics.Vty.Output.TerminfoBased as TerminfoBased
37
37
38import Blaze.ByteString.Builder (writeToByteString)
38import Blaze.ByteString.Builder (writeToByteString)
39
39
40−import Data.List (isPrefixOf)
40+import Control.Monad.Trans
41
41
42−#if !MIN_VERSION_base(4,11,0)
42+import Data.List (isPrefixOf)
43import Data.Monoid ((<>))
43import Data.Monoid ((<>))
44−#endif
45
44
46−-- | Returns an `Output` for the terminal specified in `Config`.
45+-- | Returns a `Output` for the terminal specified in `Config`
47--
46--
48−-- The specific Output implementation used is hidden from the API user.
47+-- The specific Output implementation used is hidden from the API user. All terminal implementations
49−-- All terminal implementations are assumed to perform more, or less,
50−-- the same. Currently, all implementations use terminfo for at least
48+-- are assumed to perform more, or less, the same. Currently, all implementations use terminfo for at
51−-- some terminal specific information.
49+-- least some terminal specific information.
52--
50--
51+-- Specifics about it being based on terminfo are hidden from the API user. If a terminal
53−-- If a terminal implementation is developed for a terminal without
52+-- implementation is developed for a terminal without terminfo support then Vty should work as
54−-- terminfo support then Vty should work as expected on that terminal.
53+-- expected on that terminal.
55--
54--
56-- Selection of a terminal is done as follows:
55-- Selection of a terminal is done as follows:
57--
56--
58-- * If TERM contains "xterm" or "screen", use XTermColor.
57-- * If TERM contains "xterm" or "screen", use XTermColor.
59-- * otherwise use the TerminfoBased driver.
58-- * otherwise use the TerminfoBased driver.
59+--
60+-- \todo add an implementation for windows that does not depend on terminfo. Should be installable
61+-- with only what is provided in the haskell platform. Use ansi-terminal
60outputForConfig :: Config -> IO Output
62outputForConfig :: Config -> IO Output
61−outputForConfig Config{ outputFd = Just fd, termName = Just termName
63+outputForConfig Config{ outputFd = Just fd, termName = Just termName, .. } = do
62− , colorMode = Just colorMode, .. } = do
63 t <- if "xterm" `isPrefixOf` termName || "screen" `isPrefixOf` termName
64 t <- if "xterm" `isPrefixOf` termName || "screen" `isPrefixOf` termName
64− then XTermColor.reserveTerminal termName fd colorMode
65+ then XTermColor.reserveTerminal termName fd
65 -- Not an xterm-like terminal. try for generic terminfo.
66 -- Not an xterm-like terminal. try for generic terminfo.
66− else TerminfoBased.reserveTerminal termName fd colorMode
67+ else TerminfoBased.reserveTerminal termName fd
67
68
68 case mouseMode of
69 case mouseMode of
69 Just s -> setMode t Mouse s
70 Just s -> setMode t Mouse s
@@ -78,30 +79,28 @@ outputForConfig config = (<> config) <$> standardIOConfig >>= outputForConfig
78
79
79-- | Sets the cursor position to the given output column and row.
80-- | Sets the cursor position to the given output column and row.
80--
81--
81−-- This is not necessarily the same as the character position with the
82+-- This is not necessarially the same as the character position with the same coordinates.
82−-- same coordinates. Characters can be a variable number of columns in
83+-- Characters can be a variable number of columns in width.
83−-- width.
84--
84--
85−-- Currently, the only way to set the cursor position to a given
85+-- Currently, the only way to set the cursor position to a given character coordinate is to specify
86−-- character coordinate is to specify the coordinate in the Picture
87−-- instance provided to 'outputPicture' or 'refresh'.
86+-- the coordinate in the Picture instance provided to outputPicture or refresh.
88−setCursorPos :: Output -> Int -> Int -> IO ()
87+setCursorPos :: MonadIO m => Output -> Int -> Int -> m ()
89setCursorPos t x y = do
88setCursorPos t x y = do
90 bounds <- displayBounds t
89 bounds <- displayBounds t
91 when (x >= 0 && x < regionWidth bounds && y >= 0 && y < regionHeight bounds) $ do
90 when (x >= 0 && x < regionWidth bounds && y >= 0 && y < regionHeight bounds) $ do
92 dc <- displayContext t bounds
91 dc <- displayContext t bounds
93− outputByteBuffer t $ writeToByteString $ writeMoveCursor dc x y
92+ liftIO $ outputByteBuffer t $ writeToByteString $ writeMoveCursor dc x y
94
93
95−-- | Hides the cursor.
94+-- | Hides the cursor
96−hideCursor :: Output -> IO ()
95+hideCursor :: MonadIO m => Output -> m ()
97hideCursor t = do
96hideCursor t = do
98 bounds <- displayBounds t
97 bounds <- displayBounds t
99 dc <- displayContext t bounds
98 dc <- displayContext t bounds
100− outputByteBuffer t $ writeToByteString $ writeHideCursor dc
99+ liftIO $ outputByteBuffer t $ writeToByteString $ writeHideCursor dc
101
100
102−-- | Shows the cursor.
101+-- | Shows the cursor
103−showCursor :: Output -> IO ()
102+showCursor :: MonadIO m => Output -> m ()
104showCursor t = do
103showCursor t = do
105 bounds <- displayBounds t
104 bounds <- displayBounds t
106 dc <- displayContext t bounds
105 dc <- displayContext t bounds
107− outputByteBuffer t $ writeToByteString $ writeShowCursor dc
106+ liftIO $ outputByteBuffer t $ writeToByteString $ writeShowCursor dc
src/Graphics/Vty/Output/Interface.hs+132−176
@@ -1,25 +1,21 @@
1-- Copyright Corey O'Connor
1-- Copyright Corey O'Connor
2+-- General philosophy is: MonadIO is for equations exposed to clients.
3+{-# LANGUAGE CPP #-}
4+{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE RankNTypes #-}
5{-# LANGUAGE RankNTypes #-}
3{-# LANGUAGE ExistentialQuantification #-}
6{-# LANGUAGE ExistentialQuantification #-}
4{-# LANGUAGE GADTs #-}
7{-# LANGUAGE GADTs #-}
5{-# LANGUAGE FlexibleContexts #-}
8{-# LANGUAGE FlexibleContexts #-}
6−{-# LANGUAGE ScopedTypeVariables #-}
9+
7−-- | This module provides an abstract interface for performing terminal
10+#ifndef MIN_VERSION_base
8−-- output. The only user-facing part of this API is 'Output'.
11+#defined MIN_VERSION_base(x,y,z) 1
12+#endif
13+
9module Graphics.Vty.Output.Interface
14module Graphics.Vty.Output.Interface
10− ( Output(..)
11− , AssumedState(..)
12− , DisplayContext(..)
13− , Mode(..)
14− , displayContext
15− , outputPicture
16− , initialAssumedState
17− , limitAttrForDisplay
18− )
19where
15where
20
16
21−import Graphics.Vty.Attributes
17+import Graphics.Vty.Prelude
22−import Graphics.Vty.Image (DisplayRegion, regionHeight)
18+
23import Graphics.Vty.Picture
19import Graphics.Vty.Picture
24import Graphics.Vty.PictureToSpans
20import Graphics.Vty.PictureToSpans
25import Graphics.Vty.Span
21import Graphics.Vty.Span
@@ -29,97 +25,72 @@ import Graphics.Vty.DisplayAttributes
29import Blaze.ByteString.Builder (Write, writeToByteString)
25import Blaze.ByteString.Builder (Write, writeToByteString)
30import Blaze.ByteString.Builder.ByteString (writeByteString)
26import Blaze.ByteString.Builder.ByteString (writeByteString)
31
27
28+import Control.Monad.Trans
29+
32import qualified Data.ByteString as BS
30import qualified Data.ByteString as BS
33import Data.IORef
31import Data.IORef
34import qualified Data.Text.Encoding as T
32import qualified Data.Text.Encoding as T
35import qualified Data.Text.Lazy as TL
33import qualified Data.Text.Lazy as TL
36import qualified Data.Vector as Vector
34import qualified Data.Vector as Vector
37
35
36+#if !(MIN_VERSION_base(4,8,0))
37+import Data.Monoid (mempty, mappend)
38+#endif
39+
38-- | Modal terminal features that can be enabled and disabled.
40-- | Modal terminal features that can be enabled and disabled.
39data Mode = Mouse
41data Mode = Mouse
40− -- ^ Mouse mode (whether the terminal is configured to provide
41− -- mouse input events)
42 | BracketedPaste
42 | BracketedPaste
43− -- ^ Paste mode (whether the terminal is configured to provide
44− -- events on OS pastes)
45− | Focus
46− -- ^ Focus-in/focus-out events (whether the terminal is
47− -- configured to provide events on focus change)
48− | Hyperlink
49− -- ^ Hyperlink mode via the 'withURL' attribute modifier (see
50− -- https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda).
51− -- Note that this may not work gracefully in all terminal
52− -- emulators so be sure to test this mode with the terminals
53− -- you intend to support. It is off by default.
54 deriving (Eq, Read, Show)
43 deriving (Eq, Read, Show)
55
44
56−-- | The Vty terminal output interface.
57data Output = Output
45data Output = Output
58− { -- | Text identifier for the output device. Used for debugging.
46+ { -- | Text identifier for the output device. Used for debugging.
59 terminalID :: String
47 terminalID :: String
60− -- | Release the terminal just prior to application exit and reset
61− -- it to its state prior to application startup.
62− , releaseTerminal :: IO ()
48+ , releaseTerminal :: forall m. MonadIO m => m ()
63− -- | Clear the display and initialize the terminal to some initial
49+ -- | Clear the display and initialize the terminal to some initial display state.
64− -- display state.
65− --
50+ --
66− -- The expectation of a program is that the display starts in some
51+ -- The expectation of a program is that the display starts in some initial state.
67− -- The initial state. initial state would consist of fixed values:
52+ -- The initial state would consist of fixed values:
68− --
53+ --
69− -- - cursor at top left
54+ -- - cursor at top left
70− -- - UTF-8 character encoding
55+ -- - UTF-8 character encoding
71− -- - drawing characteristics are the default
56+ -- - drawing characteristics are the default
57+ --
58+ -- The abstract operation I think all these behaviors are instances of is reserving exclusive
59+ -- access to a display such that:
60+ --
61+ -- - The previous state cannot be determined
62+ -- - When exclusive access to a display is released the display returns to the previous state.
72− , reserveDisplay :: IO ()
63+ , reserveDisplay :: forall m. MonadIO m => m ()
73− -- | Return the display to the state before `reserveDisplay` If no
64+ -- | Return the display to the state before `reserveDisplay`
74− -- previous state then set the display state to the initial state.
65+ -- If no previous state then set the display state to the initial state.
75− , releaseDisplay :: IO ()
66+ , releaseDisplay :: forall m. MonadIO m => m ()
76− -- | Sets the current display bounds (width, height).
77− , setDisplayBounds :: (Int, Int) -> IO ()
78− -- | Returns the current display bounds.
67+ -- | Returns the current display bounds.
79− , displayBounds :: IO DisplayRegion
68+ , displayBounds :: forall m. MonadIO m => m DisplayRegion
80− -- | Output the bytestring to the terminal device.
69+ -- | Output the byte string to the terminal device.
81 , outputByteBuffer :: BS.ByteString -> IO ()
70 , outputByteBuffer :: BS.ByteString -> IO ()
71+ -- | Maximum number of colors supported by the context.
72+ , contextColorCount :: Int
82− -- | Specifies whether the cursor can be shown / hidden.
73+ -- | if the cursor can be shown / hidden
83 , supportsCursorVisibility :: Bool
74 , supportsCursorVisibility :: Bool
84− -- | Indicates support for terminal modes for this output device.
75+ -- | Indicates support for terminal modes for this output device
85 , supportsMode :: Mode -> Bool
76 , supportsMode :: Mode -> Bool
86− -- | Enables or disables a mode (does nothing if the mode is
77+ -- | Enables or disables a mode (does nothing if the mode is unsupported)
87− -- unsupported).
88− , setMode :: Mode -> Bool -> IO ()
78+ , setMode :: forall m. MonadIO m => Mode -> Bool -> m ()
89− -- | Returns whether a mode is enabled.
79+ -- | Returns whether a mode is enabled
90− , getModeStatus :: Mode -> IO Bool
80+ , getModeStatus :: forall m. MonadIO m => Mode -> m Bool
91 , assumedStateRef :: IORef AssumedState
81 , assumedStateRef :: IORef AssumedState
92− -- | Acquire display access to the given region of the display.
82+ -- | Acquire display access to the given region of the display.
93− -- Currently all regions have the upper left corner of (0,0) and
83+ -- Currently all regions have the upper left corner of (0,0) and the lower right corner at
94− -- the lower right corner at (max displayWidth providedWidth, max
95− -- displayHeight providedHeight)
84+ -- (max displayWidth providedWidth, max displayHeight providedHeight)
96− , mkDisplayContext :: Output -> DisplayRegion -> IO DisplayContext
85+ , mkDisplayContext :: forall m. MonadIO m => Output -> DisplayRegion -> m DisplayContext
97− -- | Ring the terminal bell if supported.
86+ -- | Ring the terminal bell if supported.
98− , ringTerminalBell :: IO ()
87+ , ringTerminalBell :: forall m. MonadIO m => m ()
99− -- | Returns whether the terminal has an audio bell feature.
88+ -- | Returns whether the terminal has an audio bell feature.
100− , supportsBell :: IO Bool
89+ , supportsBell :: forall m. MonadIO m => m Bool
101− -- | Returns whether the terminal supports italicized text.
102− --
103− -- This is terminal-dependent and should make a best effort to
104− -- determine whether this feature is supported, but even if the
105− -- terminal advertises support (e.g. via terminfo) that might not
106− -- be a reliable indicator of whether the feature will work as
107− -- desired.
108− , supportsItalics :: IO Bool
109− -- | Returns whether the terminal supports strikethrough text.
110− --
111− -- This is terminal-dependent and should make a best effort to
112− -- determine whether this feature is supported, but even if the
113− -- terminal advertises support (e.g. via terminfo) that might not
114− -- be a reliable indicator of whether the feature will work as
115− -- desired.
116− , supportsStrikethrough :: IO Bool
117− -- | Returns how many colors the terminal supports.
118− , outputColorMode :: ColorMode
119 }
90 }
120
91
121−displayContext :: Output -> DisplayRegion -> IO DisplayContext
92+displayContext :: MonadIO m => Output -> DisplayRegion -> m DisplayContext
122−displayContext t = mkDisplayContext t t
93+displayContext t = liftIO . mkDisplayContext t t
123
94
124data AssumedState = AssumedState
95data AssumedState = AssumedState
125 { prevFattr :: Maybe FixedAttr
96 { prevFattr :: Maybe FixedAttr
@@ -131,71 +102,69 @@ initialAssumedState = AssumedState Nothing Nothing
131
102
132data DisplayContext = DisplayContext
103data DisplayContext = DisplayContext
133 { contextDevice :: Output
104 { contextDevice :: Output
134− -- | Provide the bounds of the display context.
105+ -- | Provide the bounds of the display context.
135 , contextRegion :: DisplayRegion
106 , contextRegion :: DisplayRegion
136− -- | Sets the output position to the specified row and column
107+ -- | sets the output position to the specified row and column. Where the number of bytes
137− -- where the number of bytes required for the control codes can be
138− -- specified seperate from the actual byte sequence.
108+ -- required for the control codes can be specified seperate from the actual byte sequence.
139 , writeMoveCursor :: Int -> Int -> Write
109 , writeMoveCursor :: Int -> Int -> Write
140 , writeShowCursor :: Write
110 , writeShowCursor :: Write
141 , writeHideCursor :: Write
111 , writeHideCursor :: Write
142− -- Ensure that the specified output attributes will be applied to
112+ -- | Assure the specified output attributes will be applied to all the following text until the
143− -- all the following text until the next output attribute change
144− -- where the number of bytes required for the control codes can be
113+ -- next output attribute change. Where the number of bytes required for the control codes can
145− -- specified seperately from the actual byte sequence. The required
114+ -- be specified seperate from the actual byte sequence. The required number of bytes must be
146− -- number of bytes must be at least the maximum number of bytes
147− -- required by any attribute changes. The serialization equations
115+ -- at least the maximum number of bytes required by any attribute changes. The serialization
148− -- must provide the ptr to the next byte to be specified in the
116+ -- equations must provide the ptr to the next byte to be specified in the output buffer.
149− -- output buffer.
150 --
117 --
151− -- The currently applied display attributes are provided as well.
118+ -- The currently applied display attributes are provided as well. The Attr data type can
152− -- The Attr data type can specify the style or color should not be
153− -- changed from the currently applied display attributes. In order
119+ -- specify the style or color should not be changed from the currently applied display
154− -- to support this the currently applied display attributes are
120+ -- attributes. In order to support this the currently applied display attributes are required.
155− -- required. In addition it may be possible to optimize the state
121+ -- In addition it may be possible to optimize the state changes based off the currently applied
156− -- changes based off the currently applied display attributes.
122+ -- display attributes.
157− , writeSetAttr :: Bool -> FixedAttr -> Attr -> DisplayAttrDiff -> Write
123+ , writeSetAttr :: FixedAttr -> Attr -> DisplayAttrDiff -> Write
158− -- | Reset the display attributes to the default display attributes.
124+ -- | Reset the display attributes to the default display attributes
159− , writeDefaultAttr :: Bool -> Write
125+ , writeDefaultAttr :: Write
160 , writeRowEnd :: Write
126 , writeRowEnd :: Write
161 -- | See `Graphics.Vty.Output.XTermColor.inlineHack`
127 -- | See `Graphics.Vty.Output.XTermColor.inlineHack`
162 , inlineHack :: IO ()
128 , inlineHack :: IO ()
163 }
129 }
164
130
165−-- | All terminals serialize UTF8 text to the terminal device exactly as
131+-- | All terminals serialize UTF8 text to the terminal device exactly as serialized in memory.
166−-- serialized in memory.
167writeUtf8Text :: BS.ByteString -> Write
132writeUtf8Text :: BS.ByteString -> Write
168writeUtf8Text = writeByteString
133writeUtf8Text = writeByteString
169
134
170-- | Displays the given `Picture`.
135-- | Displays the given `Picture`.
171--
136--
172−-- 1. The image is cropped to the display size.
137+-- 0. The image is cropped to the display size.
173--
138--
174−-- 2. Converted into a sequence of attribute changes and text spans.
139+-- 1. Converted into a sequence of attribute changes and text spans.
140+--
141+-- 2. The cursor is hidden.
175--
142--
176−-- 3. The cursor is hidden.
143+-- 3. Serialized to the display.
177--
144--
178−-- 4. Serialized to the display.
179−--
180−-- 5. The cursor is then shown and positioned or kept hidden.
145+-- 4. The cursor is then shown and positioned or kept hidden.
146+--
147+-- todo: specify possible IO exceptions.
148+-- abstract from IO monad to a MonadIO instance.
181−outputPicture :: DisplayContext -> Picture -> IO ()
149+outputPicture :: MonadIO m => DisplayContext -> Picture -> m ()
182−outputPicture dc pic = do
150+outputPicture dc pic = liftIO $ do
183− urlsEnabled <- getModeStatus (contextDevice dc) Hyperlink
184 as <- readIORef (assumedStateRef $ contextDevice dc)
151 as <- readIORef (assumedStateRef $ contextDevice dc)
185 let manipCursor = supportsCursorVisibility (contextDevice dc)
152 let manipCursor = supportsCursorVisibility (contextDevice dc)
186 r = contextRegion dc
153 r = contextRegion dc
187 ops = displayOpsForPic pic r
154 ops = displayOpsForPic pic r
188− initialAttr = FixedAttr defaultStyleMask Nothing Nothing Nothing
155+ initialAttr = FixedAttr defaultStyleMask Nothing Nothing
189− -- Diff the previous output against the requested output.
156+ -- Diff the previous output against the requested output. Differences are currently on a per-row
190− -- Differences are currently on a per-row basis.
157+ -- basis.
158+ -- \todo handle resizes that crop the dominate directions better.
191 diffs :: [Bool] = case prevOutputOps as of
159 diffs :: [Bool] = case prevOutputOps as of
192− Nothing -> replicate (fromEnum $ regionHeight $ affectedRegion ops) True
160+ Nothing -> replicate (fromEnum $ regionHeight $ effectedRegion ops) True
193− Just previousOps -> if affectedRegion previousOps /= affectedRegion ops
161+ Just previousOps -> if effectedRegion previousOps /= effectedRegion ops
194 then replicate (displayOpsRows ops) True
162 then replicate (displayOpsRows ops) True
195− else Vector.toList $ Vector.zipWith (/=) previousOps ops
163+ else zipWith (/=) (Vector.toList previousOps)
164+ (Vector.toList ops)
196 -- build the Write corresponding to the output image
165 -- build the Write corresponding to the output image
197 out = (if manipCursor then writeHideCursor dc else mempty)
166 out = (if manipCursor then writeHideCursor dc else mempty)
198− `mappend` writeOutputOps urlsEnabled dc initialAttr diffs ops
167+ `mappend` writeOutputOps dc initialAttr diffs ops
199 `mappend`
168 `mappend`
200 (let (w,h) = contextRegion dc
169 (let (w,h) = contextRegion dc
201 clampX = max 0 . min (w-1)
170 clampX = max 0 . min (w-1)
@@ -206,15 +175,9 @@ outputPicture dc pic = do
206 AbsoluteCursor x y ->
175 AbsoluteCursor x y ->
207 writeShowCursor dc `mappend`
176 writeShowCursor dc `mappend`
208 writeMoveCursor dc (clampX x) (clampY y)
177 writeMoveCursor dc (clampX x) (clampY y)
209− PositionOnly isAbs x y ->
210− if isAbs
211− then writeMoveCursor dc (clampX x) (clampY y)
212− else let (ox, oy) = charToOutputPos m (clampX x, clampY y)
213− m = cursorOutputMap ops $ picCursor pic
214− in writeMoveCursor dc (clampX ox) (clampY oy)
215 Cursor x y ->
178 Cursor x y ->
216 let m = cursorOutputMap ops $ picCursor pic
179 let m = cursorOutputMap ops $ picCursor pic
217− (ox, oy) = charToOutputPos m (clampX x, clampY y)
180+ (ox, oy) = charToOutputPos m (x,y)
218 in writeShowCursor dc `mappend`
181 in writeShowCursor dc `mappend`
219 writeMoveCursor dc (clampX ox) (clampY oy)
182 writeMoveCursor dc (clampX ox) (clampY oy)
220 )
183 )
@@ -224,15 +187,15 @@ outputPicture dc pic = do
224 let as' = as { prevOutputOps = Just ops }
187 let as' = as { prevOutputOps = Just ops }
225 writeIORef (assumedStateRef $ contextDevice dc) as'
188 writeIORef (assumedStateRef $ contextDevice dc) as'
226
189
227−writeOutputOps :: Bool -> DisplayContext -> FixedAttr -> [Bool] -> DisplayOps -> Write
190+writeOutputOps :: DisplayContext -> FixedAttr -> [Bool] -> DisplayOps -> Write
228−writeOutputOps urlsEnabled dc initialAttr diffs ops =
191+writeOutputOps dc initialAttr diffs ops =
229 let (_, out, _) = Vector.foldl' writeOutputOps'
192 let (_, out, _) = Vector.foldl' writeOutputOps'
230 (0, mempty, diffs)
193 (0, mempty, diffs)
231 ops
194 ops
232 in out
195 in out
233− where
196+ where
234 writeOutputOps' (y, out, True : diffs') spanOps
197 writeOutputOps' (y, out, True : diffs') spanOps
235− = let spanOut = writeSpanOps urlsEnabled dc y initialAttr spanOps
198+ = let spanOut = writeSpanOps dc y initialAttr spanOps
236 out' = out `mappend` spanOut
199 out' = out `mappend` spanOut
237 in (y+1, out', diffs')
200 in (y+1, out', diffs')
238 writeOutputOps' (y, out, False : diffs') _spanOps
201 writeOutputOps' (y, out, False : diffs') _spanOps
@@ -240,34 +203,33 @@ writeOutputOps urlsEnabled dc initialAttr diffs ops =
240 writeOutputOps' (_y, _out, []) _spanOps
203 writeOutputOps' (_y, _out, []) _spanOps
241 = error "vty - output spans without a corresponding diff."
204 = error "vty - output spans without a corresponding diff."
242
205
243−writeSpanOps :: Bool -> DisplayContext -> Int -> FixedAttr -> SpanOps -> Write
206+writeSpanOps :: DisplayContext -> Int -> FixedAttr -> SpanOps -> Write
244−writeSpanOps urlsEnabled dc y initialAttr spanOps =
207+writeSpanOps dc y initialAttr spanOps =
245 -- The first operation is to set the cursor to the start of the row
208 -- The first operation is to set the cursor to the start of the row
246− let start = writeMoveCursor dc 0 y `mappend` writeDefaultAttr dc urlsEnabled
209+ let start = writeMoveCursor dc 0 y `mappend` writeDefaultAttr dc
247 -- then the span ops are serialized in the order specified
210 -- then the span ops are serialized in the order specified
248− in fst $ Vector.foldl' (\(out, fattr) op -> case writeSpanOp urlsEnabled dc op fattr of
211+ in fst $ Vector.foldl' (\(out, fattr) op -> case writeSpanOp dc op fattr of
249 (opOut, fattr') -> (out `mappend` opOut, fattr')
212 (opOut, fattr') -> (out `mappend` opOut, fattr')
250 )
213 )
251 (start, initialAttr)
214 (start, initialAttr)
252 spanOps
215 spanOps
253
216
254−writeSpanOp :: Bool -> DisplayContext -> SpanOp -> FixedAttr -> (Write, FixedAttr)
217+writeSpanOp :: DisplayContext -> SpanOp -> FixedAttr -> (Write, FixedAttr)
255−writeSpanOp urlsEnabled dc (TextSpan attr _ _ str) fattr =
218+writeSpanOp dc (TextSpan attr _ _ str) fattr =
256 let attr' = limitAttrForDisplay (contextDevice dc) attr
219 let attr' = limitAttrForDisplay (contextDevice dc) attr
257 fattr' = fixDisplayAttr fattr attr'
220 fattr' = fixDisplayAttr fattr attr'
258 diffs = displayAttrDiffs fattr fattr'
221 diffs = displayAttrDiffs fattr fattr'
259− out = writeSetAttr dc urlsEnabled fattr attr' diffs
222+ out = writeSetAttr dc fattr attr' diffs
260 `mappend` writeUtf8Text (T.encodeUtf8 $ TL.toStrict str)
223 `mappend` writeUtf8Text (T.encodeUtf8 $ TL.toStrict str)
261 in (out, fattr')
224 in (out, fattr')
262−writeSpanOp _ _ (Skip _) _fattr = error "writeSpanOp for Skip"
225+writeSpanOp _dc (Skip _) _fattr = error "writeSpanOp for Skip"
263−writeSpanOp urlsEnabled dc (RowEnd _) fattr = (writeDefaultAttr dc urlsEnabled `mappend` writeRowEnd dc, fattr)
226+writeSpanOp dc (RowEnd _) fattr = (writeDefaultAttr dc `mappend` writeRowEnd dc, fattr)
264
227
265−-- | The cursor position is given in X,Y character offsets. Due to
228+-- | The cursor position is given in X,Y character offsets. Due to multi-column characters this
266−-- multi-column characters this needs to be translated to column, row
229+-- needs to be translated to column, row positions.
267−-- positions.
268data CursorOutputMap = CursorOutputMap
230data CursorOutputMap = CursorOutputMap
269 { charToOutputPos :: (Int, Int) -> (Int, Int)
231 { charToOutputPos :: (Int, Int) -> (Int, Int)
270− }
232+ }
271
233
272cursorOutputMap :: DisplayOps -> Cursor -> CursorOutputMap
234cursorOutputMap :: DisplayOps -> Cursor -> CursorOutputMap
273cursorOutputMap spanOps _cursor = CursorOutputMap
235cursorOutputMap spanOps _cursor = CursorOutputMap
@@ -277,18 +239,18 @@ cursorOutputMap spanOps _cursor = CursorOutputMap
277cursorColumnOffset :: DisplayOps -> Int -> Int -> Int
239cursorColumnOffset :: DisplayOps -> Int -> Int -> Int
278cursorColumnOffset ops cx cy =
240cursorColumnOffset ops cx cy =
279 let cursorRowOps = Vector.unsafeIndex ops (fromEnum cy)
241 let cursorRowOps = Vector.unsafeIndex ops (fromEnum cy)
280− (outOffset, _, _)
242+ (outOffset, _, _)
281− = Vector.foldl' ( \(d, currentCx, done) op ->
243+ = Vector.foldl' ( \(d, currentCx, done) op ->
282 if done then (d, currentCx, done) else case spanOpHasWidth op of
244 if done then (d, currentCx, done) else case spanOpHasWidth op of
283 Nothing -> (d, currentCx, False)
245 Nothing -> (d, currentCx, False)
284 Just (cw, ow) -> case compare cx (currentCx + cw) of
246 Just (cw, ow) -> case compare cx (currentCx + cw) of
285 GT -> ( d + ow
247 GT -> ( d + ow
286 , currentCx + cw
248 , currentCx + cw
287− , False
249+ , False
288 )
250 )
289 EQ -> ( d + ow
251 EQ -> ( d + ow
290 , currentCx + cw
252 , currentCx + cw
291− , True
253+ , True
292 )
254 )
293 LT -> ( d + columnsToCharOffset (cx - currentCx) op
255 LT -> ( d + columnsToCharOffset (cx - currentCx) op
294 , currentCx + cw
256 , currentCx + cw
@@ -299,33 +261,27 @@ cursorColumnOffset ops cx cy =
299 cursorRowOps
261 cursorRowOps
300 in outOffset
262 in outOffset
301
263
302−-- | Not all terminals support all display attributes. This filters a
264+-- | Not all terminals support all display attributes. This filters a display attribute to what the
303−-- display attribute to what the given terminal can display.
265+-- given terminal can display.
304limitAttrForDisplay :: Output -> Attr -> Attr
266limitAttrForDisplay :: Output -> Attr -> Attr
305−limitAttrForDisplay t attr
267+limitAttrForDisplay t attr
306 = attr { attrForeColor = clampColor $ attrForeColor attr
268 = attr { attrForeColor = clampColor $ attrForeColor attr
307 , attrBackColor = clampColor $ attrBackColor attr
269 , attrBackColor = clampColor $ attrBackColor attr
308 }
270 }
309 where
271 where
310 clampColor Default = Default
272 clampColor Default = Default
311 clampColor KeepCurrent = KeepCurrent
273 clampColor KeepCurrent = KeepCurrent
312− clampColor (SetTo c) = clampColor' (outputColorMode t) c
274+ clampColor (SetTo c) = clampColor' c
313−
314− clampColor' NoColor _ = Default
275+ clampColor' (ISOColor v)
315−
276+ | contextColorCount t < 8 = Default
316− clampColor' ColorMode8 (ISOColor v)
317− | v >= 8 = SetTo $ ISOColor (v - 8)
277+ | contextColorCount t < 16 && v >= 8 = SetTo $ ISOColor (v - 8)
318− | otherwise = SetTo $ ISOColor v
278+ | otherwise = SetTo $ ISOColor v
319− clampColor' ColorMode8 _ = Default
279+ clampColor' (Color240 v)
320−
280+ -- TODO: Choose closes ISO color?
321− clampColor' ColorMode16 c@(ISOColor _) = SetTo c
281+ | contextColorCount t < 8 = Default
322− clampColor' ColorMode16 _ = Default
282+ | contextColorCount t < 16 = Default
323−
283+ | contextColorCount t <= 256 = SetTo $ Color240 v
324− clampColor' (ColorMode240 _) c@(ISOColor _) = SetTo c
325− clampColor' (ColorMode240 colorCount) c@(Color240 n)
326− | n <= colorCount = SetTo c
327− | otherwise = Default
284+ | otherwise
328− clampColor' colorMode@(ColorMode240 _) (RGBColor r g b) =
285+ = let p :: Double = fromIntegral v / 240.0
329− clampColor' colorMode (color240 r g b)
286+ v' = floor $ p * (fromIntegral $ contextColorCount t)
330−
287+ in SetTo $ Color240 v'
331− clampColor' FullColor c = SetTo c
src/Graphics/Vty/Output/Mock.hs+25−40
@@ -1,17 +1,13 @@
1-- Copyright Corey O'Connor
1-- Copyright Corey O'Connor
2{-# LANGUAGE FlexibleInstances #-}
2{-# LANGUAGE FlexibleInstances #-}
3{-# LANGUAGE TypeFamilies #-}
3{-# LANGUAGE TypeFamilies #-}
4−-- | This provides a mock terminal implementation that is nice for
4+-- | This provides a mock terminal implementation that is nice for testing. This transforms the
5−-- testing. This transforms the output operations to visible characters
5+-- output operations to visible characters. Which is nice for some tests.
6−-- which is useful for testing.
7−module Graphics.Vty.Output.Mock
6+module Graphics.Vty.Output.Mock ( MockData, mockTerminal )
8− ( MockData
9− , mockTerminal
10− )
11−where
7+ where
8+
9+import Graphics.Vty.Prelude
12
10
13−import Graphics.Vty.Image (DisplayRegion)
14−import Graphics.Vty.Attributes.Color (ColorMode(ColorMode16))
15import Graphics.Vty.Output.Interface
11import Graphics.Vty.Output.Interface
16
12
17import Blaze.ByteString.Builder.Word (writeWord8)
13import Blaze.ByteString.Builder.Word (writeWord8)
@@ -24,20 +20,18 @@ import qualified Data.String.UTF8 as UTF8
24
20
25type MockData = IORef (UTF8.UTF8 BS.ByteString)
21type MockData = IORef (UTF8.UTF8 BS.ByteString)
26
22
27−-- | The mock display terminal produces a string representation of
23+-- | The mock display terminal produces a string representation of the requested picture. There is
28−-- the requested picture. There is *not* an isomorphism between the
29−-- string representation and the picture. The string representation is
24+-- *not* an isomorphism between the string representation and the picture. The string
30−-- a simplification of the picture that is only useful in debugging VTY
25+-- representation is a simplification of the picture that is only useful in debugging VTY without
31−-- without considering terminal specific issues.
26+-- considering terminal specific issues.
32--
27--
33−-- The mock implementation is useful in manually determining if the
28+-- The mock implementation is useful in manually determining if the sequence of terminal operations
34−-- sequence of terminal operations matches the expected sequence. The
35−-- requirement of the produced representation is simplicity in parsing
29+-- matches the expected sequence. So requirement of the produced representation is simplicity in
36−-- the text representation and determining how the picture was mapped to
30+-- parsing the text representation and determining how the picture was mapped to terminal
37−-- terminal operations.
31+-- operations.
38--
32--
39−-- The string representation is a sequence of identifiers where each
33+-- The string representation is a sequence of identifiers where each identifier is the name of an
40−-- identifier is the name of an operation in the algebra.
34+-- operation in the algebra.
41mockTerminal :: (Applicative m, MonadIO m) => DisplayRegion -> m (MockData, Output)
35mockTerminal :: (Applicative m, MonadIO m) => DisplayRegion -> m (MockData, Output)
42mockTerminal r = liftIO $ do
36mockTerminal r = liftIO $ do
43 outRef <- newIORef undefined
37 outRef <- newIORef undefined
@@ -49,39 +43,30 @@ mockTerminal r = liftIO $ do
49 , releaseDisplay = return ()
43 , releaseDisplay = return ()
50 , ringTerminalBell = return ()
44 , ringTerminalBell = return ()
51 , supportsBell = return False
45 , supportsBell = return False
52− , supportsItalics = return False
53− , supportsStrikethrough = return False
54− , setDisplayBounds = const $ return ()
55 , displayBounds = return r
46 , displayBounds = return r
56 , outputByteBuffer = \bytes -> do
47 , outputByteBuffer = \bytes -> do
57 putStrLn $ "mock outputByteBuffer of " ++ show (BS.length bytes) ++ " bytes"
48 putStrLn $ "mock outputByteBuffer of " ++ show (BS.length bytes) ++ " bytes"
58 writeIORef outRef $ UTF8.fromRep bytes
49 writeIORef outRef $ UTF8.fromRep bytes
50+ , contextColorCount = 16
59 , supportsCursorVisibility = True
51 , supportsCursorVisibility = True
60 , supportsMode = const False
52 , supportsMode = const False
61 , setMode = const $ const $ return ()
53 , setMode = const $ const $ return ()
62 , getModeStatus = const $ return False
54 , getModeStatus = const $ return False
63 , assumedStateRef = newAssumedStateRef
55 , assumedStateRef = newAssumedStateRef
64− , outputColorMode = ColorMode16
65 , mkDisplayContext = \tActual rActual -> return $ DisplayContext
56 , mkDisplayContext = \tActual rActual -> return $ DisplayContext
66 { contextRegion = rActual
57 { contextRegion = rActual
67 , contextDevice = tActual
58 , contextDevice = tActual
68− -- A cursor move is always visualized as the single
59+ -- A cursor move is always visualized as the single character 'M'
69− -- character 'M'
70 , writeMoveCursor = \_x _y -> writeWord8 $ toEnum $ fromEnum 'M'
60 , writeMoveCursor = \_x _y -> writeWord8 $ toEnum $ fromEnum 'M'
71− -- Show cursor is always visualized as the single
61+ -- Show cursor is always visualized as the single character 'S'
72− -- character 'S'
73 , writeShowCursor = writeWord8 $ toEnum $ fromEnum 'S'
62 , writeShowCursor = writeWord8 $ toEnum $ fromEnum 'S'
74− -- Hide cursor is always visualized as the single
63+ -- Hide cursor is always visualized as the single character 'H'
75− -- character 'H'
76 , writeHideCursor = writeWord8 $ toEnum $ fromEnum 'H'
64 , writeHideCursor = writeWord8 $ toEnum $ fromEnum 'H'
77− -- An attr change is always visualized as the single
65+ -- An attr change is always visualized as the single character 'A'
78− -- character 'A'
79− , writeSetAttr = \_ _fattr _diffs _attr -> writeWord8 $ toEnum $ fromEnum 'A'
66+ , writeSetAttr = \_fattr _diffs _attr -> writeWord8 $ toEnum $ fromEnum 'A'
80− -- default attr is always visualized as the single
67+ -- default attr is always visualized as the single character 'D'
81− -- character 'D'
82− , writeDefaultAttr = const $ writeWord8 $ toEnum $ fromEnum 'D'
68+ , writeDefaultAttr = writeWord8 $ toEnum $ fromEnum 'D'
83− -- row end is always visualized as the single character
69+ -- row end is always visualized as the single character 'E'
84− -- 'E'
85 , writeRowEnd = writeWord8 $ toEnum $ fromEnum 'E'
70 , writeRowEnd = writeWord8 $ toEnum $ fromEnum 'E'
86 , inlineHack = return ()
71 , inlineHack = return ()
87 }
72 }
src/Graphics/Vty/Output/TerminfoBased.hs+161−290
@@ -1,40 +1,42 @@
1−{-# LANGUAGE FlexibleInstances #-}
1+{-# LANGUAGE RecordWildCards #-}
2−{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
3+{-# LANGUAGE FlexibleInstances #-}
4{-# OPTIONS_GHC -D_XOPEN_SOURCE=500 -fno-warn-warnings-deprecations #-}
4{-# OPTIONS_GHC -D_XOPEN_SOURCE=500 -fno-warn-warnings-deprecations #-}
5{-# CFILES gwinsz.c #-}
5{-# CFILES gwinsz.c #-}
6
6
7+#ifndef MIN_VERSION_base
8+#defined MIN_VERSION_base(x,y,z) 1
9+#endif
10+
7−-- | Terminfo-based terminal output driver.
11+-- | Terminfo based terminal handling.
12+--
13+-- The color handling assumes tektronix like. No HP support provided. If the terminal is not one I
14+-- have easy access to then color support is entirely based of the docs. Probably with some
15+-- assumptions mixed in.
8--
16--
9-- Copyright Corey O'Connor (coreyoconnor@gmail.com)
17-- Copyright Corey O'Connor (coreyoconnor@gmail.com)
10−module Graphics.Vty.Output.TerminfoBased
18+module Graphics.Vty.Output.TerminfoBased ( reserveTerminal )
11− ( reserveTerminal
12− , setWindowSize
13− )
14−where
19+ where
15−
20+
16−import Control.Monad (when)
21+import Graphics.Vty.Prelude
17−import Data.Bits (shiftL, (.&.))
22+
18−import qualified Data.ByteString as BS
19import Data.ByteString.Internal (toForeignPtr)
23import Data.ByteString.Internal (toForeignPtr)
20import Data.Terminfo.Parse
24import Data.Terminfo.Parse
21import Data.Terminfo.Eval
25import Data.Terminfo.Eval
22
26
23import Graphics.Vty.Attributes
27import Graphics.Vty.Attributes
24−import Graphics.Vty.Image (DisplayRegion)
25import Graphics.Vty.DisplayAttributes
28import Graphics.Vty.DisplayAttributes
26import Graphics.Vty.Output.Interface
29import Graphics.Vty.Output.Interface
27
30
28−import Blaze.ByteString.Builder (Write, writeToByteString, writeStorable, writeWord8)
31+import Blaze.ByteString.Builder (Write, writeToByteString)
32+
33+import Control.Monad.Trans
29
34
35+import Data.Bits ((.&.))
30import Data.IORef
36import Data.IORef
31import Data.Maybe (isJust, isNothing, fromJust)
37import Data.Maybe (isJust, isNothing, fromJust)
32import Data.Word
38import Data.Word
33
39
34−#if !MIN_VERSION_base(4,8,0)
35−import Data.Foldable (foldMap)
36−#endif
37−
38import Foreign.C.Types ( CInt(..), CLong(..) )
40import Foreign.C.Types ( CInt(..), CLong(..) )
39import Foreign.ForeignPtr (withForeignPtr)
41import Foreign.ForeignPtr (withForeignPtr)
40import Foreign.Ptr (Ptr, plusPtr)
42import Foreign.Ptr (Ptr, plusPtr)
@@ -43,12 +45,18 @@ import qualified System.Console.Terminfo as Terminfo
43import System.Posix.IO (fdWriteBuf)
45import System.Posix.IO (fdWriteBuf)
44import System.Posix.Types (Fd(..))
46import System.Posix.Types (Fd(..))
45
47
48+#if !(MIN_VERSION_base(4,8,0))
49+import Data.Foldable (foldMap)
50+import Data.Monoid
51+#endif
52+
46−data TerminfoCaps = TerminfoCaps
53+data TerminfoCaps = TerminfoCaps
47 { smcup :: Maybe CapExpression
54 { smcup :: Maybe CapExpression
48 , rmcup :: Maybe CapExpression
55 , rmcup :: Maybe CapExpression
49 , cup :: CapExpression
56 , cup :: CapExpression
50 , cnorm :: Maybe CapExpression
57 , cnorm :: Maybe CapExpression
51 , civis :: Maybe CapExpression
58 , civis :: Maybe CapExpression
59+ , supportsNoColors :: Bool
52 , useAltColorMap :: Bool
60 , useAltColorMap :: Bool
53 , setForeColor :: CapExpression
61 , setForeColor :: CapExpression
54 , setBackColor :: CapExpression
62 , setBackColor :: CapExpression
@@ -63,21 +71,15 @@ data DisplayAttrCaps = DisplayAttrCaps
63 { setAttrStates :: Maybe CapExpression
71 { setAttrStates :: Maybe CapExpression
64 , enterStandout :: Maybe CapExpression
72 , enterStandout :: Maybe CapExpression
65 , exitStandout :: Maybe CapExpression
73 , exitStandout :: Maybe CapExpression
66− , enterItalic :: Maybe CapExpression
67− , exitItalic :: Maybe CapExpression
68− , enterStrikethrough :: Maybe CapExpression
69− , exitStrikethrough :: Maybe CapExpression
70 , enterUnderline :: Maybe CapExpression
74 , enterUnderline :: Maybe CapExpression
71 , exitUnderline :: Maybe CapExpression
75 , exitUnderline :: Maybe CapExpression
72 , enterReverseVideo :: Maybe CapExpression
76 , enterReverseVideo :: Maybe CapExpression
73 , enterDimMode :: Maybe CapExpression
77 , enterDimMode :: Maybe CapExpression
74 , enterBoldMode :: Maybe CapExpression
78 , enterBoldMode :: Maybe CapExpression
75 }
79 }
76−
80+
77−-- kinda like:
78−-- https://code.google.com/p/vim/source/browse/src/fileio.c#10422
81+-- kinda like: https://code.google.com/p/vim/source/browse/src/fileio.c#10422
79−-- fdWriteBuf will throw on error. Unless the error is EINTR. On EINTR
82+-- fdWriteBuf will throw on error. Unless the error is EINTR. On EINTR the write will be retried.
80−-- the write will be retried.
81fdWriteAll :: Fd -> Ptr Word8 -> Int -> Int -> IO Int
83fdWriteAll :: Fd -> Ptr Word8 -> Int -> Int -> IO Int
82fdWriteAll outFd ptr len count
84fdWriteAll outFd ptr len count
83 | len < 0 = fail "fdWriteAll: len is less than 0"
85 | len < 0 = fail "fdWriteAll: len is less than 0"
@@ -93,95 +95,71 @@ sendCapToTerminal :: Output -> CapExpression -> [CapParam] -> IO ()
93sendCapToTerminal t cap capParams = do
95sendCapToTerminal t cap capParams = do
94 outputByteBuffer t $ writeToByteString $ writeCapExpr cap capParams
96 outputByteBuffer t $ writeToByteString $ writeCapExpr cap capParams
95
97
96−-- | Constructs an output driver that uses terminfo for all control
97−-- codes. While this should provide the most compatible terminal,
98+{- | Uses terminfo for all control codes. While this should provide the most compatible terminal
98−-- terminfo does not support some features that would increase
99+ - terminfo does not support some features that would increase efficiency and improve compatibility:
99−-- efficiency and improve compatibility:
100+ -
100−--
101−-- * determining the character encoding supported by the terminal.
101+ - * determine the character encoding supported by the terminal. Should this be taken from the LANG
102−-- Should this be taken from the LANG environment variable?
102+ - environment variable?
103−--
103+ -
104−-- * Providing independent string capabilities for all display
104+ - * Provide independent string capabilities for all display attributes.
105−-- attributes.
105+ -
106+ - todo: Some display attributes like underline and bold have independent string capabilities that
107+ - should be used instead of the generic "sgr" string capability.
108+ -}
106−reserveTerminal :: String -> Fd -> ColorMode -> IO Output
109+reserveTerminal :: ( Applicative m, MonadIO m ) => String -> Fd -> m Output
107−reserveTerminal termName outFd colorMode = do
110+reserveTerminal termName outFd = liftIO $ do
108 ti <- Terminfo.setupTerm termName
111 ti <- Terminfo.setupTerm termName
109 -- assumes set foreground always implies set background exists.
112 -- assumes set foreground always implies set background exists.
110− -- if set foreground is not set then all color changing style
113+ -- if set foreground is not set then all color changing style attributes are filtered.
111− -- attributes are filtered.
112 msetaf <- probeCap ti "setaf"
114 msetaf <- probeCap ti "setaf"
113 msetf <- probeCap ti "setf"
115 msetf <- probeCap ti "setf"
114− let (useAlt, setForeCap)
116+ let (noColors, useAlt, setForeCap)
115 = case msetaf of
117 = case msetaf of
116− Just setaf -> (False, setaf)
118+ Just setaf -> (False, False, setaf)
117 Nothing -> case msetf of
119 Nothing -> case msetf of
118− Just setf -> (True, setf)
120+ Just setf -> (False, True, setf)
119− Nothing -> (True, error $ "no fore color support for terminal " ++ termName)
121+ Nothing -> (True, True, error $ "no fore color support for terminal " ++ termName)
120 msetab <- probeCap ti "setab"
122 msetab <- probeCap ti "setab"
121 msetb <- probeCap ti "setb"
123 msetb <- probeCap ti "setb"
122− let setBackCap
124+ let set_back_cap
123 = case msetab of
125 = case msetab of
124− Just setab -> setab
125 Nothing -> case msetb of
126 Nothing -> case msetb of
126 Just setb -> setb
127 Just setb -> setb
127 Nothing -> error $ "no back color support for terminal " ++ termName
128 Nothing -> error $ "no back color support for terminal " ++ termName
128−
129+ Just setab -> setab
129− hyperlinkModeStatus <- newIORef False
130− newAssumedStateRef <- newIORef initialAssumedState
131−
132− let terminfoSetMode m newStatus = do
133− curStatus <- terminfoModeStatus m
134− when (newStatus /= curStatus) $
135− case m of
136− Hyperlink -> do
137− writeIORef hyperlinkModeStatus newStatus
138− writeIORef newAssumedStateRef initialAssumedState
139− _ -> return ()
140− terminfoModeStatus m =
141− case m of
142− Hyperlink -> readIORef hyperlinkModeStatus
143− _ -> return False
144− terminfoModeSupported Hyperlink = True
145− terminfoModeSupported _ = False
146−
147 terminfoCaps <- pure TerminfoCaps
130 terminfoCaps <- pure TerminfoCaps
148 <*> probeCap ti "smcup"
131 <*> probeCap ti "smcup"
149 <*> probeCap ti "rmcup"
132 <*> probeCap ti "rmcup"
150 <*> requireCap ti "cup"
133 <*> requireCap ti "cup"
151 <*> probeCap ti "cnorm"
134 <*> probeCap ti "cnorm"
152 <*> probeCap ti "civis"
135 <*> probeCap ti "civis"
136+ <*> pure noColors
153 <*> pure useAlt
137 <*> pure useAlt
154 <*> pure setForeCap
138 <*> pure setForeCap
155− <*> pure setBackCap
139+ <*> pure set_back_cap
156 <*> requireCap ti "sgr0"
140 <*> requireCap ti "sgr0"
157 <*> requireCap ti "clear"
141 <*> requireCap ti "clear"
158 <*> requireCap ti "el"
142 <*> requireCap ti "el"
159 <*> currentDisplayAttrCaps ti
143 <*> currentDisplayAttrCaps ti
160 <*> probeCap ti "bel"
144 <*> probeCap ti "bel"
145+ newAssumedStateRef <- newIORef initialAssumedState
161 let t = Output
146 let t = Output
162 { terminalID = termName
147 { terminalID = termName
163− , releaseTerminal = do
148+ , releaseTerminal = liftIO $ do
164 sendCap setDefaultAttr []
149 sendCap setDefaultAttr []
165 maybeSendCap cnorm []
150 maybeSendCap cnorm []
166 , supportsBell = return $ isJust $ ringBellAudio terminfoCaps
151 , supportsBell = return $ isJust $ ringBellAudio terminfoCaps
167− , supportsItalics = return $ (isJust $ enterItalic (displayAttrCaps terminfoCaps)) &&
168− (isJust $ exitItalic (displayAttrCaps terminfoCaps))
169− , supportsStrikethrough = return $ (isJust $ enterStrikethrough (displayAttrCaps terminfoCaps)) &&
170− (isJust $ exitStrikethrough (displayAttrCaps terminfoCaps))
171− , ringTerminalBell = maybeSendCap ringBellAudio []
152+ , ringTerminalBell = liftIO $ maybeSendCap ringBellAudio []
172− , reserveDisplay = do
153+ , reserveDisplay = liftIO $ do
173− -- If there is no support for smcup: Clear the screen
154+ -- If there is no support for smcup: Clear the screen and then move the mouse to the
174− -- and then move the mouse to the home position to
175− -- approximate the behavior.
155+ -- home position to approximate the behavior.
176 maybeSendCap smcup []
156 maybeSendCap smcup []
177 sendCap clearScreen []
157 sendCap clearScreen []
178− , releaseDisplay = do
158+ , releaseDisplay = liftIO $ do
179 maybeSendCap rmcup []
159 maybeSendCap rmcup []
180 maybeSendCap cnorm []
160 maybeSendCap cnorm []
181− , setDisplayBounds = \(w, h) ->
182− setWindowSize outFd (w, h)
183 , displayBounds = do
161 , displayBounds = do
184− rawSize <- getWindowSize outFd
162+ rawSize <- liftIO $ getWindowSize outFd
185 case rawSize of
163 case rawSize of
186 (w, h) | w < 0 || h < 0 -> fail $ "getwinsize returned < 0 : " ++ show rawSize
164 (w, h) | w < 0 || h < 0 -> fail $ "getwinsize returned < 0 : " ++ show rawSize
187 | otherwise -> return (w,h)
165 | otherwise -> return (w,h)
@@ -192,48 +170,51 @@ reserveTerminal termName outFd colorMode = do
192 when (toEnum len /= actualLen) $ fail $ "Graphics.Vty.Output: outputByteBuffer "
170 when (toEnum len /= actualLen) $ fail $ "Graphics.Vty.Output: outputByteBuffer "
193 ++ "length mismatch. " ++ show len ++ " /= " ++ show actualLen
171 ++ "length mismatch. " ++ show len ++ " /= " ++ show actualLen
194 ++ " Please report this bug to vty project."
172 ++ " Please report this bug to vty project."
173+ , contextColorCount
174+ = case supportsNoColors terminfoCaps of
175+ False -> case Terminfo.getCapability ti (Terminfo.tiGetNum "colors" ) of
176+ Nothing -> 8
177+ Just v -> toEnum v
178+ True -> 1
195 , supportsCursorVisibility = isJust $ civis terminfoCaps
179 , supportsCursorVisibility = isJust $ civis terminfoCaps
196− , supportsMode = terminfoModeSupported
180+ , supportsMode = const False
197− , setMode = terminfoSetMode
181+ , setMode = const $ const $ return ()
198− , getModeStatus = terminfoModeStatus
182+ , getModeStatus = const $ return False
199 , assumedStateRef = newAssumedStateRef
183 , assumedStateRef = newAssumedStateRef
200− , outputColorMode = colorMode
201− -- I think fix would help assure tActual is the only
184+ -- I think fix would help assure tActual is the only reference. I was having issues
202− -- reference. I was having issues tho.
185+ -- tho.
203− , mkDisplayContext = (`terminfoDisplayContext` terminfoCaps)
186+ , mkDisplayContext = \tActual -> liftIO . terminfoDisplayContext tActual terminfoCaps
204 }
187 }
205 sendCap s = sendCapToTerminal t (s terminfoCaps)
188 sendCap s = sendCapToTerminal t (s terminfoCaps)
206 maybeSendCap s = when (isJust $ s terminfoCaps) . sendCap (fromJust . s)
189 maybeSendCap s = when (isJust $ s terminfoCaps) . sendCap (fromJust . s)
207 return t
190 return t
208
191
209−requireCap :: Terminfo.Terminal -> String -> IO CapExpression
192+requireCap :: (Applicative m, MonadIO m) => Terminfo.Terminal -> String -> m CapExpression
210−requireCap ti capName
193+requireCap ti capName
211 = case Terminfo.getCapability ti (Terminfo.tiGetStr capName) of
194 = case Terminfo.getCapability ti (Terminfo.tiGetStr capName) of
212 Nothing -> fail $ "Terminal does not define required capability \"" ++ capName ++ "\""
195 Nothing -> fail $ "Terminal does not define required capability \"" ++ capName ++ "\""
213 Just capStr -> parseCap capStr
196 Just capStr -> parseCap capStr
214
197
215−probeCap :: Terminfo.Terminal -> String -> IO (Maybe CapExpression)
198+probeCap :: (Applicative m, MonadIO m) => Terminfo.Terminal -> String -> m (Maybe CapExpression)
216−probeCap ti capName
199+probeCap ti capName
217 = case Terminfo.getCapability ti (Terminfo.tiGetStr capName) of
200 = case Terminfo.getCapability ti (Terminfo.tiGetStr capName) of
218 Nothing -> return Nothing
201 Nothing -> return Nothing
219 Just capStr -> Just <$> parseCap capStr
202 Just capStr -> Just <$> parseCap capStr
220
203
221−parseCap :: String -> IO CapExpression
204+parseCap :: (Applicative m, MonadIO m) => String -> m CapExpression
222parseCap capStr = do
205parseCap capStr = do
223 case parseCapExpression capStr of
206 case parseCapExpression capStr of
224 Left e -> fail $ show e
207 Left e -> fail $ show e
225 Right cap -> return cap
208 Right cap -> return cap
226
209
227−currentDisplayAttrCaps :: Terminfo.Terminal -> IO DisplayAttrCaps
210+currentDisplayAttrCaps :: ( Applicative m, MonadIO m )
211+ => Terminfo.Terminal
212+ -> m DisplayAttrCaps
228−currentDisplayAttrCaps ti
213+currentDisplayAttrCaps ti
229− = pure DisplayAttrCaps
214+ = pure DisplayAttrCaps
230 <*> probeCap ti "sgr"
215 <*> probeCap ti "sgr"
231 <*> probeCap ti "smso"
216 <*> probeCap ti "smso"
232 <*> probeCap ti "rmso"
217 <*> probeCap ti "rmso"
233− <*> probeCap ti "sitm"
234− <*> probeCap ti "ritm"
235− <*> probeCap ti "smxx"
236− <*> probeCap ti "rmxx"
237 <*> probeCap ti "smul"
218 <*> probeCap ti "smul"
238 <*> probeCap ti "rmul"
219 <*> probeCap ti "rmul"
239 <*> probeCap ti "rev"
220 <*> probeCap ti "rev"
@@ -243,17 +224,10 @@ currentDisplayAttrCaps ti
243foreign import ccall "gwinsz.h vty_c_get_window_size" c_getWindowSize :: Fd -> IO CLong
224foreign import ccall "gwinsz.h vty_c_get_window_size" c_getWindowSize :: Fd -> IO CLong
244
225
245getWindowSize :: Fd -> IO (Int,Int)
226getWindowSize :: Fd -> IO (Int,Int)
246−getWindowSize fd = do
227+getWindowSize fd = do
247 (a,b) <- (`divMod` 65536) `fmap` c_getWindowSize fd
228 (a,b) <- (`divMod` 65536) `fmap` c_getWindowSize fd
248 return (fromIntegral b, fromIntegral a)
229 return (fromIntegral b, fromIntegral a)
249
230
250−foreign import ccall "gwinsz.h vty_c_set_window_size" c_setWindowSize :: Fd -> CLong -> IO ()
251−
252−setWindowSize :: Fd -> (Int, Int) -> IO ()
253−setWindowSize fd (w, h) = do
254− let val = (h `shiftL` 16) + w
255− c_setWindowSize fd $ fromIntegral val
256−
257terminfoDisplayContext :: Output -> TerminfoCaps -> DisplayRegion -> IO DisplayContext
231terminfoDisplayContext :: Output -> TerminfoCaps -> DisplayRegion -> IO DisplayContext
258terminfoDisplayContext tActual terminfoCaps r = return dc
232terminfoDisplayContext tActual terminfoCaps r = return dc
259 where dc = DisplayContext
233 where dc = DisplayContext
@@ -267,204 +241,123 @@ terminfoDisplayContext tActual terminfoCaps r = return dc
267 Nothing -> error "this terminal does not support hide cursor"
241 Nothing -> error "this terminal does not support hide cursor"
268 Just c -> writeCapExpr c []
242 Just c -> writeCapExpr c []
269 , writeSetAttr = terminfoWriteSetAttr dc terminfoCaps
243 , writeSetAttr = terminfoWriteSetAttr dc terminfoCaps
270− , writeDefaultAttr = \urlsEnabled ->
271− writeCapExpr (setDefaultAttr terminfoCaps) [] `mappend`
244+ , writeDefaultAttr = writeCapExpr (setDefaultAttr terminfoCaps) []
272− (if urlsEnabled then writeURLEscapes EndLink else mempty) `mappend`
273− (case exitStrikethrough $ displayAttrCaps terminfoCaps of
274− Just cap -> writeCapExpr cap []
275− Nothing -> mempty
276− )
277 , writeRowEnd = writeCapExpr (clearEol terminfoCaps) []
245 , writeRowEnd = writeCapExpr (clearEol terminfoCaps) []
278 , inlineHack = return ()
246 , inlineHack = return ()
279 }
247 }
280
248
281−-- | Write the escape sequences that are used in some terminals to
282−-- include embedded hyperlinks. As of yet, this information isn't
283−-- included in termcap or terminfo, so this writes them directly
284−-- instead of looking up the appropriate capabilities.
285−writeURLEscapes :: URLDiff -> Write
286−writeURLEscapes (LinkTo url) =
287− foldMap writeStorable (BS.unpack "\x1b]8;;") `mappend`
288− foldMap writeStorable (BS.unpack url) `mappend`
289− writeStorable (0x07 :: Word8)
290−writeURLEscapes EndLink =
291− foldMap writeStorable (BS.unpack "\x1b]8;;\a")
292−writeURLEscapes NoLinkChange =
293− mempty
294−
295-- | Portably setting the display attributes is a giant pain in the ass.
249-- | Portably setting the display attributes is a giant pain in the ass.
296--
250--
297−-- If the terminal supports the sgr capability (which sets the on/off
251+-- If the terminal supports the sgr capability (which sets the on/off state of each style
298−-- state of each style directly; and, for no good reason, resets the
299−-- colors to the default) this procedure is used:
252+-- directly ; and, for no good reason, resets the colors to the default) this procedure is used:
300--
253--
301-- 0. set the style attributes. This resets the fore and back color.
254-- 0. set the style attributes. This resets the fore and back color.
302--
255--
303-- 1, If a foreground color is to be set then set the foreground color
256-- 1, If a foreground color is to be set then set the foreground color
304--
257--
305-- 2. likewise with the background color
258-- 2. likewise with the background color
259+--
260+-- If the terminal does not support the sgr cap then:
261+-- if there is a change from an applied color to the default (in either the fore or back color)
262+-- then:
306--
263--
307−-- If the terminal does not support the sgr cap then: if there is a
264+-- 0. reset all display attributes (sgr0)
308−-- change from an applied color to the default (in either the fore or
309−-- back color) then:
310--
265--
311−-- 0. reset all display attributes (sgr0)
266+-- 1. enter required style modes
312--
267--
313−-- 1. enter required style modes
268+-- 2. set the fore color if required
314--
269--
315−-- 2. set the fore color if required
270+-- 3. set the back color if required
316--
271--
317−-- 3. set the back color if required
318−--
319−-- Entering the required style modes could require a reset of the
272+-- Entering the required style modes could require a reset of the display attributes. If this is
320−-- display attributes. If this is the case then the back and fore colors
321−-- always need to be set if not default.
273+-- the case then the back and fore colors always need to be set if not default.
322--
274--
323-- This equation implements the above logic.
275-- This equation implements the above logic.
324--
276--
325−-- Note that this assumes the removal of color changes in the
277+-- \todo This assumes the removal of color changes in the display attributes is done as expected
326−-- display attributes is done as expected with noColors == True. See
327−-- `limitAttrForDisplay`.
278+-- with noColors == True. See `limitAttrForDisplay`
328--
279--
329−-- Note that this optimizes for fewer state changes followed by fewer
280+-- \todo This assumes that fewer state changes, followed by fewer bytes, is what to optimize. I
330−-- bytes.
281+-- haven't measured this or even examined terminal implementations. *shrug*
331−terminfoWriteSetAttr :: DisplayContext -> TerminfoCaps -> Bool -> FixedAttr -> Attr -> DisplayAttrDiff -> Write
282+terminfoWriteSetAttr :: DisplayContext -> TerminfoCaps -> FixedAttr -> Attr -> DisplayAttrDiff -> Write
332−terminfoWriteSetAttr dc terminfoCaps urlsEnabled prevAttr reqAttr diffs =
283+terminfoWriteSetAttr dc terminfoCaps prevAttr reqAttr diffs = do
333− urlAttrs urlsEnabled `mappend` case (foreColorDiff diffs == ColorToDefault) || (backColorDiff diffs == ColorToDefault) of
284+ case (foreColorDiff diffs == ColorToDefault) || (backColorDiff diffs == ColorToDefault) of
334− -- The only way to reset either color, portably, to the default
285+ -- The only way to reset either color, portably, to the default is to use either the set
335− -- is to use either the set state capability or the set default
286+ -- state capability or the set default capability.
336− -- capability.
337− True -> do
287+ True -> do
338 case reqDisplayCapSeqFor (displayAttrCaps terminfoCaps)
288 case reqDisplayCapSeqFor (displayAttrCaps terminfoCaps)
339− (fixedStyle attr)
289+ (fixedStyle attr )
340 (styleToApplySeq $ fixedStyle attr) of
290 (styleToApplySeq $ fixedStyle attr) of
341 -- only way to reset a color to the defaults
291 -- only way to reset a color to the defaults
342− EnterExitSeq caps -> writeDefaultAttr dc urlsEnabled
292+ EnterExitSeq caps -> writeDefaultAttr dc
343− `mappend`
293+ `mappend`
344 foldMap (\cap -> writeCapExpr cap []) caps
294 foldMap (\cap -> writeCapExpr cap []) caps
345 `mappend`
295 `mappend`
346 setColors
296 setColors
347 -- implicitly resets the colors to the defaults
297 -- implicitly resets the colors to the defaults
348− SetState state -> writeCapExpr (fromJust $ setAttrStates
298+ SetState state -> writeCapExpr (fromJust $ setAttrStates
349− $ displayAttrCaps terminfoCaps
299+ $ displayAttrCaps
300+ $ terminfoCaps
350 )
301 )
351 (sgrArgsForState state)
302 (sgrArgsForState state)
352− `mappend` setItalics
303+ `mappend`
353− `mappend` setStrikethrough
354− `mappend` setColors
304+ setColors
355− -- Otherwise the display colors are not changing or changing
305+ -- Otherwise the display colors are not changing or changing between two non-default
356− -- between two non-default points.
306+ -- points.
357 False -> do
307 False -> do
358− -- Still, it could be the case that the change in display
308+ -- Still, it could be the case that the change in display attributes requires the
359− -- attributes requires the colors to be reset because the
360− -- required capability was not available.
309+ -- colors to be reset because the required capability was not available.
361 case reqDisplayCapSeqFor (displayAttrCaps terminfoCaps)
310 case reqDisplayCapSeqFor (displayAttrCaps terminfoCaps)
362 (fixedStyle attr)
311 (fixedStyle attr)
363 (styleDiffs diffs) of
312 (styleDiffs diffs) of
364− -- Really, if terminals were re-implemented with modern
313+ -- Really, if terminals were re-implemented with modern concepts instead of bowing
365− -- concepts instead of bowing down to 40 yr old dumb
366− -- terminal requirements this would be the only case
314+ -- down to 40 yr old dumb terminal requirements this would be the only case ever
367− -- ever reached! Changes the style and color states
315+ -- reached! Changes the style and color states according to the differences with
368− -- according to the differences with the currently
369− -- applied states.
316+ -- the currently applied states.
370 EnterExitSeq caps -> foldMap (\cap -> writeCapExpr cap []) caps
317 EnterExitSeq caps -> foldMap (\cap -> writeCapExpr cap []) caps
371 `mappend`
318 `mappend`
372− writeColorDiff Foreground (foreColorDiff diffs)
319+ writeColorDiff setForeColor (foreColorDiff diffs)
373 `mappend`
320 `mappend`
374− writeColorDiff Background (backColorDiff diffs)
321+ writeColorDiff setBackColor (backColorDiff diffs)
375 -- implicitly resets the colors to the defaults
322 -- implicitly resets the colors to the defaults
376− SetState state -> writeCapExpr (fromJust $ setAttrStates
323+ SetState state -> writeCapExpr (fromJust $ setAttrStates
377 $ displayAttrCaps terminfoCaps
324 $ displayAttrCaps terminfoCaps
378 )
325 )
379 (sgrArgsForState state)
326 (sgrArgsForState state)
380− `mappend` setItalics
381− `mappend` setStrikethrough
382 `mappend` setColors
327 `mappend` setColors
383− where
328+ where
384− urlAttrs True = writeURLEscapes (urlDiff diffs)
385− urlAttrs False = mempty
386 colorMap = case useAltColorMap terminfoCaps of
329 colorMap = case useAltColorMap terminfoCaps of
387 False -> ansiColorIndex
330 False -> ansiColorIndex
388 True -> altColorIndex
331 True -> altColorIndex
389 attr = fixDisplayAttr prevAttr reqAttr
332 attr = fixDisplayAttr prevAttr reqAttr
390−
391− -- italics can't be set via SGR, so here we manually
392− -- apply the enter and exit sequences as needed after
393− -- changing the SGR
394− setItalics
395− | hasStyle (fixedStyle attr) italic
396− , Just sitm <- enterItalic (displayAttrCaps terminfoCaps)
397− = writeCapExpr sitm []
398− | otherwise = mempty
399− setStrikethrough
400− | hasStyle (fixedStyle attr) strikethrough
401− , Just smxx <- enterStrikethrough (displayAttrCaps terminfoCaps)
402− = writeCapExpr smxx []
403− | otherwise = mempty
404 setColors =
333 setColors =
405 (case fixedForeColor attr of
334 (case fixedForeColor attr of
406− Just c -> writeColor Foreground c
335+ Just c -> writeCapExpr (setForeColor terminfoCaps)
336+ [toEnum $ colorMap c]
407 Nothing -> mempty)
337 Nothing -> mempty)
408 `mappend`
338 `mappend`
409 (case fixedBackColor attr of
339 (case fixedBackColor attr of
410− Just c -> writeColor Background c
340+ Just c -> writeCapExpr (setBackColor terminfoCaps)
341+ [toEnum $ colorMap c]
411 Nothing -> mempty)
342 Nothing -> mempty)
412− writeColorDiff _side NoColorChange
343+ writeColorDiff _f NoColorChange
413 = mempty
344 = mempty
414− writeColorDiff _side ColorToDefault
345+ writeColorDiff _f ColorToDefault
415 = error "ColorToDefault is not a possible case for applyColorDiffs"
346 = error "ColorToDefault is not a possible case for applyColorDiffs"
416− writeColorDiff side (SetColor c)
347+ writeColorDiff f (SetColor c)
417− = writeColor side c
418−
419− writeColor side (RGBColor r g b) =
420− case outputColorMode (contextDevice dc) of
421− FullColor ->
422− hardcodeColor side (r, g, b)
423− _ ->
424− error "clampColor should remove rgb colors in standard mode"
425− writeColor side c =
426− writeCapExpr (setSideColor side terminfoCaps) [toEnum $ colorMap c]
348+ = writeCapExpr (f terminfoCaps) [toEnum $ colorMap c]
427−
349+
428−-- a color can either be in the foreground or the background
429−data ColorSide = Foreground | Background
430−
431−-- get the capability for drawing a color on a specific side
432−setSideColor :: ColorSide -> TerminfoCaps -> CapExpression
433−setSideColor Foreground = setForeColor
434−setSideColor Background = setBackColor
435−
436−hardcodeColor :: ColorSide -> (Word8, Word8, Word8) -> Write
437−hardcodeColor side (r, g, b) =
438− -- hardcoded color codes are formatted as "\x1b[{side};2;{r};{g};{b}m"
439− mconcat [ writeStr "\x1b[", sideCode, delimiter, writeChar '2', delimiter
440− , writeColor r, delimiter, writeColor g, delimiter, writeColor b
441− , writeChar 'm']
442− where
443− writeChar = writeWord8 . fromIntegral . fromEnum
444− writeStr = mconcat . map writeChar
445− writeColor = writeStr . show
446− delimiter = writeChar ';'
447− -- 38/48 are used to set whether we should write to the
448− -- foreground/background. I really don't want to know why.
449− sideCode = case side of
450− Foreground -> writeStr "38"
451− Background -> writeStr "48"
452−
453−-- | The color table used by a terminal is a 16 color set followed by a
350+-- | The color table used by a terminal is a 16 color set followed by a 240 color set that might not
454−-- 240 color set that might not be supported by the terminal.
351+-- be supported by the terminal.
455--
352--
456−-- This takes a Color which clearly identifies which palette to use and
353+-- This takes a Color which clearly identifies which pallete to use and computes the index
457−-- computes the index into the full 256 color palette.
354+-- into the full 256 color pallete.
458ansiColorIndex :: Color -> Int
355ansiColorIndex :: Color -> Int
459ansiColorIndex (ISOColor v) = fromEnum v
356ansiColorIndex (ISOColor v) = fromEnum v
460ansiColorIndex (Color240 v) = 16 + fromEnum v
357ansiColorIndex (Color240 v) = 16 + fromEnum v
461−ansiColorIndex (RGBColor _ _ _) =
462− error $ unlines [ "Attempted to create color index from rgb color."
463− , "This is currently unsupported, and shouldn't ever happen"
464− ]
465
358
466-- | For terminals without setaf/setab
359-- | For terminals without setaf/setab
467−--
360+--
468-- See table in `man terminfo`
361-- See table in `man terminfo`
469-- Will error if not in table.
362-- Will error if not in table.
470altColorIndex :: Color -> Int
363altColorIndex :: Color -> Int
@@ -478,28 +371,21 @@ altColorIndex (ISOColor 6) = 3
478altColorIndex (ISOColor 7) = 7
371altColorIndex (ISOColor 7) = 7
479altColorIndex (ISOColor v) = fromEnum v
372altColorIndex (ISOColor v) = fromEnum v
480altColorIndex (Color240 v) = 16 + fromEnum v
373altColorIndex (Color240 v) = 16 + fromEnum v
481−altColorIndex (RGBColor _ _ _) =
482− error $ unlines [ "Attempted to create color index from rgb color."
483− , "This is currently unsupported, and shouldn't ever happen"
484− ]
485
374
486−{- | The sequence of terminfo caps to apply a given style are determined
375+{- | The sequence of terminfo caps to apply a given style are determined according to these rules.
487− - according to these rules.
376+ -
377+ - 1. The assumption is that it's preferable to use the simpler enter/exit mode capabilities than
378+ - the full set display attribute state capability.
488 -
379 -
489− - 1. The assumption is that it's preferable to use the simpler
380+ - 2. If a mode is supposed to be removed but there is not an exit capability defined then the
490− - enter/exit mode capabilities than the full set display attribute
381+ - display attributes are reset to defaults then the display attribute state is set.
491− - state capability.
492 -
382 -
493− - 2. If a mode is supposed to be removed but there is not an exit
383+ - 3. If a mode is supposed to be applied but there is not an enter capability defined then then
494− - capability defined then the display attributes are reset to defaults
495− - then the display attribute state is set.
384+ - display attribute state is set if possible. Otherwise the mode is not applied.
496 -
385 -
497− - 3. If a mode is supposed to be applied but there is not an enter
498− - capability defined then then display attribute state is set if
386+ - 4. If the display attribute state is being set then just update the arguments to that for any
499− - possible. Otherwise the mode is not applied.
387+ - apply/remove.
500 -
388 -
501− - 4. If the display attribute state is being set then just update the
502− - arguments to that for any apply/remove.
503 -}
389 -}
504data DisplayAttrSeq
390data DisplayAttrSeq
505 = EnterExitSeq [CapExpression]
391 = EnterExitSeq [CapExpression]
@@ -508,8 +394,6 @@ data DisplayAttrSeq
508data DisplayAttrState = DisplayAttrState
394data DisplayAttrState = DisplayAttrState
509 { applyStandout :: Bool
395 { applyStandout :: Bool
510 , applyUnderline :: Bool
396 , applyUnderline :: Bool
511− , applyItalic :: Bool
512− , applyStrikethrough :: Bool
513 , applyReverseVideo :: Bool
397 , applyReverseVideo :: Bool
514 , applyBlink :: Bool
398 , applyBlink :: Bool
515 , applyDim :: Bool
399 , applyDim :: Bool
@@ -531,25 +415,19 @@ sgrArgsForState attrState = map (\b -> if b then 1 else 0)
531
415
532reqDisplayCapSeqFor :: DisplayAttrCaps -> Style -> [StyleStateChange] -> DisplayAttrSeq
416reqDisplayCapSeqFor :: DisplayAttrCaps -> Style -> [StyleStateChange] -> DisplayAttrSeq
533reqDisplayCapSeqFor caps s diffs
417reqDisplayCapSeqFor caps s diffs
534− -- if the state transition implied by any diff cannot be supported
418+ -- if the state transition implied by any diff cannot be supported with an enter/exit mode cap
535− -- with an enter/exit mode cap then either the state needs to be set
536− -- or the attribute change ignored.
419+ -- then either the state needs to be set or the attribute change ignored.
537 = case (any noEnterExitCap diffs, isJust $ setAttrStates caps) of
420 = case (any noEnterExitCap diffs, isJust $ setAttrStates caps) of
538 -- If all the diffs have an enter-exit cap then just use those
421 -- If all the diffs have an enter-exit cap then just use those
539 ( False, _ ) -> EnterExitSeq $ map enterExitCap diffs
422 ( False, _ ) -> EnterExitSeq $ map enterExitCap diffs
540− -- If not all the diffs have an enter-exit cap and there is no
423+ -- If not all the diffs have an enter-exit cap and there is no set state cap then filter out
541− -- set state cap then filter out all unsupported diffs and just
424+ -- all unsupported diffs and just apply the rest
542− -- apply the rest
543− ( True, False ) -> EnterExitSeq $ map enterExitCap
425+ ( True, False ) -> EnterExitSeq $ map enterExitCap
544 $ filter (not . noEnterExitCap) diffs
426 $ filter (not . noEnterExitCap) diffs
545− -- if not all the diffs have an enter-exit can and there is a
427+ -- if not all the diffs have an enter-exit can and there is a set state cap then just use
546− -- set state cap then just use the set state cap.
428+ -- the set state cap.
547 ( True, True ) -> SetState $ stateForStyle s
429 ( True, True ) -> SetState $ stateForStyle s
548 where
430 where
549− noEnterExitCap ApplyStrikethrough = isNothing $ enterStrikethrough caps
550− noEnterExitCap RemoveStrikethrough = isNothing $ exitStrikethrough caps
551− noEnterExitCap ApplyItalic = isNothing $ enterItalic caps
552− noEnterExitCap RemoveItalic = isNothing $ exitItalic caps
553 noEnterExitCap ApplyStandout = isNothing $ enterStandout caps
431 noEnterExitCap ApplyStandout = isNothing $ enterStandout caps
554 noEnterExitCap RemoveStandout = isNothing $ exitStandout caps
432 noEnterExitCap RemoveStandout = isNothing $ exitStandout caps
555 noEnterExitCap ApplyUnderline = isNothing $ enterUnderline caps
433 noEnterExitCap ApplyUnderline = isNothing $ enterUnderline caps
@@ -562,10 +440,6 @@ reqDisplayCapSeqFor caps s diffs
562 noEnterExitCap RemoveDim = True
440 noEnterExitCap RemoveDim = True
563 noEnterExitCap ApplyBold = isNothing $ enterBoldMode caps
441 noEnterExitCap ApplyBold = isNothing $ enterBoldMode caps
564 noEnterExitCap RemoveBold = True
442 noEnterExitCap RemoveBold = True
565− enterExitCap ApplyStrikethrough = fromJust $ enterStrikethrough caps
566− enterExitCap RemoveStrikethrough = fromJust $ exitStrikethrough caps
567− enterExitCap ApplyItalic = fromJust $ enterItalic caps
568− enterExitCap RemoveItalic = fromJust $ exitItalic caps
569 enterExitCap ApplyStandout = fromJust $ enterStandout caps
443 enterExitCap ApplyStandout = fromJust $ enterStandout caps
570 enterExitCap RemoveStandout = fromJust $ exitStandout caps
444 enterExitCap RemoveStandout = fromJust $ exitStandout caps
571 enterExitCap ApplyUnderline = fromJust $ enterUnderline caps
445 enterExitCap ApplyUnderline = fromJust $ enterUnderline caps
@@ -579,8 +453,6 @@ stateForStyle :: Style -> DisplayAttrState
579stateForStyle s = DisplayAttrState
453stateForStyle s = DisplayAttrState
580 { applyStandout = isStyleSet standout
454 { applyStandout = isStyleSet standout
581 , applyUnderline = isStyleSet underline
455 , applyUnderline = isStyleSet underline
582− , applyItalic = isStyleSet italic
583− , applyStrikethrough = isStyleSet strikethrough
584 , applyReverseVideo = isStyleSet reverseVideo
456 , applyReverseVideo = isStyleSet reverseVideo
585 , applyBlink = isStyleSet blink
457 , applyBlink = isStyleSet blink
586 , applyDim = isStyleSet dim
458 , applyDim = isStyleSet dim
@@ -592,15 +464,14 @@ styleToApplySeq :: Style -> [StyleStateChange]
592styleToApplySeq s = concat
464styleToApplySeq s = concat
593 [ applyIfRequired ApplyStandout standout
465 [ applyIfRequired ApplyStandout standout
594 , applyIfRequired ApplyUnderline underline
466 , applyIfRequired ApplyUnderline underline
595− , applyIfRequired ApplyItalic italic
596− , applyIfRequired ApplyStrikethrough strikethrough
597 , applyIfRequired ApplyReverseVideo reverseVideo
467 , applyIfRequired ApplyReverseVideo reverseVideo
598 , applyIfRequired ApplyBlink blink
468 , applyIfRequired ApplyBlink blink
599 , applyIfRequired ApplyDim dim
469 , applyIfRequired ApplyDim dim
600− , applyIfRequired ApplyBold bold
470+ , applyIfRequired ApplyBlink bold
601 ]
471 ]
602− where
472+ where
603− applyIfRequired op flag
473+ applyIfRequired op flag
604 = if 0 == (flag .&. s)
474 = if 0 == (flag .&. s)
605 then []
475 then []
606 else [op]
476 else [op]
477+
src/Graphics/Vty/Output/XTermColor.hs+37−53
@@ -1,72 +1,56 @@
1−{-# Language CPP #-}
1+{-# LANGUAGE CPP #-}
2+
3+#ifndef MIN_VERSION_base
4+#defined MIN_VERSION_base(x,y,z) 1
5+#endif
6+
2-- Copyright 2009-2010 Corey O'Connor
7-- Copyright 2009-2010 Corey O'Connor
3−-- | Xterm output driver. This uses the Terminfo driver with some
4−-- extensions for Xterm.
5−module Graphics.Vty.Output.XTermColor
8+module Graphics.Vty.Output.XTermColor ( reserveTerminal )
6− ( reserveTerminal
7− )
8−where
9+ where
9
10
10import Graphics.Vty.Output.Interface
11import Graphics.Vty.Output.Interface
11import Graphics.Vty.Input.Mouse
12import Graphics.Vty.Input.Mouse
12−import Graphics.Vty.Input.Focus
13−import Graphics.Vty.Attributes.Color (ColorMode)
14import qualified Graphics.Vty.Output.TerminfoBased as TerminfoBased
13import qualified Graphics.Vty.Output.TerminfoBased as TerminfoBased
15
14
16import Blaze.ByteString.Builder (writeToByteString)
15import Blaze.ByteString.Builder (writeToByteString)
17import Blaze.ByteString.Builder.Word (writeWord8)
16import Blaze.ByteString.Builder.Word (writeWord8)
18
17
19−import qualified Data.ByteString.Char8 as BS8
20−import Data.ByteString.Char8 (ByteString)
21−import Foreign.Ptr (castPtr)
22−
23import Control.Monad (void, when)
18import Control.Monad (void, when)
24import Control.Monad.Trans
19import Control.Monad.Trans
25−import Data.Char (toLower)
26import Data.IORef
20import Data.IORef
27
21
28−import System.Posix.IO (fdWriteBuf)
22+import System.Posix.IO (fdWrite)
29−import System.Posix.Types (ByteCount, Fd)
23+import System.Posix.Types (Fd)
30import System.Posix.Env (getEnv)
24import System.Posix.Env (getEnv)
31
25
26+#if !(MIN_VERSION_base(4,8,0))
27+import Control.Applicative
28+import Data.Foldable (foldMap)
29+#endif
30+
32import Data.List (isInfixOf)
31import Data.List (isInfixOf)
33import Data.Maybe (catMaybes)
32import Data.Maybe (catMaybes)
34−
35−#if !MIN_VERSION_base(4,11,0)
36import Data.Monoid ((<>))
33import Data.Monoid ((<>))
37−#endif
38−
39−-- | Write a 'ByteString' to an 'Fd'.
40−fdWrite :: Fd -> ByteString -> IO ByteCount
41−fdWrite fd s =
42− BS8.useAsCStringLen s $ \(buf,len) -> do
43− fdWriteBuf fd (castPtr buf) (fromIntegral len)
44
34
45−-- | Construct an Xterm output driver. Initialize the display to UTF-8.
35+-- | Initialize the display to UTF-8.
46−reserveTerminal :: ( Applicative m, MonadIO m ) => String -> Fd -> ColorMode -> m Output
36+reserveTerminal :: ( Applicative m, MonadIO m ) => String -> Fd -> m Output
47−reserveTerminal variant outFd colorMode = liftIO $ do
37+reserveTerminal variant outFd = liftIO $ do
48 let flushedPut = void . fdWrite outFd
38 let flushedPut = void . fdWrite outFd
49− -- If the terminal variant is xterm-color use xterm instead since,
39+ -- If the terminal variant is xterm-color use xterm instead since, more often than not,
50− -- more often than not, xterm-color is broken.
40+ -- xterm-color is broken.
51 let variant' = if variant == "xterm-color" then "xterm" else variant
41 let variant' = if variant == "xterm-color" then "xterm" else variant
52
42
53 utf8a <- utf8Active
43 utf8a <- utf8Active
54 when (not utf8a) $ flushedPut setUtf8CharSet
44 when (not utf8a) $ flushedPut setUtf8CharSet
55− t <- TerminfoBased.reserveTerminal variant' outFd colorMode
45+ t <- TerminfoBased.reserveTerminal variant' outFd
56
46
57 mouseModeStatus <- newIORef False
47 mouseModeStatus <- newIORef False
58− focusModeStatus <- newIORef False
59 pasteModeStatus <- newIORef False
48 pasteModeStatus <- newIORef False
60
49
61 let xtermSetMode t' m newStatus = do
50 let xtermSetMode t' m newStatus = do
62 curStatus <- getModeStatus t' m
51 curStatus <- getModeStatus t' m
63 when (newStatus /= curStatus) $
52 when (newStatus /= curStatus) $
64 case m of
53 case m of
65− Focus -> liftIO $ do
66− case newStatus of
67− True -> flushedPut requestFocusEvents
68− False -> flushedPut disableFocusEvents
69− writeIORef focusModeStatus newStatus
70 Mouse -> liftIO $ do
54 Mouse -> liftIO $ do
71 case newStatus of
55 case newStatus of
72 True -> flushedPut requestMouseEvents
56 True -> flushedPut requestMouseEvents
@@ -77,12 +61,9 @@ reserveTerminal variant outFd colorMode = liftIO $ do
77 True -> flushedPut enableBracketedPastes
61 True -> flushedPut enableBracketedPastes
78 False -> flushedPut disableBracketedPastes
62 False -> flushedPut disableBracketedPastes
79 writeIORef pasteModeStatus newStatus
63 writeIORef pasteModeStatus newStatus
80− Hyperlink -> setMode t Hyperlink newStatus
81
64
82 xtermGetMode Mouse = liftIO $ readIORef mouseModeStatus
65 xtermGetMode Mouse = liftIO $ readIORef mouseModeStatus
83− xtermGetMode Focus = liftIO $ readIORef focusModeStatus
84 xtermGetMode BracketedPaste = liftIO $ readIORef pasteModeStatus
66 xtermGetMode BracketedPaste = liftIO $ readIORef pasteModeStatus
85− xtermGetMode Hyperlink = getModeStatus t Hyperlink
86
67
87 let t' = t
68 let t' = t
88 { terminalID = terminalID t ++ " (xterm-color)"
69 { terminalID = terminalID t ++ " (xterm-color)"
@@ -90,7 +71,6 @@ reserveTerminal variant outFd colorMode = liftIO $ do
90 when (not utf8a) $ liftIO $ flushedPut setDefaultCharSet
71 when (not utf8a) $ liftIO $ flushedPut setDefaultCharSet
91 setMode t' BracketedPaste False
72 setMode t' BracketedPaste False
92 setMode t' Mouse False
73 setMode t' Mouse False
93− setMode t' Focus False
94 releaseTerminal t
74 releaseTerminal t
95 , mkDisplayContext = \tActual r -> do
75 , mkDisplayContext = \tActual r -> do
96 dc <- mkDisplayContext t tActual r
76 dc <- mkDisplayContext t tActual r
@@ -104,28 +84,32 @@ reserveTerminal variant outFd colorMode = liftIO $ do
104utf8Active :: IO Bool
84utf8Active :: IO Bool
105utf8Active = do
85utf8Active = do
106 let vars = ["LC_ALL", "LANG", "LC_CTYPE"]
86 let vars = ["LC_ALL", "LANG", "LC_CTYPE"]
107− results <- map (toLower <$>) . catMaybes <$> mapM getEnv vars
87+ results <- catMaybes <$> mapM getEnv vars
108− let matches = filter ("utf8" `isInfixOf`) results <>
88+ let matches = filter ("UTF8" `isInfixOf`) results <>
109− filter ("utf-8" `isInfixOf`) results
89+ filter ("UTF-8" `isInfixOf`) results
110 return $ not $ null matches
90 return $ not $ null matches
111
91
112-- | Enable bracketed paste mode:
92-- | Enable bracketed paste mode:
113-- http://cirw.in/blog/bracketed-paste
93-- http://cirw.in/blog/bracketed-paste
114−enableBracketedPastes :: ByteString
94+enableBracketedPastes :: String
115−enableBracketedPastes = BS8.pack "\ESC[?2004h"
95+enableBracketedPastes = "\ESC[?2004h"
116
96
117-- | Disable bracketed paste mode:
97-- | Disable bracketed paste mode:
118−disableBracketedPastes :: ByteString
98+disableBracketedPastes :: String
119−disableBracketedPastes = BS8.pack "\ESC[?2004l"
99+disableBracketedPastes = "\ESC[?2004l"
120
100
121-- | These sequences set xterm based terminals to UTF-8 output.
101-- | These sequences set xterm based terminals to UTF-8 output.
122--
102--
123−-- There is no known terminfo capability equivalent to this.
103+-- \todo I don't know of a terminfo cap that is equivalent to this.
124−setUtf8CharSet, setDefaultCharSet :: ByteString
104+setUtf8CharSet, setDefaultCharSet :: String
125−setUtf8CharSet = BS8.pack "\ESC%G"
105+setUtf8CharSet = "\ESC%G"
126−setDefaultCharSet = BS8.pack "\ESC%@"
106+setDefaultCharSet = "\ESC%@"
127−
107+
108+-- | I think xterm is broken: Reseting the background color as the first bytes serialized on a
109+-- new line does not effect the background color xterm uses to clear the line. Which is used
110+-- *after* the next newline.
128xtermInlineHack :: Output -> IO ()
111xtermInlineHack :: Output -> IO ()
129xtermInlineHack t = do
112xtermInlineHack t = do
130 let writeReset = foldMap (writeWord8.toEnum.fromEnum) "\ESC[K"
113 let writeReset = foldMap (writeWord8.toEnum.fromEnum) "\ESC[K"
131 outputByteBuffer t $ writeToByteString writeReset
114 outputByteBuffer t $ writeToByteString writeReset
115+
src/Graphics/Vty/Picture.hs+42−65
@@ -1,36 +1,25 @@
1−-- A 'Picture' is a background paired with a set of 'Image' layers. The
1+{-# LANGUAGE BangPatterns #-}
2−-- 'Picture' data structure is representative of the final terminal
2+-- | The 'Picture' data structure is representative of the final terminal view.
3−-- view.
3+--
4+-- A 'Picture' is a background paired with a layer of 'Image's.
4−module Graphics.Vty.Picture
5+module Graphics.Vty.Picture ( module Graphics.Vty.Picture
5− ( Picture(..)
6+ , module Graphics.Vty.Image
6− , Cursor(..)
7− , Background(..)
8− , emptyPicture
9− , addToTop
10− , addToBottom
11− , picForImage
12− , picForLayers
13− , picImage
14− )
7+ )
15−where
8+ where
16
9
17import Graphics.Vty.Image
10import Graphics.Vty.Image
18−import Graphics.Vty.Attributes
19
11
20import Control.DeepSeq
12import Control.DeepSeq
21
13
22−-- | A Vty picture.
14+-- | The type of images to be displayed using 'update'.
23--
15--
24−-- These can be constructed directly or using `picForImage`.
16+-- Can be constructed directly or using `picForImage`. Which provides an initial instance with
17+-- reasonable defaults for picCursor and picBackground.
25data Picture = Picture
18data Picture = Picture
26 { picCursor :: Cursor
19 { picCursor :: Cursor
27− -- ^ The picture's cursor.
28 , picLayers :: [Image]
20 , picLayers :: [Image]
29− -- ^ The picture's image layers (top-most first).
30 , picBackground :: Background
21 , picBackground :: Background
31− -- ^ The picture's background to be displayed in locations with no
22+ }
32− -- Image data.
33− } deriving Eq
34
23
35instance Show Picture where
24instance Show Picture where
36 show (Picture _ layers _ ) = "Picture ?? " ++ show layers ++ " ??"
25 show (Picture _ layers _ ) = "Picture ?? " ++ show layers ++ " ??"
@@ -38,73 +27,66 @@ instance Show Picture where
38instance NFData Picture where
27instance NFData Picture where
39 rnf (Picture c l b) = c `deepseq` l `deepseq` b `deepseq` ()
28 rnf (Picture c l b) = c `deepseq` l `deepseq` b `deepseq` ()
40
29
41−-- | A picture with no cursor, background or image layers.
30+-- | a picture with no cursor, background or image layers
42emptyPicture :: Picture
31emptyPicture :: Picture
43emptyPicture = Picture NoCursor [] ClearBackground
32emptyPicture = Picture NoCursor [] ClearBackground
44
33
45−-- | Add an 'Image' as the top-most layer of a 'Picture'.
34+-- | The given 'Image' is added as the top layer of the 'Picture'
46addToTop :: Picture -> Image -> Picture
35addToTop :: Picture -> Image -> Picture
47addToTop p i = p {picLayers = i : picLayers p}
36addToTop p i = p {picLayers = i : picLayers p}
48
37
49−-- | Add an 'Image' as the bottom-most layer of a 'Picture'.
38+-- | The given 'Image' is added as the bottom layer of the 'Picture'
50addToBottom :: Picture -> Image -> Picture
39addToBottom :: Picture -> Image -> Picture
51addToBottom p i = p {picLayers = picLayers p ++ [i]}
40addToBottom p i = p {picLayers = picLayers p ++ [i]}
52
41
53−-- | Create a picture from the given image. The picture will not have a
42+-- | Create a picture for display for the given image. The picture will not have a displayed cursor
54−-- displayed cursor and no background pattern (ClearBackground) will be
43+-- and no background pattern (ClearBackground) will be used.
55−-- used.
56picForImage :: Image -> Picture
44picForImage :: Image -> Picture
57−picForImage i = Picture
45+picForImage i = Picture
58 { picCursor = NoCursor
46 { picCursor = NoCursor
59 , picLayers = [i]
47 , picLayers = [i]
60 , picBackground = ClearBackground
48 , picBackground = ClearBackground
61 }
49 }
62
50
63−-- | Create a picture with the given layers, top-most first.
51+-- | Create a picture for display with the given layers. Ordered top to bottom.
64--
52--
65−-- The picture will not have a displayed cursor and no background
53+-- The picture will not have a displayed cursor and no background apttern (ClearBackgroun) will be
66−-- pattern (ClearBackgroun) will be used.
54+-- used.
55+--
56+-- The first 'Image' is the top layer.
67picForLayers :: [Image] -> Picture
57picForLayers :: [Image] -> Picture
68−picForLayers is = Picture
58+picForLayers is = Picture
69 { picCursor = NoCursor
59 { picCursor = NoCursor
70 , picLayers = is
60 , picLayers = is
71 , picBackground = ClearBackground
61 , picBackground = ClearBackground
72 }
62 }
73
63
74−-- | A picture can be configured to hide the cursor or to show the
64+-- | A picture can be configured either to not show the cursor or show the cursor at the specified
75−-- cursor at the specified character position.
65+-- character position.
76--
66--
77−-- There is not a 1:1 map from character positions to a row and column
67+-- There is not a 1 to 1 map from character positions to a row and column on the screen due to
78−-- on the screen due to characters that take more than 1 column.
68+-- characters that take more than 1 column.
69+--
70+-- todo: The Cursor can be given a (character,row) offset outside of the visible bounds of the
71+-- output region. In this case the cursor will not be shown.
79data Cursor =
72data Cursor =
80− -- | Hide the cursor
73+ -- | Hide the cursor
81− NoCursor
74+ NoCursor
82− -- | Set the terminal's cursor position without displaying a cursor
83− -- character. This is important for accessibility with screen
84− -- readers where a cursor position needs to be reported but we may
85− -- not want to show a block cursor in that location for cosmetic
86− -- reasons. The boolean argument indicates whether the positioning
87− -- should be absolute as with 'AbsoluteCursor' ('True') or logical
88− -- as with 'Cursor' ('False').
89− | PositionOnly !Bool !Int !Int
90− -- | Show the cursor at the given logical column accounting for
75+ -- | Show the cursor at the given logical column accounting for char width and row
91− -- character width in the presence of multi-column characters.
92 | Cursor !Int !Int
76 | Cursor !Int !Int
93− -- | Show the cursor at the given absolute terminal column and row
77+ -- | Show the cursor at the given absolute terminal column and row
94 | AbsoluteCursor !Int !Int
78 | AbsoluteCursor !Int !Int
95− deriving Eq
96
79
97instance NFData Cursor where
80instance NFData Cursor where
98 rnf c = c `seq` ()
81 rnf c = c `seq` ()
99
82
100−-- | A 'Picture' has a background pattern. The background is either:
83+-- | A 'Picture' has a background pattern. The background is either ClearBackground. Which shows the
101−--
84+-- layer below or is blank if the bottom layer. Or the background pattern is a character and a
102−-- * ClearBackground, which shows the layer below or is blank if the
85+-- display attribute. If the display attribute used previously should be used for a background fill
103−-- bottom layer
86+-- then use `currentAttr` for the background attribute.
104−-- * A character and a display attribute
105--
87--
106−-- If the display attribute used previously should be used for a
88+-- \todo The current attribute is always set to the default attributes at the start of updating the
107−-- background fill then use `currentAttr` for the background attribute.
89+-- screen to a picture.
108data Background
90data Background
109 = Background
91 = Background
110 { backgroundChar :: Char
92 { backgroundChar :: Char
@@ -116,16 +98,11 @@ data Background
116 --
98 --
117 -- * End of line if there are no remaining non-skip ops.
99 -- * End of line if there are no remaining non-skip ops.
118 | ClearBackground
100 | ClearBackground
119− deriving Eq
120
101
121instance NFData Background where
102instance NFData Background where
122 rnf (Background c a) = c `seq` a `seq` ()
103 rnf (Background c a) = c `seq` a `seq` ()
123 rnf ClearBackground = ()
104 rnf ClearBackground = ()
124
105
125−-- | Return the top-most 'Image' layer for a picture. This is unsafe for
126−-- 'Picture's without at least one layer.
127−--
128−-- This is provided for compatibility with applications that do not use
129−-- more than a single layer.
106+-- | Compatibility with applications that do not use more than a single layer.
130picImage :: Picture -> Image
107picImage :: Picture -> Image
131picImage = head . picLayers
108picImage = head . picLayers
src/Graphics/Vty/PictureToSpans.hs+87−68
@@ -1,14 +1,21 @@
1-- Copyright Corey O'Connor<coreyoconnor@gmail.com>
1-- Copyright Corey O'Connor<coreyoconnor@gmail.com>
2{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE BangPatterns #-}
3+{-# LANGUAGE CPP #-}
3{-# LANGUAGE ExistentialQuantification #-}
4{-# LANGUAGE ExistentialQuantification #-}
4{-# LANGUAGE NamedFieldPuns #-}
5{-# LANGUAGE NamedFieldPuns #-}
5{-# LANGUAGE RankNTypes #-}
6{-# LANGUAGE RankNTypes #-}
6{-# LANGUAGE TemplateHaskell #-}
7{-# LANGUAGE TemplateHaskell #-}
7
8
9+#ifndef MIN_VERSION_base
10+#defined MIN_VERSION_base(x,y,z) 1
11+#endif
12+
8−-- | Transforms an image into rows of operations.
13+{- | Transforms an image into rows of operations.
14+ -}
9module Graphics.Vty.PictureToSpans where
15module Graphics.Vty.PictureToSpans where
10
16
11−import Graphics.Vty.Attributes (Attr, currentAttr)
17+import Graphics.Vty.Prelude
18+
12import Graphics.Vty.Image
19import Graphics.Vty.Image
13import Graphics.Vty.Image.Internal
20import Graphics.Vty.Image.Internal
14import Graphics.Vty.Picture
21import Graphics.Vty.Picture
@@ -19,7 +26,12 @@ import Lens.Micro.Mtl
19import Lens.Micro.TH
26import Lens.Micro.TH
20import Control.Monad.Reader
27import Control.Monad.Reader
21import Control.Monad.State.Strict hiding ( state )
28import Control.Monad.State.Strict hiding ( state )
29+
30+#if __GLASGOW_HASKELL__ < 708
31+import Control.Monad.ST.Strict hiding ( unsafeIOToST )
32+#else
22import Control.Monad.ST.Strict
33import Control.Monad.ST.Strict
34+#endif
23
35
24import qualified Data.Vector as Vector hiding ( take, replicate )
36import qualified Data.Vector as Vector hiding ( take, replicate )
25import Data.Vector.Mutable ( MVector(..))
37import Data.Vector.Mutable ( MVector(..))
@@ -27,27 +39,29 @@ import qualified Data.Vector.Mutable as MVector
27
39
28import qualified Data.Text.Lazy as TL
40import qualified Data.Text.Lazy as TL
29
41
42+#if !(MIN_VERSION_base(4,8,0))
43+import Data.Monoid (mappend)
44+#endif
45+
30type MRowOps s = MVector s SpanOps
46type MRowOps s = MVector s SpanOps
31
47
32type MSpanOps s = MVector s SpanOp
48type MSpanOps s = MVector s SpanOp
33
49
34-- transform plus clip. More or less.
50-- transform plus clip. More or less.
35data BlitState = BlitState
51data BlitState = BlitState
36− -- we always snoc to the operation vectors. Thus the columnOffset =
52+ -- we always snoc to the operation vectors. Thus the columnOffset = length of row at rowOffset
37− -- length of row at rowOffset although, one possibility is to merge
38− -- layers right in snocOp (naming it something else, of course). In
53+ -- although, one possibility is to merge layers right in snocOp (naming it something else, of
39− -- which case columnnOffset would be applicable. Right now we need
54+ -- course). In which case columnnOffset would be applicable.
40− -- it to exist.
55+ -- Right now we need it to exist.
41 { _columnOffset :: Int
56 { _columnOffset :: Int
42 , _rowOffset :: Int
57 , _rowOffset :: Int
43− -- clip coordinate space is in image space. Which means it's >= 0
58+ -- clip coordinate space is in image space. Which means it's >= 0 and < imageWidth.
44− -- and < imageWidth.
45 , _skipColumns :: Int
59 , _skipColumns :: Int
46 -- >= 0 and < imageHeight
60 -- >= 0 and < imageHeight
47 , _skipRows :: Int
61 , _skipRows :: Int
48− -- includes consideration of skipColumns. In display space. The
62+ -- includes consideration of skipColumns. In display space.
49− -- number of columns from the next column to be defined to the end
63+ -- The number of columns from the next column to be defined to the end of the display for the
50− -- of the display for the row.
64+ -- row.
51 , _remainingColumns :: Int
65 , _remainingColumns :: Int
52 -- includes consideration of skipRows. In display space.
66 -- includes consideration of skipRows. In display space.
53 , _remainingRows :: Int
67 , _remainingRows :: Int
@@ -64,29 +78,31 @@ makeLenses ''BlitEnv
64
78
65type BlitM s a = ReaderT (BlitEnv s) (StateT BlitState (ST s)) a
79type BlitM s a = ReaderT (BlitEnv s) (StateT BlitState (ST s)) a
66
80
67−-- | Produces the span ops that will render the given picture, possibly
81+-- | Produces the span ops that will render the given picture, possibly cropped or padded, into the
68−-- cropped or padded, into the specified region.
82+-- specified region.
69displayOpsForPic :: Picture -> DisplayRegion -> DisplayOps
83displayOpsForPic :: Picture -> DisplayRegion -> DisplayOps
70displayOpsForPic pic r = Vector.create (combinedOpsForLayers pic r)
84displayOpsForPic pic r = Vector.create (combinedOpsForLayers pic r)
71
85
72−-- | Returns the DisplayOps for an image rendered to a window the size
86+-- | Returns the DisplayOps for an image rendered to a window the size of the image.
73−-- of the image.
74--
87--
75−-- largely used only for debugging.
88+-- largerly used only for debugging.
76displayOpsForImage :: Image -> DisplayOps
89displayOpsForImage :: Image -> DisplayOps
77displayOpsForImage i = displayOpsForPic (picForImage i) (imageWidth i, imageHeight i)
90displayOpsForImage i = displayOpsForPic (picForImage i) (imageWidth i, imageHeight i)
78
91
79-- | Produces the span ops for each layer then combines them.
92-- | Produces the span ops for each layer then combines them.
93+--
94+-- TODO: a fold over a builder function. start with span ops that are a bg fill of the entire
95+-- region.
80combinedOpsForLayers :: Picture -> DisplayRegion -> ST s (MRowOps s)
96combinedOpsForLayers :: Picture -> DisplayRegion -> ST s (MRowOps s)
81combinedOpsForLayers pic r
97combinedOpsForLayers pic r
82 | regionWidth r == 0 || regionHeight r == 0 = MVector.new 0
98 | regionWidth r == 0 || regionHeight r == 0 = MVector.new 0
83 | otherwise = do
99 | otherwise = do
84− layerOps <- mapM (`buildSpans` r) (picLayers pic)
100+ layerOps <- mapM (\layer -> buildSpans layer r) (picLayers pic)
85 case layerOps of
101 case layerOps of
86 [] -> fail "empty picture"
102 [] -> fail "empty picture"
87 [ops] -> substituteSkips (picBackground pic) ops
103 [ops] -> substituteSkips (picBackground pic) ops
88− -- instead of merging ops after generation the merging can
104+ -- instead of merging ops after generation the merging can be performed as part of
89− -- be performed as part of snocOp.
105+ -- snocOp.
90 topOps : lowerOps -> do
106 topOps : lowerOps -> do
91 ops <- foldM mergeUnder topOps lowerOps
107 ops <- foldM mergeUnder topOps lowerOps
92 substituteSkips (picBackground pic) ops
108 substituteSkips (picBackground pic) ops
@@ -95,23 +111,21 @@ substituteSkips :: Background -> MRowOps s -> ST s (MRowOps s)
95substituteSkips ClearBackground ops = do
111substituteSkips ClearBackground ops = do
96 forM_ [0 .. MVector.length ops - 1] $ \row -> do
112 forM_ [0 .. MVector.length ops - 1] $ \row -> do
97 rowOps <- MVector.read ops row
113 rowOps <- MVector.read ops row
98− -- the image operations assure that background fills are
114+ -- the image operations assure that background fills are combined.
99− -- combined. clipping a background fill does not split the
115+ -- clipping a background fill does not split the background fill.
100− -- background fill. merging of image layers can split a skip,
116+ -- merging of image layers can split a skip, but only by the insertion of a non skip.
101− -- but only by the insertion of a non skip. all this combines to
102− -- mean we can check the last operation and remove it if it's a
117+ -- all this combines to mean we can check the last operation and remove it if it's a skip
103− -- skip
118+ -- todo: or does it?
104 let rowOps' = case Vector.last rowOps of
119 let rowOps' = case Vector.last rowOps of
105 Skip w -> Vector.init rowOps `Vector.snoc` RowEnd w
120 Skip w -> Vector.init rowOps `Vector.snoc` RowEnd w
106 _ -> rowOps
121 _ -> rowOps
107− -- now all the skips can be replaced by replications of ' ' of
122+ -- now all the skips can be replaced by replications of ' ' of the required width.
108− -- the required width.
109 let rowOps'' = swapSkipsForSingleColumnCharSpan ' ' currentAttr rowOps'
123 let rowOps'' = swapSkipsForSingleColumnCharSpan ' ' currentAttr rowOps'
110 MVector.write ops row rowOps''
124 MVector.write ops row rowOps''
111 return ops
125 return ops
112substituteSkips (Background {backgroundChar, backgroundAttr}) ops = do
126substituteSkips (Background {backgroundChar, backgroundAttr}) ops = do
113− -- At this point we decide if the background character is single
127+ -- At this point we decide if the background character is single column or not.
114− -- column or not. obviously, single column is easier.
128+ -- obviously, single column is easier.
115 case safeWcwidth backgroundChar of
129 case safeWcwidth backgroundChar of
116 w | w == 0 -> fail $ "invalid background character " ++ show backgroundChar
130 w | w == 0 -> fail $ "invalid background character " ++ show backgroundChar
117 | w == 1 -> do
131 | w == 1 -> do
@@ -135,12 +149,12 @@ mergeUnder upper lower = do
135 MVector.write upper row rowOps
149 MVector.write upper row rowOps
136 return upper
150 return upper
137
151
152+-- fugly
138mergeRowUnder :: SpanOps -> SpanOps -> SpanOps
153mergeRowUnder :: SpanOps -> SpanOps -> SpanOps
139−mergeRowUnder upperRowOps =
154+mergeRowUnder upperRowOps lowerRowOps =
140− onUpperOp Vector.empty (Vector.head upperRowOps) (Vector.tail upperRowOps)
155+ onUpperOp Vector.empty (Vector.head upperRowOps) (Vector.tail upperRowOps) lowerRowOps
141 where
156 where
142− -- H: it will never be the case that we are out of upper ops
157+ -- H: it will never be the case that we are out of upper ops before lower ops.
143− -- before lower ops.
144 onUpperOp :: SpanOps -> SpanOp -> SpanOps -> SpanOps -> SpanOps
158 onUpperOp :: SpanOps -> SpanOp -> SpanOps -> SpanOps -> SpanOps
145 onUpperOp outOps op@(TextSpan _ w _ _) upperOps lowerOps =
159 onUpperOp outOps op@(TextSpan _ w _ _) upperOps lowerOps =
146 let lowerOps' = dropOps w lowerOps
160 let lowerOps' = dropOps w lowerOps
@@ -175,32 +189,30 @@ swapSkipsForCharSpan w c a = Vector.map f
175 in TextSpan a ow cw txt
189 in TextSpan a ow cw txt
176 f v = v
190 f v = v
177
191
178−-- | Builds a vector of row operations that will output the given
192+-- | Builds a vector of row operations that will output the given picture to the terminal.
179−-- picture to the terminal.
180--
193--
181-- Crops to the given display region.
194-- Crops to the given display region.
195+--
196+-- \todo I'm pretty sure there is an algorithm that does not require a mutable buffer.
182buildSpans :: Image -> DisplayRegion -> ST s (MRowOps s)
197buildSpans :: Image -> DisplayRegion -> ST s (MRowOps s)
183buildSpans image outRegion = do
198buildSpans image outRegion = do
184 -- First we create a mutable vector for each rows output operations.
199 -- First we create a mutable vector for each rows output operations.
185 outOps <- MVector.replicate (regionHeight outRegion) Vector.empty
200 outOps <- MVector.replicate (regionHeight outRegion) Vector.empty
186− -- It's possible that building the span operations in display order
201+ -- \todo I think building the span operations in display order would provide better performance.
187− -- would provide better performance.
202+ -- However, I got stuck trying to implement an algorithm that did this. This will be considered
203+ -- as a possible future optimization.
188 --
204 --
189− -- A depth first traversal of the image is performed. ordered
205+ -- A depth first traversal of the image is performed. ordered according to the column range
190− -- according to the column range defined by the image from least
191− -- to greatest. The output row ops will at least have the region
206+ -- defined by the image from least to greatest. The output row ops will at least have the
192− -- of the image specified. Iterate over all output rows and output
207+ -- region of the image specified. Iterate over all output rows and output background fills for
193− -- background fills for all unspecified columns.
208+ -- all unspecified columns.
194 --
209 --
195− -- The images are made into span operations from left to right. It's
210+ -- The images are made into span operations from left to right. It's possible that this could
196− -- possible that this could easily be made to assure top to bottom
211+ -- easily be made to assure top to bottom output as well.
197− -- output as well.
198 when (regionHeight outRegion > 0 && regionWidth outRegion > 0) $ do
212 when (regionHeight outRegion > 0 && regionWidth outRegion > 0) $ do
199− -- The ops builder recursively descends the image and outputs
213+ -- The ops builder recursively descends the image and outputs span ops that would
200− -- span ops that would display that image. The number of columns
201− -- remaining in this row before exceeding the bounds is also
214+ -- display that image. The number of columns remaining in this row before exceeding the
202− -- provided. This is used to clip the span ops produced to the
215+ -- bounds is also provided. This is used to clip the span ops produced to the display.
203− -- display.
204 let fullBuild = do
216 let fullBuild = do
205 startImageBuild image
217 startImageBuild image
206 -- Fill in any unspecified columns with a skip.
218 -- Fill in any unspecified columns with a skip.
@@ -211,8 +223,7 @@ buildSpans image outRegion = do
211 return ()
223 return ()
212 return outOps
224 return outOps
213
225
214−-- | Add the operations required to build a given image to the current
226+-- | Add the operations required to build a given image to the current set of row operations.
215−-- set of row operations.
216startImageBuild :: Image -> BlitM s ()
227startImageBuild :: Image -> BlitM s ()
217startImageBuild image = do
228startImageBuild image = do
218 outOfBounds <- isOutOfBounds image <$> get
229 outOfBounds <- isOutOfBounds image <$> get
@@ -226,16 +237,17 @@ isOutOfBounds i s
226 | s ^. skipRows >= imageHeight i = True
237 | s ^. skipRows >= imageHeight i = True
227 | otherwise = False
238 | otherwise = False
228
239
229−-- | This adds an image that might be partially clipped to the output
240+-- | This adds an image that might be partially clipped to the output ops.
230−-- ops.
241+--
242+-- This is a very touchy algorithm. Too touchy. For instance, the CropRight and CropBottom
243+-- implementations are odd. They pass the current tests but something seems terribly wrong about all
244+-- this.
231--
245--
232−-- This is a very touchy algorithm. Too touchy. For instance, the
246+-- \todo prove this cannot be called in an out of bounds case.
233−-- CropRight and CropBottom implementations are odd. They pass the
234−-- current tests but something seems terribly wrong about all this.
235addMaybeClipped :: forall s . Image -> BlitM s ()
247addMaybeClipped :: forall s . Image -> BlitM s ()
236addMaybeClipped EmptyImage = return ()
248addMaybeClipped EmptyImage = return ()
237addMaybeClipped (HorizText a textStr ow _cw) = do
249addMaybeClipped (HorizText a textStr ow _cw) = do
238− -- This assumes that text spans are only 1 row high.
250+ -- TODO: assumption that text spans are only 1 row high.
239 s <- use skipRows
251 s <- use skipRows
240 when (s < 1) $ do
252 when (s < 1) $ do
241 leftClip <- use skipColumns
253 leftClip <- use skipColumns
@@ -285,7 +297,7 @@ addMaybeClipped CropTop {croppedImage, topSkip} = do
285 skipRows += topSkip
297 skipRows += topSkip
286 addMaybeClipped croppedImage
298 addMaybeClipped croppedImage
287
299
288−addMaybeClippedJoin :: forall s . String
300+addMaybeClippedJoin :: forall s . String
289 -> Lens BlitState BlitState Int Int
301 -> Lens BlitState BlitState Int Int
290 -> Lens BlitState BlitState Int Int
302 -> Lens BlitState BlitState Int Int
291 -> Lens BlitState BlitState Int Int
303 -> Lens BlitState BlitState Int Int
@@ -298,11 +310,12 @@ addMaybeClippedJoin name skip remaining offset i0Dim i0 i1 size = do
298 state <- get
310 state <- get
299 when (state^.remaining <= 0) $ fail $ name ++ " with remaining <= 0"
311 when (state^.remaining <= 0) $ fail $ name ++ " with remaining <= 0"
300 case state^.skip of
312 case state^.skip of
313+ s -- TODO: check if clipped in other dim. if not use addUnclipped
301− s | s > size -> put $ state & skip %~ subtract size
314+ | s > size -> put $ state & skip -~ size
302− | s == 0 -> if state^.remaining > i0Dim
315+ | s == 0 -> if state^.remaining > i0Dim
303 then do
316 then do
304 addMaybeClipped i0
317 addMaybeClipped i0
305− put $ state & offset %~ (+ i0Dim) & remaining %~ subtract i0Dim
318+ put $ state & offset +~ i0Dim & remaining -~ i0Dim
306 addMaybeClipped i1
319 addMaybeClipped i1
307 else addMaybeClipped i0
320 else addMaybeClipped i0
308 | s < i0Dim ->
321 | s < i0Dim ->
@@ -311,10 +324,10 @@ addMaybeClippedJoin name skip remaining offset i0Dim i0 i1 size = do
311 then addMaybeClipped i0
324 then addMaybeClipped i0
312 else do
325 else do
313 addMaybeClipped i0
326 addMaybeClipped i0
314− put $ state & offset %~ (+ i0Dim') & remaining %~ subtract i0Dim' & skip .~ 0
327+ put $ state & offset +~ i0Dim' & remaining -~ i0Dim' & skip .~ 0
315 addMaybeClipped i1
328 addMaybeClipped i1
316 | s >= i0Dim -> do
329 | s >= i0Dim -> do
317− put $ state & skip %~ subtract i0Dim
330+ put $ state & skip -~ i0Dim
318 addMaybeClipped i1
331 addMaybeClipped i1
319 _ -> fail $ name ++ " has unhandled skip class"
332 _ -> fail $ name ++ " has unhandled skip class"
320
333
@@ -323,14 +336,14 @@ addUnclippedText a txt = do
323 let op = TextSpan a usedDisplayColumns
336 let op = TextSpan a usedDisplayColumns
324 (fromIntegral $ TL.length txt)
337 (fromIntegral $ TL.length txt)
325 txt
338 txt
326− usedDisplayColumns = wctlwidth txt
339+ usedDisplayColumns = wcswidth $ TL.unpack txt
327 use rowOffset >>= snocOp op
340 use rowOffset >>= snocOp op
328
341
329addRowCompletion :: DisplayRegion -> Int -> BlitM s ()
342addRowCompletion :: DisplayRegion -> Int -> BlitM s ()
330addRowCompletion displayRegion row = do
343addRowCompletion displayRegion row = do
331 allRowOps <- view mrowOps
344 allRowOps <- view mrowOps
332 rowOps <- lift $ lift $ MVector.read allRowOps row
345 rowOps <- lift $ lift $ MVector.read allRowOps row
333− let endX = spanOpsAffectedColumns rowOps
346+ let endX = spanOpsEffectedColumns rowOps
334 when (endX < regionWidth displayRegion) $ do
347 when (endX < regionWidth displayRegion) $ do
335 let ow = regionWidth displayRegion - endX
348 let ow = regionWidth displayRegion - endX
336 snocOp (Skip ow) row
349 snocOp (Skip ow) row
@@ -343,6 +356,12 @@ snocOp !op !row = do
343 lift $ lift $ do
356 lift $ lift $ do
344 ops <- MVector.read theMrowOps row
357 ops <- MVector.read theMrowOps row
345 let ops' = Vector.snoc ops op
358 let ops' = Vector.snoc ops op
346− when (spanOpsAffectedColumns ops' > regionWidth theRegion)
359+ when (spanOpsEffectedColumns ops' > regionWidth theRegion)
347 $ fail $ "row " ++ show row ++ " now exceeds region width"
360 $ fail $ "row " ++ show row ++ " now exceeds region width"
348 MVector.write theMrowOps row ops'
361 MVector.write theMrowOps row ops'
362+
363+(-~) :: Num a => ASetter s t a a -> a -> s -> t
364+l -~ n = over l (subtract n)
365+
366+(+~) :: Num a => ASetter s t a a -> a -> s -> t
367+l +~ n = over l (n +)
src/Graphics/Vty/Prelude.hsnew file+18
@@ -0,0 +1,18 @@
1+-- | Prelude for Vty modules. Not particularly useful outside of Vty.
2+module Graphics.Vty.Prelude ( module Graphics.Vty.Prelude
3+ , module Control.Applicative
4+ , module Control.Monad
5+ )
6+where
7+
8+import Control.Applicative hiding ((<|>))
9+import Control.Monad
10+
11+-- | Named alias for a Int pair
12+type DisplayRegion = (Int,Int)
13+
14+regionWidth :: DisplayRegion -> Int
15+regionWidth = fst
16+
17+regionHeight :: DisplayRegion -> Int
18+regionHeight = snd
src/Graphics/Vty/Span.hs+55−46
@@ -1,15 +1,23 @@
1-- Copyright Corey O'Connor
1-- Copyright Corey O'Connor
2+{-# LANGUAGE BangPatterns #-}
3+{-# LANGUAGE NamedFieldPuns #-}
2{-# LANGUAGE GADTs #-}
4{-# LANGUAGE GADTs #-}
3−-- | A picture is translated into a sequences of state changes and
5+{- | A picture is translated into a sequences of state changes and character spans.
4−-- character spans. The attribute is applied to all following spans,
6+ - State changes are currently limited to new attribute values. The attribute is applied to all
5−-- including spans of the next row. The nth element of the sequence
7+ - following spans. Including spans of the next row. The nth element of the sequence represents the
6−-- represents the nth row (from top to bottom) of the picture to render.
8+ - nth row (from top to bottom) of the picture to render.
7−--
9+ -
8−-- A span op sequence will be defined for all rows and columns (and no
10+ - A span op sequence will be defined for all rows and columns (and no more) of the region provided
9−-- more) of the region provided with the picture to 'spansForPic'.
11+ - with the picture to `spansForPic`.
12+ -
13+ - todo: Partition attribute changes into multiple categories according to the serialized
14+ - representation of the various attributes.
15+ -}
10−module Graphics.Vty.Span where
16+module Graphics.Vty.Span
17+ where
18+
19+import Graphics.Vty.Prelude
11
20
12−import Graphics.Vty.Attributes (Attr)
13import Graphics.Vty.Image
21import Graphics.Vty.Image
14import Graphics.Vty.Image.Internal ( clipText )
22import Graphics.Vty.Image.Internal ( clipText )
15
23
@@ -17,40 +25,40 @@ import qualified Data.Text.Lazy as TL
17import Data.Vector (Vector)
25import Data.Vector (Vector)
18import qualified Data.Vector as Vector
26import qualified Data.Vector as Vector
19
27
20−-- | This represents an operation on the terminal: either an attribute
28+-- | This represents an operation on the terminal. Either an attribute change or the output of a
21−-- change or the output of a text string.
29+-- text string.
22data SpanOp =
30data SpanOp =
23− -- | A span of UTF-8 text occupies a specific number of screen space
31+ -- | a span of UTF-8 text occupies a specific number of screen space columns. A single UTF
24− -- columns. A single UTF character does not necessarily represent 1
25− -- colunm. See Codec.Binary.UTF8.Width TextSpan [Attr] [output width
32+ -- character does not necessarially represent 1 colunm. See Codec.Binary.UTF8.Width
26− -- in columns] [number of characters] [data]
33+ -- TextSpan [Attr] [output width in columns] [number of characters] [data]
27− TextSpan
34+ TextSpan
28 { textSpanAttr :: !Attr
35 { textSpanAttr :: !Attr
29 , textSpanOutputWidth :: !Int
36 , textSpanOutputWidth :: !Int
30 , textSpanCharWidth :: !Int
37 , textSpanCharWidth :: !Int
31 , textSpanText :: DisplayText
38 , textSpanText :: DisplayText
32 }
39 }
33− -- | Skips the given number of columns.
40+ -- | Skips the given number of columns
41+ -- A skip is transparent.... maybe? I am not sure how attribute changes interact.
42+ -- todo: separate from this type.
34 | Skip !Int
43 | Skip !Int
35− -- | Marks the end of a row. Specifies how many columns are
44+ -- | Marks the end of a row. specifies how many columns are remaining. These columns will not be
36− -- remaining. These columns will not be explicitly overwritten with
37− -- the span ops. The terminal is require to assure the remaining
45+ -- explicitly overwritten with the span ops. The terminal is require to assure the remaining
38 -- columns are clear.
46 -- columns are clear.
47+ -- todo: separate from this type.
39 | RowEnd !Int
48 | RowEnd !Int
40 deriving Eq
49 deriving Eq
41
50
42−-- | A vector of span operations executed in succession. This represents
51+-- | vector of span operations. executed in succession. This represents the operations required to
43−-- the operations required to render a row of the terminal. The
44−-- operations in one row may affect subsequent rows. For example,
52+-- render a row of the terminal. The operations in one row may effect subsequent rows.
45−-- setting the foreground color in one row will affect all subsequent
53+-- EG: Setting the foreground color in one row will effect all subsequent rows until the foreground
46−-- rows until the foreground color is changed.
54+-- color is changed.
47type SpanOps = Vector SpanOp
55type SpanOps = Vector SpanOp
48
56
49dropOps :: Int -> SpanOps -> SpanOps
57dropOps :: Int -> SpanOps -> SpanOps
50dropOps w = snd . splitOpsAt w
58dropOps w = snd . splitOpsAt w
51
59
52splitOpsAt :: Int -> SpanOps -> (SpanOps, SpanOps)
60splitOpsAt :: Int -> SpanOps -> (SpanOps, SpanOps)
53−splitOpsAt = splitOpsAt'
61+splitOpsAt inW inOps = splitOpsAt' inW inOps
54 where
62 where
55 splitOpsAt' 0 ops = (Vector.empty, ops)
63 splitOpsAt' 0 ops = (Vector.empty, ops)
56 splitOpsAt' remainingColumns ops = case Vector.head ops of
64 splitOpsAt' remainingColumns ops = case Vector.head ops of
@@ -81,9 +89,9 @@ splitOpsAt = splitOpsAt'
81 , Vector.cons (Skip (w - remainingColumns)) (Vector.tail ops)
89 , Vector.cons (Skip (w - remainingColumns)) (Vector.tail ops)
82 )
90 )
83 RowEnd _ -> error "cannot split ops containing a row end"
91 RowEnd _ -> error "cannot split ops containing a row end"
92+
84
93
85−-- | A vector of span operation vectors for display, one per row of the
94+-- | vector of span operation vectors for display. One per row of the output region.
86−-- output region.
87type DisplayOps = Vector SpanOps
95type DisplayOps = Vector SpanOps
88
96
89instance Show SpanOp where
97instance Show SpanOp where
@@ -91,39 +99,40 @@ instance Show SpanOp where
91 show (Skip ow) = "Skip(" ++ show ow ++ ")"
99 show (Skip ow) = "Skip(" ++ show ow ++ ")"
92 show (RowEnd ow) = "RowEnd(" ++ show ow ++ ")"
100 show (RowEnd ow) = "RowEnd(" ++ show ow ++ ")"
93
101
94−-- | The number of columns the DisplayOps are defined for.
102+-- | Number of columns the DisplayOps are defined for
95--
103--
96−-- All spans are verified to define same number of columns.
104+-- All spans are verified to define same number of columns. See: VerifySpanOps
97displayOpsColumns :: DisplayOps -> Int
105displayOpsColumns :: DisplayOps -> Int
98−displayOpsColumns ops
106+displayOpsColumns ops
99 | Vector.length ops == 0 = 0
107 | Vector.length ops == 0 = 0
100 | otherwise = Vector.length $ Vector.head ops
108 | otherwise = Vector.length $ Vector.head ops
101
109
102−-- | The number of rows the DisplayOps are defined for.
110+-- | Number of rows the DisplayOps are defined for
103displayOpsRows :: DisplayOps -> Int
111displayOpsRows :: DisplayOps -> Int
104−displayOpsRows = Vector.length
112+displayOpsRows ops = Vector.length ops
105
113
106−affectedRegion :: DisplayOps -> DisplayRegion
114+effectedRegion :: DisplayOps -> DisplayRegion
107−affectedRegion ops = (displayOpsColumns ops, displayOpsRows ops)
115+effectedRegion ops = (displayOpsColumns ops, displayOpsRows ops)
108
116
109−-- | The number of columns a SpanOps affects.
117+-- | The number of columns a SpanOps effects.
110−spanOpsAffectedColumns :: SpanOps -> Int
118+spanOpsEffectedColumns :: SpanOps -> Int
111−spanOpsAffectedColumns inOps = Vector.foldl' spanOpsAffectedColumns' 0 inOps
119+spanOpsEffectedColumns inOps = Vector.foldl' spanOpsEffectedColumns' 0 inOps
112− where
120+ where
113− spanOpsAffectedColumns' t (TextSpan _ w _ _ ) = t + w
121+ spanOpsEffectedColumns' t (TextSpan _ w _ _ ) = t + w
114− spanOpsAffectedColumns' t (Skip w) = t + w
122+ spanOpsEffectedColumns' t (Skip w) = t + w
115− spanOpsAffectedColumns' t (RowEnd w) = t + w
123+ spanOpsEffectedColumns' t (RowEnd w) = t + w
116
124
117−-- | The width of a single SpanOp in columns.
125+-- | The width of a single SpanOp in columns
118spanOpHasWidth :: SpanOp -> Maybe (Int, Int)
126spanOpHasWidth :: SpanOp -> Maybe (Int, Int)
119spanOpHasWidth (TextSpan _ ow cw _) = Just (cw, ow)
127spanOpHasWidth (TextSpan _ ow cw _) = Just (cw, ow)
120spanOpHasWidth (Skip ow) = Just (ow,ow)
128spanOpHasWidth (Skip ow) = Just (ow,ow)
121spanOpHasWidth (RowEnd ow) = Just (ow,ow)
129spanOpHasWidth (RowEnd ow) = Just (ow,ow)
122
130
123−-- | The number of columns to the character at the given position in the
131+-- | returns the number of columns to the character at the given position in the span op
124−-- span op.
125columnsToCharOffset :: Int -> SpanOp -> Int
132columnsToCharOffset :: Int -> SpanOp -> Int
126columnsToCharOffset cx (TextSpan _ _ _ utf8Str) =
133columnsToCharOffset cx (TextSpan _ _ _ utf8Str) =
127− wctlwidth (TL.take (fromIntegral cx) utf8Str)
134+ let str = TL.unpack utf8Str
135+ in wcswidth (take cx str)
128columnsToCharOffset cx (Skip _) = cx
136columnsToCharOffset cx (Skip _) = cx
129columnsToCharOffset cx (RowEnd _) = cx
137columnsToCharOffset cx (RowEnd _) = cx
138+
src/Graphics/Vty/UnicodeWidthTable/IO.hsdeleted−105
@@ -1,105 +0,0 @@
1−{-# LANGUAGE CPP #-}
2−module Graphics.Vty.UnicodeWidthTable.IO
3− ( readUnicodeWidthTable
4− , parseUnicodeWidthTable
5− , writeUnicodeWidthTable
6− )
7−where
8−
9−import Control.Monad (when, forM)
10−import Data.Binary
11−import Data.Binary.Get
12−import Data.Binary.Put
13−import qualified Data.ByteString.Lazy as BSL
14−#if !(MIN_VERSION_base(4,11,0))
15−import Data.Semigroup ((<>))
16−#endif
17−
18−import Graphics.Vty.UnicodeWidthTable.Types
19−
20−-- | Load a binary unicode width table from the specified file.
21−--
22−-- This either returns a successfully parsed table or a table parsing
23−-- error message. This does not handle I/O exceptions.
24−readUnicodeWidthTable :: FilePath -> IO (Either String UnicodeWidthTable)
25−readUnicodeWidthTable path = parseUnicodeWidthTable <$> BSL.readFile path
26−
27−-- | Parse a binary unicode width table.
28−parseUnicodeWidthTable :: BSL.ByteString -> Either String UnicodeWidthTable
29−parseUnicodeWidthTable bs =
30− case runGetOrFail tableParser bs of
31− Left (_, _, msg) ->
32− Left msg
33−
34− -- Even if we parsed a table, leftover bytes indicate something
35− -- could be wrong.
36− Right (remainingBytes, _, _) | not (BSL.null remainingBytes) ->
37− Left $ "Error: " <> show (BSL.length remainingBytes) <>
38− " byte(s) left unconsumed"
39−
40− Right (_, _, table) ->
41− Right table
42−
43−-- | Write the unicode width table to the specified path.
44−--
45−-- This does not handle I/O exceptions.
46−writeUnicodeWidthTable :: FilePath -> UnicodeWidthTable -> IO ()
47−writeUnicodeWidthTable path table = do
48− let body = runPut (tableV1Writer table)
49− BSL.writeFile path body
50−
51−-- | Width table magic bytes for use in the binary format.
52−widthTableMagic :: Word32
53−widthTableMagic = 0xc1a9f7e0
54−
55−tableParser :: Get UnicodeWidthTable
56−tableParser = do
57− magic <- getWord32le
58−
59− when (magic /= widthTableMagic) $
60− fail "Table magic number invalid"
61−
62− version <- getWord8
63−
64− case version of
65− 1 -> tableV1Parser
66− _ -> fail "Table version invalid"
67−
68−tableV1Parser :: Get UnicodeWidthTable
69−tableV1Parser = do
70− numRanges <- getWord32le
71−
72− let parseRange = do
73− start <- getWord32le
74− size <- getWord32le
75− cols <- getWord8
76− return WidthTableRange { rangeStart = start
77− , rangeSize = size
78− , rangeColumns = cols
79− }
80−
81− ranges <- forM [1..numRanges] $ const parseRange
82−
83− return UnicodeWidthTable { unicodeWidthTableRanges = ranges
84− }
85−
86−tableV1Writer :: UnicodeWidthTable -> Put
87−tableV1Writer table = do
88− -- Magic bytes
89− putWord32le widthTableMagic
90−
91− -- Version
92− putWord8 1
93−
94− -- Number of ranges
95− let ranges = unicodeWidthTableRanges table
96− let numRanges = length ranges
97− putWord32le (fromIntegral numRanges)
98−
99− -- Ranges
100− let putRange r = do
101− putWord32le $ rangeStart r
102− putWord32le $ rangeSize r
103− putWord8 $ rangeColumns r
104−
105− mapM_ putRange ranges
src/Graphics/Vty/UnicodeWidthTable/Install.hsdeleted−129
@@ -1,129 +0,0 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE ForeignFunctionInterface #-}
3−module Graphics.Vty.UnicodeWidthTable.Install
4− ( TableInstallException(..)
5− , installUnicodeWidthTable
6− , isCustomTableReady
7− )
8−where
9−
10−import Control.Monad (when, forM_)
11−import qualified Control.Exception as E
12−import GHC.Conc.Sync (withMVar)
13−import Control.Concurrent.MVar (MVar, newMVar)
14−import Data.Word (Word8, Word32)
15−#if !(MIN_VERSION_base(4,11,0))
16−import Data.Semigroup ((<>))
17−#endif
18−import System.IO.Unsafe (unsafePerformIO)
19−
20−import Graphics.Vty.UnicodeWidthTable.Types
21−
22−-- | The lock used to make functions in this module thread-safe.
23−installLock :: MVar ()
24−{-# NOINLINE installLock #-}
25−installLock = unsafePerformIO $ newMVar ()
26−
27−-- | Returns True if and only if a custom table has been allocated and
28−-- marked as ready for use.
29−--
30−-- This function is thread-safe.
31−isCustomTableReady :: IO Bool
32−isCustomTableReady = withInstallLock $ (== 1) <$> c_isCustomTableReady
33−
34−withInstallLock :: IO a -> IO a
35−withInstallLock act = withMVar installLock $ const act
36−
37−-- This is the size of the allocated custom character width table, in
38−-- character slots. It's important that this be large enough to hold all
39−-- possible Unicode character values. At the time of this writing, the
40−-- valid Unicode range is 0 - 0x10ffff, hence this value.
41−tableSize :: Int
42−tableSize = 0x110000
43−
44−-- | Exception type raised by 'installUnicodeWidthTable'.
45−data TableInstallException =
46− TableInitFailure Int Int
47− -- ^ The width table could not be initialized. Args: failure status,
48− -- requested table size.
49− | TableRangeFailure Int WidthTableRange
50− -- ^ A code point range could not be configured. Args: failure
51− -- status, offending range.
52− | TableActivationFailure Int
53− -- ^ The table could not be activated. Args: failure status.
54− deriving (Eq, Show)
55−
56−instance E.Exception TableInstallException
57−
58−-- | Install a custom unicode character width
59−-- table. Such tables are obtained with
60−-- 'Graphics.Vty.UnicodeWidthTable.Query.buildUnicodeWidthTable' and
61−-- 'Graphics.Vty.UnicodeWidthTable.IO.readUnicodeWidthTable'.
62−--
63−-- ALERT! This function is probably not what you want to use because
64−-- it is automatically called by 'Graphics.Vty.mkVty'. You will only
65−-- ever need to call this function if you want to use functions
66−-- in 'Graphics.Text.Width' without controlling the terminal with
67−-- 'Graphics.Vty.mkVty'.
68−--
69−-- This affects the behavior of the 'Graphics.Vty.Image.wcwidth'
70−-- function and functions that call it. It does so by
71−-- changing global state available to the C implementation
72−-- of 'Graphics.Vty.Image.wcwidth'. To ensure that your
73−-- program gets consistent results from evaluating calls to
74−-- 'Graphics.Vty.Image.wcwidth', the installation of a custom table
75−-- should be performed before you call 'Graphics.Vty.Image.wcwidth' in
76−-- your program.
77−--
78−-- This is best done at Vty startup, and if you use
79−-- 'Graphics.Vty.mkVty', that function calls this automatically based on
80−-- the Vty configuration's declared width tables. It is exposed as part
81−-- of the public API so that applications can call this as needed if
82−-- they don't want to control the terminal with 'mkVty' but do want to
83−-- make calls to 'Graphics.Vty.Image.wcwidth'.
84−--
85−-- It's also important to note that once a custom table has been
86−-- installed, it is permanent for the life of the process. No new table
87−-- can be installed, and the new custom table cannot be removed.
88−--
89−-- If this function fails for any reason -- if the table cannot be
90−-- installed or is invalid, or if a custom table already exists -- this
91−-- will raise a 'TableInstallException' exception.
92−--
93−-- This function is thread-safe.
94−installUnicodeWidthTable :: UnicodeWidthTable -> IO ()
95−installUnicodeWidthTable table = withInstallLock $ do
96− initResult <- initCustomTable tableSize
97− when (initResult /= 0) $
98− E.throwIO $ TableInitFailure initResult tableSize
99−
100− forM_ (unicodeWidthTableRanges table) $ \r -> do
101− result <- setCustomTableRange (rangeStart r)
102− (rangeSize r)
103− (rangeColumns r)
104−
105− when (result /= 0) $ do
106− deallocateCustomTable
107− E.throwIO $ TableRangeFailure result r
108−
109− actResult <- activateCustomTable
110− when (actResult /= 0) $
111− E.throwIO $ TableActivationFailure actResult
112−
113−------------------------------------------------------------------------
114−-- C imports
115−
116−foreign import ccall unsafe "vty_init_custom_table"
117− initCustomTable :: Int -> IO Int
118−
119−foreign import ccall unsafe "vty_set_custom_table_range"
120− setCustomTableRange :: Word32 -> Word32 -> Word8 -> IO Int
121−
122−foreign import ccall unsafe "vty_activate_custom_table"
123− activateCustomTable :: IO Int
124−
125−foreign import ccall unsafe "vty_custom_table_ready"
126− c_isCustomTableReady :: IO Int
127−
128−foreign import ccall unsafe "vty_deallocate_custom_table"
129− deallocateCustomTable :: IO ()
src/Graphics/Vty/UnicodeWidthTable/Query.hsdeleted−79
@@ -1,79 +0,0 @@
1−{-# LANGUAGE TupleSections #-}
2−module Graphics.Vty.UnicodeWidthTable.Query
3− ( buildUnicodeWidthTable
4− , defaultUnicodeTableUpperBound
5− )
6−where
7−
8−import Control.Monad (forM)
9−import Data.Char (generalCategory, GeneralCategory(..))
10−import System.Console.ANSI (getCursorPosition)
11−import Text.Printf (printf)
12−
13−import Graphics.Vty.UnicodeWidthTable.Types
14−
15−shouldConsider :: Char -> Bool
16−shouldConsider c =
17− case generalCategory c of
18− Control -> False
19− NotAssigned -> False
20− Surrogate -> False
21− _ -> True
22−
23−charWidth :: Char -> IO Int
24−charWidth c = do
25− printf "\r"
26− putChar c
27− Just (_, col) <- getCursorPosition
28− return col
29−
30−-- | Convert a sequence of character/width pairs into a list of
31−-- run-length encoded ranges. This function assumes the pairs come
32−-- sorted by character ordinal value. It does not require that the
33−-- character range is fully covered by the sequence.
34−--
35−-- The result of this function is a list of ranges in reverse order
36−-- relative to the input sequence.
37−mkRanges :: [(Char, Int)] -> [WidthTableRange]
38−mkRanges pairs =
39− let convertedPairs = convert <$> pairs
40− convert (c, i) = (fromIntegral $ fromEnum c, fromIntegral i)
41−
42− go Nothing finishedRanges [] = finishedRanges
43− go (Just r) finishedRanges [] = r:finishedRanges
44−
45− go Nothing finishedRanges ((c, width):rest) =
46− go (Just $ WidthTableRange c 1 width) finishedRanges rest
47−
48− go (Just r@(WidthTableRange prevCh sz prevWidth)) finishedRanges ((c, width):rest) =
49− if c == prevCh + sz && prevWidth == width
50− then go (Just (WidthTableRange prevCh (sz + 1) prevWidth)) finishedRanges rest
51− else go (Just (WidthTableRange c 1 width)) (r:finishedRanges) rest
52−
53− in go Nothing [] convertedPairs
54−
55−-- The uppermost code point to consider when building Unicode width
56−-- tables.
57−defaultUnicodeTableUpperBound :: Char
58−defaultUnicodeTableUpperBound = '\xe0000'
59−
60−-- | Construct a unicode character width table by querying the terminal
61−-- connected to stdout. This works by emitting characters to stdout
62−-- and then querying the terminal to determine the resulting cursor
63−-- position in order to measure character widths. Consequently this will
64−-- generate a lot of output and may take a while, depending on your
65−-- system performance. This should not be run in a terminal while it is
66−-- controlled by Vty.
67−--
68−-- The argument specifies the upper bound code point to test when
69−-- building the table. This allows callers to decide how much of the
70−-- Unicode code point space to scan when building the table.
71−--
72−-- This does not handle exceptions.
73−buildUnicodeWidthTable :: Char -> IO UnicodeWidthTable
74−buildUnicodeWidthTable tableUpperBound = do
75− pairs <- forM (filter shouldConsider ['\0'..tableUpperBound]) $ \i ->
76− (i,) <$> charWidth i
77−
78− return UnicodeWidthTable { unicodeWidthTableRanges = reverse $ mkRanges pairs
79− }
src/Graphics/Vty/UnicodeWidthTable/Types.hsdeleted−29
@@ -1,29 +0,0 @@
1−module Graphics.Vty.UnicodeWidthTable.Types
2− ( UnicodeWidthTable(..)
3− , WidthTableRange(..)
4− )
5−where
6−
7−import Data.Word (Word8, Word32)
8−
9−-- | A range of code points in a width table.
10−data WidthTableRange =
11− WidthTableRange { rangeStart :: Word32
12− -- ^ The range's starting code point.
13− , rangeSize :: Word32
14− -- ^ The number of code points in the contiguous
15− -- range, beginning with the starting code point
16− -- ('rangeStart').
17− , rangeColumns :: Word8
18− -- ^ The terminal width, in columns, of all of the
19− -- characters corresponding to the code points in
20− -- this range.
21− }
22− deriving (Eq, Show)
23−
24−-- | A run-length-encoded table of Unicode character widths.
25−data UnicodeWidthTable =
26− UnicodeWidthTable { unicodeWidthTableRanges :: [WidthTableRange]
27− -- ^ The ranges in the table.
28− }
29− deriving (Show)
test/BenchImageFuzz.hs+3−1
@@ -8,6 +8,8 @@ import Verify
8import Control.Applicative
8import Control.Applicative
9import Control.Monad
9import Control.Monad
10
10
11+import Data.Default (def)
12+
11import System.Random
13import System.Random
12
14
13rand :: Arbitrary a => IO a
15rand :: Arbitrary a => IO a
@@ -19,7 +21,7 @@ randomImage = rand
19randomPicture = picForImage <$> randomImage
21randomPicture = picForImage <$> randomImage
20
22
21bench0 = do
23bench0 = do
22− vty <- mkVty defaultConfig
24+ vty <- mkVty def
23 (w,h) <- displayBounds $ outputIface vty
25 (w,h) <- displayBounds $ outputIface vty
24 let pictures = replicateM 3000 randomPicture
26 let pictures = replicateM 3000 randomPicture
25 bench ps = do
27 bench ps = do
test/BenchNoDiffOpt.hs+4−3
@@ -9,16 +9,17 @@ import Control.Concurrent( threadDelay )
9import Control.Monad( liftM2 )
9import Control.Monad( liftM2 )
10
10
11import qualified Data.ByteString.Char8 as B
11import qualified Data.ByteString.Char8 as B
12+import Data.Default (def)
12import Data.List
13import Data.List
13
14
14import System.Environment( getArgs )
15import System.Environment( getArgs )
15import System.IO
16import System.IO
16import System.Random
17import System.Random
17
18
18−bench0 = do
19+bench0 = do
19 let fixedGen = mkStdGen 0
20 let fixedGen = mkStdGen 0
20 setStdGen fixedGen
21 setStdGen fixedGen
21− vty <- mkVty defaultConfig
22+ vty <- mkVty def
22 (w,h) <- displayBounds $ outputIface vty
23 (w,h) <- displayBounds $ outputIface vty
23 let images = return $ (image0, image1)
24 let images = return $ (image0, image1)
24 image0 = charFill defAttr 'X' w h
25 image0 = charFill defAttr 'X' w h
@@ -28,7 +29,7 @@ bench0 = do
28 shutdown vty
29 shutdown vty
29 return $ Bench images bench
30 return $ Bench images bench
30
31
31−flipOut vty n image0 image1 =
32+flipOut vty n image0 image1 =
32 let !pLeft = picForImage image0
33 let !pLeft = picForImage image0
33 !pRight = picForImage image1
34 !pRight = picForImage image1
34 wLeft 0 = return ()
35 wLeft 0 = return ()
test/BenchRenderChar.hs+9−7
@@ -1,7 +1,7 @@
1−-- benchmarks composing images using the renderChar operation. This is
1+{- benchmarks composing images using the renderChar operation.
2−-- what Yi uses in Yi.UI.Vty.drawText. Ideally a sequence of renderChar
2+ - This is what Yi uses in Yi.UI.Vty.drawText. Ideally a sequence of renderChar images horizontally
3−-- images horizontally composed should provide no worse performance than
3+ - composed should provide no worse performance than a fill render op.
4−-- a fill render op.
4+ -}
5module BenchRenderChar where
5module BenchRenderChar where
6
6
7import Graphics.Vty
7import Graphics.Vty
@@ -9,8 +9,10 @@ import Verify
9
9
10import Control.Monad ( forM_ )
10import Control.Monad ( forM_ )
11
11
12+import Data.Default (def)
13+
12bench0 = do
14bench0 = do
13− vty <- mkVty defaultConfig
15+ vty <- mkVty def
14 (w,h) <- displayBounds $ outputIface vty
16 (w,h) <- displayBounds $ outputIface vty
15 let testChars = return $ take 500 $ cycle $ [ c | c <- ['a'..'z']]
17 let testChars = return $ take 500 $ cycle $ [ c | c <- ['a'..'z']]
16 bench d = do
18 bench d = do
@@ -21,12 +23,12 @@ bench0 = do
21 shutdown vty
23 shutdown vty
22 return $ Bench testChars bench
24 return $ Bench testChars bench
23
25
24−testImageUsingChar c w h
26+testImageUsingChar c w h
25 = vertCat $ replicate (fromIntegral h)
27 = vertCat $ replicate (fromIntegral h)
26 $ horizCat $ map (char defAttr) (replicate (fromIntegral w) c)
28 $ horizCat $ map (char defAttr) (replicate (fromIntegral w) c)
27
29
28bench1 = do
30bench1 = do
29− vty <- mkVty defaultConfig
31+ vty <- mkVty def
30 (w,h) <- displayBounds $ outputIface vty
32 (w,h) <- displayBounds $ outputIface vty
31 let testChars = return $ take 500 $ cycle $ [ c | c <- ['a'..'z']]
33 let testChars = return $ take 500 $ cycle $ [ c | c <- ['a'..'z']]
32 bench d = do
34 bench d = do
test/BenchVerticalScroll.hs+6−4
@@ -6,6 +6,7 @@ import Verify
6import Control.Concurrent( threadDelay )
6import Control.Concurrent( threadDelay )
7import Control.Monad( liftM2 )
7import Control.Monad( liftM2 )
8
8
9+import Data.Default (def)
9import Data.List
10import Data.List
10import Data.Word
11import Data.Word
11
12
@@ -13,10 +14,10 @@ import System.Environment( getArgs )
13import System.IO
14import System.IO
14import System.Random
15import System.Random
15
16
16−bench0 = do
17+bench0 = do
17 let fixedGen = mkStdGen 0
18 let fixedGen = mkStdGen 0
18 setStdGen fixedGen
19 setStdGen fixedGen
19− return $ Bench (return ()) (\() -> mkVty defaultConfig >>= liftM2 (>>) run shutdown)
20+ return $ Bench (return ()) (\() -> mkVty def >>= liftM2 (>>) run shutdown)
20
21
21run vt = mapM_ (\p -> update vt p) . benchgen =<< displayBounds (outputIface vt)
22run vt = mapM_ (\p -> update vt p) . benchgen =<< displayBounds (outputIface vt)
22
23
@@ -48,12 +49,13 @@ pad :: Int -> Image -> Image
48pad ml img = img <|> charFill defAttr ' ' (ml - imageWidth img) 1
49pad ml img = img <|> charFill defAttr ' ' (ml - imageWidth img) 1
49
50
50clines :: StdGen -> Int -> [Image]
51clines :: StdGen -> Int -> [Image]
51−clines g maxll = map (pad maxll . horizCat . map (uncurry string))
52+clines g maxll = map (pad maxll . horizCat . map (uncurry string))
52 $ fold (length . snd) (lengths maxll g1) (nums g2)
53 $ fold (length . snd) (lengths maxll g1) (nums g2)
53 where (g1,g2) = split g
54 where (g1,g2) = split g
54
55
55benchgen :: DisplayRegion -> [Picture]
56benchgen :: DisplayRegion -> [Picture]
56−benchgen (w,h)
57+benchgen (w,h)
57 = take 2000 $ map ((\i -> picForImage i) . vertCat . take (fromEnum h))
58 = take 2000 $ map ((\i -> picForImage i) . vertCat . take (fromEnum h))
58 $ tails
59 $ tails
59 $ clines (mkStdGen 80) w
60 $ clines (mkStdGen 80) w
61+
test/ControlTable.hs+1−1
@@ -5,7 +5,7 @@ import Graphics.Vty.ControlStrings
5import System.Console.Terminfo
5import System.Console.Terminfo
6
6
7main = do
7main = do
8− terminal <- setupTermFromEnv
8+ terminal <- setupTermFromEnv
9 controlTable <- init_controlTable terminal
9 controlTable <- init_controlTable terminal
10 putStrLn $ "ANSI terminal show cursor string: " ++ show cvis
10 putStrLn $ "ANSI terminal show cursor string: " ++ show cvis
11 putStrLn $ "Current terminal show cursor string: " ++ show (showCursorStr controlTable)
11 putStrLn $ "Current terminal show cursor string: " ++ show (showCursorStr controlTable)
test/EventEcho.hs+2−1
@@ -6,6 +6,7 @@ import Control.Applicative
6import Control.Arrow
6import Control.Arrow
7import Control.Monad.RWS
7import Control.Monad.RWS
8
8
9+import Data.Default (def)
9import Data.Sequence (Seq, (<|) )
10import Data.Sequence (Seq, (<|) )
10import qualified Data.Sequence as Seq
11import qualified Data.Sequence as Seq
11import Data.Foldable
12import Data.Foldable
@@ -15,7 +16,7 @@ eventBufferSize = 1000
15type App = RWST Vty () (Seq String) IO
16type App = RWST Vty () (Seq String) IO
16
17
17main = do
18main = do
18− vty <- mkVty defaultConfig
19+ vty <- mkVty def
19 _ <- execRWST (vtyInteract False) vty Seq.empty
20 _ <- execRWST (vtyInteract False) vty Seq.empty
20 shutdown vty
21 shutdown vty
21
22
test/HereDoc.hs+4−2
@@ -1,7 +1,8 @@
1{-# LANGUAGE QuasiQuotes #-}
1{-# LANGUAGE QuasiQuotes #-}
2{-# LANGUAGE TemplateHaskell #-}
2{-# LANGUAGE TemplateHaskell #-}
3−-- From http://www.reddit.com/r/haskell/comments/8ereh/a_here_document_syntax/
3+{- From http://www.reddit.com/r/haskell/comments/8ereh/a_here_document_syntax/
4−-- copyright unknown?
4+ - copyright unknown?
5+ -}
5module HereDoc (heredoc) where
6module HereDoc (heredoc) where
6
7
7import Language.Haskell.TH.Quote
8import Language.Haskell.TH.Quote
@@ -10,3 +11,4 @@ import Language.Haskell.TH.Lib
10
11
11heredoc :: QuasiQuoter
12heredoc :: QuasiQuoter
12heredoc = QuasiQuoter (litE . stringL) (litP . stringL) undefined undefined
13heredoc = QuasiQuoter (litE . stringL) (litP . stringL) undefined undefined
14+
test/Issue18.hs+6−4
@@ -1,4 +1,5 @@
1−module Main where
1+module Main
2+ where
2
3
3import Graphics.Vty
4import Graphics.Vty
4import Graphics.Vty.Debug
5import Graphics.Vty.Debug
@@ -12,8 +13,8 @@ main = do
12 play vty sx sy
13 play vty sx sy
13
14
14play :: Vty -> Int -> Int -> IO ()
15play :: Vty -> Int -> Int -> IO ()
15−play vty sx sy =
16+play vty sx sy =
16− let
17+ let
17 testScreen = pic {
18 testScreen = pic {
18 pCursor = NoCursor
19 pCursor = NoCursor
19 , pImage = box 10 10 }
20 , pImage = box 10 10 }
@@ -30,5 +31,6 @@ box w h =
30 vertLine = renderFill attr '|' 1 (h - 2)
31 vertLine = renderFill attr '|' 1 (h - 2)
31 horizLine = corner <|> renderHFill attr '-' (w - 2) <|> corner
32 horizLine = corner <|> renderHFill attr '-' (w - 2) <|> corner
32 centerArea = vertLine <|> renderFill attr 'X' (w - 2) (h - 2) <|> vertLine
33 centerArea = vertLine <|> renderFill attr 'X' (w - 2) (h - 2) <|> vertLine
33− in
34+ in
34 horizLine <-> centerArea <-> horizLine
35 horizLine <-> centerArea <-> horizLine
36+
test/Makefile+2−2
@@ -45,7 +45,7 @@ all : $(VERIF_TESTS)
45
45
46.PHONY: $(TESTS)
46.PHONY: $(TESTS)
47.SECONDEXPANSION:
47.SECONDEXPANSION:
48−$(TESTS) :
48+$(TESTS) :
49 @echo running test $@
49 @echo running test $@
50 @mkdir -p results/$@
50 @mkdir -p results/$@
51 ( ghc $(GHC_PROF_ARGS) $@ \
51 ( ghc $(GHC_PROF_ARGS) $@ \
@@ -54,7 +54,7 @@ $(TESTS) :
54 )
54 )
55
55
56.PHONY: interactive_terminal_test
56.PHONY: interactive_terminal_test
57−interactive_terminal_test :
57+interactive_terminal_test :
58 ghc $(GHC_ARGS) $@ && ./$@
58 ghc $(GHC_ARGS) $@ && ./$@
59
59
60.PHONY: core
60.PHONY: core
test/MinimalExample.hs+3−1
@@ -2,8 +2,10 @@ module Main where
2
2
3import Graphics.Vty
3import Graphics.Vty
4
4
5+import Data.Default
6+
5main = do
7main = do
6− vty <- mkVty defaultConfig
8+ vty <- mkVty def
7 let line0 = string (def `withForeColor` green) "first line"
9 let line0 = string (def `withForeColor` green) "first line"
8 line1 = string (def `withBackColor` blue) "second line"
10 line1 = string (def `withBackColor` blue) "second line"
9 img = line0 <-> line1
11 img = line0 <-> line1
test/Rogue.hs+3−1
@@ -1,8 +1,10 @@
1+{-# LANGUAGE TemplateHaskell #-}
1module Main where
2module Main where
2
3
3import Graphics.Vty
4import Graphics.Vty
4
5
5import Data.Array
6import Data.Array
7+import Data.Default (def)
6
8
7import Control.Applicative
9import Control.Applicative
8import Control.Monad
10import Control.Monad
@@ -41,7 +43,7 @@ type Coord = (Int, Int)
41
43
42main :: IO ()
44main :: IO ()
43main = do
45main = do
44− vty <- mkVty defaultConfig
46+ vty <- mkVty def
45 level0 <- mkLevel 1
47 level0 <- mkLevel 1
46 let world0 = World (Player (levelStart level0)) level0
48 let world0 = World (Player (levelStart level0)) level0
47 (_finalWorld, ()) <- execRWST play vty world0
49 (_finalWorld, ()) <- execRWST play vty world0
test/Test2.hs−1
@@ -1,5 +1,4 @@
1module Main where
1module Main where
2−
3import Graphics.Vty
2import Graphics.Vty
4
3
5main = do
4main = do
test/Verify.hs+31−20
@@ -1,29 +1,29 @@
1{-# LANGUAGE RankNTypes #-}
1{-# LANGUAGE RankNTypes #-}
2{-# LANGUAGE GADTs #-}
2{-# LANGUAGE GADTs #-}
3{-# LANGUAGE RecordWildCards #-}
3{-# LANGUAGE RecordWildCards #-}
4+{-# LANGUAGE CPP #-}
4{-# LANGUAGE TypeSynonymInstances #-}
5{-# LANGUAGE TypeSynonymInstances #-}
5{-# LANGUAGE FlexibleInstances #-}
6{-# LANGUAGE FlexibleInstances #-}
6{-# LANGUAGE StandaloneDeriving #-}
7{-# LANGUAGE StandaloneDeriving #-}
7{-# LANGUAGE DisambiguateRecordFields #-}
8{-# LANGUAGE DisambiguateRecordFields #-}
8{-# LANGUAGE NamedFieldPuns #-}
9{-# LANGUAGE NamedFieldPuns #-}
9−module Verify
10+module Verify ( module Verify
10− ( module Verify
11− , module Control.Applicative
11+ , module Control.Applicative
12− , module Control.DeepSeq
12+ , module Control.DeepSeq
13− , module Control.Exception
13+ , module Control.Exception
14− , module Control.Monad
14+ , module Control.Monad
15− , module Test.QuickCheck
15+ , module Test.QuickCheck
16− , module Test.QuickCheck.Modifiers
16+ , module Test.QuickCheck.Modifiers
17− , module Text.Printf
17+ , module Text.Printf
18− , succeeded
18+ , succeeded
19− , failed
19+ , failed
20− , monadicIO
20+ , monadicIO
21− , liftIO
21+ , liftIO
22− , liftBool
22+ , liftBool
23− , Test(..)
23+ , Test(..)
24− , Prop.Result(..)
24+ , Prop.Result(..)
25− )
25+ )
26−where
26+ where
27
27
28import Control.Exception ( bracket, try, SomeException(..) )
28import Control.Exception ( bracket, try, SomeException(..) )
29
29
@@ -35,7 +35,7 @@ import qualified Test.QuickCheck as QC
35import Test.QuickCheck.Modifiers
35import Test.QuickCheck.Modifiers
36import Test.QuickCheck.Property hiding ( Result(..) )
36import Test.QuickCheck.Property hiding ( Result(..) )
37import qualified Test.QuickCheck.Property as Prop
37import qualified Test.QuickCheck.Property as Prop
38−import Test.QuickCheck.Monadic ( monadicIO )
38+import Test.QuickCheck.Monadic ( monadicIO )
39
39
40import Text.Printf
40import Text.Printf
41
41
@@ -56,7 +56,7 @@ verify testName p = Test $ TestInstance
56 case qcResult of
56 case qcResult of
57 QC.Success {..} -> return $ Finished TS.Pass
57 QC.Success {..} -> return $ Finished TS.Pass
58 QC.Failure {numShrinks,reason} -> return $ Finished
58 QC.Failure {numShrinks,reason} -> return $ Finished
59− $ TS.Fail $ "After "
59+ $ TS.Fail $ "After "
60 ++ show numShrinks ++ " shrinks determined failure to be: "
60 ++ show numShrinks ++ " shrinks determined failure to be: "
61 ++ show reason
61 ++ show reason
62 _ -> return $ Finished $ TS.Fail "TODO(corey): add failure message"
62 _ -> return $ Finished $ TS.Fail "TODO(corey): add failure message"
@@ -85,5 +85,16 @@ instance Arbitrary DoubleColumnChar where
85liftIOResult :: Testable prop => IO prop -> Property
85liftIOResult :: Testable prop => IO prop -> Property
86liftIOResult = ioProperty
86liftIOResult = ioProperty
87
87
88+#if __GLASGOW_HASKELL__ <= 701
89+instance Random Word where
90+ random g =
91+ let (i :: Int, g') = random g
92+ in (toEnum i, g')
93+ randomR (l,h) g =
94+ let (i :: Int, g') = randomR (fromEnum l,fromEnum h) g
95+ in (toEnum i, g')
96+#endif
97+
88data Bench where
98data Bench where
89 Bench :: forall v . NFData v => IO v -> (v -> IO ()) -> Bench
99 Bench :: forall v . NFData v => IO v -> (v -> IO ()) -> Bench
100+
test/Verify/Data/Terminfo/Parse.hs+17−17
@@ -1,8 +1,7 @@
1−module Verify.Data.Terminfo.Parse
1+module Verify.Data.Terminfo.Parse ( module Verify.Data.Terminfo.Parse
2− ( module Verify.Data.Terminfo.Parse
3− , module Data.Terminfo.Parse
2+ , module Data.Terminfo.Parse
4− )
3+ )
5−where
4+ where
6
5
7import Data.Terminfo.Parse
6import Data.Terminfo.Parse
8import Data.Terminfo.Eval
7import Data.Terminfo.Eval
@@ -20,22 +19,22 @@ data NonParamCapString = NonParamCapString String
20 deriving Show
19 deriving Show
21
20
22instance Arbitrary NonParamCapString where
21instance Arbitrary NonParamCapString where
23− arbitrary
22+ arbitrary
24 = ( do
23 = ( do
25 s <- listOf1 $ (choose (0, 255) >>= return . toEnum) `suchThat` (/= '%')
24 s <- listOf1 $ (choose (0, 255) >>= return . toEnum) `suchThat` (/= '%')
26 return $ NonParamCapString s
25 return $ NonParamCapString s
27− ) `suchThat` ( \(NonParamCapString str) -> length str < 255 )
26+ ) `suchThat` ( \(NonParamCapString str) -> length str < 255 )
28
27
29data LiteralPercentCap = LiteralPercentCap String [Word8]
28data LiteralPercentCap = LiteralPercentCap String [Word8]
30 deriving ( Show )
29 deriving ( Show )
31
30
32instance Arbitrary LiteralPercentCap where
31instance Arbitrary LiteralPercentCap where
33− arbitrary
32+ arbitrary
34 = ( do
33 = ( do
35 NonParamCapString s <- arbitrary
34 NonParamCapString s <- arbitrary
36 (s', bytes) <- insertEscapeOp "%" [toEnum $ fromEnum '%'] s
35 (s', bytes) <- insertEscapeOp "%" [toEnum $ fromEnum '%'] s
37 return $ LiteralPercentCap s' bytes
36 return $ LiteralPercentCap s' bytes
38− ) `suchThat` ( \(LiteralPercentCap str _) -> length str < 255 )
37+ ) `suchThat` ( \(LiteralPercentCap str _) -> length str < 255 )
39
38
40data IncFirstTwoCap = IncFirstTwoCap String [Word8]
39data IncFirstTwoCap = IncFirstTwoCap String [Word8]
41 deriving ( Show )
40 deriving ( Show )
@@ -46,7 +45,7 @@ instance Arbitrary IncFirstTwoCap where
46 NonParamCapString s <- arbitrary
45 NonParamCapString s <- arbitrary
47 (s', bytes) <- insertEscapeOp "i" [] s
46 (s', bytes) <- insertEscapeOp "i" [] s
48 return $ IncFirstTwoCap s' bytes
47 return $ IncFirstTwoCap s' bytes
49− ) `suchThat` ( \(IncFirstTwoCap str _) -> length str < 255 )
48+ ) `suchThat` ( \(IncFirstTwoCap str _) -> length str < 255 )
50
49
51data PushParamCap = PushParamCap String Int [Word8]
50data PushParamCap = PushParamCap String Int [Word8]
52 deriving ( Show )
51 deriving ( Show )
@@ -58,7 +57,7 @@ instance Arbitrary PushParamCap where
58 n <- choose (1,9)
57 n <- choose (1,9)
59 (s', bytes) <- insertEscapeOp ("p" ++ show n) [] s
58 (s', bytes) <- insertEscapeOp ("p" ++ show n) [] s
60 return $ PushParamCap s' n bytes
59 return $ PushParamCap s' n bytes
61− ) `suchThat` ( \(PushParamCap str _ _) -> length str < 255 )
60+ ) `suchThat` ( \(PushParamCap str _ _) -> length str < 255 )
62
61
63data DecPrintCap = DecPrintCap String Int [Word8]
62data DecPrintCap = DecPrintCap String Int [Word8]
64 deriving ( Show )
63 deriving ( Show )
@@ -70,7 +69,7 @@ instance Arbitrary DecPrintCap where
70 n <- choose (1,9)
69 n <- choose (1,9)
71 (s', bytes) <- insertEscapeOp ("p" ++ show n ++ "%d") [] s
70 (s', bytes) <- insertEscapeOp ("p" ++ show n ++ "%d") [] s
72 return $ DecPrintCap s' n bytes
71 return $ DecPrintCap s' n bytes
73− ) `suchThat` ( \(DecPrintCap str _ _) -> length str < 255 )
72+ ) `suchThat` ( \(DecPrintCap str _ _) -> length str < 255 )
74
73
75insertEscapeOp opStr replBytes s = do
74insertEscapeOp opStr replBytes s = do
76 insertPoints <- listOf1 $ elements [0 .. length s - 1]
75 insertPoints <- listOf1 $ elements [0 .. length s - 1]
@@ -93,20 +92,21 @@ bytesForRange cap offset count
93 = Vector.toList $ Vector.take count $ Vector.drop offset $ capBytes cap
92 = Vector.toList $ Vector.take count $ Vector.drop offset $ capBytes cap
94
93
95collectBytes :: CapExpression -> [Word8]
94collectBytes :: CapExpression -> [Word8]
96−collectBytes e = concat [ bytes
95+collectBytes e = concat [ bytes
97 | Bytes offset count <- capOps e
96 | Bytes offset count <- capOps e
98 , let bytes = bytesForRange e offset count
97 , let bytes = bytesForRange e offset count
99 ]
98 ]
100−
99+
101
100
102verifyBytesEqual :: [Word8] -> [Word8] -> Result
101verifyBytesEqual :: [Word8] -> [Word8] -> Result
103−verifyBytesEqual outBytes expectedBytes
102+verifyBytesEqual outBytes expectedBytes
104 = if outBytes == expectedBytes
103 = if outBytes == expectedBytes
105 then succeeded
104 then succeeded
106− else failed
105+ else failed
107− { reason = "outBytes ["
106+ { reason = "outBytes ["
108 ++ hexDump outBytes
107 ++ hexDump outBytes
109 ++ "] /= expectedBytes ["
108 ++ "] /= expectedBytes ["
110 ++ hexDump expectedBytes
109 ++ hexDump expectedBytes
111 ++ "]"
110 ++ "]"
112 }
111 }
112+
test/Verify/Graphics/Vty/Attributes.hs+7−7
@@ -1,8 +1,7 @@
1−module Verify.Graphics.Vty.Attributes
1+module Verify.Graphics.Vty.Attributes ( module Verify.Graphics.Vty.Attributes
2− ( module Verify.Graphics.Vty.Attributes
3− , module Graphics.Vty.Attributes
2+ , module Graphics.Vty.Attributes
4− )
3+ )
5−where
4+ where
6
5
7import Graphics.Vty.Attributes
6import Graphics.Vty.Attributes
8import Verify
7import Verify
@@ -41,8 +40,8 @@ allStyles =
41
40
42-- Limit the possible attributes to just a few for now.
41-- Limit the possible attributes to just a few for now.
43possibleAttrMods :: [ AttrOp ]
42possibleAttrMods :: [ AttrOp ]
44−possibleAttrMods =
43+possibleAttrMods =
45− [ idOp
44+ [ idOp
46 ] ++ map setForeColorOp allColors
45 ] ++ map setForeColorOp allColors
47 ++ map setBackColorOp allColors
46 ++ map setBackColorOp allColors
48 ++ map setStyleOp allStyles
47 ++ map setStyleOp allStyles
@@ -71,3 +70,4 @@ idOp = AttrOp "id" id
71
70
72applyOp :: AttrOp -> Attr -> Attr
71applyOp :: AttrOp -> Attr -> Attr
73applyOp (AttrOp _ f) a = f a
72applyOp (AttrOp _ f) a = f a
73+
test/Verify/Graphics/Vty/DisplayAttributes.hs+5−5
@@ -1,8 +1,8 @@
1−module Verify.Graphics.Vty.DisplayAttributes
1+module Verify.Graphics.Vty.DisplayAttributes ( module Verify.Graphics.Vty.DisplayAttributes
2− ( module Verify.Graphics.Vty.DisplayAttributes
3− , module Graphics.Vty.DisplayAttributes
2+ , module Graphics.Vty.DisplayAttributes
4− )
3+ )
5−where
4+ where
6
5
7import Graphics.Vty.DisplayAttributes
6import Graphics.Vty.DisplayAttributes
8import Verify
7import Verify
8+
test/Verify/Graphics/Vty/Image.hs+18−18
@@ -1,11 +1,10 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE NamedFieldPuns #-}
2{-# LANGUAGE NamedFieldPuns #-}
3{-# LANGUAGE DisambiguateRecordFields #-}
3{-# LANGUAGE DisambiguateRecordFields #-}
4−module Verify.Graphics.Vty.Image
4+module Verify.Graphics.Vty.Image ( module Verify.Graphics.Vty.Image
5− ( module Verify.Graphics.Vty.Image
6− , module Graphics.Vty.Image
5+ , module Graphics.Vty.Image
7− )
6+ )
8−where
7+ where
9
8
10import Verify.Graphics.Vty.Attributes
9import Verify.Graphics.Vty.Attributes
11import Graphics.Vty.Image
10import Graphics.Vty.Image
@@ -27,7 +26,7 @@ instance Show UnitImage where
27data DefaultImage = DefaultImage Image
26data DefaultImage = DefaultImage Image
28
27
29instance Show DefaultImage where
28instance Show DefaultImage where
30− show (DefaultImage i)
29+ show (DefaultImage i)
31 = "DefaultImage (" ++ show i ++ ") " ++ show (imageWidth i, imageHeight i)
30 = "DefaultImage (" ++ show i ++ ") " ++ show (imageWidth i, imageHeight i)
32
31
33instance Arbitrary DefaultImage where
32instance Arbitrary DefaultImage where
@@ -35,15 +34,15 @@ instance Arbitrary DefaultImage where
35 i <- return $ char defAttr 'X'
34 i <- return $ char defAttr 'X'
36 return $ DefaultImage i
35 return $ DefaultImage i
37
36
38−data SingleRowSingleAttrImage
37+data SingleRowSingleAttrImage
39− = SingleRowSingleAttrImage
38+ = SingleRowSingleAttrImage
40 { expectedAttr :: Attr
39 { expectedAttr :: Attr
41 , expectedColumns :: Int
40 , expectedColumns :: Int
42 , rowImage :: Image
41 , rowImage :: Image
43 }
42 }
44
43
45instance Show SingleRowSingleAttrImage where
44instance Show SingleRowSingleAttrImage where
46− show (SingleRowSingleAttrImage attr columns image)
45+ show (SingleRowSingleAttrImage attr columns image)
47 = "SingleRowSingleAttrImage (" ++ show attr ++ ") " ++ show columns ++ " ( " ++ show image ++ " )"
46 = "SingleRowSingleAttrImage (" ++ show attr ++ ") " ++ show columns ++ " ( " ++ show image ++ " )"
48
47
49newtype WidthResize = WidthResize (Image -> (Image, Int))
48newtype WidthResize = WidthResize (Image -> (Image, Int))
@@ -85,14 +84,14 @@ instance Arbitrary ImageResize where
85 , do
84 , do
86 ImageResize f <- arbitrary
85 ImageResize f <- arbitrary
87 WidthResize g <- arbitrary
86 WidthResize g <- arbitrary
88− return $! ImageResize $! \i ->
87+ return $! ImageResize $! \i ->
89 let (i0, (_, outHeight)) = f i
88 let (i0, (_, outHeight)) = f i
90 gI = g i0
89 gI = g i0
91 in (fst gI, (snd gI, outHeight))
90 in (fst gI, (snd gI, outHeight))
92 , do
91 , do
93 ImageResize f <- arbitrary
92 ImageResize f <- arbitrary
94 HeightResize g <- arbitrary
93 HeightResize g <- arbitrary
95− return $! ImageResize $! \i ->
94+ return $! ImageResize $! \i ->
96 let (i0, (outWidth, _)) = f i
95 let (i0, (outWidth, _)) = f i
97 gI = g i0
96 gI = g i0
98 in (fst gI, (outWidth, snd gI))
97 in (fst gI, (outWidth, snd gI))
@@ -101,17 +100,17 @@ instance Arbitrary ImageResize where
101
100
102instance Arbitrary SingleRowSingleAttrImage where
101instance Arbitrary SingleRowSingleAttrImage where
103 arbitrary = do
102 arbitrary = do
104− -- The text must contain at least one character. Otherwise the
103+ -- The text must contain at least one character. Otherwise the image simplifies to the
105− -- image simplifies to the IdImage which has a height of 0. If
106− -- this is to represent a single row then the height must be 1
104+ -- IdImage which has a height of 0. If this is to represent a single row then the height
105+ -- must be 1
107 singleColumnRowText <- Verify.resize 16 (listOf1 arbitrary)
106 singleColumnRowText <- Verify.resize 16 (listOf1 arbitrary)
108 a <- arbitrary
107 a <- arbitrary
109 let outImage = horizCat $ [char a c | SingleColumnChar c <- singleColumnRowText]
108 let outImage = horizCat $ [char a c | SingleColumnChar c <- singleColumnRowText]
110 outWidth = length singleColumnRowText
109 outWidth = length singleColumnRowText
111 return $ SingleRowSingleAttrImage a outWidth outImage
110 return $ SingleRowSingleAttrImage a outWidth outImage
112
111
113−data SingleRowTwoAttrImage
112+data SingleRowTwoAttrImage
114− = SingleRowTwoAttrImage
113+ = SingleRowTwoAttrImage
115 { part0 :: SingleRowSingleAttrImage
114 { part0 :: SingleRowSingleAttrImage
116 , part1 :: SingleRowSingleAttrImage
115 , part1 :: SingleRowSingleAttrImage
117 , joinImage :: Image
116 , joinImage :: Image
@@ -123,8 +122,8 @@ instance Arbitrary SingleRowTwoAttrImage where
123 p1 <- arbitrary
122 p1 <- arbitrary
124 return $ SingleRowTwoAttrImage p0 p1 (rowImage p0 <|> rowImage p1)
123 return $ SingleRowTwoAttrImage p0 p1 (rowImage p0 <|> rowImage p1)
125
124
126−data SingleAttrSingleSpanStack = SingleAttrSingleSpanStack
125+data SingleAttrSingleSpanStack = SingleAttrSingleSpanStack
127− { stackImage :: Image
126+ { stackImage :: Image
128 , stackSourceImages :: [SingleRowSingleAttrImage]
127 , stackSourceImages :: [SingleRowSingleAttrImage]
129 , stackWidth :: Int
128 , stackWidth :: Int
130 , stackHeight :: Int
129 , stackHeight :: Int
@@ -216,3 +215,4 @@ instance Arbitrary Translation where
216 y <- arbitrary `suchThat` (> 0)
215 y <- arbitrary `suchThat` (> 0)
217 let i' = translate x y i
216 let i' = translate x y i
218 return $ Translation i (x,y) i'
217 return $ Translation i (x,y) i'
218+
test/Verify/Graphics/Vty/Output.hs+7−5
@@ -4,17 +4,18 @@ import Control.Applicative ((<$>))
4
4
5import Graphics.Vty.Output.Mock
5import Graphics.Vty.Output.Mock
6
6
7+import qualified Data.ByteString as BS
7import Data.IORef
8import Data.IORef
8import qualified Data.String.UTF8 as UTF8
9import qualified Data.String.UTF8 as UTF8
9
10
10import Test.QuickCheck.Property
11import Test.QuickCheck.Property
11
12
12−-- A list of terminals that should be supported. This started with a
13+-- A list of terminals that should be supported.
13−-- list of terminals ubuntu supported. Then those terminals that really
14+-- This started with a list of terminals ubuntu supported. Then those terminals that really could
14−-- could not be supported were removed. Then a few more were pruned
15+-- not be supported were removed. Then a few more were pruned until a reasonable looking set was
15−-- until a reasonable looking set was made.
16+-- made.
16terminalsOfInterest :: [String]
17terminalsOfInterest :: [String]
17−terminalsOfInterest =
18+terminalsOfInterest =
18 [ "vt100"
19 [ "vt100"
19 , "vt220"
20 , "vt220"
20 , "vt102"
21 , "vt102"
@@ -57,3 +58,4 @@ compareMockOutput mockData expectedStr = do
57 ++ expectedStr
58 ++ expectedStr
58 }
59 }
59 else return succeeded
60 else return succeeded
61+
test/Verify/Graphics/Vty/Picture.hs+13−13
@@ -1,9 +1,8 @@
1{-# LANGUAGE DisambiguateRecordFields #-}
1{-# LANGUAGE DisambiguateRecordFields #-}
2−module Verify.Graphics.Vty.Picture
2+module Verify.Graphics.Vty.Picture ( module Verify.Graphics.Vty.Picture
3− ( module Verify.Graphics.Vty.Picture
4− , module Graphics.Vty.Picture
3+ , module Graphics.Vty.Picture
5− )
4+ )
6−where
5+ where
7
6
8import Verify.Graphics.Vty.Prelude
7import Verify.Graphics.Vty.Prelude
9
8
@@ -15,9 +14,9 @@ import Verify.Graphics.Vty.Image
15
14
16import Verify
15import Verify
17
16
18−data DefaultPic = DefaultPic
17+data DefaultPic = DefaultPic
19 { defaultPic :: Picture
18 { defaultPic :: Picture
20− , defaultWin :: MockWindow
19+ , defaultWin :: MockWindow
21 }
20 }
22
21
23instance Show DefaultPic where
22instance Show DefaultPic where
@@ -28,10 +27,10 @@ instance Arbitrary DefaultPic where
28 arbitrary = do
27 arbitrary = do
29 DefaultImage image <- arbitrary
28 DefaultImage image <- arbitrary
30 let win = MockWindow (imageWidth image) (imageHeight image)
29 let win = MockWindow (imageWidth image) (imageHeight image)
31− return $ DefaultPic (picForImage image)
30+ return $ DefaultPic (picForImage image)
32− win
31+ win
33
32
34−data PicWithBGAttr = PicWithBGAttr
33+data PicWithBGAttr = PicWithBGAttr
35 { withAttrPic :: Picture
34 { withAttrPic :: Picture
36 , withAttrWin :: MockWindow
35 , withAttrWin :: MockWindow
37 , withAttrSpecifiedAttr :: Attr
36 , withAttrSpecifiedAttr :: Attr
@@ -42,11 +41,12 @@ instance Arbitrary PicWithBGAttr where
42 DefaultImage image <- arbitrary
41 DefaultImage image <- arbitrary
43 let win = MockWindow (imageWidth image) (imageHeight image)
42 let win = MockWindow (imageWidth image) (imageHeight image)
44 attr <- arbitrary
43 attr <- arbitrary
45− return $ PicWithBGAttr (picForImage image)
44+ return $ PicWithBGAttr (picForImage image)
46− win
45+ win
47 attr
46 attr
48−
47+
49instance Arbitrary Picture where
48instance Arbitrary Picture where
50 arbitrary = do
49 arbitrary = do
51 layers <- Verify.resize 20 (listOf1 arbitrary)
50 layers <- Verify.resize 20 (listOf1 arbitrary)
52 return $ picForLayers layers
51 return $ picForLayers layers
52+
test/Verify/Graphics/Vty/Prelude.hs+7−5
@@ -1,8 +1,10 @@
1−module Verify.Graphics.Vty.Prelude
1+module Verify.Graphics.Vty.Prelude ( module Verify.Graphics.Vty.Prelude
2− ( module Verify.Graphics.Vty.Prelude
2+ , module Graphics.Vty.Prelude
3− , MockWindow(..)
3+ , MockWindow(..)
4− )
4+ )
5−where
5+ where
6+
7+import Graphics.Vty.Prelude
6
8
7import Graphics.Vty.Debug
9import Graphics.Vty.Debug
8
10
test/Verify/Graphics/Vty/Span.hs+7−7
@@ -1,9 +1,8 @@
1{-# LANGUAGE FlexibleInstances #-}
1{-# LANGUAGE FlexibleInstances #-}
2−module Verify.Graphics.Vty.Span
2+module Verify.Graphics.Vty.Span ( module Verify.Graphics.Vty.Span
3− ( module Verify.Graphics.Vty.Span
4− , module Graphics.Vty.Span
3+ , module Graphics.Vty.Span
5− )
4+ )
6−where
5+ where
7
6
8import Graphics.Vty.Debug
7import Graphics.Vty.Debug
9import Graphics.Vty.Span
8import Graphics.Vty.Span
@@ -20,10 +19,10 @@ isAttrSpanOp TextSpan {} = True
20isAttrSpanOp _ = False
19isAttrSpanOp _ = False
21
20
22verifyAllSpansHaveWidth i spans w
21verifyAllSpansHaveWidth i spans w
23− = let v = map (\s -> (spanOpsAffectedColumns s /= w, s)) (Vector.toList spans)
22+ = let v = map (\s -> (spanOpsEffectedColumns s /= w, s)) (Vector.toList spans)
24 in case any ((== True) . fst) v of
23 in case any ((== True) . fst) v of
25 False -> succeeded
24 False -> succeeded
26− True -> failed { reason = "Not all spans contained operations defining exactly "
25+ True -> failed { reason = "Not all spans contained operations defining exactly "
27 ++ show w
26 ++ show w
28 ++ " columns of output - \n"
27 ++ " columns of output - \n"
29 ++ (concatMap ((++ "\n") . show)) v
28 ++ (concatMap ((++ "\n") . show)) v
@@ -35,3 +34,4 @@ verifyOpsEquality i_ops i_alt_ops =
35 else failed { reason = "ops for alternate image " ++ show i_alt_ops
34 else failed { reason = "ops for alternate image " ++ show i_alt_ops
36 ++ " are not the same as " ++ show i_ops
35 ++ " are not the same as " ++ show i_ops
37 }
36 }
37+
test/VerifyAttributeOps.hsnew file+9
@@ -0,0 +1,9 @@
1+module VerifyAttributeOps where
2+
3+import Verify.Graphics.Vty.Attributes
4+
5+import Verify
6+
7+tests :: IO [Test]
8+tests = return []
9+
test/VerifyColor240.hsdeleted−269
@@ -1,269 +0,0 @@
1−module VerifyColor240 where
2−
3−import Data.Word(Word8)
4−import Verify
5−
6−import Graphics.Vty.Attributes.Color240(rgbColorToColor240)
7−
8−oldRgbColorToColor240 :: Integral i => i -> i -> i -> Word8
9−oldRgbColorToColor240 r g b
10− | r < 0 && g < 0 && b < 0 = error "rgbColor with negative color component intensity"
11− | r == 8 && g == 8 && b == 8 = 216
12− | r == 18 && g == 18 && b == 18 = 217
13− | r == 28 && g == 28 && b == 28 = 218
14− | r == 38 && g == 38 && b == 38 = 219
15− | r == 48 && g == 48 && b == 48 = 220
16− | r == 58 && g == 58 && b == 58 = 221
17− | r == 68 && g == 68 && b == 68 = 222
18− | r == 78 && g == 78 && b == 78 = 223
19− | r == 88 && g == 88 && b == 88 = 224
20− | r == 98 && g == 98 && b == 98 = 225
21− | r == 108 && g == 108 && b == 108 = 226
22− | r == 118 && g == 118 && b == 118 = 227
23− | r == 128 && g == 128 && b == 128 = 228
24− | r == 138 && g == 138 && b == 138 = 229
25− | r == 148 && g == 148 && b == 148 = 230
26− | r == 158 && g == 158 && b == 158 = 231
27− | r == 168 && g == 168 && b == 168 = 232
28− | r == 178 && g == 178 && b == 178 = 233
29− | r == 188 && g == 188 && b == 188 = 234
30− | r == 198 && g == 198 && b == 198 = 235
31− | r == 208 && g == 208 && b == 208 = 236
32− | r == 218 && g == 218 && b == 218 = 237
33− | r == 228 && g == 228 && b == 228 = 238
34− | r == 238 && g == 238 && b == 238 = 239
35− | r <= 0 && g <= 0 && b <= 0 = 0
36− | r <= 0 && g <= 0 && b <= 95 = 1
37− | r <= 0 && g <= 0 && b <= 135 = 2
38− | r <= 0 && g <= 0 && b <= 175 = 3
39− | r <= 0 && g <= 0 && b <= 215 = 4
40− | r <= 0 && g <= 0 && b <= 255 = 5
41− | r <= 0 && g <= 95 && b <= 0 = 6
42− | r <= 0 && g <= 95 && b <= 95 = 7
43− | r <= 0 && g <= 95 && b <= 135 = 8
44− | r <= 0 && g <= 95 && b <= 175 = 9
45− | r <= 0 && g <= 95 && b <= 215 = 10
46− | r <= 0 && g <= 95 && b <= 255 = 11
47− | r <= 0 && g <= 135 && b <= 0 = 12
48− | r <= 0 && g <= 135 && b <= 95 = 13
49− | r <= 0 && g <= 135 && b <= 135 = 14
50− | r <= 0 && g <= 135 && b <= 175 = 15
51− | r <= 0 && g <= 135 && b <= 215 = 16
52− | r <= 0 && g <= 135 && b <= 255 = 17
53− | r <= 0 && g <= 175 && b <= 0 = 18
54− | r <= 0 && g <= 175 && b <= 95 = 19
55− | r <= 0 && g <= 175 && b <= 135 = 20
56− | r <= 0 && g <= 175 && b <= 175 = 21
57− | r <= 0 && g <= 175 && b <= 215 = 22
58− | r <= 0 && g <= 175 && b <= 255 = 23
59− | r <= 0 && g <= 215 && b <= 0 = 24
60− | r <= 0 && g <= 215 && b <= 95 = 25
61− | r <= 0 && g <= 215 && b <= 135 = 26
62− | r <= 0 && g <= 215 && b <= 175 = 27
63− | r <= 0 && g <= 215 && b <= 215 = 28
64− | r <= 0 && g <= 215 && b <= 255 = 29
65− | r <= 0 && g <= 255 && b <= 0 = 30
66− | r <= 0 && g <= 255 && b <= 95 = 31
67− | r <= 0 && g <= 255 && b <= 135 = 32
68− | r <= 0 && g <= 255 && b <= 175 = 33
69− | r <= 0 && g <= 255 && b <= 215 = 34
70− | r <= 0 && g <= 255 && b <= 255 = 35
71− | r <= 95 && g <= 0 && b <= 0 = 36
72− | r <= 95 && g <= 0 && b <= 95 = 37
73− | r <= 95 && g <= 0 && b <= 135 = 38
74− | r <= 95 && g <= 0 && b <= 175 = 39
75− | r <= 95 && g <= 0 && b <= 215 = 40
76− | r <= 95 && g <= 0 && b <= 255 = 41
77− | r <= 95 && g <= 95 && b <= 0 = 42
78− | r <= 95 && g <= 95 && b <= 95 = 43
79− | r <= 95 && g <= 95 && b <= 135 = 44
80− | r <= 95 && g <= 95 && b <= 175 = 45
81− | r <= 95 && g <= 95 && b <= 215 = 46
82− | r <= 95 && g <= 95 && b <= 255 = 47
83− | r <= 95 && g <= 135 && b <= 0 = 48
84− | r <= 95 && g <= 135 && b <= 95 = 49
85− | r <= 95 && g <= 135 && b <= 135 = 50
86− | r <= 95 && g <= 135 && b <= 175 = 51
87− | r <= 95 && g <= 135 && b <= 215 = 52
88− | r <= 95 && g <= 135 && b <= 255 = 53
89− | r <= 95 && g <= 175 && b <= 0 = 54
90− | r <= 95 && g <= 175 && b <= 95 = 55
91− | r <= 95 && g <= 175 && b <= 135 = 56
92− | r <= 95 && g <= 175 && b <= 175 = 57
93− | r <= 95 && g <= 175 && b <= 215 = 58
94− | r <= 95 && g <= 175 && b <= 255 = 59
95− | r <= 95 && g <= 215 && b <= 0 = 60
96− | r <= 95 && g <= 215 && b <= 95 = 61
97− | r <= 95 && g <= 215 && b <= 135 = 62
98− | r <= 95 && g <= 215 && b <= 175 = 63
99− | r <= 95 && g <= 215 && b <= 215 = 64
100− | r <= 95 && g <= 215 && b <= 255 = 65
101− | r <= 95 && g <= 255 && b <= 0 = 66
102− | r <= 95 && g <= 255 && b <= 95 = 67
103− | r <= 95 && g <= 255 && b <= 135 = 68
104− | r <= 95 && g <= 255 && b <= 175 = 69
105− | r <= 95 && g <= 255 && b <= 215 = 70
106− | r <= 95 && g <= 255 && b <= 255 = 71
107− | r <= 135 && g <= 0 && b <= 0 = 72
108− | r <= 135 && g <= 0 && b <= 95 = 73
109− | r <= 135 && g <= 0 && b <= 135 = 74
110− | r <= 135 && g <= 0 && b <= 175 = 75
111− | r <= 135 && g <= 0 && b <= 215 = 76
112− | r <= 135 && g <= 0 && b <= 255 = 77
113− | r <= 135 && g <= 95 && b <= 0 = 78
114− | r <= 135 && g <= 95 && b <= 95 = 79
115− | r <= 135 && g <= 95 && b <= 135 = 80
116− | r <= 135 && g <= 95 && b <= 175 = 81
117− | r <= 135 && g <= 95 && b <= 215 = 82
118− | r <= 135 && g <= 95 && b <= 255 = 83
119− | r <= 135 && g <= 135 && b <= 0 = 84
120− | r <= 135 && g <= 135 && b <= 95 = 85
121− | r <= 135 && g <= 135 && b <= 135 = 86
122− | r <= 135 && g <= 135 && b <= 175 = 87
123− | r <= 135 && g <= 135 && b <= 215 = 88
124− | r <= 135 && g <= 135 && b <= 255 = 89
125− | r <= 135 && g <= 175 && b <= 0 = 90
126− | r <= 135 && g <= 175 && b <= 95 = 91
127− | r <= 135 && g <= 175 && b <= 135 = 92
128− | r <= 135 && g <= 175 && b <= 175 = 93
129− | r <= 135 && g <= 175 && b <= 215 = 94
130− | r <= 135 && g <= 175 && b <= 255 = 95
131− | r <= 135 && g <= 215 && b <= 0 = 96
132− | r <= 135 && g <= 215 && b <= 95 = 97
133− | r <= 135 && g <= 215 && b <= 135 = 98
134− | r <= 135 && g <= 215 && b <= 175 = 99
135− | r <= 135 && g <= 215 && b <= 215 = 100
136− | r <= 135 && g <= 215 && b <= 255 = 101
137− | r <= 135 && g <= 255 && b <= 0 = 102
138− | r <= 135 && g <= 255 && b <= 95 = 103
139− | r <= 135 && g <= 255 && b <= 135 = 104
140− | r <= 135 && g <= 255 && b <= 175 = 105
141− | r <= 135 && g <= 255 && b <= 215 = 106
142− | r <= 135 && g <= 255 && b <= 255 = 107
143− | r <= 175 && g <= 0 && b <= 0 = 108
144− | r <= 175 && g <= 0 && b <= 95 = 109
145− | r <= 175 && g <= 0 && b <= 135 = 110
146− | r <= 175 && g <= 0 && b <= 175 = 111
147− | r <= 175 && g <= 0 && b <= 215 = 112
148− | r <= 175 && g <= 0 && b <= 255 = 113
149− | r <= 175 && g <= 95 && b <= 0 = 114
150− | r <= 175 && g <= 95 && b <= 95 = 115
151− | r <= 175 && g <= 95 && b <= 135 = 116
152− | r <= 175 && g <= 95 && b <= 175 = 117
153− | r <= 175 && g <= 95 && b <= 215 = 118
154− | r <= 175 && g <= 95 && b <= 255 = 119
155− | r <= 175 && g <= 135 && b <= 0 = 120
156− | r <= 175 && g <= 135 && b <= 95 = 121
157− | r <= 175 && g <= 135 && b <= 135 = 122
158− | r <= 175 && g <= 135 && b <= 175 = 123
159− | r <= 175 && g <= 135 && b <= 215 = 124
160− | r <= 175 && g <= 135 && b <= 255 = 125
161− | r <= 175 && g <= 175 && b <= 0 = 126
162− | r <= 175 && g <= 175 && b <= 95 = 127
163− | r <= 175 && g <= 175 && b <= 135 = 128
164− | r <= 175 && g <= 175 && b <= 175 = 129
165− | r <= 175 && g <= 175 && b <= 215 = 130
166− | r <= 175 && g <= 175 && b <= 255 = 131
167− | r <= 175 && g <= 215 && b <= 0 = 132
168− | r <= 175 && g <= 215 && b <= 95 = 133
169− | r <= 175 && g <= 215 && b <= 135 = 134
170− | r <= 175 && g <= 215 && b <= 175 = 135
171− | r <= 175 && g <= 215 && b <= 215 = 136
172− | r <= 175 && g <= 215 && b <= 255 = 137
173− | r <= 175 && g <= 255 && b <= 0 = 138
174− | r <= 175 && g <= 255 && b <= 95 = 139
175− | r <= 175 && g <= 255 && b <= 135 = 140
176− | r <= 175 && g <= 255 && b <= 175 = 141
177− | r <= 175 && g <= 255 && b <= 215 = 142
178− | r <= 175 && g <= 255 && b <= 255 = 143
179− | r <= 215 && g <= 0 && b <= 0 = 144
180− | r <= 215 && g <= 0 && b <= 95 = 145
181− | r <= 215 && g <= 0 && b <= 135 = 146
182− | r <= 215 && g <= 0 && b <= 175 = 147
183− | r <= 215 && g <= 0 && b <= 215 = 148
184− | r <= 215 && g <= 0 && b <= 255 = 149
185− | r <= 215 && g <= 95 && b <= 0 = 150
186− | r <= 215 && g <= 95 && b <= 95 = 151
187− | r <= 215 && g <= 95 && b <= 135 = 152
188− | r <= 215 && g <= 95 && b <= 175 = 153
189− | r <= 215 && g <= 95 && b <= 215 = 154
190− | r <= 215 && g <= 95 && b <= 255 = 155
191− | r <= 215 && g <= 135 && b <= 0 = 156
192− | r <= 215 && g <= 135 && b <= 95 = 157
193− | r <= 215 && g <= 135 && b <= 135 = 158
194− | r <= 215 && g <= 135 && b <= 175 = 159
195− | r <= 215 && g <= 135 && b <= 215 = 160
196− | r <= 215 && g <= 135 && b <= 255 = 161
197− | r <= 215 && g <= 175 && b <= 0 = 162
198− | r <= 215 && g <= 175 && b <= 95 = 163
199− | r <= 215 && g <= 175 && b <= 135 = 164
200− | r <= 215 && g <= 175 && b <= 175 = 165
201− | r <= 215 && g <= 175 && b <= 215 = 166
202− | r <= 215 && g <= 175 && b <= 255 = 167
203− | r <= 215 && g <= 215 && b <= 0 = 168
204− | r <= 215 && g <= 215 && b <= 95 = 169
205− | r <= 215 && g <= 215 && b <= 135 = 170
206− | r <= 215 && g <= 215 && b <= 175 = 171
207− | r <= 215 && g <= 215 && b <= 215 = 172
208− | r <= 215 && g <= 215 && b <= 255 = 173
209− | r <= 215 && g <= 255 && b <= 0 = 174
210− | r <= 215 && g <= 255 && b <= 95 = 175
211− | r <= 215 && g <= 255 && b <= 135 = 176
212− | r <= 215 && g <= 255 && b <= 175 = 177
213− | r <= 215 && g <= 255 && b <= 215 = 178
214− | r <= 215 && g <= 255 && b <= 255 = 179
215− | r <= 255 && g <= 0 && b <= 0 = 180
216− | r <= 255 && g <= 0 && b <= 95 = 181
217− | r <= 255 && g <= 0 && b <= 135 = 182
218− | r <= 255 && g <= 0 && b <= 175 = 183
219− | r <= 255 && g <= 0 && b <= 215 = 184
220− | r <= 255 && g <= 0 && b <= 255 = 185
221− | r <= 255 && g <= 95 && b <= 0 = 186
222− | r <= 255 && g <= 95 && b <= 95 = 187
223− | r <= 255 && g <= 95 && b <= 135 = 188
224− | r <= 255 && g <= 95 && b <= 175 = 189
225− | r <= 255 && g <= 95 && b <= 215 = 190
226− | r <= 255 && g <= 95 && b <= 255 = 191
227− | r <= 255 && g <= 135 && b <= 0 = 192
228− | r <= 255 && g <= 135 && b <= 95 = 193
229− | r <= 255 && g <= 135 && b <= 135 = 194
230− | r <= 255 && g <= 135 && b <= 175 = 195
231− | r <= 255 && g <= 135 && b <= 215 = 196
232− | r <= 255 && g <= 135 && b <= 255 = 197
233− | r <= 255 && g <= 175 && b <= 0 = 198
234− | r <= 255 && g <= 175 && b <= 95 = 199
235− | r <= 255 && g <= 175 && b <= 135 = 200
236− | r <= 255 && g <= 175 && b <= 175 = 201
237− | r <= 255 && g <= 175 && b <= 215 = 202
238− | r <= 255 && g <= 175 && b <= 255 = 203
239− | r <= 255 && g <= 215 && b <= 0 = 204
240− | r <= 255 && g <= 215 && b <= 95 = 205
241− | r <= 255 && g <= 215 && b <= 135 = 206
242− | r <= 255 && g <= 215 && b <= 175 = 207
243− | r <= 255 && g <= 215 && b <= 215 = 208
244− | r <= 255 && g <= 215 && b <= 255 = 209
245− | r <= 255 && g <= 255 && b <= 0 = 210
246− | r <= 255 && g <= 255 && b <= 95 = 211
247− | r <= 255 && g <= 255 && b <= 135 = 212
248− | r <= 255 && g <= 255 && b <= 175 = 213
249− | r <= 255 && g <= 255 && b <= 215 = 214
250− | r <= 255 && g <= 255 && b <= 255 = 215
251− | otherwise = error (printf "RGB color %d %d %d does not map to 240 palette."
252− (fromIntegral r :: Int)
253− (fromIntegral g :: Int)
254− (fromIntegral b :: Int))
255−
256−sameColor :: Int -> Int -> Int -> Bool
257−sameColor r g b = oldRgbColorToColor240 r g b == rgbColorToColor240 r g b
258−
259−genVal :: Gen Int
260−genVal = chooseInt (0, 255)
261−
262−sameColorCheck :: Property
263−sameColorCheck = forAll genVal (\r -> forAll genVal (\g -> forAll genVal (sameColor r g)))
264−
265−tests :: IO [Test]
266−tests = return
267− [ verify "check rgbColorToColor240 optimization is correct" sameColorCheck
268− ]
269−
test/VerifyConfig.hs+3−1
@@ -4,6 +4,7 @@ module Main where
4import Graphics.Vty.Config
4import Graphics.Vty.Config
5import Graphics.Vty.Input.Events
5import Graphics.Vty.Input.Events
6
6
7+import Data.Default
7import Data.String.QQ
8import Data.String.QQ
8import qualified Data.ByteString.Char8 as B
9import qualified Data.ByteString.Char8 as B
9
10
@@ -23,7 +24,7 @@ debugLog "/tmp/vty-debug.txt"
23|]
24|]
24
25
25exampleConfigConfig :: Config
26exampleConfigConfig :: Config
26−exampleConfigConfig = defaultConfig
27+exampleConfigConfig = def
27 { debugLog = Just "/tmp/vty-debug.txt"
28 { debugLog = Just "/tmp/vty-debug.txt"
28 , inputMap = [ (Nothing, "\ESC[B", EvKey KUp [])
29 , inputMap = [ (Nothing, "\ESC[B", EvKey KUp [])
29 , (Nothing, "\ESC[1;3B", EvKey KDown [MAlt])
30 , (Nothing, "\ESC[1;3B", EvKey KDown [MAlt])
@@ -42,3 +43,4 @@ main :: IO ()
42main = defaultMain
43main = defaultMain
43 [ testCase "example config parses" $ exampleConfigParses
44 [ testCase "example config parses" $ exampleConfigParses
44 ]
45 ]
46+
test/VerifyCropSpanGeneration.hs+3−2
@@ -13,7 +13,7 @@ import Graphics.Vty.PictureToSpans
13
13
14import Verify
14import Verify
15
15
16−import qualified Data.Vector as Vector
16+import qualified Data.Vector as Vector
17
17
18cropOpDisplayOps :: (Int -> Image -> Image) ->
18cropOpDisplayOps :: (Int -> Image -> Image) ->
19 Int -> Image -> (DisplayOps, Image)
19 Int -> Image -> (DisplayOps, Image)
@@ -75,7 +75,7 @@ cropTopAndBottomRejoinedEquivalence stack = imageHeight (stackImage stack) `mod`
75 in displayOpsForImage i == displayOpsForImage iAlt
75 in displayOpsForImage i == displayOpsForImage iAlt
76
76
77tests :: IO [Test]
77tests :: IO [Test]
78−tests = return
78+tests = return
79 [ verify "cropping from the bottom produces display operations covering the expected rows"
79 [ verify "cropping from the bottom produces display operations covering the expected rows"
80 cropBottomOutputRows
80 cropBottomOutputRows
81 , verify "cropping from the top produces display operations covering the expected rows"
81 , verify "cropping from the top produces display operations covering the expected rows"
@@ -90,3 +90,4 @@ tests = return
90 , verify "the output of a stack is the same as that stack cropped top & bottom and joined together"
90 , verify "the output of a stack is the same as that stack cropped top & bottom and joined together"
91 cropTopAndBottomRejoinedEquivalence
91 cropTopAndBottomRejoinedEquivalence
92 ]
92 ]
93+
test/VerifyEmptyImageProps.hs+1−2
@@ -1,10 +1,9 @@
1−{-# LANGUAGE ScopedTypeVariables #-}
2module VerifyEmptyImageProps where
1module VerifyEmptyImageProps where
3
2
4import Verify
3import Verify
5
4
6-- should be exported by Graphics.Vty.Picture
5-- should be exported by Graphics.Vty.Picture
7−import Graphics.Vty.Image ( Image, emptyImage )
6+import Graphics.Vty.Picture ( Image, emptyImage )
8
7
9tests :: IO [Test]
8tests :: IO [Test]
10tests = do
9tests = do
test/VerifyEvalTerminfoCaps.hs+12−14
@@ -1,10 +1,9 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE NamedFieldPuns #-}
2{-# LANGUAGE NamedFieldPuns #-}
3−{-# LANGUAGE ScopedTypeVariables #-}
4module VerifyEvalTerminfoCaps where
3module VerifyEvalTerminfoCaps where
5
4
6import Blaze.ByteString.Builder.Internal.Write (runWrite, getBound)
5import Blaze.ByteString.Builder.Internal.Write (runWrite, getBound)
7−import Data.Terminfo.Eval
6+import Data.Terminfo.Eval
8import Data.Terminfo.Parse
7import Data.Terminfo.Parse
9import Control.DeepSeq
8import Control.DeepSeq
10
9
@@ -25,9 +24,8 @@ import Foreign.Marshal.Alloc (mallocBytes)
25import Foreign.Ptr (Ptr, minusPtr)
24import Foreign.Ptr (Ptr, minusPtr)
26import Numeric
25import Numeric
27
26
28−-- If a terminal defines one of the caps then it's expected to be
27+-- If a terminal defines one of the caps then it's expected to be parsable.
29−-- parsable.
30−capsOfInterest =
28+capsOfInterest =
31 [ "cup"
29 [ "cup"
32 , "sc"
30 , "sc"
33 , "rc"
31 , "rc"
@@ -51,13 +49,12 @@ fromCapname ti name = fromJust $ Terminfo.getCapability ti (Terminfo.tiGetStr na
51
49
52tests :: IO [Test]
50tests :: IO [Test]
53tests = do
51tests = do
54− -- 1 MB should be big enough for any termcaps ;-)
52+ evalBuffer :: Ptr Word8 <- mallocBytes (1024 * 1024) -- Should be big enough for any termcaps ;-)
55− evalBuffer :: Ptr Word8 <- mallocBytes (1024 * 1024)
56 fmap concat $ forM terminalsOfInterest $ \termName -> do
53 fmap concat $ forM terminalsOfInterest $ \termName -> do
57 putStrLn $ "adding tests for terminal: " ++ termName
54 putStrLn $ "adding tests for terminal: " ++ termName
58 mti <- try $ Terminfo.setupTerm termName
55 mti <- try $ Terminfo.setupTerm termName
59 case mti of
56 case mti of
60− Left (_e :: SomeException)
57+ Left (_e :: SomeException)
61 -> return []
58 -> return []
62 Right ti -> do
59 Right ti -> do
63 fmap concat $ forM capsOfInterest $ \capName -> do
60 fmap concat $ forM capsOfInterest $ \capName -> do
@@ -74,7 +71,7 @@ tests = do
74{-# NOINLINE verifyEvalCap #-}
71{-# NOINLINE verifyEvalCap #-}
75verifyEvalCap :: Ptr Word8 -> CapExpression -> Int -> Property
72verifyEvalCap :: Ptr Word8 -> CapExpression -> Int -> Property
76verifyEvalCap evalBuffer expr !junkInt = do
73verifyEvalCap evalBuffer expr !junkInt = do
77− forAll (vector 9) $ \inputValues ->
74+ forAll (vector 9) $ \inputValues ->
78 let write = writeCapExpr expr inputValues
75 let write = writeCapExpr expr inputValues
79 !byteCount = getBound write
76 !byteCount = getBound write
80 in liftIOResult $ do
77 in liftIOResult $ do
@@ -82,11 +79,12 @@ verifyEvalCap evalBuffer expr !junkInt = do
82 forM_ [0..100] $ \i -> runWrite write startPtr
79 forM_ [0..100] $ \i -> runWrite write startPtr
83 endPtr <- runWrite write startPtr
80 endPtr <- runWrite write startPtr
84 case endPtr `minusPtr` startPtr of
81 case endPtr `minusPtr` startPtr of
85− count | count < 0 ->
82+ count | count < 0 ->
86 return $ failed { reason = "End pointer before start pointer." }
83 return $ failed { reason = "End pointer before start pointer." }
87− | toEnum count > byteCount ->
84+ | toEnum count > byteCount ->
88− return $ failed { reason = "End pointer past end of buffer by "
85+ return $ failed { reason = "End pointer past end of buffer by "
89− ++ show (toEnum count - byteCount)
86+ ++ show (toEnum count - byteCount)
90 }
87 }
91− | otherwise ->
88+ | otherwise ->
92 return succeeded
89 return succeeded
90+
test/VerifyImageOps.hs+27−27
@@ -1,4 +1,3 @@
1−{-# LANGUAGE ScopedTypeVariables #-}
2module VerifyImageOps where
1module VerifyImageOps where
3
2
4import Graphics.Vty.Attributes
3import Graphics.Vty.Attributes
@@ -10,43 +9,43 @@ import Verify
10import Control.DeepSeq
9import Control.DeepSeq
11
10
12twoSwHorizConcat :: SingleColumnChar -> SingleColumnChar -> Bool
11twoSwHorizConcat :: SingleColumnChar -> SingleColumnChar -> Bool
13−twoSwHorizConcat (SingleColumnChar c1) (SingleColumnChar c2) =
12+twoSwHorizConcat (SingleColumnChar c1) (SingleColumnChar c2) =
14 imageWidth (char defAttr c1 <|> char defAttr c2) == 2
13 imageWidth (char defAttr c1 <|> char defAttr c2) == 2
15
14
16manySwHorizConcat :: [SingleColumnChar] -> Bool
15manySwHorizConcat :: [SingleColumnChar] -> Bool
17−manySwHorizConcat cs =
16+manySwHorizConcat cs =
18 let chars = [ char | SingleColumnChar char <- cs ]
17 let chars = [ char | SingleColumnChar char <- cs ]
19 l = fromIntegral $ length cs
18 l = fromIntegral $ length cs
20 in imageWidth ( horizCat $ map (char defAttr) chars ) == l
19 in imageWidth ( horizCat $ map (char defAttr) chars ) == l
21
20
22twoSwVertConcat :: SingleColumnChar -> SingleColumnChar -> Bool
21twoSwVertConcat :: SingleColumnChar -> SingleColumnChar -> Bool
23−twoSwVertConcat (SingleColumnChar c1) (SingleColumnChar c2) =
22+twoSwVertConcat (SingleColumnChar c1) (SingleColumnChar c2) =
24 imageHeight (char defAttr c1 <-> char defAttr c2) == 2
23 imageHeight (char defAttr c1 <-> char defAttr c2) == 2
25
24
26horizConcatSwAssoc :: SingleColumnChar -> SingleColumnChar -> SingleColumnChar -> Bool
25horizConcatSwAssoc :: SingleColumnChar -> SingleColumnChar -> SingleColumnChar -> Bool
27−horizConcatSwAssoc (SingleColumnChar c0) (SingleColumnChar c1) (SingleColumnChar c2) =
26+horizConcatSwAssoc (SingleColumnChar c0) (SingleColumnChar c1) (SingleColumnChar c2) =
28− (char defAttr c0 <|> char defAttr c1) <|> char defAttr c2
27+ (char defAttr c0 <|> char defAttr c1) <|> char defAttr c2
29− ==
28+ ==
30 char defAttr c0 <|> (char defAttr c1 <|> char defAttr c2)
29 char defAttr c0 <|> (char defAttr c1 <|> char defAttr c2)
31
30
32twoDwHorizConcat :: DoubleColumnChar -> DoubleColumnChar -> Bool
31twoDwHorizConcat :: DoubleColumnChar -> DoubleColumnChar -> Bool
33−twoDwHorizConcat (DoubleColumnChar c1) (DoubleColumnChar c2) =
32+twoDwHorizConcat (DoubleColumnChar c1) (DoubleColumnChar c2) =
34 imageWidth (char defAttr c1 <|> char defAttr c2) == 4
33 imageWidth (char defAttr c1 <|> char defAttr c2) == 4
35
34
36manyDwHorizConcat :: [DoubleColumnChar] -> Bool
35manyDwHorizConcat :: [DoubleColumnChar] -> Bool
37−manyDwHorizConcat cs =
36+manyDwHorizConcat cs =
38 let chars = [ char | DoubleColumnChar char <- cs ]
37 let chars = [ char | DoubleColumnChar char <- cs ]
39 l = fromIntegral $ length cs
38 l = fromIntegral $ length cs
40 in imageWidth ( horizCat $ map (char defAttr) chars ) == l * 2
39 in imageWidth ( horizCat $ map (char defAttr) chars ) == l * 2
41
40
42twoDwVertConcat :: DoubleColumnChar -> DoubleColumnChar -> Bool
41twoDwVertConcat :: DoubleColumnChar -> DoubleColumnChar -> Bool
43−twoDwVertConcat (DoubleColumnChar c1) (DoubleColumnChar c2) =
42+twoDwVertConcat (DoubleColumnChar c1) (DoubleColumnChar c2) =
44 imageHeight (char defAttr c1 <-> char defAttr c2) == 2
43 imageHeight (char defAttr c1 <-> char defAttr c2) == 2
45
44
46horizConcatDwAssoc :: DoubleColumnChar -> DoubleColumnChar -> DoubleColumnChar -> Bool
45horizConcatDwAssoc :: DoubleColumnChar -> DoubleColumnChar -> DoubleColumnChar -> Bool
47−horizConcatDwAssoc (DoubleColumnChar c0) (DoubleColumnChar c1) (DoubleColumnChar c2) =
46+horizConcatDwAssoc (DoubleColumnChar c0) (DoubleColumnChar c1) (DoubleColumnChar c2) =
48− (char defAttr c0 <|> char defAttr c1) <|> char defAttr c2
47+ (char defAttr c0 <|> char defAttr c1) <|> char defAttr c2
49− ==
48+ ==
50 char defAttr c0 <|> (char defAttr c1 <|> char defAttr c2)
49 char defAttr c0 <|> (char defAttr c1 <|> char defAttr c2)
51
50
52vertContatSingleRow :: NonEmptyList SingleRowSingleAttrImage -> Bool
51vertContatSingleRow :: NonEmptyList SingleRowSingleAttrImage -> Bool
@@ -55,9 +54,9 @@ vertContatSingleRow (NonEmpty stack) =
55 stackImage = vertCat [ i | SingleRowSingleAttrImage { rowImage = i } <- stack ]
54 stackImage = vertCat [ i | SingleRowSingleAttrImage { rowImage = i } <- stack ]
56 in imageHeight stackImage == expectedHeight
55 in imageHeight stackImage == expectedHeight
57
56
58−disjointHeightHorizJoin :: NonEmptyList SingleRowSingleAttrImage
57+disjointHeightHorizJoin :: NonEmptyList SingleRowSingleAttrImage
59− -> NonEmptyList SingleRowSingleAttrImage
58+ -> NonEmptyList SingleRowSingleAttrImage
60− -> Bool
59+ -> Bool
61disjointHeightHorizJoin (NonEmpty stack0) (NonEmpty stack1) =
60disjointHeightHorizJoin (NonEmpty stack0) (NonEmpty stack1) =
62 let expectedHeight :: Int = max (length stack0) (length stack1)
61 let expectedHeight :: Int = max (length stack0) (length stack1)
63 stackImage0 = vertCat [ i | SingleRowSingleAttrImage { rowImage = i } <- stack0 ]
62 stackImage0 = vertCat [ i | SingleRowSingleAttrImage { rowImage = i } <- stack0 ]
@@ -65,9 +64,9 @@ disjointHeightHorizJoin (NonEmpty stack0) (NonEmpty stack1) =
65 in imageHeight (stackImage0 <|> stackImage1) == expectedHeight
64 in imageHeight (stackImage0 <|> stackImage1) == expectedHeight
66
65
67
66
68−disjointHeightHorizJoinBgFill :: NonEmptyList SingleRowSingleAttrImage
67+disjointHeightHorizJoinBgFill :: NonEmptyList SingleRowSingleAttrImage
69− -> NonEmptyList SingleRowSingleAttrImage
68+ -> NonEmptyList SingleRowSingleAttrImage
70− -> Bool
69+ -> Bool
71disjointHeightHorizJoinBgFill (NonEmpty stack0) (NonEmpty stack1) =
70disjointHeightHorizJoinBgFill (NonEmpty stack0) (NonEmpty stack1) =
72 let stackImage0 = vertCat [ i | SingleRowSingleAttrImage { rowImage = i } <- stack0 ]
71 let stackImage0 = vertCat [ i | SingleRowSingleAttrImage { rowImage = i } <- stack0 ]
73 stackImage1 = vertCat [ i | SingleRowSingleAttrImage { rowImage = i } <- stack1 ]
72 stackImage1 = vertCat [ i | SingleRowSingleAttrImage { rowImage = i } <- stack1 ]
@@ -75,31 +74,31 @@ disjointHeightHorizJoinBgFill (NonEmpty stack0) (NonEmpty stack1) =
75 expectedHeight = imageHeight image
74 expectedHeight = imageHeight image
76 in case image of
75 in case image of
77 HorizJoin {} -> ( expectedHeight == (imageHeight $ partLeft image) )
76 HorizJoin {} -> ( expectedHeight == (imageHeight $ partLeft image) )
78− &&
77+ &&
79 ( expectedHeight == (imageHeight $ partRight image) )
78 ( expectedHeight == (imageHeight $ partRight image) )
80 _ -> True
79 _ -> True
81
80
82−disjointWidthVertJoin :: NonEmptyList SingleRowSingleAttrImage
81+disjointWidthVertJoin :: NonEmptyList SingleRowSingleAttrImage
83 -> NonEmptyList SingleRowSingleAttrImage
82 -> NonEmptyList SingleRowSingleAttrImage
84 -> Bool
83 -> Bool
85disjointWidthVertJoin (NonEmpty stack0) (NonEmpty stack1) =
84disjointWidthVertJoin (NonEmpty stack0) (NonEmpty stack1) =
86 let expectedWidth = maximum $ map imageWidth (stack0Images ++ stack1Images)
85 let expectedWidth = maximum $ map imageWidth (stack0Images ++ stack1Images)
87 stack0Images = [ i | SingleRowSingleAttrImage { rowImage = i } <- stack0 ]
86 stack0Images = [ i | SingleRowSingleAttrImage { rowImage = i } <- stack0 ]
88 stack1Images = [ i | SingleRowSingleAttrImage { rowImage = i } <- stack1 ]
87 stack1Images = [ i | SingleRowSingleAttrImage { rowImage = i } <- stack1 ]
89− stack0Image = vertCat stack0Images
88+ stack0Image = vertCat stack0Images
90− stack1Image = vertCat stack1Images
89+ stack1Image = vertCat stack1Images
91 image = stack0Image <-> stack1Image
90 image = stack0Image <-> stack1Image
92 in imageWidth image == expectedWidth
91 in imageWidth image == expectedWidth
93
92
94−disjointWidthVertJoinBgFill :: NonEmptyList SingleRowSingleAttrImage
93+disjointWidthVertJoinBgFill :: NonEmptyList SingleRowSingleAttrImage
95 -> NonEmptyList SingleRowSingleAttrImage
94 -> NonEmptyList SingleRowSingleAttrImage
96 -> Bool
95 -> Bool
97disjointWidthVertJoinBgFill (NonEmpty stack0) (NonEmpty stack1) =
96disjointWidthVertJoinBgFill (NonEmpty stack0) (NonEmpty stack1) =
98 let expectedWidth = maximum $ map imageWidth (stack0Images ++ stack1Images)
97 let expectedWidth = maximum $ map imageWidth (stack0Images ++ stack1Images)
99 stack0Images = [ i | SingleRowSingleAttrImage { rowImage = i } <- stack0 ]
98 stack0Images = [ i | SingleRowSingleAttrImage { rowImage = i } <- stack0 ]
100 stack1Images = [ i | SingleRowSingleAttrImage { rowImage = i } <- stack1 ]
99 stack1Images = [ i | SingleRowSingleAttrImage { rowImage = i } <- stack1 ]
101− stack0Image = vertCat stack0Images
100+ stack0Image = vertCat stack0Images
102− stack1Image = vertCat stack1Images
101+ stack1Image = vertCat stack1Images
103 image = stack0Image <-> stack1Image
102 image = stack0Image <-> stack1Image
104 in case image of
103 in case image of
105 VertJoin {} -> ( expectedWidth == (imageWidth $ partTop image) )
104 VertJoin {} -> ( expectedWidth == (imageWidth $ partTop image) )
@@ -137,7 +136,7 @@ cropBottomLimitsHeight :: Image -> Int -> Property
137cropBottomLimitsHeight i v = v >= 0 ==>
136cropBottomLimitsHeight i v = v >= 0 ==>
138 v >= imageHeight (cropBottom v i)
137 v >= imageHeight (cropBottom v i)
139
138
140−-- ridiculous tests just to satisfy my desire for nice code coverage :-P
139+-- rediculous tests just to satisfy my desire for nice code coverage :-P
141canShowImage :: Image -> Bool
140canShowImage :: Image -> Bool
142canShowImage i = length (show i) > 0
141canShowImage i = length (show i) > 0
143
142
@@ -172,3 +171,4 @@ tests = return
172 , verify "can rnf image" canRnfImage
171 , verify "can rnf image" canRnfImage
173 , verify "can pp image" canPpImage
172 , verify "can pp image" canPpImage
174 ]
173 ]
174+
test/VerifyImageTrans.hs+1−1
@@ -22,7 +22,7 @@ verifyHorizContatWAttrChangeSimplifies :: SingleRowTwoAttrImage -> Bool
22verifyHorizContatWAttrChangeSimplifies ( SingleRowTwoAttrImage (SingleRowSingleAttrImage attr0 charCount0 _image0)
22verifyHorizContatWAttrChangeSimplifies ( SingleRowTwoAttrImage (SingleRowSingleAttrImage attr0 charCount0 _image0)
23 (SingleRowSingleAttrImage attr1 charCount1 _image1)
23 (SingleRowSingleAttrImage attr1 charCount1 _image1)
24 i
24 i
25− )
25+ )
26 | charCount0 == 0 || charCount1 == 0 || attr0 == attr1 = isHorizTextOfColumns i (charCount0 + charCount1)
26 | charCount0 == 0 || charCount1 == 0 || attr0 == attr1 = isHorizTextOfColumns i (charCount0 + charCount1)
27 | otherwise = False == isHorizTextOfColumns i (charCount0 + charCount1)
27 | otherwise = False == isHorizTextOfColumns i (charCount0 + charCount1)
28
28
test/VerifyLayersSpanGeneration.hs+7−9
@@ -4,7 +4,6 @@ module VerifyLayersSpanGeneration where
4
4
5import Verify.Graphics.Vty.Prelude
5import Verify.Graphics.Vty.Prelude
6
6
7−import Verify.Graphics.Vty.Attributes
8import Verify.Graphics.Vty.Image
7import Verify.Graphics.Vty.Image
9import Verify.Graphics.Vty.Picture
8import Verify.Graphics.Vty.Picture
10import Verify.Graphics.Vty.Span
9import Verify.Graphics.Vty.Span
@@ -14,7 +13,7 @@ import Graphics.Vty.PictureToSpans
14
13
15import Verify
14import Verify
16
15
17−import qualified Data.Vector as Vector
16+import qualified Data.Vector as Vector
18
17
19largerHorizSpanOcclusion :: SingleRowSingleAttrImage -> SingleRowSingleAttrImage -> Result
18largerHorizSpanOcclusion :: SingleRowSingleAttrImage -> SingleRowSingleAttrImage -> Result
20largerHorizSpanOcclusion row0 row1 =
19largerHorizSpanOcclusion row0 row1 =
@@ -26,9 +25,8 @@ largerHorizSpanOcclusion row0 row1 =
26 ops = displayOpsForPic p (imageWidth iLarger,imageHeight iLarger)
25 ops = displayOpsForPic p (imageWidth iLarger,imageHeight iLarger)
27 in verifyOpsEquality expectedOps ops
26 in verifyOpsEquality expectedOps ops
28
27
29−-- | Two rows stacked vertical is equivalent to the first row rendered
28+-- | Two rows stacked vertical is equivalent to the first row rendered as the top layer and the
30−-- as the top layer and the second row rendered as a bottom layer with a
31−-- background fill where the first row would be.
29+-- second row rendered as a bottom layer with a background fill where the first row would be.
32vertStackLayerEquivalence0 :: SingleRowSingleAttrImage -> SingleRowSingleAttrImage -> Result
30vertStackLayerEquivalence0 :: SingleRowSingleAttrImage -> SingleRowSingleAttrImage -> Result
33vertStackLayerEquivalence0 row0 row1 =
31vertStackLayerEquivalence0 row0 row1 =
34 let i0 = rowImage row0
32 let i0 = rowImage row0
@@ -54,9 +52,8 @@ vertStackLayerEquivalence1 row0 row1 =
54 opsLayered = displayOpsForPic pLayered (imageWidth iLower,imageHeight iLower)
52 opsLayered = displayOpsForPic pLayered (imageWidth iLower,imageHeight iLower)
55 in verifyOpsEquality expectedOps opsLayered
53 in verifyOpsEquality expectedOps opsLayered
56
54
57−-- | Two rows horiz joined is equivalent to the first row rendered as
55+-- | Two rows horiz joined is equivalent to the first row rendered as the top layer and the
58−-- the top layer and the second row rendered as a bottom layer with a
59−-- background fill where the first row would be.
56+-- second row rendered as a bottom layer with a background fill where the first row would be.
60horizJoinLayerEquivalence0 :: SingleRowSingleAttrImage -> SingleRowSingleAttrImage -> Result
57horizJoinLayerEquivalence0 :: SingleRowSingleAttrImage -> SingleRowSingleAttrImage -> Result
61horizJoinLayerEquivalence0 row0 row1 =
58horizJoinLayerEquivalence0 row0 row1 =
62 let i0 = rowImage row0
59 let i0 = rowImage row0
@@ -112,7 +109,7 @@ horizJoinAlternate1 =
112 in verifyOpsEquality expectedOps opsLayered
109 in verifyOpsEquality expectedOps opsLayered
113
110
114tests :: IO [Test]
111tests :: IO [Test]
115−tests = return
112+tests = return
116 [ verify "a larger horiz span occludes a smaller span on a lower layer"
113 [ verify "a larger horiz span occludes a smaller span on a lower layer"
117 largerHorizSpanOcclusion
114 largerHorizSpanOcclusion
118 , verify "two rows stack vertical equiv to first image layered on top of second with padding (0)"
115 , verify "two rows stack vertical equiv to first image layered on top of second with padding (0)"
@@ -128,3 +125,4 @@ tests = return
128 -- , verify "alternating images using joins is the same as alternating images using layers (1)"
125 -- , verify "alternating images using joins is the same as alternating images using layers (1)"
129 -- horizJoinAlternate1
126 -- horizJoinAlternate1
130 ]
127 ]
128+
test/VerifyOutput.hs+9−12
@@ -1,9 +1,8 @@
1−-- We setup the environment to invoke certain terminals of interest.
1+{- We setup the environment to envoke certain terminals of interest.
2−-- This assumes appropriate definitions exist in the current environment
2+ - This assumes appropriate definitions exist in the current environment for the terminals of
3−-- for the terminals of interest.
3+ - interest.
4−{-# LANGUAGE ScopedTypeVariables #-}
4+ -}
5module VerifyOutput where
5module VerifyOutput where
6−
7import Verify
6import Verify
8
7
9import Graphics.Vty
8import Graphics.Vty
@@ -13,7 +12,10 @@ import Verify.Graphics.Vty.Output
13
12
14import Control.Monad
13import Control.Monad
15
14
15+import Data.Default
16+
16import qualified System.Console.Terminfo as Terminfo
17import qualified System.Console.Terminfo as Terminfo
18+import System.Posix.Env
17import System.Posix.IO
19import System.Posix.IO
18
20
19tests :: IO [Test]
21tests :: IO [Test]
@@ -35,16 +37,11 @@ smokeTestTermNonMac termName i = liftIOResult $ do
35smokeTestTerm :: String -> Image -> IO Result
37smokeTestTerm :: String -> Image -> IO Result
36smokeTestTerm termName i = do
38smokeTestTerm termName i = do
37 nullOut <- openFd "/dev/null" WriteOnly Nothing defaultFileFlags
39 nullOut <- openFd "/dev/null" WriteOnly Nothing defaultFileFlags
38− t <- outputForConfig $ defaultConfig
39− { outputFd = Just nullOut
40− , termName = Just termName
40+ t <- outputForConfig $ def { outputFd = Just nullOut, termName = Just termName }
41− , colorMode = Just NoColor
42− }
43 -- putStrLn $ "context color count: " ++ show (contextColorCount t)
41 -- putStrLn $ "context color count: " ++ show (contextColorCount t)
44 reserveDisplay t
42 reserveDisplay t
45 dc <- displayContext t (100,100)
43 dc <- displayContext t (100,100)
46− -- always show the cursor to produce tests for terminals with no
44+ -- always show the cursor to produce tests for terminals with no cursor support.
47− -- cursor support.
48 let pic = (picForImage i) { picCursor = Cursor 0 0 }
45 let pic = (picForImage i) { picCursor = Cursor 0 0 }
49 outputPicture dc pic
46 outputPicture dc pic
50 setCursorPos t 0 0
47 setCursorPos t 0 0
test/VerifyParseTerminfoCaps.hs+4−4
@@ -1,5 +1,4 @@
1{-# LANGUAGE NamedFieldPuns #-}
1{-# LANGUAGE NamedFieldPuns #-}
2−{-# LANGUAGE ScopedTypeVariables #-}
3module VerifyParseTerminfoCaps where
2module VerifyParseTerminfoCaps where
4
3
5import Prelude hiding ( catch )
4import Prelude hiding ( catch )
@@ -17,7 +16,7 @@ import Numeric
17
16
18-- If a terminal defines one of the caps then it's expected to be parsable.
17-- If a terminal defines one of the caps then it's expected to be parsable.
19-- TODO: reduce duplication with terminfo terminal implementation.
18-- TODO: reduce duplication with terminfo terminal implementation.
20−capsOfInterest =
19+capsOfInterest =
21 [ "cup"
20 [ "cup"
22 , "sc"
21 , "sc"
23 , "rc"
22 , "rc"
@@ -66,7 +65,7 @@ verifyParseCap capString onParse =
66 Right e -> onParse e
65 Right e -> onParse e
67
66
68nonParamaterizedCaps (NonParamCapString cap) = do
67nonParamaterizedCaps (NonParamCapString cap) = do
69− verifyParseCap cap $ \e ->
68+ verifyParseCap cap $ \e ->
70 let expectedBytes = map (toEnum . fromEnum) cap
69 let expectedBytes = map (toEnum . fromEnum) cap
71 outBytes = bytesForRange e 0 (length cap)
70 outBytes = bytesForRange e 0 (length cap)
72 in verifyBytesEqual outBytes expectedBytes
71 in verifyBytesEqual outBytes expectedBytes
@@ -76,7 +75,7 @@ literalPercentCaps (LiteralPercentCap capString expectedBytes) = do
76
75
77incFirstTwoCaps (IncFirstTwoCap capString expectedBytes) = do
76incFirstTwoCaps (IncFirstTwoCap capString expectedBytes) = do
78 verifyParseCap capString $ \e -> verifyBytesEqual (collectBytes e) expectedBytes
77 verifyParseCap capString $ \e -> verifyBytesEqual (collectBytes e) expectedBytes
79−
78+
80pushParamCaps (PushParamCap capString expectedParamCount expectedBytes) = do
79pushParamCaps (PushParamCap capString expectedParamCount expectedBytes) = do
81 verifyParseCap capString $ \e ->
80 verifyParseCap capString $ \e ->
82 let outBytes = collectBytes e
81 let outBytes = collectBytes e
@@ -99,3 +98,4 @@ printCap ti capName = do
99printExpression ti capName = do
98printExpression ti capName = do
100 let parseResult = parseCapExpression $ fromCapname ti capName
99 let parseResult = parseCapExpression $ fromCapname ti capName
101 putStrLn $ capName ++ ": " ++ show parseResult
100 putStrLn $ capName ++ ": " ++ show parseResult
101+
test/VerifySimpleSpanGeneration.hs+16−16
@@ -13,31 +13,31 @@ import Graphics.Vty.PictureToSpans
13
13
14import Verify
14import Verify
15
15
16−import qualified Data.Vector as Vector
16+import qualified Data.Vector as Vector
17
17
18unitImageAndZeroWindow0 :: UnitImage -> EmptyWindow -> Bool
18unitImageAndZeroWindow0 :: UnitImage -> EmptyWindow -> Bool
19−unitImageAndZeroWindow0 (UnitImage _ i) (EmptyWindow w) =
19+unitImageAndZeroWindow0 (UnitImage _ i) (EmptyWindow w) =
20 let p = picForImage i
20 let p = picForImage i
21 ops = displayOpsForPic p (regionForWindow w)
21 ops = displayOpsForPic p (regionForWindow w)
22 in displayOpsColumns ops == 0 && displayOpsRows ops == 0
22 in displayOpsColumns ops == 0 && displayOpsRows ops == 0
23
23
24unitImageAndZeroWindow1 :: UnitImage -> EmptyWindow -> Bool
24unitImageAndZeroWindow1 :: UnitImage -> EmptyWindow -> Bool
25−unitImageAndZeroWindow1 (UnitImage _ i) (EmptyWindow w) =
25+unitImageAndZeroWindow1 (UnitImage _ i) (EmptyWindow w) =
26 let p = picForImage i
26 let p = picForImage i
27 ops = displayOpsForPic p (regionForWindow w)
27 ops = displayOpsForPic p (regionForWindow w)
28− in ( spanOpsAffectedRows ops == 0 ) && ( allSpansHaveWidth ops 0 )
28+ in ( spanOpsEffectedRows ops == 0 ) && ( allSpansHaveWidth ops 0 )
29
29
30horizSpanImageAndZeroWindow0 :: SingleRowSingleAttrImage -> EmptyWindow -> Bool
30horizSpanImageAndZeroWindow0 :: SingleRowSingleAttrImage -> EmptyWindow -> Bool
31−horizSpanImageAndZeroWindow0 (SingleRowSingleAttrImage { rowImage = i }) (EmptyWindow w) =
31+horizSpanImageAndZeroWindow0 (SingleRowSingleAttrImage { rowImage = i }) (EmptyWindow w) =
32 let p = picForImage i
32 let p = picForImage i
33 ops = displayOpsForPic p (regionForWindow w)
33 ops = displayOpsForPic p (regionForWindow w)
34 in displayOpsColumns ops == 0 && displayOpsRows ops == 0
34 in displayOpsColumns ops == 0 && displayOpsRows ops == 0
35
35
36horizSpanImageAndZeroWindow1 :: SingleRowSingleAttrImage -> EmptyWindow -> Bool
36horizSpanImageAndZeroWindow1 :: SingleRowSingleAttrImage -> EmptyWindow -> Bool
37−horizSpanImageAndZeroWindow1 (SingleRowSingleAttrImage { rowImage = i }) (EmptyWindow w) =
37+horizSpanImageAndZeroWindow1 (SingleRowSingleAttrImage { rowImage = i }) (EmptyWindow w) =
38 let p = picForImage i
38 let p = picForImage i
39 ops = displayOpsForPic p (regionForWindow w)
39 ops = displayOpsForPic p (regionForWindow w)
40− in ( spanOpsAffectedRows ops == 0 ) && ( allSpansHaveWidth ops 0 )
40+ in ( spanOpsEffectedRows ops == 0 ) && ( allSpansHaveWidth ops 0 )
41
41
42horizSpanImageAndEqualWindow0 :: SingleRowSingleAttrImage -> Result
42horizSpanImageAndEqualWindow0 :: SingleRowSingleAttrImage -> Result
43horizSpanImageAndEqualWindow0 (SingleRowSingleAttrImage { rowImage = i, expectedColumns = c }) =
43horizSpanImageAndEqualWindow0 (SingleRowSingleAttrImage { rowImage = i, expectedColumns = c }) =
@@ -51,7 +51,7 @@ horizSpanImageAndEqualWindow1 (SingleRowSingleAttrImage { rowImage = i, expected
51 let p = picForImage i
51 let p = picForImage i
52 w = MockWindow c 1
52 w = MockWindow c 1
53 ops = displayOpsForPic p (regionForWindow w)
53 ops = displayOpsForPic p (regionForWindow w)
54− in spanOpsAffectedRows ops == 1
54+ in spanOpsEffectedRows ops == 1
55
55
56horizSpanImageAndLesserWindow0 :: SingleRowSingleAttrImage -> Result
56horizSpanImageAndLesserWindow0 :: SingleRowSingleAttrImage -> Result
57horizSpanImageAndLesserWindow0 (SingleRowSingleAttrImage { rowImage = i, expectedColumns = c }) =
57horizSpanImageAndLesserWindow0 (SingleRowSingleAttrImage { rowImage = i, expectedColumns = c }) =
@@ -74,7 +74,7 @@ singleAttrSingleSpanStackCropped1 stack =
74 expectedRowCount = stackHeight stack `div` 2
74 expectedRowCount = stackHeight stack `div` 2
75 w = MockWindow (stackWidth stack) expectedRowCount
75 w = MockWindow (stackWidth stack) expectedRowCount
76 ops = displayOpsForPic p (regionForWindow w)
76 ops = displayOpsForPic p (regionForWindow w)
77− actualRowCount = spanOpsAffectedRows ops
77+ actualRowCount = spanOpsEffectedRows ops
78 in expectedRowCount == actualRowCount
78 in expectedRowCount == actualRowCount
79
79
80singleAttrSingleSpanStackCropped2 :: SingleAttrSingleSpanStack -> SingleAttrSingleSpanStack -> Result
80singleAttrSingleSpanStackCropped2 :: SingleAttrSingleSpanStack -> SingleAttrSingleSpanStack -> Result
@@ -90,7 +90,7 @@ singleAttrSingleSpanStackCropped3 stack0 stack1 =
90 w = MockWindow (imageWidth (picImage p)) expectedRowCount
90 w = MockWindow (imageWidth (picImage p)) expectedRowCount
91 ops = displayOpsForPic p (regionForWindow w)
91 ops = displayOpsForPic p (regionForWindow w)
92 expectedRowCount = imageHeight (picImage p) `div` 2
92 expectedRowCount = imageHeight (picImage p) `div` 2
93− actualRowCount = spanOpsAffectedRows ops
93+ actualRowCount = spanOpsEffectedRows ops
94 in expectedRowCount == actualRowCount
94 in expectedRowCount == actualRowCount
95
95
96singleAttrSingleSpanStackCropped4 :: SingleAttrSingleSpanStack -> SingleAttrSingleSpanStack -> Result
96singleAttrSingleSpanStackCropped4 :: SingleAttrSingleSpanStack -> SingleAttrSingleSpanStack -> Result
@@ -107,7 +107,7 @@ singleAttrSingleSpanStackCropped5 stack0 stack1 =
107 w = MockWindow (imageWidth (picImage p)) (stackHeight stack0)
107 w = MockWindow (imageWidth (picImage p)) (stackHeight stack0)
108 ops = displayOpsForPic p (regionForWindow w)
108 ops = displayOpsForPic p (regionForWindow w)
109 expectedRowCount = stackHeight stack0
109 expectedRowCount = stackHeight stack0
110− actualRowCount = spanOpsAffectedRows ops
110+ actualRowCount = spanOpsEffectedRows ops
111 in expectedRowCount == actualRowCount
111 in expectedRowCount == actualRowCount
112
112
113horizSpanImageAndGreaterWindow0 :: SingleRowSingleAttrImage -> Result
113horizSpanImageAndGreaterWindow0 :: SingleRowSingleAttrImage -> Result
@@ -123,13 +123,13 @@ arbImageIsCropped :: DefaultImage -> MockWindow -> Bool
123arbImageIsCropped (DefaultImage image) win@(MockWindow w h) =
123arbImageIsCropped (DefaultImage image) win@(MockWindow w h) =
124 let pic = picForImage image
124 let pic = picForImage image
125 ops = displayOpsForPic pic (regionForWindow win)
125 ops = displayOpsForPic pic (regionForWindow win)
126− in ( spanOpsAffectedRows ops == h ) && ( allSpansHaveWidth ops w )
126+ in ( spanOpsEffectedRows ops == h ) && ( allSpansHaveWidth ops w )
127
127
128spanOpsActuallyFillRows :: DefaultPic -> Bool
128spanOpsActuallyFillRows :: DefaultPic -> Bool
129spanOpsActuallyFillRows (DefaultPic pic win) =
129spanOpsActuallyFillRows (DefaultPic pic win) =
130 let ops = displayOpsForPic pic (regionForWindow win)
130 let ops = displayOpsForPic pic (regionForWindow win)
131 expectedRowCount = regionHeight (regionForWindow win)
131 expectedRowCount = regionHeight (regionForWindow win)
132− actualRowCount = spanOpsAffectedRows ops
132+ actualRowCount = spanOpsEffectedRows ops
133 in expectedRowCount == actualRowCount
133 in expectedRowCount == actualRowCount
134
134
135spanOpsActuallyFillColumns :: DefaultPic -> Bool
135spanOpsActuallyFillColumns :: DefaultPic -> Bool
@@ -139,7 +139,7 @@ spanOpsActuallyFillColumns (DefaultPic pic win) =
139 in allSpansHaveWidth ops expectedColumnCount
139 in allSpansHaveWidth ops expectedColumnCount
140
140
141firstSpanOpSetsAttr :: DefaultPic -> Bool
141firstSpanOpSetsAttr :: DefaultPic -> Bool
142−firstSpanOpSetsAttr DefaultPic { defaultPic = pic, defaultWin = win } =
142+firstSpanOpSetsAttr DefaultPic { defaultPic = pic, defaultWin = win } =
143 let ops = displayOpsForPic pic (regionForWindow win)
143 let ops = displayOpsForPic pic (regionForWindow win)
144 in all ( isAttrSpanOp . Vector.head ) ( Vector.toList ops )
144 in all ( isAttrSpanOp . Vector.head ) ( Vector.toList ops )
145
145
@@ -158,7 +158,7 @@ imageCoverageMatchesBounds i =
158 in verifyAllSpansHaveWidth i ops (imageWidth i)
158 in verifyAllSpansHaveWidth i ops (imageWidth i)
159
159
160tests :: IO [Test]
160tests :: IO [Test]
161−tests = return
161+tests = return
162 [ verify "unit image is cropped when window size == (0,0) [0]" unitImageAndZeroWindow0
162 [ verify "unit image is cropped when window size == (0,0) [0]" unitImageAndZeroWindow0
163 , verify "unit image is cropped when window size == (0,0) [1]" unitImageAndZeroWindow1
163 , verify "unit image is cropped when window size == (0,0) [1]" unitImageAndZeroWindow1
164 , verify "horiz span image is cropped when window size == (0,0) [0]" horizSpanImageAndZeroWindow0
164 , verify "horiz span image is cropped when window size == (0,0) [0]" horizSpanImageAndZeroWindow0
@@ -171,7 +171,7 @@ tests = return
171 , verify "a stack of single attr text spans should define content for all the columns [output region == size of stack]"
171 , verify "a stack of single attr text spans should define content for all the columns [output region == size of stack]"
172 singleAttrSingleSpanStackOpCoverage
172 singleAttrSingleSpanStackOpCoverage
173 , verify "a single attr text span is cropped when window size < size of stack image [width]"
173 , verify "a single attr text span is cropped when window size < size of stack image [width]"
174− singleAttrSingleSpanStackCropped0
174+ singleAttrSingleSpanStackCropped0
175 , verify "a single attr text span is cropped when window size < size of stack image [height]"
175 , verify "a single attr text span is cropped when window size < size of stack image [height]"
176 singleAttrSingleSpanStackCropped1
176 singleAttrSingleSpanStackCropped1
177 , verify "single attr text span <|> single attr text span display cropped. [width]"
177 , verify "single attr text span <|> single attr text span display cropped. [width]"
test/VerifyUsingMockInput.hs+22−26
@@ -1,8 +1,8 @@
1{-# LANGUAGE MultiParamTypeClasses #-}
1{-# LANGUAGE MultiParamTypeClasses #-}
2{-# LANGUAGE FlexibleInstances #-}
2{-# LANGUAGE FlexibleInstances #-}
3−{-# LANGUAGE ScopedTypeVariables #-}
4−-- Generate some input bytes and delays between blocks of input bytes.
3+{- Generate some input bytes and delays between blocks of input bytes. Verify the events produced
5−-- Verify the events produced are as expected.
4+ - are as expected.
5+ -}
6module Main where
6module Main where
7
7
8import Verify.Graphics.Vty.Output
8import Verify.Graphics.Vty.Output
@@ -12,12 +12,14 @@ import Graphics.Vty.Input.Events
12import Graphics.Vty.Input.Loop
12import Graphics.Vty.Input.Loop
13import Graphics.Vty.Input.Terminfo
13import Graphics.Vty.Input.Terminfo
14
14
15+import Control.Applicative
15import Control.Concurrent
16import Control.Concurrent
16import Control.Concurrent.STM
17import Control.Concurrent.STM
17import Control.Exception
18import Control.Exception
18import Lens.Micro ((^.))
19import Lens.Micro ((^.))
19import Control.Monad
20import Control.Monad
20
21
22+import Data.Default
21import Data.IORef
23import Data.IORef
22import Data.List (intersperse, reverse, nubBy)
24import Data.List (intersperse, reverse, nubBy)
23
25
@@ -34,8 +36,7 @@ import Test.SmallCheck.Series
34
36
35import Text.Printf
37import Text.Printf
36
38
37−-- processing a block of 16 chars is the largest I can do without taking
39+-- processing a block of 16 chars is the largest I can do without taking too long to run the test.
38−-- too long to run the test.
39maxBlockSize :: Int
40maxBlockSize :: Int
40maxBlockSize = 16
41maxBlockSize = 16
41
42
@@ -46,11 +47,8 @@ forEachOf :: (Show a, Testable m b) => [a] -> (a -> b) -> Property m
46forEachOf l = over (generate (\n -> take n l))
47forEachOf l = over (generate (\n -> take n l))
47
48
48data InputEvent
49data InputEvent
49− = Bytes String
50− -- ^ Input sequence encoded as a string. Regardless, the input is
50+ = Bytes String -- | input sequence encoded as a string. Regardless, the input is read a byte at a time.
51− -- read a byte at a time.
52− | Delay Int
51+ | Delay Int -- | microsecond delay
53− -- ^ Microsecond delay
54 deriving Show
52 deriving Show
55
53
56type InputSpec = [InputEvent]
54type InputSpec = [InputEvent]
@@ -113,11 +111,11 @@ assertEventsFromSynInput table inputSpec expectedEvents = do
113 (writeFd, readFd) <- openPseudoTerminal
111 (writeFd, readFd) <- openPseudoTerminal
114 (setTermAttr,_) <- attributeControl readFd
112 (setTermAttr,_) <- attributeControl readFd
115 setTermAttr
113 setTermAttr
116− let testConfig = defaultConfig { inputFd = Just readFd
114+ let testConfig = def { inputFd = Just readFd
117− , termName = Just "dummy"
115+ , termName = Just "dummy"
118− , vmin = Just 1
116+ , vmin = Just 1
119− , vtime = Just 100
117+ , vtime = Just 100
120− }
118+ }
121 input <- initInput testConfig table
119 input <- initInput testConfig table
122 eventsRef <- newIORef []
120 eventsRef <- newIORef []
123 let writeWaitClose = do
121 let writeWaitClose = do
@@ -132,9 +130,7 @@ assertEventsFromSynInput table inputSpec expectedEvents = do
132 readLoop 0 = return ()
130 readLoop 0 = return ()
133 readLoop n = do
131 readLoop n = do
134 e <- atomically $ readTChan $ input^.eventChannel
132 e <- atomically $ readTChan $ input^.eventChannel
135− case e of
136− InputEvent ev -> modifyIORef eventsRef ((:) ev)
133+ modifyIORef eventsRef ((:) e)
137− ResumeAfterSignal -> return ()
138 readLoop (n - 1)
134 readLoop (n - 1)
139 genEventsUsingIoActions maxDuration writeWaitClose readEvents
135 genEventsUsingIoActions maxDuration writeWaitClose readEvents
140 outEvents <- reverse <$> readIORef eventsRef
136 outEvents <- reverse <$> readIORef eventsRef
@@ -167,8 +163,8 @@ verifyVisibleSynInputToEvent = forAll $ \(InputBlocksUsingTable gen) -> monadic
167
163
168verifyCapsSynInputToEvent :: Property IO
164verifyCapsSynInputToEvent :: Property IO
169verifyCapsSynInputToEvent = forAll $ \(InputBlocksUsingTable gen) ->
165verifyCapsSynInputToEvent = forAll $ \(InputBlocksUsingTable gen) ->
170− forEachOf terminalsOfInterest $ \terminalName -> monadic $ do
166+ forEachOf terminalsOfInterest $ \termName -> monadic $ do
171− term <- setupTerm terminalName
167+ term <- setupTerm termName
172 let table = capsClassifyMap term keysFromCapsTable
168 let table = capsClassifyMap term keysFromCapsTable
173 inputSeq = gen table
169 inputSeq = gen table
174 events = map snd inputSeq
170 events = map snd inputSeq
@@ -187,9 +183,9 @@ verifySpecialSynInputToEvent = forAll $ \(InputBlocksUsingTable gen) -> monadic
187
183
188verifyFullSynInputToEvent :: Property IO
184verifyFullSynInputToEvent :: Property IO
189verifyFullSynInputToEvent = forAll $ \(InputBlocksUsingTable gen) ->
185verifyFullSynInputToEvent = forAll $ \(InputBlocksUsingTable gen) ->
190− forEachOf terminalsOfInterest $ \terminalName -> monadic $ do
186+ forEachOf terminalsOfInterest $ \termName -> monadic $ do
191− term <- setupTerm terminalName
187+ term <- setupTerm termName
192− let table = classifyMapForTerm terminalName term
188+ let table = classifyMapForTerm termName term
193 inputSeq = gen table
189 inputSeq = gen table
194 events = map snd inputSeq
190 events = map snd inputSeq
195 keydowns = map (Bytes . fst) inputSeq
191 keydowns = map (Bytes . fst) inputSeq
@@ -198,9 +194,9 @@ verifyFullSynInputToEvent = forAll $ \(InputBlocksUsingTable gen) ->
198
194
199verifyFullSynInputToEvent_2x :: Property IO
195verifyFullSynInputToEvent_2x :: Property IO
200verifyFullSynInputToEvent_2x = forAll $ \(InputBlocksUsingTable gen) ->
196verifyFullSynInputToEvent_2x = forAll $ \(InputBlocksUsingTable gen) ->
201− forEachOf terminalsOfInterest $ \terminalName -> monadic $ do
197+ forEachOf terminalsOfInterest $ \termName -> monadic $ do
202− term <- setupTerm terminalName
198+ term <- setupTerm termName
203− let table = classifyMapForTerm terminalName term
199+ let table = classifyMapForTerm termName term
204 inputSeq = gen table
200 inputSeq = gen table
205 events = concatMap ((\s -> [s,s]) . snd) inputSeq
201 events = concatMap ((\s -> [s,s]) . snd) inputSeq
206 keydowns = map (Bytes . (\s -> s ++ s) . fst) inputSeq
202 keydowns = map (Bytes . (\s -> s ++ s) . fst) inputSeq
test/VerifyUsingMockTerminal.hs+15−23
@@ -4,11 +4,9 @@ import Verify.Graphics.Vty.Prelude
4
4
5import Verify.Graphics.Vty.Picture
5import Verify.Graphics.Vty.Picture
6import Verify.Graphics.Vty.Image
6import Verify.Graphics.Vty.Image
7−import Verify.Graphics.Vty.Attributes
8import Verify.Graphics.Vty.Span
7import Verify.Graphics.Vty.Span
9import Verify.Graphics.Vty.Output
8import Verify.Graphics.Vty.Output
10import Graphics.Vty.Output
9import Graphics.Vty.Output
11−import Graphics.Vty.Output.Interface
12import Graphics.Vty.Output.Mock
10import Graphics.Vty.Output.Mock
13
11
14import Graphics.Vty.Debug
12import Graphics.Vty.Debug
@@ -41,30 +39,27 @@ singleTRow :: MockWindow -> Property
41singleTRow (MockWindow w h) = liftIOResult $ do
39singleTRow (MockWindow w h) = liftIOResult $ do
42 (mockData,t) <- mockTerminal (w,h)
40 (mockData,t) <- mockTerminal (w,h)
43 dc <- displayBounds t >>= displayContext t
41 dc <- displayBounds t >>= displayContext t
44− -- create an image that contains just the character T repeated for a
42+ -- create an image that contains just the character T repeated for a single row
45− -- single row
46 let i = horizCat $ replicate (fromEnum w) (char defAttr 'T')
43 let i = horizCat $ replicate (fromEnum w) (char defAttr 'T')
47 pic = (picForImage i) { picBackground = Background 'B' defAttr }
44 pic = (picForImage i) { picBackground = Background 'B' defAttr }
48 outputPicture dc pic
45 outputPicture dc pic
49− -- The mock output string that represents the output bytes a single
46+ -- The mock output string that represents the output bytes a single line containing the T
50− -- line containing the T string: Followed by h - 1 lines of a change
51− -- to the background attribute and then the background character
47+ -- string: Followed by h - 1 lines of a change to the background attribute and then the
48+ -- background character
52 let expected = "H" ++ "MDA" ++ replicate (fromEnum w) 'T'
49 let expected = "H" ++ "MDA" ++ replicate (fromEnum w) 'T'
53 ++ concat (replicate (fromEnum h - 1) $ "MDA" ++ replicate (fromEnum w) 'B')
50 ++ concat (replicate (fromEnum h - 1) $ "MDA" ++ replicate (fromEnum w) 'B')
54 compareMockOutput mockData expected
51 compareMockOutput mockData expected
55−
52+
56manyTRows :: MockWindow -> Property
53manyTRows :: MockWindow -> Property
57manyTRows (MockWindow w h) = liftIOResult $ do
54manyTRows (MockWindow w h) = liftIOResult $ do
58 (mockData, t) <- mockTerminal (w,h)
55 (mockData, t) <- mockTerminal (w,h)
59 dc <- displayBounds t >>= displayContext t
56 dc <- displayBounds t >>= displayContext t
60− -- create an image that contains the character 'T' repeated for all
57+ -- create an image that contains the character 'T' repeated for all the rows
61− -- the rows
62 let i = vertCat $ replicate (fromEnum h) $ horizCat $ replicate (fromEnum w) (char defAttr 'T')
58 let i = vertCat $ replicate (fromEnum h) $ horizCat $ replicate (fromEnum w) (char defAttr 'T')
63 pic = (picForImage i) { picBackground = Background 'B' defAttr }
59 pic = (picForImage i) { picBackground = Background 'B' defAttr }
64 outputPicture dc pic
60 outputPicture dc pic
65− -- The UTF8 string that represents the output bytes is h repeats of
61+ -- The UTF8 string that represents the output bytes is h repeats of a move, 'M', followed by an
66− -- a move, 'M', followed by an attribute change. 'A', followed by w
62+ -- attribute change. 'A', followed by w 'T's
67− -- 'T's
68 let expected = "H" ++ concat (replicate (fromEnum h) $ "MDA" ++ replicate (fromEnum w) 'T')
63 let expected = "H" ++ concat (replicate (fromEnum h) $ "MDA" ++ replicate (fromEnum w) 'T')
69 compareMockOutput mockData expected
64 compareMockOutput mockData expected
70
65
@@ -72,14 +67,12 @@ manyTRowsCroppedWidth :: MockWindow -> Property
72manyTRowsCroppedWidth (MockWindow w h) = liftIOResult $ do
67manyTRowsCroppedWidth (MockWindow w h) = liftIOResult $ do
73 (mockData,t) <- mockTerminal (w,h)
68 (mockData,t) <- mockTerminal (w,h)
74 dc <- displayBounds t >>= displayContext t
69 dc <- displayBounds t >>= displayContext t
75− -- create an image that contains the character 'T' repeated for all
70+ -- create an image that contains the character 'T' repeated for all the rows
76− -- the rows
77 let i = vertCat $ replicate (fromEnum h) $ horizCat $ replicate (fromEnum w * 2) (char defAttr 'T')
71 let i = vertCat $ replicate (fromEnum h) $ horizCat $ replicate (fromEnum w * 2) (char defAttr 'T')
78 pic = (picForImage i) { picBackground = Background 'B' defAttr }
72 pic = (picForImage i) { picBackground = Background 'B' defAttr }
79 outputPicture dc pic
73 outputPicture dc pic
80− -- The UTF8 string that represents the output bytes is h repeats of
74+ -- The UTF8 string that represents the output bytes is h repeats of a move, 'M', followed by an
81− -- a move, 'M', followed by an attribute change. 'A', followed by w
75+ -- attribute change. 'A', followed by w 'T's
82− -- 'T's
83 let expected = "H" ++ concat (replicate (fromEnum h) $ "MDA" ++ replicate (fromEnum w) 'T')
76 let expected = "H" ++ concat (replicate (fromEnum h) $ "MDA" ++ replicate (fromEnum w) 'T')
84 compareMockOutput mockData expected
77 compareMockOutput mockData expected
85
78
@@ -87,14 +80,12 @@ manyTRowsCroppedHeight :: MockWindow -> Property
87manyTRowsCroppedHeight (MockWindow w h) = liftIOResult $ do
80manyTRowsCroppedHeight (MockWindow w h) = liftIOResult $ do
88 (mockData,t) <- mockTerminal (w,h)
81 (mockData,t) <- mockTerminal (w,h)
89 dc <- displayBounds t >>= displayContext t
82 dc <- displayBounds t >>= displayContext t
90− -- create an image that contains the character 'T' repeated for all
83+ -- create an image that contains the character 'T' repeated for all the rows
91− -- the rows
92 let i = vertCat $ replicate (fromEnum h * 2) $ horizCat $ replicate (fromEnum w) (char defAttr 'T')
84 let i = vertCat $ replicate (fromEnum h * 2) $ horizCat $ replicate (fromEnum w) (char defAttr 'T')
93 pic = (picForImage i) { picBackground = Background 'B' defAttr }
85 pic = (picForImage i) { picBackground = Background 'B' defAttr }
94 outputPicture dc pic
86 outputPicture dc pic
95− -- The UTF8 string that represents the output bytes is h repeats of
87+ -- The UTF8 string that represents the output bytes is h repeats of a move, 'M', followed by an
96− -- a move, 'M', followed by an attribute change. 'A', followed by w
88+ -- attribute change. 'A', followed by w count 'T's
97− -- count 'T's
98 let expected = "H" ++ concat (replicate (fromEnum h) $ "MDA" ++ replicate (fromEnum w) 'T')
89 let expected = "H" ++ concat (replicate (fromEnum h) $ "MDA" ++ replicate (fromEnum w) 'T')
99 compareMockOutput mockData expected
90 compareMockOutput mockData expected
100
91
@@ -106,3 +97,4 @@ tests = return [ verify "unitImageUnitBounds" unitImageUnitBounds
106 , verify "manyTRowsCroppedWidth" manyTRowsCroppedWidth
97 , verify "manyTRowsCroppedWidth" manyTRowsCroppedWidth
107 , verify "manyTRowsCroppedHeight" manyTRowsCroppedHeight
98 , verify "manyTRowsCroppedHeight" manyTRowsCroppedHeight
108 ]
99 ]
100+
test/VerifyUtf8Width.hs−2
@@ -1,11 +1,9 @@
1module VerifyUtf8Width where
1module VerifyUtf8Width where
2−
3import Verify
2import Verify
4
3
5import Graphics.Text.Width
4import Graphics.Text.Width
6import Graphics.Vty.Attributes
5import Graphics.Vty.Attributes
7import Graphics.Vty.Picture
6import Graphics.Vty.Picture
8−import Graphics.Vty.Image
9
7
10swIs1Column :: SingleColumnChar -> Bool
8swIs1Column :: SingleColumnChar -> Bool
11swIs1Column (SingleColumnChar c) = imageWidth (char defAttr c) == 1
9swIs1Column (SingleColumnChar c) = imageWidth (char defAttr c) == 1
test/YiIssue264.hs−1
@@ -1,5 +1,4 @@
1module Main where
1module Main where
2−
3import Graphics.Vty
2import Graphics.Vty
4import Control.Exception
3import Control.Exception
5
4
test/interactive_terminal_test.hs+52−51
@@ -12,13 +12,14 @@ import Control.Concurrent (threadDelay)
12import Control.Exception
12import Control.Exception
13import Control.Monad
13import Control.Monad
14
14
15+import Data.Default (def)
15import Data.List ( lookup )
16import Data.List ( lookup )
16import Data.Maybe ( isJust, fromJust )
17import Data.Maybe ( isJust, fromJust )
17import Data.Monoid
18import Data.Monoid
18import Data.String.QQ
19import Data.String.QQ
19import Data.Word
20import Data.Word
20
21
21−import Foreign.Marshal.Array
22+import Foreign.Marshal.Array
22
23
23import qualified System.Environment as Env
24import qualified System.Environment as Env
24
25
@@ -73,12 +74,12 @@ with the test_results.list file pasted into the issue. A suitable summary is:
73|]
74|]
74 waitForReturn
75 waitForReturn
75 results <- doTestMenu 1
76 results <- doTestMenu 1
76− envAttributes <- mapM ( \envName -> Control.Exception.catch ( Env.getEnv envName >>= return . (,) envName )
77+ envAttributes <- mapM ( \envName -> Control.Exception.catch ( Env.getEnv envName >>= return . (,) envName )
77− ( \ (_ :: SomeException) -> return (envName, "") )
78+ ( \ (_ :: SomeException) -> return (envName, "") )
78− )
79+ )
79 [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
80 [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
80 t <- standardIOConfig >>= outputForConfig
81 t <- standardIOConfig >>= outputForConfig
81− let resultsTxt = show envAttributes ++ "\n"
82+ let resultsTxt = show envAttributes ++ "\n"
82 ++ terminalID t ++ "\n"
83 ++ terminalID t ++ "\n"
83 ++ show results ++ "\n"
84 ++ show results ++ "\n"
84 releaseTerminal t
85 releaseTerminal t
@@ -93,7 +94,7 @@ testMenu :: [(String, Test)]
93testMenu = zip (map show [1..]) allTests
94testMenu = zip (map show [1..]) allTests
94
95
95doTestMenu :: Int -> IO [(String, Bool)]
96doTestMenu :: Int -> IO [(String, Bool)]
96−doTestMenu nextID
97+doTestMenu nextID
97 | nextID > length allTests = do
98 | nextID > length allTests = do
98 putStrLn $ "Done! Please email the " ++ outputFilePath ++ " file to coreyoconnor@gmail.com"
99 putStrLn $ "Done! Please email the " ++ outputFilePath ++ " file to coreyoconnor@gmail.com"
99 return []
100 return []
@@ -107,26 +108,26 @@ doTestMenu nextID
107 s <- getLine >>= return . filter (/= '\n')
108 s <- getLine >>= return . filter (/= '\n')
108 case s of
109 case s of
109 "q" -> return mempty
110 "q" -> return mempty
110− "" -> do
111+ "" -> do
111− r <- runTest $ show nextID
112+ r <- runTest $ show nextID
112 rs <- doTestMenu ( nextID + 1 )
113 rs <- doTestMenu ( nextID + 1 )
113 return $ r : rs
114 return $ r : rs
114 i | isJust ( lookup i testMenu ) -> do
115 i | isJust ( lookup i testMenu ) -> do
115− r <- runTest i
116+ r <- runTest i
116 rs <- doTestMenu ( read i + 1 )
117 rs <- doTestMenu ( read i + 1 )
117 return $ r : rs
118 return $ r : rs
118 where
119 where
119− displayTestMenu
120+ displayTestMenu
120 = mapM_ displayTestMenu' testMenu
121 = mapM_ displayTestMenu' testMenu
121− displayTestMenu' ( i, t )
122+ displayTestMenu' ( i, t )
122− = putStrLn $ ( if i == show nextID
123+ = putStrLn $ ( if i == show nextID
123− then "> "
124+ then "> "
124 else " "
125 else " "
125 ) ++ i ++ ". " ++ testName t
126 ) ++ i ++ ". " ++ testName t
126
127
127runTest :: String -> IO (String, Bool)
128runTest :: String -> IO (String, Bool)
128runTest i = do
129runTest i = do
129− let t = fromJust $ lookup i testMenu
130+ let t = fromJust $ lookup i testMenu
130 printSummary t
131 printSummary t
131 waitForReturn
132 waitForReturn
132 testAction t
133 testAction t
@@ -152,8 +153,8 @@ data Test = Test
152 , confirmResults :: IO Bool
153 , confirmResults :: IO Bool
153 }
154 }
154
155
155−allTests
156+allTests
156− = [ reserveOutputTest
157+ = [ reserveOutputTest
157 , displayBoundsTest0
158 , displayBoundsTest0
158 , displayBoundsTest1
159 , displayBoundsTest1
159 , displayBoundsTest2
160 , displayBoundsTest2
@@ -184,7 +185,7 @@ allTests
184 , layer1
185 , layer1
185 ]
186 ]
186
187
187−reserveOutputTest = Test
188+reserveOutputTest = Test
188 { testName = "Initialize and reserve terminal output then restore previous state."
189 { testName = "Initialize and reserve terminal output then restore previous state."
189 , testID = "reserveOutputTest"
190 , testID = "reserveOutputTest"
190 , testAction = do
191 , testAction = do
@@ -202,7 +203,7 @@ reserveOutputTest = Test
202 , printSummary = do
203 , printSummary = do
203 putStr $ [s|
204 putStr $ [s|
204Once return is pressed:
205Once return is pressed:
205− 0. The screen will be cleared.
206+ 0. The screen will be cleared.
206 1. Four lines of text should be visible.
207 1. Four lines of text should be visible.
207 1. The cursor should be visible and at the start of the fifth line.
208 1. The cursor should be visible and at the start of the fifth line.
208
209
@@ -364,7 +365,7 @@ Did the test output match the description?
364|]
365|]
365 defaultSuccessConfirmResults
366 defaultSuccessConfirmResults
366
367
367−-- Explicitly define the bytes that encode each example text.
368+-- Explicitely definethe bytes that encode each example text.
368-- This avoids any issues with how the compiler represents string literals.
369-- This avoids any issues with how the compiler represents string literals.
369--
370--
370-- This document is UTF-8 encoded so the UTF-8 string is still included for
371-- This document is UTF-8 encoded so the UTF-8 string is still included for
@@ -390,7 +391,7 @@ utf8Txt0 = [ [ 0xe2 , 0x86 , 0x91 ]
390
391
391iso10646Txt0 :: String
392iso10646Txt0 :: String
392iso10646Txt0 = map toEnum
393iso10646Txt0 = map toEnum
393− [ 8593
394+ [ 8593
394 , 8593
395 , 8593
395 , 8595
396 , 8595
396 , 8595
397 , 8595
@@ -553,11 +554,11 @@ After return is pressed for the second time:
553allColors = zip [ black, red, green, yellow, blue, magenta, cyan, white ]
554allColors = zip [ black, red, green, yellow, blue, magenta, cyan, white ]
554 [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" ]
555 [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" ]
555
556
556−allBrightColors
557+allBrightColors
557 = zip [ brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite ]
558 = zip [ brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite ]
558 [ "bright black", "bright red", "bright green", "bright yellow", "bright blue", "bright magenta", "bright cyan", "bright white" ]
559 [ "bright black", "bright red", "bright green", "bright yellow", "bright blue", "bright magenta", "bright cyan", "bright white" ]
559
560
560−attributesTest0 = Test
561+attributesTest0 = Test
561 { testName = "Character attributes: foreground colors."
562 { testName = "Character attributes: foreground colors."
562 , testID = "attributesTest0"
563 , testID = "attributesTest0"
563 , testAction = do
564 , testAction = do
@@ -603,7 +604,7 @@ Did the test output match the description?
603 defaultSuccessConfirmResults
604 defaultSuccessConfirmResults
604 }
605 }
605
606
606−attributesTest1 = Test
607+attributesTest1 = Test
607 { testName = "Character attributes: background colors."
608 { testName = "Character attributes: background colors."
608 , testID = "attributesTest1"
609 , testID = "attributesTest1"
609 , testAction = do
610 , testAction = do
@@ -658,7 +659,7 @@ Did the test output match the description?
658 defaultSuccessConfirmResults
659 defaultSuccessConfirmResults
659 }
660 }
660
661
661−attributesTest2 = Test
662+attributesTest2 = Test
662 { testName = "Character attributes: Vivid foreground colors."
663 { testName = "Character attributes: Vivid foreground colors."
663 , testID = "attributesTest2"
664 , testID = "attributesTest2"
664 , testAction = do
665 , testAction = do
@@ -685,23 +686,23 @@ Once return is pressed:
685 1. The cursor will be hidden.
686 1. The cursor will be hidden.
686 2. 9 lines of text in three columns will be drawn:
687 2. 9 lines of text in three columns will be drawn:
687 a. The first column will be a name of a standard color (for an 8 color
688 a. The first column will be a name of a standard color (for an 8 color
688− terminal) rendered with that color as the foreground color.
689+ terminal) rendered with that color as the foreground color.
689 b. The next column will be also be the name of a standard color rendered
690 b. The next column will be also be the name of a standard color rendered
690 with that color as the foreground color but the shade used should be
691 with that color as the foreground color but the shade used should be
691− more vivid than the shade used in the first column.
692+ more vivid than the shade used in the first column.
692 c. The final column will be the name of a color rendered with the
693 c. The final column will be the name of a color rendered with the
693 default attributes.
694 default attributes.
694
695
695For instance, one line will be the word "magenta" and that word should be
696For instance, one line will be the word "magenta" and that word should be
696−rendered in the magenta color.
697+rendered in the magenta color.
697
698
698I'm not actually sure exactly what "vivid" means in this context. For xterm the
699I'm not actually sure exactly what "vivid" means in this context. For xterm the
699−vivid colors are brighter.
700+vivid colors are brighter.
700
701
701−Verify:
702+Verify:
702 * The first column: The foreground color matches the named color.
703 * The first column: The foreground color matches the named color.
703 * The second column: The foreground color matches the named color but is
704 * The second column: The foreground color matches the named color but is
704− more vivid than the color used in the first column.
705+ more vivid than the color used in the first column.
705 * The third column: All text is rendered with the default attributes.
706 * The third column: All text is rendered with the default attributes.
706 * The vertical bars used in each line to mark the border of a column are
707 * The vertical bars used in each line to mark the border of a column are
707 lined up.
708 lined up.
@@ -717,7 +718,7 @@ Did the test output match the description?
717 defaultSuccessConfirmResults
718 defaultSuccessConfirmResults
718 }
719 }
719
720
720−attributesTest3 = Test
721+attributesTest3 = Test
721 { testName = "Character attributes: Vivid background colors."
722 { testName = "Character attributes: Vivid background colors."
722 , testID = "attributesTest3"
723 , testID = "attributesTest3"
723 , testAction = do
724 , testAction = do
@@ -745,23 +746,23 @@ Once return is pressed:
745 2. 9 lines of text in three columns will be drawn:
746 2. 9 lines of text in three columns will be drawn:
746 a. The first column will contain be a name of a standard color for an 8
747 a. The first column will contain be a name of a standard color for an 8
747 color terminal rendered with the default foreground color with a
748 color terminal rendered with the default foreground color with a
748− background the named color.
749+ background the named color.
749 b. The first column will contain be a name of a standard color for an 8
750 b. The first column will contain be a name of a standard color for an 8
750 color terminal rendered with the default foreground color with the
751 color terminal rendered with the default foreground color with the
751− background a vivid version of the named color.
752+ background a vivid version of the named color.
752 c. The third column will be the name of a standard color rendered with
753 c. The third column will be the name of a standard color rendered with
753 the default attributes.
754 the default attributes.
754−
755+
755For instance, one line will contain be the word "magenta" and the word should
756For instance, one line will contain be the word "magenta" and the word should
756−be rendered in the default foreground color over a magenta background.
757+be rendered in the default foreground color over a magenta background.
757
758
758I'm not actually sure exactly what "vivid" means in this context. For xterm the
759I'm not actually sure exactly what "vivid" means in this context. For xterm the
759vivid colors are brighter.
760vivid colors are brighter.
760
761
761−Verify:
762+Verify:
762 * The first column: The background color matches the named color.
763 * The first column: The background color matches the named color.
763 * The second column: The background color matches the named color and is
764 * The second column: The background color matches the named color and is
764− more vivid than the color used in the first column.
765+ more vivid than the color used in the first column.
765 * The third column column: All text is rendered with the default attributes.
766 * The third column column: All text is rendered with the default attributes.
766 * The vertical bars used in each line to mark the border of a column are
767 * The vertical bars used in each line to mark the border of a column are
767 lined up.
768 lined up.
@@ -784,7 +785,7 @@ Did the test output match the description?
784 defaultSuccessConfirmResults
785 defaultSuccessConfirmResults
785 }
786 }
786
787
787−attrCombos =
788+attrCombos =
788 [ ( "default", id )
789 [ ( "default", id )
789 , ( "bold", flip withStyle bold )
790 , ( "bold", flip withStyle bold )
790 , ( "blink", flip withStyle blink )
791 , ( "blink", flip withStyle blink )
@@ -795,7 +796,7 @@ attrCombos =
795 , ( "bold + blink + underline", flip withStyle (bold + blink + underline) )
796 , ( "bold + blink + underline", flip withStyle (bold + blink + underline) )
796 ]
797 ]
797
798
798−attributesTest4 = Test
799+attributesTest4 = Test
799 { testName = "Character attributes: Bold; Blink; Underline."
800 { testName = "Character attributes: Bold; Blink; Underline."
800 , testID = "attributesTest4"
801 , testID = "attributesTest4"
801 , testAction = do
802 , testAction = do
@@ -818,10 +819,10 @@ attributesTest4 = Test
818Once return is pressed:
819Once return is pressed:
819 0. The screen will be cleared.
820 0. The screen will be cleared.
820 1. The cursor will be hidden.
821 1. The cursor will be hidden.
821− 2. 8 rows of text in two columns.
822+ 2. 8 rows of text in two columns.
822 The rows will contain the following text:
823 The rows will contain the following text:
823 default
824 default
824− bold
825+ bold
825 blink
826 blink
826 underline
827 underline
827 bold + blink
828 bold + blink
@@ -830,8 +831,8 @@ Once return is pressed:
830 bold + blink + underline
831 bold + blink + underline
831 The first column will be rendered with the described attributes. The second
832 The first column will be rendered with the described attributes. The second
832 column will be rendered with the default attributes.
833 column will be rendered with the default attributes.
833−
834+
834−Verify:
835+Verify:
835 * The vertical bars used in each line to mark the border of a column are
836 * The vertical bars used in each line to mark the border of a column are
836 lined up.
837 lined up.
837 * The text in the first column is rendered as described.
838 * The text in the first column is rendered as described.
@@ -847,7 +848,7 @@ Did the test output match the description?
847 defaultSuccessConfirmResults
848 defaultSuccessConfirmResults
848 }
849 }
849
850
850−attributesTest5 = Test
851+attributesTest5 = Test
851 { testName = "Character attributes: 240 color palette"
852 { testName = "Character attributes: 240 color palette"
852 , testID = "attributesTest5"
853 , testID = "attributesTest5"
853 , testAction = do
854 , testAction = do
@@ -872,7 +873,7 @@ Once return is pressed:
872 2. A 20 character wide and 12 row high block of color squares. This should look like a palette
873 2. A 20 character wide and 12 row high block of color squares. This should look like a palette
873 of some sort. I'm not exactly sure if all color terminals use the same palette. I doubt it...
874 of some sort. I'm not exactly sure if all color terminals use the same palette. I doubt it...
874
875
875−Verify:
876+Verify:
876
877
877After return is pressed for the second time:
878After return is pressed for the second time:
878 0. The screen containing the test summary should be restored.
879 0. The screen containing the test summary should be restored.
@@ -937,7 +938,7 @@ cursorHideTest0 = Test
937 { testName = "Verify the cursor is hid and re-shown. issue #7"
938 { testName = "Verify the cursor is hid and re-shown. issue #7"
938 , testID = "cursorHideTest0"
939 , testID = "cursorHideTest0"
939 , testAction = do
940 , testAction = do
940− vty <- mkVty defaultConfig
941+ vty <- mkVty def
941 showCursor $ outputIface vty
942 showCursor $ outputIface vty
942 setCursorPos (outputIface vty) 5 5
943 setCursorPos (outputIface vty) 5 5
943 nextEvent vty
944 nextEvent vty
@@ -970,7 +971,7 @@ outputPicAndWait pic = do
970 releaseDisplay t
971 releaseDisplay t
971 releaseTerminal t
972 releaseTerminal t
972 return ()
973 return ()
973−
974+
974vertCropTest0 :: Test
975vertCropTest0 :: Test
975vertCropTest0 = Test
976vertCropTest0 = Test
976 { testName = "Verify bottom cropping works as expected with single column chars"
977 { testName = "Verify bottom cropping works as expected with single column chars"
@@ -1045,7 +1046,7 @@ horizCropTest0 = Test
1045 , testID = "cropTest0"
1046 , testID = "cropTest0"
1046 , testAction = do
1047 , testAction = do
1047 let baseImage = vertCat $ map (string defAttr) lorumIpsum
1048 let baseImage = vertCat $ map (string defAttr) lorumIpsum
1048− croppedImage = cropRight (imageWidth baseImage `div` 2) baseImage
1049+ croppedImage = cropRight (imageWidth baseImage `div` 2) baseImage
1049 image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1050 image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1050 outputImageAndWait image
1051 outputImageAndWait image
1051 , printSummary = putStr $ [s|
1052 , printSummary = putStr $ [s|
@@ -1062,7 +1063,7 @@ horizCropTest1 = Test
1062 , testID = "cropTest0"
1063 , testID = "cropTest0"
1063 , testAction = do
1064 , testAction = do
1064 let baseImage = vertCat $ map (string defAttr) lorumIpsumChinese
1065 let baseImage = vertCat $ map (string defAttr) lorumIpsumChinese
1065− croppedImage = cropRight (imageWidth baseImage `div` 2) baseImage
1066+ croppedImage = cropRight (imageWidth baseImage `div` 2) baseImage
1066 image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1067 image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1067 outputImageAndWait image
1068 outputImageAndWait image
1068 , printSummary = putStr $ [s|
1069 , printSummary = putStr $ [s|
@@ -1079,7 +1080,7 @@ horizCropTest2 = Test
1079 , testID = "cropTest0"
1080 , testID = "cropTest0"
1080 , testAction = do
1081 , testAction = do
1081 let baseImage = vertCat $ map (string defAttr) lorumIpsum
1082 let baseImage = vertCat $ map (string defAttr) lorumIpsum
1082− croppedImage = cropLeft (imageWidth baseImage `div` 2) baseImage
1083+ croppedImage = cropLeft (imageWidth baseImage `div` 2) baseImage
1083 image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1084 image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1084 outputImageAndWait image
1085 outputImageAndWait image
1085 , printSummary = putStr $ [s|
1086 , printSummary = putStr $ [s|
@@ -1096,7 +1097,7 @@ horizCropTest3 = Test
1096 , testID = "cropTest0"
1097 , testID = "cropTest0"
1097 , testAction = do
1098 , testAction = do
1098 let baseImage = vertCat $ map (string defAttr) lorumIpsumChinese
1099 let baseImage = vertCat $ map (string defAttr) lorumIpsumChinese
1099− croppedImage = cropLeft (imageWidth baseImage `div` 2) baseImage
1100+ croppedImage = cropLeft (imageWidth baseImage `div` 2) baseImage
1100 image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1101 image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1101 outputImageAndWait image
1102 outputImageAndWait image
1102 , printSummary = putStr $ [s|
1103 , printSummary = putStr $ [s|
test/vty-examples.cabal+11−16
@@ -1,5 +1,5 @@
1name: vty-examples
1name: vty-examples
2−version: 5.7
2+version: 5.6
3license: BSD3
3license: BSD3
4license-file: LICENSE
4license-file: LICENSE
5author: AUTHORS
5author: AUTHORS
@@ -8,21 +8,16 @@ homepage: https://github.com/jtdaugherty/vty
8category: User Interfaces
8category: User Interfaces
9synopsis: Examples programs using the vty library.
9synopsis: Examples programs using the vty library.
10description:
10description:
11− vty is terminal GUI library in the niche of ncurses. It is intended to
11+ vty is terminal GUI library in the niche of ncurses. It is intended to be easy to use, have no
12− be easy to use, have no confusing corner cases, and good support for
12+ confusing corner cases, and good support for common terminal types.
13− common terminal types.
14 .
13 .
15− vty-interactive-terminal-test - interactive test. Useful for building
14+ vty-interactive-terminal-test - interactive test. Useful for building a bug report for vtys author.
16− a bug report for vtys author.
17 .
15 .
18− vty-event-echo - view a input event log for vty. Example of
16+ vty-event-echo - view a input event log for vty. Example of interacting with user.
19− interacting with user.
20 .
17 .
21− vty-rogue - A bad rogue-like game. Go from the entrance to exit.
18+ vty-rogue - A bad rogue-like game. Go from the entrance to exit. Example of layers
22− Example of layers
23 .
19 .
24− vty-benchmark - benchmarks vty. A series of tests that push random
20+ vty-benchmark - benchmarks vty. A series of tests that push random pictures to the terminal.
25− pictures to the terminal.
26 .
21 .
27 &#169; Corey O'Connor; BSD3 license.
22 &#169; Corey O'Connor; BSD3 license.
28 .
23 .
@@ -41,7 +36,7 @@ executable vty-interactive-terminal-test
41 default-extensions: ScopedTypeVariables
36 default-extensions: ScopedTypeVariables
42 ghc-options: -threaded
37 ghc-options: -threaded
43
38
44− build-depends: vty >= 5.15,
39+ build-depends: vty >= 5.2.11,
45 base >= 4 && < 5,
40 base >= 4 && < 5,
46 bytestring,
41 bytestring,
47 containers,
42 containers,
@@ -69,7 +64,7 @@ executable vty-event-echo
69 FlexibleContexts
64 FlexibleContexts
70 ghc-options: -threaded
65 ghc-options: -threaded
71
66
72− build-depends: vty >= 5.15,
67+ build-depends: vty >= 5.2.11,
73 base >= 4 && < 5,
68 base >= 4 && < 5,
74 array,
69 array,
75 bytestring,
70 bytestring,
@@ -89,7 +84,7 @@ executable vty-rogue
89 default-extensions: ScopedTypeVariables
84 default-extensions: ScopedTypeVariables
90 ghc-options: -threaded
85 ghc-options: -threaded
91
86
92− build-depends: vty >= 5.15,
87+ build-depends: vty >= 5.2.11,
93 base >= 4 && < 5,
88 base >= 4 && < 5,
94 array,
89 array,
95 bytestring,
90 bytestring,
@@ -110,7 +105,7 @@ executable vty-benchmark
110 default-extensions: ScopedTypeVariables
105 default-extensions: ScopedTypeVariables
111 ghc-options: -threaded
106 ghc-options: -threaded
112
107
113− build-depends: vty >= 5.15,
108+ build-depends: vty >= 5.2.11,
114 base >= 4 && < 5,
109 base >= 4 && < 5,
115 bytestring,
110 bytestring,
116 Cabal,
111 Cabal,
tools/BuildWidthTable.hsdeleted−144
@@ -1,144 +0,0 @@
1−{-# LANGUAGE ScopedTypeVariables #-}
2−{-# LANGUAGE CPP #-}
3−module Main where
4−
5−import qualified Control.Exception as E
6−import Control.Monad (when)
7−import Data.Maybe (fromMaybe)
8−#if !(MIN_VERSION_base(4,11,0))
9−import Data.Semigroup ((<>))
10−#endif
11−import System.Directory (createDirectoryIfMissing)
12−import System.Environment (getArgs, getProgName)
13−import System.FilePath (takeDirectory)
14−import System.Exit (exitFailure)
15−import System.Console.GetOpt
16−import Text.Read (readMaybe)
17−
18−import Graphics.Vty.Config ( terminalWidthTablePath, currentTerminalName
19− , vtyConfigPath, addConfigWidthMap
20− , ConfigUpdateResult(..)
21− )
22−import Graphics.Vty.UnicodeWidthTable.IO
23−import Graphics.Vty.UnicodeWidthTable.Query
24−
25−data Arg = Help
26− | OutputPath String
27− | TableUpperBound String
28− | UpdateConfig
29− | VtyConfigPath String
30− deriving (Eq, Show)
31−
32−options :: Config -> [OptDescr Arg]
33−options config =
34− [ Option "h" ["help"] (NoArg Help)
35− "This help output"
36− , Option "b" ["bound"] (ReqArg TableUpperBound "MAX_CHAR")
37− ("The maximum Unicode code point to test when building the table " <>
38− "(default: " <> (show $ fromEnum $ configBound config) <> ")")
39− , Option "p" ["path"] (ReqArg OutputPath "PATH")
40− ("The output path to write to (default: " <>
41− fromMaybe "<none>" (configOutputPath config) <> ")")
42− , Option "u" ["update-config"] (NoArg UpdateConfig)
43− "Create or update the Vty configuration file to use the new table (default: no)"
44− , Option "c" ["config-path"] (ReqArg VtyConfigPath "PATH")
45− ("Update the specified Vty configuration file path when -u is set (default: " <>
46− configPath config <> ")")
47− ]
48−
49−data Config =
50− Config { configOutputPath :: Maybe FilePath
51− , configBound :: Char
52− , configUpdate :: Bool
53− , configPath :: FilePath
54− }
55− deriving (Show)
56−
57−mkDefaultConfig :: IO Config
58−mkDefaultConfig = do
59− Config <$> terminalWidthTablePath
60− <*> pure defaultUnicodeTableUpperBound
61− <*> pure False
62− <*> vtyConfigPath
63−
64−usage :: IO ()
65−usage = do
66− config <- mkDefaultConfig
67− pn <- getProgName
68− putStrLn $ "Usage: " <> pn <> " [options]"
69− putStrLn ""
70− putStrLn "This tool queries the terminal on stdout to determine the widths"
71− putStrLn "of Unicode characters rendered to the terminal. The resulting data"
72− putStrLn "is written to a table at the specified output path for later"
73− putStrLn "loading by Vty-based applications."
74− putStrLn ""
75−
76− putStrLn $ usageInfo pn (options config)
77−
78−updateConfigFromArg :: Arg -> Config -> Config
79−updateConfigFromArg Help c =
80− c
81−updateConfigFromArg UpdateConfig c =
82− c { configUpdate = True }
83−updateConfigFromArg (VtyConfigPath p) c =
84− c { configPath = p }
85−updateConfigFromArg (TableUpperBound s) c =
86− case readMaybe s of
87− Nothing -> error $ "Invalid table upper bound: " <> show s
88− Just v -> c { configBound = toEnum v }
89−updateConfigFromArg (OutputPath p) c =
90− c { configOutputPath = Just p }
91−
92−main :: IO ()
93−main = do
94− defConfig <- mkDefaultConfig
95− strArgs <- getArgs
96− let (args, unused, errors) = getOpt Permute (options defConfig) strArgs
97−
98− when (not $ null errors) $ do
99− mapM_ putStrLn errors
100− exitFailure
101−
102− when ((not $ null unused) || (Help `elem` args)) $ do
103− usage
104− exitFailure
105−
106− let config = foldr updateConfigFromArg defConfig args
107−
108− outputPath <- case configOutputPath config of
109− Nothing -> do
110− putStrLn "Error: could not obtain terminal width table path"
111− exitFailure
112− Just path -> return path
113−
114− putStrLn "Querying terminal:"
115− builtTable <- buildUnicodeWidthTable $ configBound config
116−
117− let dir = takeDirectory outputPath
118− createDirectoryIfMissing True dir
119− writeUnicodeWidthTable outputPath builtTable
120−
121− putStrLn $ "\nOutput table written to " <> outputPath
122−
123− when (configUpdate config) $ do
124− let cPath = configPath config
125− Just tName <- currentTerminalName
126−
127− result <- E.try $ addConfigWidthMap cPath tName outputPath
128−
129− case result of
130− Left (e::E.SomeException) -> do
131− putStrLn $ "Error updating Vty configuration at " <> cPath <> ": " <>
132− show e
133− exitFailure
134− Right ConfigurationCreated -> do
135− putStrLn $ "Configuration file created: " <> cPath
136− Right ConfigurationModified -> do
137− putStrLn $ "Configuration file updated: " <> cPath
138− Right (ConfigurationConflict other) -> do
139− putStrLn $ "Configuration file not updated: uses a different table " <>
140− "for TERM=" <> tName <> ": " <> other
141− Right ConfigurationRedundant -> do
142− putStrLn $ "Configuration file not updated: configuration " <>
143− cPath <> " already uses table " <> outputPath <>
144− " for TERM=" <> tName
view-benchmark-corenew file+4
@@ -0,0 +1,4 @@
1+#!/bin/sh
2+ghc-core --no-asm --no-cast -- \
3+ -hide-package vty-5.0.0 -i../src -XScopedTypeVariables ../dist/build/cbits/*.o \
4+ benchmark
vty.cabal+100−101
@@ -1,5 +1,5 @@
1name: vty
1name: vty
2−version: 5.35.1
2+version: 5.14
3license: BSD3
3license: BSD3
4license-file: LICENSE
4license-file: LICENSE
5author: AUTHORS
5author: AUTHORS
@@ -12,25 +12,27 @@ description:
12 be easy to use, have no confusing corner cases, and good support for
12 be easy to use, have no confusing corner cases, and good support for
13 common terminal types.
13 common terminal types.
14 .
14 .
15− See the @vty-examples@ package as well as the program
15+ Included in the source distribution is a program
16− @test/interactive_terminal_test.hs@ included in the @vty@ package for
16+ test/interactive_terminal_test.hs that demonstrates the various
17− examples on how to use the library.
17+ features.
18 .
18 .
19− Import the "Graphics.Vty" convenience module to get access to the core
19+ Developers: See the "Graphics.Vty" module.
20− parts of the library.
20+ .
21+ Users: See the "Graphics.Vty.Config" module.
21 .
22 .
22 &#169; 2006-2007 Stefan O'Rear; BSD3 license.
23 &#169; 2006-2007 Stefan O'Rear; BSD3 license.
23 .
24 .
24 &#169; Corey O'Connor; BSD3 license.
25 &#169; Corey O'Connor; BSD3 license.
25 .
26 .
26 &#169; Jonathan Daugherty; BSD3 license.
27 &#169; Jonathan Daugherty; BSD3 license.
27−cabal-version: 1.18
28+cabal-version: >= 1.18
28build-type: Simple
29build-type: Simple
29−extra-doc-files: README.md,
30+data-files: README.md,
31+ TODO,
30 AUTHORS,
32 AUTHORS,
31− CHANGELOG.md,
33+ CHANGELOG,
32 LICENSE
34 LICENSE
33−tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.5
35+tested-with: GHC >= 7.6.2
34
36
35source-repository head
37source-repository head
36 type: git
38 type: git
@@ -38,16 +40,18 @@ source-repository head
38
40
39library
41library
40 default-language: Haskell2010
42 default-language: Haskell2010
41− build-depends: base >= 4.8 && < 5,
43+ build-depends: base >= 4.6 && < 5,
42 blaze-builder >= 0.3.3.2 && < 0.5,
44 blaze-builder >= 0.3.3.2 && < 0.5,
43 bytestring,
45 bytestring,
44 containers,
46 containers,
47+ data-default >= 0.5.3,
45 deepseq >= 1.1 && < 1.5,
48 deepseq >= 1.1 && < 1.5,
46 directory,
49 directory,
47 filepath >= 1.0 && < 2.0,
50 filepath >= 1.0 && < 2.0,
48− microlens < 0.4.13,
51+ microlens,
49 microlens-mtl,
52 microlens-mtl,
50 microlens-th,
53 microlens-th,
54+ -- required for nice installation with yi
51 hashable >= 1.2,
55 hashable >= 1.2,
52 mtl >= 1.1.1.0 && < 2.3,
56 mtl >= 1.1.1.0 && < 2.3,
53 parallel >= 2.2 && < 3.3,
57 parallel >= 2.2 && < 3.3,
@@ -58,18 +62,10 @@ library
58 text >= 0.11.3,
62 text >= 0.11.3,
59 unix,
63 unix,
60 utf8-string >= 0.3 && < 1.1,
64 utf8-string >= 0.3 && < 1.1,
61− vector >= 0.7,
65+ vector >= 0.7
62− binary,
63− ansi-terminal >= 0.10.3
64−
65− if !impl(ghc >= 8.0)
66− build-depends: semigroups >= 0.16,
67− fail
68
66
69 exposed-modules: Graphics.Vty
67 exposed-modules: Graphics.Vty
70 Graphics.Vty.Attributes
68 Graphics.Vty.Attributes
71− Graphics.Vty.Attributes.Color
72− Graphics.Vty.Attributes.Color240
73 Graphics.Vty.Config
69 Graphics.Vty.Config
74 Graphics.Vty.Error
70 Graphics.Vty.Error
75 Graphics.Vty.Image
71 Graphics.Vty.Image
@@ -78,8 +74,10 @@ library
78 Graphics.Vty.Input
74 Graphics.Vty.Input
79 Graphics.Vty.Input.Events
75 Graphics.Vty.Input.Events
80 Graphics.Vty.Picture
76 Graphics.Vty.Picture
77+ Graphics.Vty.Prelude
81 Graphics.Vty.Output
78 Graphics.Vty.Output
82 Graphics.Text.Width
79 Graphics.Text.Width
80+ -- the modules below are only meant to be used by the tests.
83 Codec.Binary.UTF8.Debug
81 Codec.Binary.UTF8.Debug
84 Data.Terminfo.Parse
82 Data.Terminfo.Parse
85 Data.Terminfo.Eval
83 Data.Terminfo.Eval
@@ -91,7 +89,6 @@ library
91 Graphics.Vty.Input.Classify.Parse
89 Graphics.Vty.Input.Classify.Parse
92 Graphics.Vty.Input.Loop
90 Graphics.Vty.Input.Loop
93 Graphics.Vty.Input.Mouse
91 Graphics.Vty.Input.Mouse
94− Graphics.Vty.Input.Focus
95 Graphics.Vty.Input.Paste
92 Graphics.Vty.Input.Paste
96 Graphics.Vty.Input.Terminfo
93 Graphics.Vty.Input.Terminfo
97 Graphics.Vty.PictureToSpans
94 Graphics.Vty.PictureToSpans
@@ -100,52 +97,41 @@ library
100 Graphics.Vty.Output.Interface
97 Graphics.Vty.Output.Interface
101 Graphics.Vty.Output.XTermColor
98 Graphics.Vty.Output.XTermColor
102 Graphics.Vty.Output.TerminfoBased
99 Graphics.Vty.Output.TerminfoBased
103− Graphics.Vty.UnicodeWidthTable.Types
104− Graphics.Vty.UnicodeWidthTable.IO
105− Graphics.Vty.UnicodeWidthTable.Query
106− Graphics.Vty.UnicodeWidthTable.Install
107
100
108− other-modules: Graphics.Vty.Debug.Image
101+ other-modules: Graphics.Vty.Attributes.Color
102+ Graphics.Vty.Attributes.Color240
103+ Graphics.Vty.Debug.Image
109 Graphics.Vty.Input.Terminfo.ANSIVT
104 Graphics.Vty.Input.Terminfo.ANSIVT
110
105
111 c-sources: cbits/gwinsz.c
106 c-sources: cbits/gwinsz.c
112 cbits/set_term_timing.c
107 cbits/set_term_timing.c
113− cbits/get_tty_erase.c
114 cbits/mk_wcwidth.c
108 cbits/mk_wcwidth.c
115
109
116 include-dirs: cbits
110 include-dirs: cbits
117
111
118 hs-source-dirs: src
112 hs-source-dirs: src
119
113
114+ default-extensions: ScopedTypeVariables
115+ ForeignFunctionInterface
116+
120 ghc-options: -O2 -funbox-strict-fields -Wall -fspec-constr -fspec-constr-count=10
117 ghc-options: -O2 -funbox-strict-fields -Wall -fspec-constr -fspec-constr-count=10
121
118
122 ghc-prof-options: -O2 -funbox-strict-fields -caf-all -Wall -fspec-constr -fspec-constr-count=10
119 ghc-prof-options: -O2 -funbox-strict-fields -caf-all -Wall -fspec-constr -fspec-constr-count=10
123
120
124−executable vty-build-width-table
125− main-is: BuildWidthTable.hs
126− hs-source-dirs: tools
127−
128− default-language: Haskell2010
129− ghc-options: -threaded -Wall
121+ cc-options: -O2
130−
131− if !impl(ghc >= 8.0)
132− build-depends: semigroups >= 0.16
133−
134− build-depends: vty,
135− directory,
136− filepath,
137− base >= 4.8 && < 5
138
122
139executable vty-mode-demo
123executable vty-mode-demo
140 main-is: ModeDemo.hs
124 main-is: ModeDemo.hs
141 hs-source-dirs: demos
125 hs-source-dirs: demos
142
126
143 default-language: Haskell2010
127 default-language: Haskell2010
128+ default-extensions: ScopedTypeVariables
144 ghc-options: -threaded
129 ghc-options: -threaded
145
130
146 build-depends: vty,
131 build-depends: vty,
147− base >= 4.8 && < 5,
132+ base >= 4.6 && < 5,
148 containers,
133 containers,
134+ data-default >= 0.5.3,
149 microlens,
135 microlens,
150 microlens-mtl,
136 microlens-mtl,
151 mtl >= 1.1.1.0 && < 2.3
137 mtl >= 1.1.1.0 && < 2.3
@@ -155,17 +141,40 @@ executable vty-demo
155 hs-source-dirs: demos
141 hs-source-dirs: demos
156
142
157 default-language: Haskell2010
143 default-language: Haskell2010
144+ default-extensions: ScopedTypeVariables
158 ghc-options: -threaded
145 ghc-options: -threaded
159
146
160 build-depends: vty,
147 build-depends: vty,
161− base >= 4.8 && < 5,
148+ base >= 4.6 && < 5,
162 containers,
149 containers,
150+ data-default >= 0.5.3,
163 microlens,
151 microlens,
164 microlens-mtl,
152 microlens-mtl,
165 mtl >= 1.1.1.0 && < 2.3
153 mtl >= 1.1.1.0 && < 2.3
166
154
155+test-suite verify-attribute-ops
156+ default-language: Haskell2010
157+ default-extensions: ScopedTypeVariables
158+ type: detailed-0.9
159+ hs-source-dirs: test
160+ test-module: VerifyAttributeOps
161+ build-depends: vty,
162+ Cabal >= 1.20,
163+ QuickCheck >= 2.7,
164+ random >= 1.0 && < 1.2,
165+ base >= 4.6 && < 5,
166+ bytestring,
167+ containers,
168+ deepseq >= 1.1 && < 1.5,
169+ mtl >= 1.1.1.0 && < 2.3,
170+ text >= 0.11.3,
171+ unix,
172+ utf8-string >= 0.3 && < 1.1,
173+ vector >= 0.7
174+
167test-suite verify-using-mock-terminal
175test-suite verify-using-mock-terminal
168 default-language: Haskell2010
176 default-language: Haskell2010
177+ default-extensions: ScopedTypeVariables
169
178
170 type: detailed-0.9
179 type: detailed-0.9
171
180
@@ -184,8 +193,8 @@ test-suite verify-using-mock-terminal
184 build-depends: vty,
193 build-depends: vty,
185 Cabal >= 1.20,
194 Cabal >= 1.20,
186 QuickCheck >= 2.7,
195 QuickCheck >= 2.7,
187− random >= 1.0 && < 1.3,
196+ random >= 1.0 && < 1.2,
188− base >= 4.8 && < 5,
197+ base >= 4.6 && < 5,
189 bytestring,
198 bytestring,
190 containers,
199 containers,
191 deepseq >= 1.1 && < 1.5,
200 deepseq >= 1.1 && < 1.5,
@@ -198,6 +207,7 @@ test-suite verify-using-mock-terminal
198
207
199test-suite verify-terminal
208test-suite verify-terminal
200 default-language: Haskell2010
209 default-language: Haskell2010
210+ default-extensions: ScopedTypeVariables
201
211
202 type: detailed-0.9
212 type: detailed-0.9
203
213
@@ -216,10 +226,11 @@ test-suite verify-terminal
216 build-depends: vty,
226 build-depends: vty,
217 Cabal >= 1.20,
227 Cabal >= 1.20,
218 QuickCheck >= 2.7,
228 QuickCheck >= 2.7,
219− random >= 1.0 && < 1.3,
229+ random >= 1.0 && < 1.2,
220− base >= 4.8 && < 5,
230+ base >= 4.6 && < 5,
221 bytestring,
231 bytestring,
222 containers,
232 containers,
233+ data-default >= 0.5.3,
223 deepseq >= 1.1 && < 1.5,
234 deepseq >= 1.1 && < 1.5,
224 mtl >= 1.1.1.0 && < 2.3,
235 mtl >= 1.1.1.0 && < 2.3,
225 terminfo >= 0.3 && < 0.5,
236 terminfo >= 0.3 && < 0.5,
@@ -230,6 +241,7 @@ test-suite verify-terminal
230
241
231test-suite verify-display-attributes
242test-suite verify-display-attributes
232 default-language: Haskell2010
243 default-language: Haskell2010
244+ default-extensions: ScopedTypeVariables
233
245
234 type: detailed-0.9
246 type: detailed-0.9
235
247
@@ -248,8 +260,8 @@ test-suite verify-display-attributes
248 build-depends: vty,
260 build-depends: vty,
249 Cabal >= 1.20,
261 Cabal >= 1.20,
250 QuickCheck >= 2.7,
262 QuickCheck >= 2.7,
251− random >= 1.0 && < 1.3,
263+ random >= 1.0 && < 1.2,
252− base >= 4.8 && < 5,
264+ base >= 4.6 && < 5,
253 bytestring,
265 bytestring,
254 containers,
266 containers,
255 deepseq >= 1.1 && < 1.5,
267 deepseq >= 1.1 && < 1.5,
@@ -261,6 +273,7 @@ test-suite verify-display-attributes
261
273
262test-suite verify-empty-image-props
274test-suite verify-empty-image-props
263 default-language: Haskell2010
275 default-language: Haskell2010
276+ default-extensions: ScopedTypeVariables
264
277
265 type: detailed-0.9
278 type: detailed-0.9
266
279
@@ -273,8 +286,8 @@ test-suite verify-empty-image-props
273 build-depends: vty,
286 build-depends: vty,
274 Cabal >= 1.20,
287 Cabal >= 1.20,
275 QuickCheck >= 2.7,
288 QuickCheck >= 2.7,
276− random >= 1.0 && < 1.3,
289+ random >= 1.0 && < 1.2,
277− base >= 4.8 && < 5,
290+ base >= 4.6 && < 5,
278 bytestring,
291 bytestring,
279 containers,
292 containers,
280 deepseq >= 1.1 && < 1.5,
293 deepseq >= 1.1 && < 1.5,
@@ -286,6 +299,7 @@ test-suite verify-empty-image-props
286
299
287test-suite verify-eval-terminfo-caps
300test-suite verify-eval-terminfo-caps
288 default-language: Haskell2010
301 default-language: Haskell2010
302+ default-extensions: ScopedTypeVariables
289
303
290 type: detailed-0.9
304 type: detailed-0.9
291
305
@@ -299,8 +313,8 @@ test-suite verify-eval-terminfo-caps
299 build-depends: vty,
313 build-depends: vty,
300 Cabal >= 1.20,
314 Cabal >= 1.20,
301 QuickCheck >= 2.7,
315 QuickCheck >= 2.7,
302− random >= 1.0 && < 1.3,
316+ random >= 1.0 && < 1.2,
303− base >= 4.8 && < 5,
317+ base >= 4.6 && < 5,
304 blaze-builder >= 0.3.3.2 && < 0.5,
318 blaze-builder >= 0.3.3.2 && < 0.5,
305 bytestring,
319 bytestring,
306 containers,
320 containers,
@@ -314,6 +328,7 @@ test-suite verify-eval-terminfo-caps
314
328
315test-suite verify-image-ops
329test-suite verify-image-ops
316 default-language: Haskell2010
330 default-language: Haskell2010
331+ default-extensions: ScopedTypeVariables
317
332
318 type: detailed-0.9
333 type: detailed-0.9
319
334
@@ -328,8 +343,8 @@ test-suite verify-image-ops
328 build-depends: vty,
343 build-depends: vty,
329 Cabal >= 1.20,
344 Cabal >= 1.20,
330 QuickCheck >= 2.7,
345 QuickCheck >= 2.7,
331− random >= 1.0 && < 1.3,
346+ random >= 1.0 && < 1.2,
332− base >= 4.8 && < 5,
347+ base >= 4.6 && < 5,
333 bytestring,
348 bytestring,
334 containers,
349 containers,
335 deepseq >= 1.1 && < 1.5,
350 deepseq >= 1.1 && < 1.5,
@@ -341,6 +356,7 @@ test-suite verify-image-ops
341
356
342test-suite verify-image-trans
357test-suite verify-image-trans
343 default-language: Haskell2010
358 default-language: Haskell2010
359+ default-extensions: ScopedTypeVariables
344
360
345 type: detailed-0.9
361 type: detailed-0.9
346
362
@@ -355,8 +371,8 @@ test-suite verify-image-trans
355 build-depends: vty,
371 build-depends: vty,
356 Cabal >= 1.20,
372 Cabal >= 1.20,
357 QuickCheck >= 2.7,
373 QuickCheck >= 2.7,
358− random >= 1.0 && < 1.3,
374+ random >= 1.0 && < 1.2,
359− base >= 4.8 && < 5,
375+ base >= 4.6 && < 5,
360 bytestring,
376 bytestring,
361 containers,
377 containers,
362 deepseq >= 1.1 && < 1.5,
378 deepseq >= 1.1 && < 1.5,
@@ -368,6 +384,7 @@ test-suite verify-image-trans
368
384
369test-suite verify-inline
385test-suite verify-inline
370 default-language: Haskell2010
386 default-language: Haskell2010
387+ default-extensions: ScopedTypeVariables
371
388
372 type: detailed-0.9
389 type: detailed-0.9
373
390
@@ -381,8 +398,8 @@ test-suite verify-inline
381 build-depends: vty,
398 build-depends: vty,
382 Cabal >= 1.20,
399 Cabal >= 1.20,
383 QuickCheck >= 2.7,
400 QuickCheck >= 2.7,
384− random >= 1.0 && < 1.3,
401+ random >= 1.0 && < 1.2,
385− base >= 4.8 && < 5,
402+ base >= 4.6 && < 5,
386 bytestring,
403 bytestring,
387 containers,
404 containers,
388 deepseq >= 1.1 && < 1.5,
405 deepseq >= 1.1 && < 1.5,
@@ -394,6 +411,7 @@ test-suite verify-inline
394
411
395test-suite verify-parse-terminfo-caps
412test-suite verify-parse-terminfo-caps
396 default-language: Haskell2010
413 default-language: Haskell2010
414+ default-extensions: ScopedTypeVariables
397
415
398 type: detailed-0.9
416 type: detailed-0.9
399
417
@@ -408,8 +426,8 @@ test-suite verify-parse-terminfo-caps
408 build-depends: vty,
426 build-depends: vty,
409 Cabal >= 1.20,
427 Cabal >= 1.20,
410 QuickCheck >= 2.7,
428 QuickCheck >= 2.7,
411− random >= 1.0 && < 1.3,
429+ random >= 1.0 && < 1.2,
412− base >= 4.8 && < 5,
430+ base >= 4.6 && < 5,
413 bytestring,
431 bytestring,
414 containers,
432 containers,
415 deepseq >= 1.1 && < 1.5,
433 deepseq >= 1.1 && < 1.5,
@@ -422,6 +440,7 @@ test-suite verify-parse-terminfo-caps
422
440
423test-suite verify-simple-span-generation
441test-suite verify-simple-span-generation
424 default-language: Haskell2010
442 default-language: Haskell2010
443+ default-extensions: ScopedTypeVariables
425
444
426 type: detailed-0.9
445 type: detailed-0.9
427
446
@@ -439,8 +458,8 @@ test-suite verify-simple-span-generation
439 build-depends: vty,
458 build-depends: vty,
440 Cabal >= 1.20,
459 Cabal >= 1.20,
441 QuickCheck >= 2.7,
460 QuickCheck >= 2.7,
442− random >= 1.0 && < 1.3,
461+ random >= 1.0 && < 1.2,
443− base >= 4.8 && < 5,
462+ base >= 4.6 && < 5,
444 bytestring,
463 bytestring,
445 containers,
464 containers,
446 deepseq >= 1.1 && < 1.5,
465 deepseq >= 1.1 && < 1.5,
@@ -453,6 +472,7 @@ test-suite verify-simple-span-generation
453
472
454test-suite verify-crop-span-generation
473test-suite verify-crop-span-generation
455 default-language: Haskell2010
474 default-language: Haskell2010
475+ default-extensions: ScopedTypeVariables
456
476
457 type: detailed-0.9
477 type: detailed-0.9
458
478
@@ -470,8 +490,8 @@ test-suite verify-crop-span-generation
470 build-depends: vty,
490 build-depends: vty,
471 Cabal >= 1.20,
491 Cabal >= 1.20,
472 QuickCheck >= 2.7,
492 QuickCheck >= 2.7,
473− random >= 1.0 && < 1.3,
493+ random >= 1.0 && < 1.2,
474− base >= 4.8 && < 5,
494+ base >= 4.6 && < 5,
475 bytestring,
495 bytestring,
476 containers,
496 containers,
477 deepseq >= 1.1 && < 1.5,
497 deepseq >= 1.1 && < 1.5,
@@ -484,6 +504,7 @@ test-suite verify-crop-span-generation
484
504
485test-suite verify-layers-span-generation
505test-suite verify-layers-span-generation
486 default-language: Haskell2010
506 default-language: Haskell2010
507+ default-extensions: ScopedTypeVariables
487
508
488 type: detailed-0.9
509 type: detailed-0.9
489
510
@@ -501,33 +522,8 @@ test-suite verify-layers-span-generation
501 build-depends: vty,
522 build-depends: vty,
502 Cabal >= 1.20,
523 Cabal >= 1.20,
503 QuickCheck >= 2.7,
524 QuickCheck >= 2.7,
504− random >= 1.0 && < 1.3,
525+ random >= 1.0 && < 1.2,
505− base >= 4.8 && < 5,
506− bytestring,
507− containers,
508− deepseq >= 1.1 && < 1.5,
509− mtl >= 1.1.1.0 && < 2.3,
510− text >= 0.11.3,
511− unix,
512− utf8-string >= 0.3 && < 1.1,
513− vector >= 0.7
514−
515−test-suite verify-color-mapping
516− default-language: Haskell2010
517−
518− type: detailed-0.9
519−
520− hs-source-dirs: test
521−
522− test-module: VerifyColor240
523−
524− other-modules: Verify
525−
526− build-depends: vty,
527− Cabal >= 1.20,
528− QuickCheck >= 2.7,
529− random >= 1.0 && < 1.3,
530− base >= 4.8 && < 5,
526+ base >= 4.6 && < 5,
531 bytestring,
527 bytestring,
532 containers,
528 containers,
533 deepseq >= 1.1 && < 1.5,
529 deepseq >= 1.1 && < 1.5,
@@ -539,6 +535,7 @@ test-suite verify-color-mapping
539
535
540test-suite verify-utf8-width
536test-suite verify-utf8-width
541 default-language: Haskell2010
537 default-language: Haskell2010
538+ default-extensions: ScopedTypeVariables
542
539
543 type: detailed-0.9
540 type: detailed-0.9
544
541
@@ -551,8 +548,8 @@ test-suite verify-utf8-width
551 build-depends: vty,
548 build-depends: vty,
552 Cabal >= 1.20,
549 Cabal >= 1.20,
553 QuickCheck >= 2.7,
550 QuickCheck >= 2.7,
554− random >= 1.0 && < 1.3,
551+ random >= 1.0 && < 1.2,
555− base >= 4.8 && < 5,
552+ base >= 4.6 && < 5,
556 bytestring,
553 bytestring,
557 containers,
554 containers,
558 deepseq >= 1.1 && < 1.5,
555 deepseq >= 1.1 && < 1.5,
@@ -564,6 +561,7 @@ test-suite verify-utf8-width
564
561
565test-suite verify-using-mock-input
562test-suite verify-using-mock-input
566 default-language: Haskell2010
563 default-language: Haskell2010
564+ default-extensions: ScopedTypeVariables
567
565
568 type: exitcode-stdio-1.0
566 type: exitcode-stdio-1.0
569
567
@@ -571,17 +569,16 @@ test-suite verify-using-mock-input
571
569
572 main-is: VerifyUsingMockInput.hs
570 main-is: VerifyUsingMockInput.hs
573
571
574− other-modules: Verify.Graphics.Vty.Output
575−
576 build-depends: vty,
572 build-depends: vty,
577 Cabal >= 1.20,
573 Cabal >= 1.20,
574+ data-default >= 0.5.3,
578 QuickCheck >= 2.7,
575 QuickCheck >= 2.7,
579 smallcheck == 1.*,
576 smallcheck == 1.*,
580 quickcheck-assertions >= 0.1.1,
577 quickcheck-assertions >= 0.1.1,
581 test-framework == 0.8.*,
578 test-framework == 0.8.*,
582 test-framework-smallcheck == 0.2.*,
579 test-framework-smallcheck == 0.2.*,
583− random >= 1.0 && < 1.3,
580+ random >= 1.0 && < 1.2,
584− base >= 4.8 && < 5,
581+ base >= 4.6 && < 5,
585 bytestring,
582 bytestring,
586 containers,
583 containers,
587 deepseq >= 1.1 && < 1.5,
584 deepseq >= 1.1 && < 1.5,
@@ -599,6 +596,7 @@ test-suite verify-using-mock-input
599
596
600test-suite verify-config
597test-suite verify-config
601 default-language: Haskell2010
598 default-language: Haskell2010
599+ default-extensions: ScopedTypeVariables
602
600
603 type: exitcode-stdio-1.0
601 type: exitcode-stdio-1.0
604
602
@@ -608,6 +606,7 @@ test-suite verify-config
608
606
609 build-depends: vty,
607 build-depends: vty,
610 Cabal >= 1.20,
608 Cabal >= 1.20,
609+ data-default >= 0.5.3,
611 HUnit,
610 HUnit,
612 QuickCheck >= 2.7,
611 QuickCheck >= 2.7,
613 smallcheck == 1.*,
612 smallcheck == 1.*,
@@ -615,8 +614,8 @@ test-suite verify-config
615 test-framework == 0.8.*,
614 test-framework == 0.8.*,
616 test-framework-smallcheck == 0.2.*,
615 test-framework-smallcheck == 0.2.*,
617 test-framework-hunit,
616 test-framework-hunit,
618− random >= 1.0 && < 1.3,
617+ random >= 1.0 && < 1.2,
619− base >= 4.8 && < 5,
618+ base >= 4.6 && < 5,
620 bytestring,
619 bytestring,
621 containers,
620 containers,
622 deepseq >= 1.1 && < 1.5,
621 deepseq >= 1.1 && < 1.5,