on ea655ee help sign in
53 files changed+1151−2065
since splitsnapshots
unifiedsplit
CHANGELOG.md+420−726 LICENSE−2 README.md−79 cbits/gwinsz.c+5−14 cbits/gwinsz.h+1−2 cbits/mk_wcwidth.c+19−24 demos/Demo.hs+4−12 src/Codec/Binary/UTF8/Debug.hs+2−1 src/Data/Sequence/Extra.hs+1−1 src/Data/Terminfo/Eval.hs+3−3 src/Data/Terminfo/Parse.hs+10−10 src/Graphics/Text/Width.hs−9 src/Graphics/Vty.hs+19−39 src/Graphics/Vty/Attributes.hs+46−8 src/Graphics/Vty/Attributes/Color.hs+3−67 src/Graphics/Vty/Attributes/Color240.hs+218−10 src/Graphics/Vty/Config.hs+7−81 src/Graphics/Vty/DisplayAttributes.hs−3 src/Graphics/Vty/Image.hs+10−11 src/Graphics/Vty/Image/Internal.hs+3−3 src/Graphics/Vty/Inline.hs+7−5 src/Graphics/Vty/Input.hs+22−11 src/Graphics/Vty/Input/Classify.hs+29−53 src/Graphics/Vty/Input/Classify/Parse.hs+7−10 src/Graphics/Vty/Input/Classify/Types.hs+1−7 src/Graphics/Vty/Input/Events.hs+6−24 src/Graphics/Vty/Input/Focus.hs+13−15 src/Graphics/Vty/Input/Loop.hs+29−86 src/Graphics/Vty/Input/Mouse.hs+17−19 src/Graphics/Vty/Input/Paste.hs+24−16 src/Graphics/Vty/Input/Terminfo.hs+4−6 src/Graphics/Vty/Input/Terminfo/ANSIVT.hs+1−1 src/Graphics/Vty/Output.hs+5−6 src/Graphics/Vty/Output/Interface.hs+18−47 src/Graphics/Vty/Output/Mock.hs+2−6 src/Graphics/Vty/Output/TerminfoBased.hs+39−106 src/Graphics/Vty/Output/XTermColor.hs+18−27 src/Graphics/Vty/Picture.hs+1−8 src/Graphics/Vty/PictureToSpans.hs+4−4 src/Graphics/Vty/Span.hs+4−2 src/Graphics/Vty/UnicodeWidthTable/IO.hs+33−17 src/Graphics/Vty/UnicodeWidthTable/Install.hs+30−65 src/Graphics/Vty/UnicodeWidthTable/Query.hs+12−21 test/VerifyColor240.hs−269 test/VerifyEmptyImageProps.hs−1 test/VerifyEvalTerminfoCaps.hs−1 test/VerifyImageOps.hs+1−2 test/VerifyOutput.hs+2−7 test/VerifyParseTerminfoCaps.hs−1 test/VerifyUsingMockInput.hs+1−4 test/interactive_terminal_test.hs+1−1 tools/BuildWidthTable.hs+10−61 vty.cabal+39−51
CHANGELOG.md+420−726
@@ -1,861 +1,555 @@
11
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−
19425.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.
3+ - Added Graphics.Vty.Config.getTtyEraseChar to support querying the
4+ kernel for the current terminal's settings to obtain the character
5+ assigned by the "stty erase" command. That can then be added to the
6+ Vty configuration's input map to map to KBS (backspace) if desired.
2017
20285.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`
9+ - Resolved various import warnings (thanks @glguy)
10+ - Removed the MonadIO constraint from the Output type's fields and
11+ removed MonadFail uses (PR #177, thanks @glguy)
12+ - Clarified documentation for ANSI colors (thanks Colby Jenn)
13+ - Graphics.Vty.Attributes no longer re-exports
14+ Graphics.Vty.Attributes.Color
15+ - The Graphics.Vty.Attributes.Color module is now exposed (thanks Colby
16+ Jenn)
17+ - Raised upper bound for microlens to 0.4.12 (thanks Artyom Kazak)
18+ - Changed from using System.Posix.Env.getEnv to
19+ System.Environment.lookupEnv (thanks Jonathan Osser)
20+ - Added Graphics.Vty.Image functions for dealing with character width
21+ computations on Text values instead of Strings:
22+ - safeWctwidth
23+ - safeWctlwidth
24+ - wctwidth
25+ - wctlwidth
22226
223275.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.
28+ - Avoided a conflict with a Microlens 0.4.10 operator and added an
29+ upper bound on Microlens of 0.4.11.
22830
229315.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.
32+ - The Vty type got a new field, isShutdown, that returns whether the
33+ Vty handle has had its 'shutdown' function called (thanks Ian
34+ Jeffries)
35+ - Vty's shutdown function is now thread-safe.
23636
237375.24.1
238−------
239−
240−* The "shutdown" method of Vty handles is now idempotent (#159)
38+ - The "shutdown" method of Vty handles is now idempotent (#159)
24139
242405.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)
41+ - Add Generic and NFData instances for some types
42+ - Image: remove custom Show instance, add derived Show and Read instances
43+ - Updated Travis build settings (thanks Eric Mertens)
24944
250455.23.1
251−------
252−
253−* Fixed a bug where italics did not combine properly with other display
254− modes (#155, thanks Eric Mertens)
46+ - Fixed a bug where italics did not combine properly with other
47+ display modes (#155, thanks Eric Mertens)
25548
256495.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.
50+ - Added support for italicized output when terminfo supports it. This
51+ takes the form of a new Style, "italic". Note that most terminfo
52+ descriptors do not report capabilities for italics, so support for
53+ this will be very spotty.
54+ - Updateed text/string function documentation to indicate that escapes
55+ are not permitted in their inputs.
26556
266575.22
267−----
268−
269−* Added Graphics.Vty.Attributes.Color240.color240CodeToRGB function
270− (thanks Brent Carmer)
271−* Added nextEventNonblocking function (field) to Vty type (#87)
58+ - Added Graphics.Vty.Attributes.Color240.color240CodeToRGB function
59+ (thanks Brent Carmer)
60+ - Added nextEventNonblocking function (field) to Vty type (#87)
27261
273625.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
63+ - Picture and Background now provide Eq instances (thanks Jaro Reinders)
64+ - #145: vty builds with microlens 0.4.9 (thanks Daniel Wagner)
65+ - #142: note requirement of threaded RTS
27966
280675.20
281−----
282−
28368API changes:
284−* Split up Monoid instances into Monoid and Semigroup for newer GHCs
285− (thanks Ryan Scott)
69+ - Split up Monoid instances into Monoid and Semigroup for newer GHCs
70+ (thanks Ryan Scott)
28671
287725.19.1
288−------
289−
29073API changes:
291−* Cursor now provides an Eq instance (thanks Jaro Reinders)
74+ * Cursor now provides an Eq instance (thanks Jaro Reinders)
29275
293765.19
294−----
295−
29677API 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.
78+ - URL hyperlinking (via 'withURL') is now optional and disabled by
79+ default due to poor support on some common terminals. A new 'Mode'
80+ constructor, 'Hyperlink', has been added to enable this feature. To
81+ change the hyperlinking mode, use 'setMode' on the 'outputIface' of a
82+ Vty handle.
30283
303845.18.1
304−------
305−
30685Bug fixes:
307−* Reset the hyperlink state on line endings to avoid run-on hyperlinks
86+ - Reset the hyperlink state on line endings to avoid run-on hyperlinks
30887
309885.18
310−----
311−
31289API 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
90+ - Added support for hyperlinking attributes (thanks Getty Ritter). This
91+ change adds a new Attr field for containing the hyperlink to apply,
92+ as per https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda
31693
317945.17.1
318−------
319−
320−* withStyle now ignores zero arguments, leaving attribute styles
321− untouched if the input style is the null style
95+ - withStyle now ignores zero arguments, leaving attribute styles
96+ untouched if the input style is the null style
32297
323985.17
324−----
325−
32699API 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)
100+ - Add support for terminal focus events. This change adds a new mode
101+ usable with setMode, Focus, that requests that the terminal send
102+ events on focus lose/gain. This change also adds two new Event
103+ constructors, EvLostFocus and EvGainedFocus.
104+ - No longer enable UTF8 mouse event encoding. This encoding was not
105+ working properly with Terminal.app, and using the other modes (SGR,
106+ etc.) work.
107+ - Graphics.Vty.Attributes: escape backticks in Haddock comment (fixes
108+ #131)
336109
3371105.16
338−----
339−
340111API 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!
112+ - Added support for mouse wheel events while in mouse mode. The Button
113+ type got two new constructors as a result: BScrollUp and BScrollDown.
114+ Thanks to doublescale@tutanota.com for this contribution!
344115
345116Bug fixes:
346−* charFill now clamps negative arguments to zero (thanks Eric Mertens!)
117+ - charFill now clamps negative arguments to zero (thanks Eric
118+ Mertens!)
347119
3481205.15.1
349−------
350−
351121Package changes:
352−* Documentation files are now marked accordingly (thanks Michal
353− Suchánek)
122+ - Documentation files are now marked accordingly (thanks Michal
123+ Suchánek)
354124
355125Bug fixes:
356−* translateX/Y: fix negative translations
126+ - translateX/Y: fix negative translations
357127
3581285.15
359−----
360−
361129Package 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).
130+ - Discontinued support for GHC versions prior to 7.10.1.
131+ - Removed instructions and configuration for Stack builds since they
132+ are no longer supported.
133+ - Clarified README mention of (lack of) Windows support (contributors
134+ wanted, though!)
135+ - Removed dependency on data-default (see below).
368136
369137API 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.
138+ - Moved color definitions from Attributes to Color module.
139+ - In lieu of data-default (Default) instances for Attr and Config, use
140+ 'defAttr' and the new 'defaultConfig' (or 'mempty') instead of 'def'.
141+ - Graphics.Vty.Output no longer re-exports
142+ Graphics.Vty.Output.Interface.
143+ - Removed Graphics.Vty.Prelude module and moved DisplayRegion and its
144+ accessors to Graphics.Vty.Image.
145+ - Graphics.Vty.Image no longer re-exports Graphics.Vty.Attributes.
146+ - Graphics.Vty.Picture no longer re-exports Graphics.Vty.Image.
379147
3801485.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.
149+ - addMaybeClippedJoin: instead of raising an exception when the join
150+ is totally clipped, just reduce the clip amount and continue
151+ - addMaybeClipped: skip blit of joins when their primary dimension is
152+ zero
153+ - 'string' and related text functions no longer treat an empty string
154+ as an empty image (thanks Chris Penner). This means that now it is
155+ possible to use 'str ""' as a non-empty image with height 1.
390156
3911575.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
158+ - Reverted changes in 5.12 due to disagreements between terminal
159+ emulators and utf8proc; for more details, please see the ticket
160+ discussion at
161+ https://github.com/coreyoconnor/vty/issues/115
398162
3991635.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.
164+ - Replaced 'wcwidth' with a call to the utf8proc library's character
165+ width function, which is much more up to date (by several Unicode
166+ versions) and returns the right width for a much larger set of
167+ characters.
168+ - Added a bundled version of the utf8proc C library.
407169
4081705.11.3
409−------
410−
411−* Fix mouse event offsets in mouse-up events
171+ - Fix mouse event offsets in mouse-up events
412172
4131735.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).
174+ - Mouse events were modified so that the upper-left corner of the
175+ window is (0,0) rather than (1,1).
418176
4191775.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
178+ - Add Generic instance for Image
179+ - nextEvent: stop trying to refresh on a resize event (fixes segfault
180+ on refresh with normal cursor positioning mode)
181+ - Remove redundant clause from clipForCharWidth (thanks Eric Mertens)
182+ - Update maintainer
427183
4281845.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)
185+ - Vty now raises a VtyConfigurationError exception when the TERM
186+ evironment variable is missing (thanks Eric Mertens)
187+ - Graphics.Vty.Config got an explicit export list to avoid accidentally
188+ exporting internal types (thanks Eric Mertens)
435189
4361905.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)
191+ - Add absolute cursor positioning mode AbsoluteCursor to Cursor. This
192+ mode provides greater control over cursor positioning by bypassing
193+ the logical positioning provided by default. Rather than positioning
194+ the cursor by looking at the widths of characters involved, this
195+ constructor lets you provide a physical row and column instead. This
196+ is useful in more sophisticated programs. (thanks Eric Mertens)
197+ - Added a new Generic-derived config parser (thanks Eric Mertens)
198+ - Fixed the MShift case in the configuration file parser (thanks Eric
199+ Mertens)
200+ - Fixed wcwidth import and matched safeWcswidth to its documented
201+ behavior. Previously vty_mk_wcwidth was being imported with
202+ the wrong type causing the -1 return value to be mapped to the
203+ wrong Int value. Additionally safeWcswidth was using the unsafe
204+ character width function and only ensuring that the final result was
205+ non-negative. (thanks Eric Mertens)
454206
4552075.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)
208+ - Vty now only emits UTF8 charset sequences in terminals without a
209+ preexisting UTF8 declaration to avoid emitting garbage sequences
210+ (fixes #89)
461211
4622125.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)
213+ - Added new Output methods supportsBell and ringTerminalBell to find
214+ out whether the output device has an audio bell and to ring it (see
215+ #102)
467216
4682175.8.1
469−-----
470−
471−* Fixed "refresh" to work as advertised (see #104)
218+ - Fixed "refresh" to work as advertised (see #104)
472219
4732205.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
221+ - API change: EvPaste input event now provides paste data as a raw
222+ ByteString rather than a String to allow the application to decode
223+ how best to decode it
479224
4802255.7.1
481−-----
482−
483−* ModeDemo: added an explicit Control.Applicative import for older GHCs
226+ - ModeDemo: added an explicit Control.Applicative import for older
227+ GHCs
484228
4852295.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
230+ - Mouse and paste modes are now off by default.
231+ - The Config type got new fields: mouseMode and bracketedPasteMode.
232+ These determine whether these modes are enabled initially (for
233+ terminals that support them).
234+ - Added a Mode type for modal terminal features (mouse events,
235+ bracketed paste mode) that is used with new Output interface
236+ functions:
237+ * supportsMode :: Mode -> Bool tells whether the device supports a
238+ mode
239+ * setMode :: Mode -> Bool -> IO () turns a mode on or off
240+ * getModeStatus :: Mode -> IO Bool tells you whether a mode is on or
241+ off
242+ - Added a new demo program, ModeDemo.hs, to demonstrate usage of modes
501243
5022445.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
245+ - Added support for normal and extended mouse modes in Xterm-like
246+ terminals via the MouseDown and MouseUp Event constructors
247+ - Added support for bracketed paste mode in Xterm-like terminals via
248+ the EvPaste event constructor
249+ - Added derived Show instances for Event and Button (thanks Felix
250+ Hirn)
251+ - Now TERM values containing "screen" will automatically use the
252+ XtermColor driver rather than just TerminfoBased
513253
5142545.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
255+ - Replaced lens dependency with microlens, microlens-mtl, microlens-th
256+ dependencies. Issue #90
257+ - Thanks Jonathan Daugherty
258+ - Cabal corrections.
259+ - Thanks Lennart Spitzner
522260
5232615.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−
262+ - Changed eventChannel of Graphics.Vty.Input from Chan to TChan.
263+ This enables clients to query if there are no pending events. The
264+ Graphics.Vty interface nextEvent is unchanged. Clients that use
265+ eventChannel directly will require updating.
266+ https://github.com/coreyoconnor/vty/issues/60
5322675.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
268+ - Reverted cabal file to depend on Cabal >= 1.18 instead of 1.20 due
269+ to possibly breaking this on reasonable GHC versions
537270
5382715.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.
272+ - Upgraded QuickCheck dependency to 2.7
273+ - The standard IO Config (standardIOConfig) was overriding any
274+ provided application config. In addition, the inputFd and outputFd
275+ could not be changed if mkVty was used. Fixed.
276+ - Correct handling of display attributes at end of line. The output
277+ attributes are set to default at the end of content for the line and
278+ at the start of a new line. Previously the current attribute would
279+ extend to the next start of content. This was odd to reason about
280+ and was the cause of https://github.com/coreyoconnor/vty/issues/76
281+ IIRC Yi requires the old behavior to display the selection region
282+ correctly.
283+ - shutdown of the input thread is now performed using killThread and
284+ synchronization on an MVar. For correct handling of the terminal
285+ read vmin and vtime the read must be a blocking read on an OS
286+ thread. This places a threadWaitRead, which will be interrupted by
287+ the killThread, prior to the uninterruptable read. An alternative
288+ would be to re-import the read foreign call as interruptable.
557289
5582905.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
291+ - deepseq bounds increased for tests.
292+ - Clean up warnings when compiling on 7.10
293+ - Thanks Eric Mertens
294+ - Avoid discarding input bytes after multi-byte encoded codepoint
295+ - Thanks Eric Mertens
566296
5672975.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
298+ - "str" now returns EmptyImage for empty strings to match behavior of
299+ other string-like Image constructors (fixes #74)
300+ - Thanks Jonathan Daugherty
573301
5743025.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
303+ - dependency version bumps
304+ - https://github.com/coreyoconnor/vty/pull/71
305+ - https://github.com/coreyoconnor/vty/pull/70
306+ - Correct/Simplify the example code
307+ - Thanks glguy
308+ - https://github.com/coreyoconnor/vty/pull/69
583309
5843105.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
311+ - blaze-builder, lens, utf8-string version constraint bump
312+ - Thanks glguy
313+ - https://github.com/coreyoconnor/vty/pull/67
314+ - Do not differentiate based on TERM_PROGRAM
315+ - https://github.com/coreyoconnor/vty/issues/68
592316
5933175.2.7
594−-----
595−
596−* lens and deepseq constraint bump + misc
597− * Thanks ethercrow
598− * https://github.com/coreyoconnor/vty/pull/66
318+ - lens and deepseq constraint bump + misc
319+ - Thanks ethercrow
320+ - https://github.com/coreyoconnor/vty/pull/66
599321
6003225.2.6
601−-----
602−
603−* lens constraint bump
604− * Thanks alexander-b!
605− * https://github.com/coreyoconnor/vty/pull/64
323+ - lens constraint bump
324+ - Thanks alexander-b!
325+ - https://github.com/coreyoconnor/vty/pull/64
606326
6073275.2.5
608−-----
609−
610−* lens and random version constraint bump.
611− * Thanks RyanGlScott!
612− * https://github.com/coreyoconnor/vty/pull/62
328+ - lens and random version constraint bump.
329+ - Thanks RyanGlScott!
330+ - https://github.com/coreyoconnor/vty/pull/62
613331
6143325.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!
333+ - removed -fpic from cc-options. No longer required.
334+ - https://github.com/coreyoconnor/vty/issues/61
335+ - https://ghc.haskell.org/trac/ghc/ticket/9657
336+ - Thanks Fuuzetsu!
621337
6223385.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!
339+ - evaluate/compile the input parsing table once instead of each
340+ keystroke.
341+ - https://github.com/coreyoconnor/vty/pull/59
342+ - Thanks ethercrow!
629343
6303445.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!
345+ - When looking at input for an event, don't look too deep.
346+ - https://github.com/coreyoconnor/vty/pull/57
347+ - Thanks ethercrow!
636348
6373495.2.1
638−-----
639−
640−* Bump upper version bound for lens to 4.5. Thanks markus1189!
350+ - Bump upper version bound for lens to 4.5. Thanks markus1189!
641351
6423525.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
353+ - Config structure now specifies file descriptor to use. The default
354+ is stdInput and stdOutput file descriptors. Previously Vty used
355+ stdInput for input and the follow code for output:
356+ - hDuplicate stdout >>= handleToFd >>= (`hSetBuffering`
357+ NoBuffering)
358+ - the difference was required by Vty.Inline. Now, Vty.Inline uses
359+ the Config structure options to acheive the same effect.
360+ - removed: derivedVtime, derivedVmin, inputForCurrentTerminal,
361+ inputForNameAndIO, outputForCurrentTerminal, outputForNameAndIO
362+ - added: inputForConfig, outputForConfig
363+ - updates to vty-rogue from jtdaugherty. Thanks!
364+ - the oldest version of GHC tested to support vty is 7.6.2.
365+ - the oldest version of GHC that vty compiles under is 7.4.2
658366
6593675.1.4
660−-----
661−
662−* merged https://github.com/coreyoconnor/vty/pull/51 thanks trofi!
368+ - merged https://github.com/coreyoconnor/vty/pull/51 thanks trofi!
663369
6643705.1.1
665−-----
666−
667−* merged https://github.com/coreyoconnor/vty/pull/48 thanks sjmielke!
668−* jtdaugherty resolved a number of compiler warnings. Thanks!
371+ - merged https://github.com/coreyoconnor/vty/pull/48 thanks sjmielke!
372+ - jtdaugherty resolved a number of compiler warnings. Thanks!
669373
6703745.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.
375+ - vmin and vtime can be specified however the application requires.
376+ See Graphics.Vty.Config.
377+ - fixed the processing of input when vmin is set > 1.
676378
6773795.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
380+ - The naming convention now matches:
381+ - http://www.haskell.org/haskellwiki/Programming_guidelines#Naming_Conventions
382+ - all projects using vty for input must be compiled with -threaded.
383+ Please notify vty author if this is not acceptable.
384+ - mkVtyEscDelay has been removed. Use "mkVty def". Which initialized
385+ vty with the default configuration.
386+ - input handling changes
387+ - KASCII is now KChar
388+ - KPN5 is now KCenter
389+ - tests exist.
390+ - Applications can add to the input tables by setting inputMap of
391+ the Config. See Graphics.Vty.Config
392+ - Users can define input table extensions that will apply to all vty
393+ applications. See Graphics.Vty.Config
394+ - terminal timing is now handled by selecting an appropriate VTIME.
395+ Previously this was implemented within Vty itself. This reduced
396+ complexity in vty but provides a different meta key behavior and
397+ implies a requirement on -threaded.
398+ - The time vty will wait to verify an ESC byte means a single ESC
399+ key is the singleEscPeriod of the Input Config structure.
400+ - removed the typeclass based terminal and display context interface
401+ in favor of a data structure of properties interface.
402+ - renamed the Terminal interface to Output
403+ - The default picture for an image now uses the "clear" background.
404+ This background fills background spans with spaces or just ends the
405+ line.
406+ - Previously the background defaulted to the space character. This
407+ causes issues copying text from a text editor. The text would end
408+ up with extra spaces at the end of the line.
409+ - Layer support
410+ - Each layer is an image.
411+ - The layers for a picture are a list of images.
412+ - The first image is the top-most layer. The images are ordered from
413+ top to bottom.
414+ - The transparent areas for a layer are the backgroundFill areas.
415+ backgroundFill is added to pad images when images of different
416+ sizes are joined.
417+ - If the background is clear there is no background layer.
418+ - If there is a background character then the bottom layer is the
419+ background layer.
420+ - emptyPicture is a Picture with no layers and no cursor
421+ - addToTop and addToBottom add a layer to the top and bottom of the
422+ given Picture.
423+ - compatibility improvements:
424+ - terminfo based terminals with no cursor support are silently
425+ accepted. The cursor visibility changes in the Picture will have
426+ no effect.
427+ - alternate (setf/setb) color maps supported. Though colors beyond
428+ the first 8 are just a guess.
429+ - added "rgbColor" for easy support of RGB specified colors.
430+ - Both applications and users can add to the mapping used to
431+ translate from input bytes to events.
432+ - Additional information about input and output process can be
433+ appended to a debug log
434+ - Set environment variable VTY_DEBUG_LOG to path of debug log
435+ - Or use "debugLog <path>" config directive
436+ - Or set 'debugLog' property of the Config provided to mkVty.
437+ - examples moved to vty-examples package. See test directory for cabal
438+ file.
439+ - vty-interactive-terminal-test
440+ - interactive test. Useful for building a bug report for vty's
441+ author.
442+ - test/interactive_terminal_test.hs
443+ - vty-event-echo
444+ - view a input event log for vty. Example of interacting with
445+ user.
446+ - test/EventEcho.hs
447+ - vty-rogue
448+ - The start of a rogue-like game. Example of layers and image
449+ build operations.
450+ - test/Rogue.hs
451+ - vty-benchmark
452+ - benchmarks vty. A series of tests that push random pictures to
453+ the terminal. The random pictures are generated using
454+ QuickCheck. The same generators used in the automated tests.
455+ - test/benchmark.hs
756456
7574574.7.0.0
758−-------
458+ - API changes:
459+ - Added Graphics.Vty.Image.crop: Ensure an image is no larger
460+ than the specified size.
461+ - Added Graphics.Vty.Image.pad: Ensure an image is no smaller
462+ than the specified size.
463+ - Added Graphics.Vty.Image.translate: Offset an image.
464+ - Thanks Ben Boeckel <MathStuf@gmail.com> for these features.
759465
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.
466+4.3.0.0
767467
7684684.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
469+ - API changes:
470+ - Attr record accessor fore_color changed to attr_fore_color
471+ - Attr record accessor back_color changed to attr_back_color
472+ - Attr record accessor style changed to attr_style
473+ - Added an "inline" display attribute changing DSL:
474+ - put_attr_change applies a display attribute change
475+ immediately to a terminal
476+ - For instance, can be used to change the display attrbiutes
477+ of text output via putStrLn and putStr. EX:
478+ "put_attr_change $ back_color red" will set the background
479+ color to red.
480+ - Changes do not apply to a Picture output via output_picture.
481+ - See Graphics.Vty.Inline
482+ - Moved all IO actions into any monad an instance of MonadIO
785483
7864844.0.0.1
787−-------
788−
789−* binding for mk_wcswidth was incorrect. Most platforms just
790− magically worked due to coincidence.
485+ - binding for mk_wcswidth was incorrect. Most platforms just
486+ magically worked due to coincidence.
791487
7924884.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.
489+ - API changes:
490+ - "getSize" has been removed. Use "terminal vty >>= display_bounds"
491+ where "vty" is an instance of the Vty data structure.
492+ - added a "terminal" field to the Vty data structure. Accesses the
493+ TerminalHandle associated with the Vty instance.
494+ - Graphics.Vty.Types has undergone a number of changes. Summary:
495+ - Partitioned into Graphics.Vty.Attributes for display attributes.
496+ Graphics.Vty.Image for image combinators. Graphics.Vty.Picture
497+ for final picture construction.
498+ - Graphics.Vty.Attributes:
499+ - "setFG" and "setBG" are now "with_fore_color" and
500+ "with_back_color"
501+ - All other "set.." equations similarly replaced.
502+ - "attr" is now "def_attr", short for "default display attributes"
503+ Also added a "current_attr" for "currently applied display
504+ attributes"
505+ - Graphics.Vty.Image:
506+ - "horzcat" is now "horiz_cat"
507+ - "vertcat" is now "vert_cat"
508+ - "renderBS" is now "utf8_bytestring"
509+ - "renderChar" is now "char"
510+ - "renderFill" is now "char_fill"
511+ - added a "utf8_string" and "string" (AKA "iso_10464_string") for
512+ UTF-8 encoded Strings and ISO-10464 encoded Strings. String
513+ literals in GHC have an ISO-10464 runtime representation.
514+ - Graphics.Vty.Picture:
515+ - exports Graphics.Vty.Image
516+ - "pic" is now "pic_for_image"
517+ - added API for setting background fill pattern.
518+ - Completely rewritten output backend.
519+ - Efficient, scanline style output span generator. Has not been
520+ fully optimized, but good enough.
521+ - The details required to display the desired picture on a
522+ terminal are well encapsulated.
523+ - Terminfo based display terminal implementation. With specialized
524+ derivitives for xterm, Terminal.app, and iTerm.app.
525+ - Attempts to robustly handle even terminals that don't
526+ support all display attributes.
527+ - I've tested the following terminals with success: iTerm.app,
528+ Terminal.app, xterm, rxvt, mlterm, Eterm, gnome-terminal,
529+ konsole, screen, linux vty. Hopefully you will be as
530+ successfull.
531+ - Improved unicode support. Double wide characters will display as
532+ expected.
533+ - 256 color support. See Graphics.Vty.Attributes.Color240. The actual
534+ output color is adjusted according to the number of colors the
535+ terminal supports.
536+ - The Graphics.Vty.Image combinators no longer require matching
537+ dimensions to arguments. Unspecified areas are filled in with a
538+ user-customizable background pattern. See Graphics.Vty.Picture.
539+ - output images are always cropped to display size.
540+ - Significant code coverage by QuickCheck tests. An interactive test
541+ for those final properties that couldn't be automatically verified.
848542
849543Issues 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
544+ - "gnome terminal displays non-basic attributes as strikethrough"
545+ - http://trac.haskell.org/vty/ticket/14
546+ - "Multi-byte characters are not displayed correctly on update"
547+ - http://trac.haskell.org/vty/ticket/10
548+ - "Redraw does not handle rendering a line that extends beyond screen
549+ width characters"
550+ - http://trac.haskell.org/vty/ticket/13
551+ - "The <|> and <-> combinators should be more forgiving of mismatched
552+ dimensions"
553+ - http://trac.haskell.org/vty/ticket/9
554+ - "256-color support"
555+ - http://trac.haskell.org/vty/ticket/19
LICENSE−2
@@ -1,5 +1,3 @@
1−BSD 3-Clause License
2−
31Copyright Stefan O'Rear 2006, Corey O'Connor 2008, Corey O'Connor 2009
42
53All rights reserved.
README.md−79
@@ -79,85 +79,6 @@ with some special rules to handle some omissions from `terminfo`.
7979
8080Windows is not supported.
8181
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−
125−```
126−widthMap "xterm" "/path/to/map.dat"
127−```
128−
129−where the first argument is the value that `TERM` must have in order for
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−
16182# Contributing
16283
16384If you decide to contribute, that's great! Here are some guidelines you
cbits/gwinsz.c+5−14
@@ -1,18 +1,9 @@
11#include <sys/ioctl.h>
22
33unsigned long vty_c_get_window_size(int fd) {
4− struct winsize w;
5− if (ioctl (fd, TIOCGWINSZ, &w) >= 0)
6− return (w.ws_row << 16) + w.ws_col;
7− else
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− }
4+ struct winsize w;
5+ if (ioctl (fd, TIOCGWINSZ, &w) >= 0)
6+ return (w.ws_row << 16) + w.ws_col;
7+ else
8+ return 0x190050;
189}
cbits/gwinsz.h+1−2
@@ -1,2 +1 @@
1−unsigned long vty_c_get_window_size(int fd);
2−unsigned long vty_c_set_window_size(int fd, unsigned long val);
1+unsigned long vty_c_get_window_size(void);
cbits/mk_wcwidth.c+19−24
@@ -67,20 +67,16 @@
6767// number of possible characters as dictated by the compiler.
6868#define MAX_CUSTOM_TABLE_SIZE (HS_CHAR_MAX + 1)
6969
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.
70+// The pointer to the start of the custom character width table, if any.
71+// If this is NULL, the built-in tree search logic is used.
7372static uint8_t* custom_table = NULL;
7473
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.
74+// The size of the custom table. This should only be set if custom_table
75+// is not NULL. Its value should be the size of the custom_table array.
7876static uint32_t custom_table_size = 0;
7977
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.
78+// A flag indicating whether the custom table is ready for use. This
79+// should only be set once the table has been allocated and initialized.
8480static uint8_t custom_table_ready = 0;
8581
8682struct interval {
@@ -141,7 +137,7 @@ static int vty_bisearch(HsChar ucs, const struct interval *table, int max) {
141137 * in ISO 10646.
142138 */
143139
144−static HsInt builtin_wcwidth(HsChar ucs)
140+HsInt builtin_wcwidth(HsChar ucs)
145141{
146142 /* sorted list of non-overlapping intervals of non-spacing characters */
147143 /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
@@ -233,11 +229,11 @@ static HsInt builtin_wcwidth(HsChar ucs)
233229// present, the built-in width table will be used.
234230HsInt vty_mk_wcwidth(HsChar ch)
235231{
236− if (custom_table_ready) {
237− if ((ch >= 0) && (ch < custom_table_size)) {
232+ if (custom_table != NULL) {
233+ if (ch >= 0 && ch < custom_table_size) {
238234 return custom_table[ch];
239235 } else {
240− return -1;
236+ return 0;
241237 }
242238 } else {
243239 return builtin_wcwidth(ch);
@@ -249,7 +245,7 @@ HsInt vty_mk_wcwidth(HsChar ch)
249245// This allocates a new character width table of the specified size
250246// (in characters). If a custom table has already been allocated, this
251247// returns 1. Otherwise it allocates a new table, initializes all of its
252−// entries to 1, and returns zero.
248+// entries to zero, and returns zero.
253249//
254250// Note that this does *not* mark the table as ready for use. Until the
255251// table is marked ready, it will not be used by vty_mk_wcwidth. To mark
@@ -261,7 +257,7 @@ int vty_init_custom_table(int size)
261257 if (size > 0 && size <= MAX_CUSTOM_TABLE_SIZE) {
262258 custom_table_ready = 0;
263259 custom_table = malloc(size);
264− memset(custom_table, 1, size);
260+ bzero(custom_table, size);
265261 custom_table_size = size;
266262 return 0;
267263 } else {
@@ -285,14 +281,14 @@ int vty_init_custom_table(int size)
285281// are not in bounds for the table.
286282int vty_set_custom_table_range(uint32_t start, uint32_t size, uint8_t width)
287283{
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) {
284+ if (custom_table == NULL) {
285+ return 1;
286+ } else if ((start + size - 1) >= custom_table_size) {
287+ return 1;
288+ } else if (custom_table_ready) {
293289 return 1;
294290 } else {
295− memset(custom_table + start, width, size);
291+ memset(custom_table + start, (uint8_t) width, size);
296292 return 0;
297293 }
298294}
@@ -318,7 +314,7 @@ int vty_activate_custom_table()
318314// Returns whether a custom character width table has been marked ready.
319315int vty_custom_table_ready()
320316{
321− return custom_table_ready;
317+ return ((custom_table != NULL) && custom_table_ready);
322318}
323319
324320// Deallocate the custom width table.
@@ -333,6 +329,5 @@ void vty_deallocate_custom_table()
333329 if ((custom_table != NULL) && (!custom_table_ready)) {
334330 free(custom_table);
335331 custom_table = NULL;
336− custom_table_size = 0;
337332 }
338333}
demos/Demo.hs+4−12
@@ -31,8 +31,7 @@ introText = vertCat $ map (string defAttr)
3131 [ "this line is hidden by the top layer"
3232 , "The vty demo program will echo the events generated by the pressed keys."
3333 , "Below there is a 240 color box."
34− , "Followed by a description of the 16 color palette."
35− , "Followed by tones of red using a 24-bit palette."
34+ , "Followed by a description of the 16 color pallete."
3635 , "If the 240 color box is not visible then the terminal"
3736 , "claims 240 colors are not supported."
3837 , "Try setting TERM to xterm-256color"
@@ -43,19 +42,12 @@ introText = vertCat $ map (string defAttr)
4342 , "¯\\_(ツ)_/¯ ¯\\_(ツ)_/¯ ¯\\_(ツ)_/¯ ¯\\_(ツ)_/¯"
4443 ]
4544
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−
5545colorbox_240 :: Image
5646colorbox_240 = vertCat $ map horizCat $ splitColorImages colorImages
5747 where
5848 colorImages = map (\i -> string (currentAttr `withBackColor` Color240 i) " ") [0..239]
49+ splitColorImages [] = []
50+ splitColorImages is = (take 20 is ++ [string defAttr " "]) : (splitColorImages (drop 20 is))
5951
6052colorbox_16 :: Image
6153colorbox_16 = border <|> column0 <|> border <|> column1 <|> border <|> column2 <|> border
@@ -78,7 +70,7 @@ updateDisplay = do
7870 "Press ESC to exit. Events for keys below."
7971 eventLog <- foldMap (string defAttr) <$> get
8072 let pic = picForImage (info <-> eventLog)
81− `addToBottom` (introText <-> colorbox_240 <|> colorbox_16 <|> fullcolorbox)
73+ `addToBottom` (introText <-> colorbox_240 <|> colorbox_16)
8274 vty <- ask
8375 liftIO $ update vty pic
8476
src/Codec/Binary/UTF8/Debug.hs+2−1
@@ -14,4 +14,5 @@ utf8FromIso :: [Int] -> [Word8]
1414utf8FromIso = encode . map toEnum
1515
1616ppUtf8 :: [Int] -> IO ()
17−ppUtf8 = print . map (`showHex` "") . utf8FromIso
17+ppUtf8 = print . map (\f -> f "") . map showHex . utf8FromIso
18+
src/Data/Sequence/Extra.hs+1−1
@@ -7,7 +7,7 @@ import Data.Sequence
77import Control.Parallel.Strategies
88
99instance NFData a => NFData (Seq a) where
10− rnf = rnf' . viewl
10+ rnf = \v -> rnf' (viewl v)
1111 where
1212 rnf' EmptyL = ()
1313 rnf' (a :< r) = rnf a >| rnf' (viewl r)
src/Data/Terminfo/Eval.hs+3−3
@@ -42,7 +42,7 @@ pop = do
4242
4343readParam :: Word -> Eval CapParam
4444readParam pn = do
45− !params <- evalParams <$> get
45+ !params <- get >>= return . evalParams
4646 return $! genericIndex params pn
4747
4848push :: CapParam -> Eval ()
@@ -64,11 +64,11 @@ writeCapExpr cap params =
6464 in snd $ runWriter (runStateT (writeCapOps (capOps cap)) s0)
6565
6666writeCapOps :: CapOps -> Eval ()
67−writeCapOps = mapM_ writeCapOp
67+writeCapOps ops = mapM_ writeCapOp ops
6868
6969writeCapOp :: CapOp -> Eval ()
7070writeCapOp (Bytes !offset !count) = do
71− !cap <- evalExpression <$> get
71+ !cap <- get >>= return . evalExpression
7272 let bytes = Vector.take count $ Vector.drop offset (capBytes cap)
7373 Vector.forM_ bytes $ tell.writeWord8
7474writeCapOp DecOut = do
src/Data/Terminfo/Parse.hs+10−10
@@ -1,9 +1,9 @@
11{-# LANGUAGE BangPatterns #-}
22{-# LANGUAGE CPP #-}
3+{-# OPTIONS_HADDOCK hide #-}
34{-# LANGUAGE NoMonomorphismRestriction #-}
4−{-# LANGUAGE ScopedTypeVariables #-}
5+{-# LANGUAGE NamedFieldPuns #-}
56{-# OPTIONS_GHC -funbox-strict-fields -O #-}
6−{-# OPTIONS_HADDOCK hide #-}
77
88module Data.Terminfo.Parse
99 ( module Data.Terminfo.Parse
@@ -39,7 +39,7 @@ instance Show CapExpression where
3939 ++ " <= " ++ show (sourceString c)
4040 where
4141 hexDump :: [Word8] -> String
42− hexDump = foldr showHex ""
42+ hexDump = foldr (\b s -> showHex b s) ""
4343
4444instance NFData CapExpression where
4545 rnf (CapExpression ops !_bytes !str !c !pOps)
@@ -99,7 +99,7 @@ parseCapExpression capString =
9999 Left e -> Left e
100100 Right buildResults -> Right $ constructCapExpression capString buildResults
101101
102−constructCapExpression :: String -> BuildResults -> CapExpression
102+constructCapExpression :: [Char] -> BuildResults -> CapExpression
103103constructCapExpression capString buildResults =
104104 let expr = CapExpression
105105 { capOps = outCapOps buildResults
@@ -128,7 +128,7 @@ paramEscapeParser = do
128128literalPercentParser :: CapParser BuildResults
129129literalPercentParser = do
130130 _ <- char '%'
131− startOffset <- nextOffset <$> getState
131+ startOffset <- getState >>= return . nextOffset
132132 incOffset 1
133133 return $ BuildResults 0 [Bytes startOffset 1] []
134134
@@ -154,7 +154,7 @@ incrementOpParser = do
154154pushOpParser :: CapParser BuildResults
155155pushOpParser = do
156156 _ <- char 'p'
157− paramN <- read . pure <$> digit
157+ paramN <- digit >>= return . (\d -> read [d])
158158 incOffset 2
159159 return $ BuildResults (fromEnum paramN) [PushParam $ paramN - 1] []
160160
@@ -299,7 +299,7 @@ compareOpParser
299299bytesOpParser :: CapParser BuildResults
300300bytesOpParser = do
301301 bytes <- many1 $ satisfy (/= '%')
302− startOffset <- nextOffset <$> getState
302+ startOffset <- getState >>= return . nextOffset
303303 let !c = length bytes
304304 !s <- getState
305305 let s' = s { nextOffset = startOffset + c }
@@ -336,9 +336,9 @@ data BuildResults = BuildResults
336336instance Semigroup BuildResults where
337337 v0 <> v1
338338 = BuildResults
339− { outParamCount = outParamCount v0 `max` outParamCount v1
340− , outCapOps = outCapOps v0 <> outCapOps v1
341− , outParamOps = outParamOps v0 <> outParamOps v1
339+ { outParamCount = (outParamCount v0) `max` (outParamCount v1)
340+ , outCapOps = (outCapOps v0) <> (outCapOps v1)
341+ , outParamOps = (outParamOps v0) <> (outParamOps v1)
342342 }
343343
344344instance Monoid BuildResults where
src/Graphics/Text/Width.hs−9
@@ -1,15 +1,6 @@
11-- Copyright 2009 Corey O'Connor
22{-# OPTIONS_GHC -D_XOPEN_SOURCE #-}
33{-# 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@.
134module Graphics.Text.Width
145 ( wcwidth
156 , wcswidth
src/Graphics/Vty.hs+19−39
@@ -1,5 +1,4 @@
11{-# LANGUAGE CPP #-}
2−{-# LANGUAGE ScopedTypeVariables #-}
32
43-- | Vty provides interfaces for both terminal input and terminal
54-- output.
@@ -34,7 +33,6 @@
3433module Graphics.Vty
3534 ( Vty(..)
3635 , mkVty
37− , setWindowTitle
3836 , Mode(..)
3937 , module Graphics.Vty.Config
4038 , module Graphics.Vty.Input
@@ -48,7 +46,6 @@ where
4846
4947import Graphics.Vty.Config
5048import Graphics.Vty.Input
51−import Graphics.Vty.Input.Events
5249import Graphics.Vty.Output
5350import Graphics.Vty.Output.Interface
5451import Graphics.Vty.Picture
@@ -57,9 +54,6 @@ import Graphics.Vty.Attributes
5754import Graphics.Vty.UnicodeWidthTable.IO
5855import Graphics.Vty.UnicodeWidthTable.Install
5956
60−import Data.Char (isPrint, showLitChar)
61−import qualified Data.ByteString.Char8 as BS8
62−
6357import qualified Control.Exception as E
6458import Control.Monad (when)
6559import Control.Concurrent.STM
@@ -118,6 +112,15 @@ data Vty =
118112-- precedence. See "Graphics.Vty.Config".
119113--
120114-- For most applications @mkVty defaultConfig@ is sufficient.
115+--
116+-- If the configuration's 'allowCustomUnicodeWidthTables' is set
117+-- to 'Nothing' or 'Just True', this will use the current value of
118+-- 'TERM' and the configuation's width table settings to attempt to
119+-- load a custom unicode character width table if one has not already
120+-- been loaded in this process. If the load is attempted and fails,
121+-- information about the failure will be logged to the debug log if the
122+-- configuration specifies one. If no custom table is loaded (or if a
123+-- load fails), the built-in character width table will be used.
121124mkVty :: Config -> IO Vty
122125mkVty appConfig = do
123126 config <- (<> appConfig) <$> userConfig
@@ -168,7 +171,7 @@ internalMkVty :: Input -> Output -> IO Vty
168171internalMkVty input out = do
169172 reserveDisplay out
170173
171− shutdownVar <- newTVarIO False
174+ shutdownVar <- atomically $ newTVar False
172175 let shutdownIo = do
173176 alreadyShutdown <- atomically $ swapTVar shutdownVar True
174177 when (not alreadyShutdown) $ do
@@ -176,7 +179,7 @@ internalMkVty input out = do
176179 releaseDisplay out
177180 releaseTerminal out
178181
179− let shutdownStatus = readTVarIO shutdownVar
182+ let shutdownStatus = atomically $ readTVar shutdownVar
180183
181184 lastPicRef <- newIORef Nothing
182185 lastUpdateRef <- newIORef Nothing
@@ -210,18 +213,16 @@ internalMkVty input out = do
210213 maybe (return ()) innerUpdate mPic
211214
212215 let mkResize = uncurry EvResize <$> displayBounds out
213−
214− translateInternalEvent ResumeAfterSignal = mkResize
215− translateInternalEvent (InputEvent e) = return e
216−
217216 gkey = do
218− e <- atomically $ readTChan $ _eventChannel input
219− translateInternalEvent e
217+ k <- atomically $ readTChan $ _eventChannel input
218+ case k of
219+ (EvResize _ _) -> mkResize
220+ _ -> return k
220221 gkey' = do
221− mEv <- atomically $ tryReadTChan $ _eventChannel input
222− case mEv of
223− Just e -> Just <$> translateInternalEvent e
224− Nothing -> return Nothing
222+ k <- atomically $ tryReadTChan $ _eventChannel input
223+ case k of
224+ (Just (EvResize _ _)) -> Just <$> mkResize
225+ _ -> return k
225226
226227 return $ Vty { update = innerUpdate
227228 , nextEvent = gkey
@@ -232,24 +233,3 @@ internalMkVty input out = do
232233 , shutdown = shutdownIo
233234 , isShutdown = shutdownStatus
234235 }
235−
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+46−8
@@ -1,4 +1,7 @@
11{-# LANGUAGE CPP #-}
2+{-# LANGUAGE StandaloneDeriving #-}
3+{-# LANGUAGE GADTs #-}
4+{-# LANGUAGE RankNTypes #-}
25{-# LANGUAGE DeriveGeneric #-}
36{-# LANGUAGE DeriveAnyClass #-}
47
@@ -40,7 +43,6 @@ module Graphics.Vty.Attributes
4043 , withStyle
4144 , standout
4245 , italic
43− , strikethrough
4446 , underline
4547 , reverseVideo
4648 , blink
@@ -61,6 +63,9 @@ where
6163
6264import Control.DeepSeq
6365import Data.Bits
66+#if !(MIN_VERSION_base(4,11,0))
67+import Data.Semigroup
68+#endif
6469import Data.Text (Text)
6570import Data.Word
6671import GHC.Generics
@@ -113,6 +118,19 @@ data Attr = Attr
113118-- Then the foreground color encoded into 8 bits.
114119-- Then the background color encoded into 8 bits.
115120
121+instance Semigroup Attr where
122+ attr0 <> attr1 =
123+ Attr ( attrStyle attr0 <> attrStyle attr1 )
124+ ( attrForeColor attr0 <> attrForeColor attr1 )
125+ ( attrBackColor attr0 <> attrBackColor attr1 )
126+ ( attrURL attr0 <> attrURL attr1 )
127+
128+instance Monoid Attr where
129+ mempty = Attr mempty mempty mempty mempty
130+#if !(MIN_VERSION_base(4,11,0))
131+ mappend = (<>)
132+#endif
133+
116134-- | Specifies the display attributes such that the final style and
117135-- color values do not depend on the previously applied display
118136-- attribute. The display attributes can still depend on the terminal's
@@ -127,20 +145,43 @@ data FixedAttr = FixedAttr
127145-- | The style and color attributes can either be the terminal defaults.
128146-- Or be equivalent to the previously applied style. Or be a specific
129147-- value.
130−data MaybeDefault v = Default | KeepCurrent | SetTo !v
131− deriving (Eq, Read, Show)
148+data MaybeDefault v where
149+ Default :: MaybeDefault v
150+ KeepCurrent :: MaybeDefault v
151+ SetTo :: forall v . ( Eq v, Show v, Read v ) => !v -> MaybeDefault v
132152
133153instance (NFData v) => NFData (MaybeDefault v) where
134154 rnf Default = ()
135155 rnf KeepCurrent = ()
136156 rnf (SetTo v) = rnf v
137157
158+deriving instance Eq v => Eq (MaybeDefault v)
159+deriving instance Eq v => Show (MaybeDefault v)
160+deriving instance (Eq v, Show v, Read v) => Read (MaybeDefault v)
161+
162+instance Eq v => Semigroup (MaybeDefault v) where
163+ Default <> Default = Default
164+ Default <> KeepCurrent = Default
165+ Default <> SetTo v = SetTo v
166+ KeepCurrent <> Default = Default
167+ KeepCurrent <> KeepCurrent = KeepCurrent
168+ KeepCurrent <> SetTo v = SetTo v
169+ SetTo _v <> Default = Default
170+ SetTo v <> KeepCurrent = SetTo v
171+ SetTo _ <> SetTo v = SetTo v
172+
173+instance Eq v => Monoid ( MaybeDefault v ) where
174+ mempty = KeepCurrent
175+#if !(MIN_VERSION_base(4,11,0))
176+ mappend = (<>)
177+#endif
178+
138179-- | Styles are represented as an 8 bit word. Each bit in the word is 1
139180-- if the style attribute assigned to that bit should be applied and 0
140181-- if the style attribute should not be applied.
141182type Style = Word8
142183
143−-- | Valid style attributes include:
184+-- | The 7 possible style attributes:
144185--
145186-- * standout
146187--
@@ -156,11 +197,9 @@ type Style = Word8
156197--
157198-- * italic
158199--
159−-- * strikethrough (via the smxx/rmxx terminfo capabilities)
160−--
161200-- (The invisible, protect, and altcharset display attributes some
162201-- terminals support are not supported via VTY.)
163−standout, underline, reverseVideo, blink, dim, bold, italic, strikethrough :: Style
202+standout, underline, reverseVideo, blink, dim, bold, italic :: Style
164203standout = 0x01
165204underline = 0x02
166205reverseVideo = 0x04
@@ -168,7 +207,6 @@ blink = 0x08
168207dim = 0x10
169208bold = 0x20
170209italic = 0x40
171−strikethrough = 0x80
172210
173211defaultStyleMask :: Style
174212defaultStyleMask = 0x00
src/Graphics/Vty/Attributes/Color.hs+3−67
@@ -1,14 +1,8 @@
11{-# LANGUAGE DeriveGeneric #-}
22{-# LANGUAGE DeriveAnyClass #-}
3−{-# LANGUAGE MultiWayIf #-}
4−{-# LANGUAGE ScopedTypeVariables #-}
53
64module Graphics.Vty.Attributes.Color
75 ( Color(..)
8− , ColorMode(..)
9−
10− -- * Detecting Terminal Color Support
11− , detectColorMode
126
137 -- ** Fixed Colors
148 -- | Standard 8-color ANSI terminal color codes.
@@ -38,10 +32,7 @@ module Graphics.Vty.Attributes.Color
3832 , brightCyan
3933 , brightWhite
4034 -- ** Creating Colors From RGB
41− , linearColor
42− , srgbColor
4335 , rgbColor
44− , color240
4536 , module Graphics.Vty.Attributes.Color240
4637 )
4738where
@@ -49,11 +40,6 @@ where
4940import Data.Word
5041import GHC.Generics
5142import 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
5743
5844import Graphics.Vty.Attributes.Color240
5945
@@ -95,7 +81,7 @@ import Graphics.Vty.Attributes.Color240
9581-- reported then the color reproduction will be incorrect.
9682--
9783-- If the terminal reports <= 16 colors then the 240 color palette
98−-- points are only mapped to the 8 color palette. I'm not sure of
84+-- points are only mapped to the 8 color pallete. I'm not sure of
9985-- the RGB points for the "bright" colors which is why they are not
10086-- addressable via the 240 color palette.
10187--
@@ -109,33 +95,9 @@ import Graphics.Vty.Attributes.Color240
10995-- terminfo but I don't know it.
11096--
11197-- Seriously, terminal color support is INSANE.
112−data Color = ISOColor !Word8 | Color240 !Word8 | RGBColor !Word8 !Word8 !Word8
98+data Color = ISOColor !Word8 | Color240 !Word8
11399 deriving ( Eq, Show, Read, Generic, NFData )
114100
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−
139101black, red, green, yellow, blue, magenta, cyan, white :: Color
140102black = ISOColor 0
141103red = ISOColor 1
@@ -157,35 +119,9 @@ brightMagenta= ISOColor 13
157119brightCyan = ISOColor 14
158120brightWhite = ISOColor 15
159121
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)
186122
187123-- | Create a Vty 'Color' (in the 240 color set) from an RGB triple.
188124-- This function is lossy in the sense that we only internally support 240 colors but the
189125-- #RRGGBB format supports 16^3 colors.
190126rgbColor :: Integral i => i -> i -> i -> Color
191−rgbColor = color240
127+rgbColor r g b = Color240 (rgbColorToColor240 r g b)
src/Graphics/Vty/Attributes/Color240.hs+218−10
@@ -39,18 +39,226 @@ rgbColorToColor240 r g b
3939 | r == 218 && g == 218 && b == 218 = 237
4040 | r == 228 && g == 228 && b == 228 = 238
4141 | r == 238 && g == 238 && b == 238 = 239
42− | otherwise = 36 * go r + 6 * go g + go b
43− where go = simpleColor_ (error (printf "RGB color %d %d %d does not map to 240 palette."
42+ | r <= 0 && g <= 0 && b <= 0 = 0
43+ | r <= 0 && g <= 0 && b <= 95 = 1
44+ | r <= 0 && g <= 0 && b <= 135 = 2
45+ | r <= 0 && g <= 0 && b <= 175 = 3
46+ | r <= 0 && g <= 0 && b <= 215 = 4
47+ | r <= 0 && g <= 0 && b <= 255 = 5
48+ | r <= 0 && g <= 95 && b <= 0 = 6
49+ | r <= 0 && g <= 95 && b <= 95 = 7
50+ | r <= 0 && g <= 95 && b <= 135 = 8
51+ | r <= 0 && g <= 95 && b <= 175 = 9
52+ | r <= 0 && g <= 95 && b <= 215 = 10
53+ | r <= 0 && g <= 95 && b <= 255 = 11
54+ | r <= 0 && g <= 135 && b <= 0 = 12
55+ | r <= 0 && g <= 135 && b <= 95 = 13
56+ | r <= 0 && g <= 135 && b <= 135 = 14
57+ | r <= 0 && g <= 135 && b <= 175 = 15
58+ | r <= 0 && g <= 135 && b <= 215 = 16
59+ | r <= 0 && g <= 135 && b <= 255 = 17
60+ | r <= 0 && g <= 175 && b <= 0 = 18
61+ | r <= 0 && g <= 175 && b <= 95 = 19
62+ | r <= 0 && g <= 175 && b <= 135 = 20
63+ | r <= 0 && g <= 175 && b <= 175 = 21
64+ | r <= 0 && g <= 175 && b <= 215 = 22
65+ | r <= 0 && g <= 175 && b <= 255 = 23
66+ | r <= 0 && g <= 215 && b <= 0 = 24
67+ | r <= 0 && g <= 215 && b <= 95 = 25
68+ | r <= 0 && g <= 215 && b <= 135 = 26
69+ | r <= 0 && g <= 215 && b <= 175 = 27
70+ | r <= 0 && g <= 215 && b <= 215 = 28
71+ | r <= 0 && g <= 215 && b <= 255 = 29
72+ | r <= 0 && g <= 255 && b <= 0 = 30
73+ | r <= 0 && g <= 255 && b <= 95 = 31
74+ | r <= 0 && g <= 255 && b <= 135 = 32
75+ | r <= 0 && g <= 255 && b <= 175 = 33
76+ | r <= 0 && g <= 255 && b <= 215 = 34
77+ | r <= 0 && g <= 255 && b <= 255 = 35
78+ | r <= 95 && g <= 0 && b <= 0 = 36
79+ | r <= 95 && g <= 0 && b <= 95 = 37
80+ | r <= 95 && g <= 0 && b <= 135 = 38
81+ | r <= 95 && g <= 0 && b <= 175 = 39
82+ | r <= 95 && g <= 0 && b <= 215 = 40
83+ | r <= 95 && g <= 0 && b <= 255 = 41
84+ | r <= 95 && g <= 95 && b <= 0 = 42
85+ | r <= 95 && g <= 95 && b <= 95 = 43
86+ | r <= 95 && g <= 95 && b <= 135 = 44
87+ | r <= 95 && g <= 95 && b <= 175 = 45
88+ | r <= 95 && g <= 95 && b <= 215 = 46
89+ | r <= 95 && g <= 95 && b <= 255 = 47
90+ | r <= 95 && g <= 135 && b <= 0 = 48
91+ | r <= 95 && g <= 135 && b <= 95 = 49
92+ | r <= 95 && g <= 135 && b <= 135 = 50
93+ | r <= 95 && g <= 135 && b <= 175 = 51
94+ | r <= 95 && g <= 135 && b <= 215 = 52
95+ | r <= 95 && g <= 135 && b <= 255 = 53
96+ | r <= 95 && g <= 175 && b <= 0 = 54
97+ | r <= 95 && g <= 175 && b <= 95 = 55
98+ | r <= 95 && g <= 175 && b <= 135 = 56
99+ | r <= 95 && g <= 175 && b <= 175 = 57
100+ | r <= 95 && g <= 175 && b <= 215 = 58
101+ | r <= 95 && g <= 175 && b <= 255 = 59
102+ | r <= 95 && g <= 215 && b <= 0 = 60
103+ | r <= 95 && g <= 215 && b <= 95 = 61
104+ | r <= 95 && g <= 215 && b <= 135 = 62
105+ | r <= 95 && g <= 215 && b <= 175 = 63
106+ | r <= 95 && g <= 215 && b <= 215 = 64
107+ | r <= 95 && g <= 215 && b <= 255 = 65
108+ | r <= 95 && g <= 255 && b <= 0 = 66
109+ | r <= 95 && g <= 255 && b <= 95 = 67
110+ | r <= 95 && g <= 255 && b <= 135 = 68
111+ | r <= 95 && g <= 255 && b <= 175 = 69
112+ | r <= 95 && g <= 255 && b <= 215 = 70
113+ | r <= 95 && g <= 255 && b <= 255 = 71
114+ | r <= 135 && g <= 0 && b <= 0 = 72
115+ | r <= 135 && g <= 0 && b <= 95 = 73
116+ | r <= 135 && g <= 0 && b <= 135 = 74
117+ | r <= 135 && g <= 0 && b <= 175 = 75
118+ | r <= 135 && g <= 0 && b <= 215 = 76
119+ | r <= 135 && g <= 0 && b <= 255 = 77
120+ | r <= 135 && g <= 95 && b <= 0 = 78
121+ | r <= 135 && g <= 95 && b <= 95 = 79
122+ | r <= 135 && g <= 95 && b <= 135 = 80
123+ | r <= 135 && g <= 95 && b <= 175 = 81
124+ | r <= 135 && g <= 95 && b <= 215 = 82
125+ | r <= 135 && g <= 95 && b <= 255 = 83
126+ | r <= 135 && g <= 135 && b <= 0 = 84
127+ | r <= 135 && g <= 135 && b <= 95 = 85
128+ | r <= 135 && g <= 135 && b <= 135 = 86
129+ | r <= 135 && g <= 135 && b <= 175 = 87
130+ | r <= 135 && g <= 135 && b <= 215 = 88
131+ | r <= 135 && g <= 135 && b <= 255 = 89
132+ | r <= 135 && g <= 175 && b <= 0 = 90
133+ | r <= 135 && g <= 175 && b <= 95 = 91
134+ | r <= 135 && g <= 175 && b <= 135 = 92
135+ | r <= 135 && g <= 175 && b <= 175 = 93
136+ | r <= 135 && g <= 175 && b <= 215 = 94
137+ | r <= 135 && g <= 175 && b <= 255 = 95
138+ | r <= 135 && g <= 215 && b <= 0 = 96
139+ | r <= 135 && g <= 215 && b <= 95 = 97
140+ | r <= 135 && g <= 215 && b <= 135 = 98
141+ | r <= 135 && g <= 215 && b <= 175 = 99
142+ | r <= 135 && g <= 215 && b <= 215 = 100
143+ | r <= 135 && g <= 215 && b <= 255 = 101
144+ | r <= 135 && g <= 255 && b <= 0 = 102
145+ | r <= 135 && g <= 255 && b <= 95 = 103
146+ | r <= 135 && g <= 255 && b <= 135 = 104
147+ | r <= 135 && g <= 255 && b <= 175 = 105
148+ | r <= 135 && g <= 255 && b <= 215 = 106
149+ | r <= 135 && g <= 255 && b <= 255 = 107
150+ | r <= 175 && g <= 0 && b <= 0 = 108
151+ | r <= 175 && g <= 0 && b <= 95 = 109
152+ | r <= 175 && g <= 0 && b <= 135 = 110
153+ | r <= 175 && g <= 0 && b <= 175 = 111
154+ | r <= 175 && g <= 0 && b <= 215 = 112
155+ | r <= 175 && g <= 0 && b <= 255 = 113
156+ | r <= 175 && g <= 95 && b <= 0 = 114
157+ | r <= 175 && g <= 95 && b <= 95 = 115
158+ | r <= 175 && g <= 95 && b <= 135 = 116
159+ | r <= 175 && g <= 95 && b <= 175 = 117
160+ | r <= 175 && g <= 95 && b <= 215 = 118
161+ | r <= 175 && g <= 95 && b <= 255 = 119
162+ | r <= 175 && g <= 135 && b <= 0 = 120
163+ | r <= 175 && g <= 135 && b <= 95 = 121
164+ | r <= 175 && g <= 135 && b <= 135 = 122
165+ | r <= 175 && g <= 135 && b <= 175 = 123
166+ | r <= 175 && g <= 135 && b <= 215 = 124
167+ | r <= 175 && g <= 135 && b <= 255 = 125
168+ | r <= 175 && g <= 175 && b <= 0 = 126
169+ | r <= 175 && g <= 175 && b <= 95 = 127
170+ | r <= 175 && g <= 175 && b <= 135 = 128
171+ | r <= 175 && g <= 175 && b <= 175 = 129
172+ | r <= 175 && g <= 175 && b <= 215 = 130
173+ | r <= 175 && g <= 175 && b <= 255 = 131
174+ | r <= 175 && g <= 215 && b <= 0 = 132
175+ | r <= 175 && g <= 215 && b <= 95 = 133
176+ | r <= 175 && g <= 215 && b <= 135 = 134
177+ | r <= 175 && g <= 215 && b <= 175 = 135
178+ | r <= 175 && g <= 215 && b <= 215 = 136
179+ | r <= 175 && g <= 215 && b <= 255 = 137
180+ | r <= 175 && g <= 255 && b <= 0 = 138
181+ | r <= 175 && g <= 255 && b <= 95 = 139
182+ | r <= 175 && g <= 255 && b <= 135 = 140
183+ | r <= 175 && g <= 255 && b <= 175 = 141
184+ | r <= 175 && g <= 255 && b <= 215 = 142
185+ | r <= 175 && g <= 255 && b <= 255 = 143
186+ | r <= 215 && g <= 0 && b <= 0 = 144
187+ | r <= 215 && g <= 0 && b <= 95 = 145
188+ | r <= 215 && g <= 0 && b <= 135 = 146
189+ | r <= 215 && g <= 0 && b <= 175 = 147
190+ | r <= 215 && g <= 0 && b <= 215 = 148
191+ | r <= 215 && g <= 0 && b <= 255 = 149
192+ | r <= 215 && g <= 95 && b <= 0 = 150
193+ | r <= 215 && g <= 95 && b <= 95 = 151
194+ | r <= 215 && g <= 95 && b <= 135 = 152
195+ | r <= 215 && g <= 95 && b <= 175 = 153
196+ | r <= 215 && g <= 95 && b <= 215 = 154
197+ | r <= 215 && g <= 95 && b <= 255 = 155
198+ | r <= 215 && g <= 135 && b <= 0 = 156
199+ | r <= 215 && g <= 135 && b <= 95 = 157
200+ | r <= 215 && g <= 135 && b <= 135 = 158
201+ | r <= 215 && g <= 135 && b <= 175 = 159
202+ | r <= 215 && g <= 135 && b <= 215 = 160
203+ | r <= 215 && g <= 135 && b <= 255 = 161
204+ | r <= 215 && g <= 175 && b <= 0 = 162
205+ | r <= 215 && g <= 175 && b <= 95 = 163
206+ | r <= 215 && g <= 175 && b <= 135 = 164
207+ | r <= 215 && g <= 175 && b <= 175 = 165
208+ | r <= 215 && g <= 175 && b <= 215 = 166
209+ | r <= 215 && g <= 175 && b <= 255 = 167
210+ | r <= 215 && g <= 215 && b <= 0 = 168
211+ | r <= 215 && g <= 215 && b <= 95 = 169
212+ | r <= 215 && g <= 215 && b <= 135 = 170
213+ | r <= 215 && g <= 215 && b <= 175 = 171
214+ | r <= 215 && g <= 215 && b <= 215 = 172
215+ | r <= 215 && g <= 215 && b <= 255 = 173
216+ | r <= 215 && g <= 255 && b <= 0 = 174
217+ | r <= 215 && g <= 255 && b <= 95 = 175
218+ | r <= 215 && g <= 255 && b <= 135 = 176
219+ | r <= 215 && g <= 255 && b <= 175 = 177
220+ | r <= 215 && g <= 255 && b <= 215 = 178
221+ | r <= 215 && g <= 255 && b <= 255 = 179
222+ | r <= 255 && g <= 0 && b <= 0 = 180
223+ | r <= 255 && g <= 0 && b <= 95 = 181
224+ | r <= 255 && g <= 0 && b <= 135 = 182
225+ | r <= 255 && g <= 0 && b <= 175 = 183
226+ | r <= 255 && g <= 0 && b <= 215 = 184
227+ | r <= 255 && g <= 0 && b <= 255 = 185
228+ | r <= 255 && g <= 95 && b <= 0 = 186
229+ | r <= 255 && g <= 95 && b <= 95 = 187
230+ | r <= 255 && g <= 95 && b <= 135 = 188
231+ | r <= 255 && g <= 95 && b <= 175 = 189
232+ | r <= 255 && g <= 95 && b <= 215 = 190
233+ | r <= 255 && g <= 95 && b <= 255 = 191
234+ | r <= 255 && g <= 135 && b <= 0 = 192
235+ | r <= 255 && g <= 135 && b <= 95 = 193
236+ | r <= 255 && g <= 135 && b <= 135 = 194
237+ | r <= 255 && g <= 135 && b <= 175 = 195
238+ | r <= 255 && g <= 135 && b <= 215 = 196
239+ | r <= 255 && g <= 135 && b <= 255 = 197
240+ | r <= 255 && g <= 175 && b <= 0 = 198
241+ | r <= 255 && g <= 175 && b <= 95 = 199
242+ | r <= 255 && g <= 175 && b <= 135 = 200
243+ | r <= 255 && g <= 175 && b <= 175 = 201
244+ | r <= 255 && g <= 175 && b <= 215 = 202
245+ | r <= 255 && g <= 175 && b <= 255 = 203
246+ | r <= 255 && g <= 215 && b <= 0 = 204
247+ | r <= 255 && g <= 215 && b <= 95 = 205
248+ | r <= 255 && g <= 215 && b <= 135 = 206
249+ | r <= 255 && g <= 215 && b <= 175 = 207
250+ | r <= 255 && g <= 215 && b <= 215 = 208
251+ | r <= 255 && g <= 215 && b <= 255 = 209
252+ | r <= 255 && g <= 255 && b <= 0 = 210
253+ | r <= 255 && g <= 255 && b <= 95 = 211
254+ | r <= 255 && g <= 255 && b <= 135 = 212
255+ | r <= 255 && g <= 255 && b <= 175 = 213
256+ | r <= 255 && g <= 255 && b <= 215 = 214
257+ | r <= 255 && g <= 255 && b <= 255 = 215
258+ | otherwise = error (printf "RGB color %d %d %d does not map to 240 palette."
44259 (fromIntegral r :: Int)
45260 (fromIntegral g :: Int)
46− (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
261+ (fromIntegral b :: Int))
54262
55263-- | Create a RGB triple from a value in the Color240 set.
56264color240CodeToRGB :: Word8 -> Maybe (Int, Int, Int)
src/Graphics/Vty/Config.hs+7−81
@@ -3,7 +3,6 @@
33{-# LANGUAGE FlexibleContexts, FlexibleInstances #-}
44{-# LANGUAGE TypeOperators #-}
55{-# LANGUAGE ScopedTypeVariables #-}
6−{-# LANGUAGE LambdaCase, MultiWayIf #-}
76-- | Vty supports a configuration file format and associated 'Config'
87-- data type. The 'Config' can be provided to 'mkVty' to customize the
98-- application's use of Vty.
@@ -55,7 +54,7 @@
5554-- If a debug log is requested then vty will output the current input
5655-- table to the log in the above format. A workflow for using this is
5756-- to set @VTY_DEBUG_LOG@. Run the application. Check the debug log for
58−-- incorrect mappings. Add corrected mappings to @$HOME\/.vty\/config@.
57+-- incorrect mappings. Add corrected mappings to @$HOME/.vty/config@.
5958--
6059-- = Unicode Character Width Maps
6160--
@@ -100,9 +99,6 @@ module Graphics.Vty.Config
10099 , vtyDataDirectory
101100 , terminalWidthTablePath
102101 , vtyConfigFileEnvName
103−
104− , ConfigUpdateResult(..)
105− , addConfigWidthMap
106102 )
107103where
108104
@@ -123,15 +119,12 @@ import Data.Semigroup (Semigroup(..))
123119import Data.Typeable (Typeable)
124120
125121import Graphics.Vty.Input.Events
126−import Graphics.Vty.Attributes.Color (ColorMode(..), detectColorMode)
127122
128123import GHC.Generics
129124
130−import System.Directory ( getAppUserDataDirectory, doesFileExist
131− , createDirectoryIfMissing
132− )
125+import System.Directory (getAppUserDataDirectory)
133126import System.Environment (lookupEnv)
134−import System.FilePath ((</>), takeDirectory)
127+import System.FilePath ((</>))
135128import System.Posix.IO (stdInput, stdOutput)
136129import System.Posix.Types (Fd(..))
137130import Foreign.C.Types (CInt(..), CChar(..))
@@ -185,19 +178,9 @@ data Config =
185178 , termWidthMaps :: [(String, FilePath)]
186179 -- ^ Terminal width map files.
187180 , 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.
181+ -- ^ Whether to permit custom Unicode width table loading.
182+ -- 'Just False' indicates that table loading should not be
183+ -- performed. Other values permit table loading.
201184 }
202185 deriving (Show, Eq)
203186
@@ -219,7 +202,6 @@ instance Semigroup Config where
219202 , termWidthMaps = termWidthMaps c1 <|> termWidthMaps c0
220203 , allowCustomUnicodeWidthTables =
221204 allowCustomUnicodeWidthTables c1 <|> allowCustomUnicodeWidthTables c0
222− , colorMode = colorMode c1 <|> colorMode c0
223205 }
224206
225207instance Monoid Config where
@@ -235,7 +217,6 @@ instance Monoid Config where
235217 , termName = Nothing
236218 , termWidthMaps = []
237219 , allowCustomUnicodeWidthTables = Nothing
238− , colorMode = Nothing
239220 }
240221#if !(MIN_VERSION_base(4,11,0))
241222 mappend = (<>)
@@ -291,8 +272,7 @@ standardIOConfig = do
291272 mb <- lookupEnv termVariable
292273 case mb of
293274 Nothing -> throwIO VtyMissingTermEnvVar
294− Just t -> do
295− mcolorMode <- detectColorMode t
275+ Just t ->
296276 return defaultConfig
297277 { vmin = Just 1
298278 , mouseMode = Just False
@@ -301,7 +281,6 @@ standardIOConfig = do
301281 , inputFd = Just stdInput
302282 , outputFd = Just stdOutput
303283 , termName = Just t
304− , colorMode = Just mcolorMode
305284 }
306285
307286parseConfigFile :: FilePath -> IO Config
@@ -433,56 +412,3 @@ getTtyEraseChar fd = do
433412 if c /= 0
434413 then return $ Just $ toEnum $ fromEnum c
435414 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/DisplayAttributes.hs−3
@@ -96,8 +96,6 @@ data StyleStateChange
9696 | RemoveStandout
9797 | ApplyItalic
9898 | RemoveItalic
99− | ApplyStrikethrough
100− | RemoveStrikethrough
10199 | ApplyUnderline
102100 | RemoveUnderline
103101 | ApplyReverseVideo
@@ -146,7 +144,6 @@ diffStyles prev cur
146144 [ styleDiff standout ApplyStandout RemoveStandout
147145 , styleDiff underline ApplyUnderline RemoveUnderline
148146 , styleDiff italic ApplyItalic RemoveItalic
149− , styleDiff strikethrough ApplyStrikethrough RemoveStrikethrough
150147 , styleDiff reverseVideo ApplyReverseVideo RemoveReverseVideo
151148 , styleDiff blink ApplyBlink RemoveBlink
152149 , styleDiff dim ApplyDim RemoveDim
src/Graphics/Vty/Image.hs+10−11
@@ -1,4 +1,5 @@
11-- Copyright 2009-2010 Corey O'Connor
2+{-# LANGUAGE BangPatterns #-}
23{-# LANGUAGE NamedFieldPuns #-}
34{-# LANGUAGE DisambiguateRecordFields #-}
45-- | A Vty program makes 'Picture's from 'Image's. This module provides
@@ -116,16 +117,14 @@ horizCat = foldr horizJoin EmptyImage
116117vertCat :: [Image] -> Image
117118vertCat = foldr vertJoin EmptyImage
118119
119−-- | Make an 'Image' from a lazy text value. The text value should be
120−-- sanitized of escape sequences (ASCII 27) and carriage returns;
121−-- otherwise layout and attribute problems may result.
120+-- | Make an 'Image' from a lazy text value. This function should not be
121+-- given a text value containing escapes.
122122text :: Attr -> TL.Text -> Image
123123text a txt = let displayWidth = safeWctlwidth txt
124124 in HorizText a txt displayWidth (fromIntegral $! TL.length txt)
125125
126−-- | Make an 'Image' from a text value. The text value should be
127−-- sanitized of escape sequences (ASCII 27) and carriage returns;
128−-- otherwise layout and attribute problems may result.
126+-- | Make an 'Image' from a text value. This function should not be
127+-- given a text value containing escapes.
129128text' :: Attr -> T.Text -> Image
130129text' a txt = let displayWidth = safeWctwidth txt
131130 in HorizText a (TL.fromStrict txt) displayWidth (T.length txt)
@@ -137,11 +136,10 @@ char a c =
137136 let displayWidth = safeWcwidth c
138137 in HorizText a (TL.singleton c) displayWidth 1
139138
140−-- | Make an image from a string of characters laid out on a single
139+-- | Make an image from a string of characters layed out on a single
141140-- row with the same display attribute. The string is assumed to be a
142−-- sequence of ISO-10646 characters. The input string should be
143−-- sanitized of escape sequences (ASCII 27) and carriage returns;
144−-- otherwise layout and attribute problems may result.
141+-- sequence of ISO-10646 characters. This function should not be given a
142+-- string containing escapes.
145143--
146144-- Note: depending on how the Haskell compiler represents string
147145-- literals, a string literal in a UTF-8 encoded source file, for
@@ -158,7 +156,8 @@ iso10646String a str =
158156--
159157-- This is an alias for iso10646String since the usual case is that a
160158-- literal string like "foo" is represented internally as a list of ISO
161−-- 10646 31 bit characters.
159+-- 10646 31 bit characters. This function should not be given a string
160+-- containing escapes.
162161--
163162-- Note: Keep in mind that GHC will compile source encoded as UTF-8
164163-- but the literal strings, while UTF-8 encoded in the source, will be
src/Graphics/Vty/Image/Internal.hs+3−3
@@ -146,7 +146,7 @@ data Image =
146146
147147-- | pretty print just the structure of an image.
148148ppImageStructure :: Image -> String
149−ppImageStructure = go 0
149+ppImageStructure inImg = go 0 inImg
150150 where
151151 go indent img = tab indent ++ pp indent img
152152 tab indent = concat $ replicate indent " "
@@ -228,7 +228,7 @@ instance Monoid Image where
228228--
229229-- The result image will have a width equal to the sum of the two images
230230-- 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
231+-- images. The area not defined in one image due to a height missmatch
232232-- will be filled with the background pattern.
233233horizJoin :: Image -> Image -> Image
234234horizJoin EmptyImage i = i
@@ -259,7 +259,7 @@ horizJoin _ _ = error "horizJoin applied to undefined values."
259259--
260260-- The result image will have a height equal to the sum of the heights
261261-- of both images. The width will equal the largest width of the two
262−-- images. The area not defined in one image due to a width mismatch
262+-- images. The area not defined in one image due to a width missmatch
263263-- will be filled with the background pattern.
264264vertJoin :: Image -> Image -> Image
265265vertJoin EmptyImage i = i
src/Graphics/Vty/Inline.hs+7−5
@@ -1,3 +1,5 @@
1+{-# LANGUAGE BangPatterns #-}
2+
13-- | The inline module provides a limited interface to changing the
24-- style of terminal output. The intention is for this interface to be
35-- used inline with other output systems.
@@ -56,13 +58,13 @@ data InlineState =
5658-- | Set the background color to the provided 'Color'.
5759backColor :: Color -> InlineM ()
5860backColor c = modify $ \s ->
59− s { inlineAttr = inlineAttr s `withBackColor` c
61+ s { inlineAttr = inlineAttr s `mappend` (currentAttr `withBackColor` c)
6062 }
6163
6264-- | Set the foreground color to the provided 'Color'.
6365foreColor :: Color -> InlineM ()
6466foreColor c = modify $ \s ->
65− s { inlineAttr = inlineAttr s `withForeColor` c
67+ s { inlineAttr = inlineAttr s `mappend` (currentAttr `withForeColor` c)
6668 }
6769
6870-- | Attempt to change the 'Style' of the following text..
@@ -71,7 +73,7 @@ foreColor c = modify $ \s ->
7173-- produced. The style can still be removed.
7274applyStyle :: Style -> InlineM ()
7375applyStyle st = modify $ \s ->
74− s { inlineAttr = inlineAttr s `withStyle` st
76+ s { inlineAttr = inlineAttr s `mappend` (currentAttr `withStyle` st)
7577 }
7678
7779-- | Attempt to remove the specified 'Style' from the display of the
@@ -83,8 +85,8 @@ removeStyle :: Style -> InlineM ()
8385removeStyle sMask = modify $ \s ->
8486 s { inlineAttr =
8587 let style' = case attrStyle (inlineAttr s) of
86− Default -> error "Graphics.Vty.Inline: Cannot removeStyle if applyStyle never used."
87− KeepCurrent -> error "Graphics.Vty.Inline: Cannot removeStyle if applyStyle never used."
88+ Default -> error $ "Graphics.Vty.Inline: Cannot removeStyle if applyStyle never used."
89+ KeepCurrent -> error $ "Graphics.Vty.Inline: Cannot removeStyle if applyStyle never used."
8890 SetTo st -> st .&. complement sMask
8991 in (inlineAttr s) { attrStyle = SetTo style' }
9092 }
src/Graphics/Vty/Input.hs+22−11
@@ -77,7 +77,7 @@
7777-- The input encoding determines how UTF-8 encoded characters are
7878-- recognized.
7979--
80−-- * 7-bit mode: UTF-8 can be input unambiguously. UTF-8 input is
80+-- * 7-bit mode: UTF-8 can be input unambiguiously. UTF-8 input is
8181-- a superset of ASCII. UTF-8 does not overlap escaped control key
8282-- sequences. However, the escape key must be differentiated from
8383-- escaped control key sequences by the timing of the input bytes.
@@ -95,7 +95,7 @@
9595--
9696-- == Terminal Input is Broken
9797--
98−-- Clearly terminal input has fundamental issues. There is no easy way
98+-- Clearly terminal input has fundemental issues. There is no easy way
9999-- to reliably resolve these issues.
100100--
101101-- One resolution would be to ditch standard terminal interfaces
@@ -143,8 +143,22 @@ import Data.Monoid ((<>))
143143-- bytes comes from 'classifyMapForTerm' which is then overridden by
144144-- the the applicable entries from the configuration's 'inputMap'.
145145--
146−-- The terminal device's mode flags are configured by the
147−-- 'attributeControl' function.
146+-- The terminal device is configured with the attributes:
147+--
148+-- * IXON disabled: disables software flow control on outgoing data.
149+-- This stops the process from being suspended if the output terminal
150+-- cannot keep up.
151+--
152+-- * Raw mode is used for input.
153+--
154+-- * ISIG disabled (enables keyboard combinations that result in
155+-- signals)
156+--
157+-- * ECHO disabled (input is not echoed to the output)
158+--
159+-- * ICANON disabled (canonical mode (line mode) input is not used)
160+--
161+-- * IEXTEN disabled (extended functions are disabled)
148162inputForConfig :: Config -> IO Input
149163inputForConfig config@Config{ termName = Just termName
150164 , inputFd = Just termFd
@@ -154,23 +168,20 @@ inputForConfig config@Config{ termName = Just termName
154168 terminal <- Terminfo.setupTerm termName
155169 let inputOverrides = [(s,e) | (t,s,e) <- inputMap, t == Nothing || t == Just termName]
156170 activeInputMap = classifyMapForTerm termName terminal `mappend` inputOverrides
157− (setAttrs, unsetAttrs) <- attributeControl termFd
171+ (setAttrs,unsetAttrs) <- attributeControl termFd
158172 setAttrs
159173 input <- initInput config activeInputMap
160174 let pokeIO = Catch $ do
175+ let e = error "vty internal failure: this value should not propagate to users"
161176 setAttrs
162− atomically $ writeTChan (input^.eventChannel) ResumeAfterSignal
177+ atomically $ writeTChan (input^.eventChannel) (EvResize e e)
163178 _ <- installHandler windowChange pokeIO Nothing
164179 _ <- installHandler continueProcess pokeIO Nothing
165−
166− let restore = unsetAttrs
167−
168180 return $ input
169181 { shutdownInput = do
170182 shutdownInput input
171183 _ <- installHandler windowChange Ignore Nothing
172184 _ <- installHandler continueProcess Ignore Nothing
173− restore
174− , restoreInputState = restoreInputState input >> restore
185+ unsetAttrs
175186 }
176187inputForConfig config = (<> config) <$> standardIOConfig >>= inputForConfig
src/Graphics/Vty/Input/Classify.hs+29−53
@@ -1,11 +1,10 @@
11{-# 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
33-- input blocks. Likely building a parser and just applying that would
44-- be better.
55module Graphics.Vty.Input.Classify
66 ( classify
77 , KClass(..)
8− , ClassifierState(..)
98 )
109where
1110
@@ -17,39 +16,25 @@ import Graphics.Vty.Input.Classify.Types
1716
1817import Codec.Binary.UTF8.Generic (decode)
1918
20−import Control.Arrow (first)
19+import Data.List (inits)
2120import qualified Data.Map as M( fromList, lookup )
2221import Data.Maybe ( mapMaybe )
2322import qualified Data.Set as S( fromList, member )
2423
24+import Data.Char
2525import Data.Word
2626
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
27+compile :: ClassifyMap -> [Char] -> KClass
4328compile table = cl' where
4429 -- take all prefixes and create a set of these
45− prefixSet = S.fromList $ concatMap (init . BS.inits . BS8.pack . fst) table
30+ prefixSet = S.fromList $ concatMap (init . inits . fst) $ table
4631 maxValidInputLength = maximum (map (length . fst) table)
47− eventForInput = M.fromList $ map (first BS8.pack) table
48− cl' inputBlock | BS8.null inputBlock = Prefix
32+ eventForInput = M.fromList table
33+ cl' [] = Prefix
4934 cl' inputBlock = case M.lookup inputBlock eventForInput of
5035 -- if the inputBlock is exactly what is expected for an
5136 -- event then consume the whole block and return the event
52− Just e -> Valid e BS8.empty
37+ Just e -> Valid e []
5338 Nothing -> case S.member inputBlock prefixSet of
5439 True -> Prefix
5540 -- look up progressively smaller tails of the input
@@ -60,49 +45,40 @@ compile table = cl' where
6045 -- H: There will always be one match. The prefixSet
6146 -- contains, by definition, all prefixes of an event.
6247 False ->
63− let inputPrefixes = reverse . take maxValidInputLength . tail . BS8.inits $ inputBlock
48+ let inputPrefixes = reverse $ take maxValidInputLength $ tail $ inits inputBlock
6449 in case mapMaybe (\s -> (,) s `fmap` M.lookup s eventForInput) inputPrefixes of
65− (s,e) : _ -> Valid e (BS8.drop (BS8.length s) inputBlock)
50+ (s,e) : _ -> Valid e (drop (length s) inputBlock)
6651 -- neither a prefix or a full event.
6752 [] -> Invalid
6853
69−classify :: ClassifyMap -> ClassifierState -> ByteString -> KClass
70−classify table = process
71− where
72− standardClassifier = compile table
73−
74− process ClassifierStart s =
75− case BS.uncons s of
76− _ | 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 =
54+classify :: ClassifyMap -> [Char] -> KClass
55+classify table =
56+ let standardClassifier = compile table
57+ in \s -> case s of
58+ _ | bracketedPasteStarted s ->
8659 if bracketedPasteFinished s
87− then parseBracketedPaste $ BS.concat $ p:reverse (s:ps)
88− else Chunk
89− process ClassifierInChunk{} _ = Invalid
60+ then parseBracketedPaste s
61+ else Prefix
62+ _ | isMouseEvent s -> classifyMouseEvent s
63+ _ | isFocusEvent s -> classifyFocusEvent s
64+ c:cs | ord c >= 0xC2 -> classifyUtf8 c cs
65+ _ -> standardClassifier s
9066
91−classifyUtf8 :: Word8 -> ByteString -> KClass
67+classifyUtf8 :: Char -> [Char] -> KClass
9268classifyUtf8 c cs =
93− let n = utf8Length c
94− (codepoint,rest) = BS8.splitAt (n - 1) cs
69+ let n = utf8Length (ord c)
70+ (codepoint,rest) = splitAt n (c:cs)
9571
9672 codepoint8 :: [Word8]
97− codepoint8 = c:BS.unpack codepoint
73+ codepoint8 = map (fromIntegral . ord) codepoint
9874
9975 in case decode codepoint8 of
100− _ | n < BS.length codepoint + 1 -> Prefix
101− Just (unicodeChar, _) -> Valid (EvKey (KChar unicodeChar) []) rest
76+ _ | n < length codepoint -> Prefix
77+ Just (unicodeChar, _) -> Valid (EvKey (KChar unicodeChar) []) rest
10278 -- something bad happened; just ignore and continue.
103− Nothing -> Invalid
79+ Nothing -> Invalid
10480
105−utf8Length :: Word8 -> Int
81+utf8Length :: (Num t, Ord a, Num a) => a -> t
10682utf8Length c
10783 | c < 0x80 = 1
10884 | c < 0xE0 = 2
src/Graphics/Vty/Input/Classify/Parse.hs+7−10
@@ -16,15 +16,12 @@ import Graphics.Vty.Input.Classify.Types
1616import Control.Monad.Trans.Maybe
1717import Control.Monad.State
1818
19−import qualified Data.ByteString.Char8 as BS8
20−import Data.ByteString.Char8 (ByteString)
21−
22−type Parser a = MaybeT (State ByteString) a
19+type Parser a = MaybeT (State String) a
2320
2421-- | Run a parser on a given input string. If the parser fails, return
2522-- 'Invalid'. Otherwise return the valid event ('Valid') and the
2623-- remaining unparsed characters.
27−runParser :: ByteString -> Parser Event -> KClass
24+runParser :: String -> Parser Event -> KClass
2825runParser s parser =
2926 case runState (runMaybeT parser) s of
3027 (Nothing, _) -> Invalid
@@ -39,9 +36,9 @@ failParse = fail "invalid parse"
3936-- return '123' and consume those characters.
4037readInt :: Parser Int
4138readInt = do
42− s <- BS8.unpack <$> get
39+ s <- get
4340 case (reads :: ReadS Int) s of
44− [(i, rest)] -> put (BS8.pack rest) >> return i
41+ [(i, rest)] -> put rest >> return i
4542 _ -> failParse
4643
4744-- | Read a character from the input stream. If one cannot be read (e.g.
@@ -49,9 +46,9 @@ readInt = do
4946readChar :: Parser Char
5047readChar = do
5148 s <- get
52− case BS8.uncons s of
53− Just (c,rest) -> put rest >> return c
54− Nothing -> failParse
49+ case s of
50+ c:rest -> put rest >> return c
51+ _ -> failParse
5552
5653-- | Read a character from the input stream and fail parsing if it is
5754-- not the specified character.
src/Graphics/Vty/Input/Classify/Types.hs+1−7
@@ -1,6 +1,5 @@
11-- | This module exports the input classification type to avoid import
22-- cycles between other modules that need this.
3−{-# LANGUAGE StrictData #-}
43module Graphics.Vty.Input.Classify.Types
54 ( KClass(..)
65 )
@@ -8,10 +7,8 @@ where
87
98import Graphics.Vty.Input.Events
109
11−import Data.ByteString.Char8 (ByteString)
12−
1310data KClass
14− = Valid Event ByteString
11+ = Valid Event [Char]
1512 -- ^ A valid event was parsed. Any unused characters from the input
1613 -- stream are also provided.
1714 | Invalid
@@ -19,7 +16,4 @@ data KClass
1916 | Prefix
2017 -- ^ The input characters form the prefix of a valid event character
2118 -- 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.
2519 deriving(Show, Eq)
src/Graphics/Vty/Input/Events.hs+6−24
@@ -1,8 +1,6 @@
11{-# Language DeriveGeneric #-}
2−{-# Language StrictData #-}
32module Graphics.Vty.Input.Events where
43
5−import Control.DeepSeq
64import Data.ByteString
75import GHC.Generics
86
@@ -16,29 +14,23 @@ import GHC.Generics
1614--
1715-- * Actually, support for most of these but KEsc, KChar, KBS, and
1816-- KEnter vary by terminal and keyboard.
19−data Key = KEsc | KChar {-# UNPACK #-} Char | KBS | KEnter
17+data Key = KEsc | KChar Char | KBS | KEnter
2018 | KLeft | KRight | KUp | KDown
2119 | KUpLeft | KUpRight | KDownLeft | KDownRight | KCenter
22− | KFun {-# UNPACK #-} Int | KBackTab | KPrtScr | KPause | KIns
20+ | KFun Int | KBackTab | KPrtScr | KPause | KIns
2321 | KHome | KPageUp | KDel | KEnd | KPageDown | KBegin | KMenu
2422 deriving (Eq,Show,Read,Ord,Generic)
2523
26−instance NFData Key
27−
2824-- | Modifier keys. Key codes are interpreted such that users are more
2925-- likely to have Meta than Alt; for instance on the PC Linux console,
3026-- 'MMeta' will generally correspond to the physical Alt key.
3127data Modifier = MShift | MCtrl | MMeta | MAlt
3228 deriving (Eq,Show,Read,Ord,Generic)
3329
34−instance NFData Modifier
35−
3630-- | Mouse buttons.
3731data Button = BLeft | BMiddle | BRight | BScrollUp | BScrollDown
3832 deriving (Eq,Show,Read,Ord,Generic)
3933
40−instance NFData Button
41−
4234-- | Events.
4335data Event
4436 = EvKey Key [Modifier]
@@ -52,8 +44,10 @@ data Event
5244 -- without specifying which one; in that case, Nothing is provided.
5345 -- Otherwise Just the button released is included in the event.
5446 | EvResize Int Int
55− -- The terminal window was resized and the size is provided in the
56− -- integer fields (width, height).
47+ -- ^ If read from 'eventChannel' this is the size at the time of the
48+ -- signal. If read from 'nextEvent' this is the size at the time the
49+ -- event was processed by Vty. Typically these are the same, but if
50+ -- somebody is resizing the terminal quickly they can be different.
5751 | EvPaste ByteString
5852 -- ^ A paste event occurs when a bracketed paste input sequence is
5953 -- received. For terminals that support bracketed paste mode, these
@@ -68,16 +62,4 @@ data Event
6862 -- ^ The terminal running the application gained input focus.
6963 deriving (Eq,Show,Read,Ord,Generic)
7064
71−instance NFData Event
72−
7365type 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.hs+13−15
@@ -11,32 +11,30 @@ import Graphics.Vty.Input.Classify.Types
1111import Graphics.Vty.Input.Classify.Parse
1212
1313import Control.Monad.State
14−
15−import qualified Data.ByteString.Char8 as BS8
16−import Data.ByteString.Char8 (ByteString)
14+import Data.List (isPrefixOf)
1715
1816-- | These sequences set xterm-based terminals to send focus event
1917-- sequences.
20−requestFocusEvents :: ByteString
21−requestFocusEvents = BS8.pack "\ESC[?1004h"
18+requestFocusEvents :: String
19+requestFocusEvents = "\ESC[?1004h"
2220
2321-- | These sequences disable focus events.
24−disableFocusEvents :: ByteString
25−disableFocusEvents = BS8.pack "\ESC[?1004l"
22+disableFocusEvents :: String
23+disableFocusEvents = "\ESC[?1004l"
2624
2725-- | 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
26+isFocusEvent :: String -> Bool
27+isFocusEvent s = isPrefixOf focusIn s ||
28+ isPrefixOf focusOut s
3129
32−focusIn :: ByteString
33−focusIn = BS8.pack "\ESC[I"
30+focusIn :: String
31+focusIn = "\ESC[I"
3432
35−focusOut :: ByteString
36−focusOut = BS8.pack "\ESC[O"
33+focusOut :: String
34+focusOut = "\ESC[O"
3735
3836-- | Attempt to classify an input string as a focus event.
39−classifyFocusEvent :: ByteString -> KClass
37+classifyFocusEvent :: String -> KClass
4038classifyFocusEvent s = runParser s $ do
4139 when (not $ isFocusEvent s) failParse
4240
src/Graphics/Vty/Input/Loop.hs+29−86
@@ -1,9 +1,8 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE NoMonomorphismRestriction #-}
31{-# LANGUAGE RecordWildCards #-}
4−{-# LANGUAGE ScopedTypeVariables #-}
5−{-# LANGUAGE TemplateHaskell #-}
62{-# OPTIONS_HADDOCK hide #-}
3+{-# LANGUAGE NoMonomorphismRestriction #-}
4+{-# LANGUAGE TemplateHaskell #-}
5+{-# LANGUAGE CPP #-}
76-- | The input layer used to be a single function that correctly
87-- accounted for the non-threaded runtime by emulating the terminal
98-- VMIN adn VTIME handling. This has been removed and replace with a
@@ -34,15 +33,12 @@ import Control.Monad.Trans.State (StateT(..), evalStateT)
3433import Control.Monad.State.Class (MonadState, modify)
3534import Control.Monad.Trans.Reader (ReaderT(..))
3635
37−import qualified Data.ByteString.Char8 as BS8
38−import qualified Data.ByteString as BS
39−import Data.ByteString.Char8 (ByteString)
36+import Data.Char
4037import Data.IORef
4138import Data.Word (Word8)
4239
43−import Foreign (allocaArray)
40+import Foreign ( allocaArray, peekArray, Ptr )
4441import Foreign.C.Types (CInt(..))
45−import Foreign.Ptr (Ptr, castPtr)
4642
4743import System.IO
4844import System.Posix.IO (fdReadBuf, setFdOption, FdOption(..))
@@ -55,15 +51,10 @@ data Input = Input
5551 { -- | Channel of events direct from input processing. Unlike
5652 -- 'nextEvent' this will not refresh the display if the next event
5753 -- is an 'EvResize'.
58− _eventChannel :: TChan InternalEvent
59− -- | Shuts down the input processing. As part of shutting down the
60− -- input, this should also restore the input state.
54+ _eventChannel :: TChan Event
55+ -- | Shuts down the input processing. This should return the
56+ -- terminal input state to before he input initialized.
6157 , 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 ()
6758 -- | Changes to this value are reflected after the next event.
6859 , _configRef :: IORef Config
6960 -- | input debug log
@@ -80,11 +71,10 @@ data InputBuffer = InputBuffer
8071makeLenses ''InputBuffer
8172
8273data InputState = InputState
83− { _unprocessedBytes :: ByteString
84− , _classifierState :: ClassifierState
74+ { _unprocessedBytes :: String
8575 , _appliedConfig :: Config
8676 , _inputBuffer :: InputBuffer
87− , _classifier :: ClassifierState -> ByteString -> KClass
77+ , _classifier :: String -> KClass
8878 }
8979
9080makeLenses ''InputState
@@ -109,20 +99,20 @@ loopInputProcessor = do
10999 dropInvalid
110100 loopInputProcessor
111101
112−addBytesToProcess :: ByteString -> InputM ()
102+addBytesToProcess :: String -> InputM ()
113103addBytesToProcess block = unprocessedBytes <>= block
114104
115105emit :: Event -> InputM ()
116106emit event = do
117107 logMsg $ "parsed event: " ++ show event
118− view eventChannel >>= liftIO . atomically . flip writeTChan (InputEvent event)
108+ view eventChannel >>= liftIO . atomically . flip writeTChan event
119109
120110-- The timing requirements are assured by the VMIN and VTIME set for the
121111-- device.
122112--
123113-- Precondition: Under the threaded runtime. Only current use is from a
124114-- forkOS thread. That case satisfies precondition.
125−readFromDevice :: InputM ByteString
115+readFromDevice :: InputM String
126116readFromDevice = do
127117 newConfig <- view configRef >>= liftIO . readIORef
128118 oldConfig <- use appliedConfig
@@ -142,10 +132,9 @@ readFromDevice = do
142132 threadWaitRead fd
143133 bytesRead <- fdReadBuf fd bufferPtr (fromIntegral maxBytes)
144134 if bytesRead > 0
145− then BS.packCStringLen (castPtr bufferPtr, fromIntegral bytesRead)
146− else return BS.empty
147− when (not $ BS.null stringRep) $
148− logMsg $ "input bytes: " ++ show (BS8.unpack stringRep)
135+ then fmap (map $ chr . fromIntegral) $ peekArray (fromIntegral bytesRead) bufferPtr
136+ else return []
137+ when (not $ null stringRep) $ logMsg $ "input bytes: " ++ show stringRep
149138 return stringRep
150139
151140applyConfig :: Fd -> Config -> IO ()
@@ -156,86 +145,41 @@ applyConfig _ _ = fail "(vty) applyConfig was not provided a complete configurat
156145parseEvent :: InputM Event
157146parseEvent = do
158147 c <- use classifier
159− s <- use classifierState
160148 b <- use unprocessedBytes
161− case c s b of
149+ case c b of
162150 Valid e remaining -> do
163151 logMsg $ "valid parse: " ++ show e
164152 logMsg $ "remaining: " ++ show remaining
165− classifierState .= ClassifierStart
166153 unprocessedBytes .= remaining
167154 return e
168− _ -> mzero
155+ _ -> mzero
169156
170157dropInvalid :: InputM ()
171158dropInvalid = do
172159 c <- use classifier
173− s <- use classifierState
174160 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
183− logMsg "dropping input bytes"
184− classifierState .= ClassifierStart
185− unprocessedBytes .= BS8.empty
186− _ -> return ()
161+ when (c b == Invalid) $ do
162+ logMsg "dropping input bytes"
163+ unprocessedBytes .= []
187164
188165runInputProcessorLoop :: ClassifyMap -> Input -> IO ()
189166runInputProcessorLoop classifyTable input = do
190167 let bufferSize = 1024
191168 allocaArray bufferSize $ \(bufferPtr :: Ptr Word8) -> do
192− s0 <- InputState BS8.empty ClassifierStart
193− <$> readIORef (_configRef input)
194− <*> pure (InputBuffer bufferPtr bufferSize)
195− <*> pure (classify classifyTable)
169+ s0 <- InputState [] <$> readIORef (_configRef input)
170+ <*> pure (InputBuffer bufferPtr bufferSize)
171+ <*> pure (classify classifyTable)
196172 runReaderT (evalStateT loopInputProcessor s0) input
197173
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)
223174attributeControl :: Fd -> IO (IO (), IO ())
224175attributeControl fd = do
225176 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
232− , EnableEcho -- ECHO
233− , ProcessInput -- ICANON
234− , ExtendedFunctions -- IEXTEN
235− ]
177+ let vtyMode = foldl withoutMode original [ StartStopOutput, KeyboardInterrupts
178+ , EnableEcho, ProcessInput, ExtendedFunctions
179+ ]
236180 let setAttrs = setTerminalAttributes fd vtyMode Immediately
237181 unsetAttrs = setTerminalAttributes fd original Immediately
238− return (setAttrs, unsetAttrs)
182+ return (setAttrs,unsetAttrs)
239183
240184logInitialInputState :: Input -> ClassifyMap -> IO()
241185logInitialInputState input classifyTable = case _inputDebug input of
@@ -243,7 +187,7 @@ logInitialInputState input classifyTable = case _inputDebug input of
243187 Just h -> do
244188 Config{ vmin = Just theVmin
245189 , vtime = Just theVtime
246− , termName = Just theTerm } <- readIORef $ _configRef input
190+ , termName = Just theTerm, .. } <- readIORef $ _configRef input
247191 _ <- hPrintf h "initial (vmin,vtime): %s\n" (show (theVmin, theVtime))
248192 forM_ classifyTable $ \i -> case i of
249193 (inBytes, EvKey k mods) -> hPrintf h "map %s %s %s %s\n" (show theTerm)
@@ -259,7 +203,6 @@ initInput config classifyTable = do
259203 applyConfig fd config
260204 stopSync <- newEmptyMVar
261205 input <- Input <$> atomically newTChan
262− <*> pure (return ())
263206 <*> pure (return ())
264207 <*> newIORef config
265208 <*> maybe (return Nothing)
src/Graphics/Vty/Input/Mouse.hs+17−19
@@ -15,12 +15,10 @@ import Graphics.Vty.Input.Classify.Types
1515import Graphics.Vty.Input.Classify.Parse
1616
1717import Control.Monad.State
18+import Data.List (isPrefixOf)
1819import Data.Maybe (catMaybes)
1920import Data.Bits ((.&.))
2021
21−import qualified Data.ByteString.Char8 as BS8
22−import Data.ByteString.Char8 (ByteString)
23−
2422-- A mouse event in SGR extended mode is
2523--
2624-- '\ESC' '[' '<' B ';' X ';' Y ';' ('M'|'m')
@@ -34,28 +32,28 @@ import Data.ByteString.Char8 (ByteString)
3432
3533-- | These sequences set xterm-based terminals to send mouse event
3634-- sequences.
37−requestMouseEvents :: ByteString
38−requestMouseEvents = BS8.pack "\ESC[?1000h\ESC[?1002h\ESC[?1006h"
35+requestMouseEvents :: String
36+requestMouseEvents = "\ESC[?1000h\ESC[?1002h\ESC[?1006h"
3937
4038-- | These sequences disable mouse events.
41−disableMouseEvents :: ByteString
42−disableMouseEvents = BS8.pack "\ESC[?1000l\ESC[?1002l\ESC[?1006l"
39+disableMouseEvents :: String
40+disableMouseEvents = "\ESC[?1000l\ESC[?1002l\ESC[?1006l"
4341
4442-- | Does the specified string begin with a mouse event?
45−isMouseEvent :: ByteString -> Bool
43+isMouseEvent :: String -> Bool
4644isMouseEvent s = isSGREvent s || isNormalEvent s
4745
48−isSGREvent :: ByteString -> Bool
49−isSGREvent = BS8.isPrefixOf sgrPrefix
46+isSGREvent :: String -> Bool
47+isSGREvent = isPrefixOf sgrPrefix
5048
51−sgrPrefix :: ByteString
52−sgrPrefix = BS8.pack "\ESC[M"
49+sgrPrefix :: String
50+sgrPrefix = "\ESC[M"
5351
54−isNormalEvent :: ByteString -> Bool
55−isNormalEvent = BS8.isPrefixOf normalPrefix
52+isNormalEvent :: String -> Bool
53+isNormalEvent = isPrefixOf normalPrefix
5654
57−normalPrefix :: ByteString
58−normalPrefix = BS8.pack "\ESC[<"
55+normalPrefix :: String
56+normalPrefix = "\ESC[<"
5957
6058-- Modifier bits:
6159shiftBit :: Int
@@ -89,8 +87,8 @@ scrollDown = 65
8987hasBitSet :: Int -> Int -> Bool
9088hasBitSet val bit = val .&. bit > 0
9189
92−-- | Attempt to classify an input string as a mouse event.
93−classifyMouseEvent :: ByteString -> KClass
90+-- | Attempt to lassify an input string as a mouse event.
91+classifyMouseEvent :: String -> KClass
9492classifyMouseEvent s = runParser s $ do
9593 when (not $ isMouseEvent s) failParse
9694
@@ -102,7 +100,7 @@ classifyMouseEvent s = runParser s $ do
102100 'M' -> classifyNormalMouseEvent
103101 _ -> failParse
104102
105−-- Given a modifier/button value, determine which button was indicated
103+-- Given a modifer/button value, determine which button was indicated
106104getSGRButton :: Int -> Parser Button
107105getSGRButton mods =
108106 let buttonMap = [ (leftButton, BLeft)
src/Graphics/Vty/Input/Paste.hs+24−16
@@ -9,33 +9,41 @@ module Graphics.Vty.Input.Paste
99where
1010
1111import qualified Data.ByteString.Char8 as BS8
12−import Data.ByteString.Char8 (ByteString)
1312
1413import Graphics.Vty.Input.Events
1514import Graphics.Vty.Input.Classify.Types
1615
17−bracketedPasteStart :: ByteString
18−bracketedPasteStart = BS8.pack "\ESC[200~"
16+import Data.List (isPrefixOf, isInfixOf)
1917
20−bracketedPasteEnd :: ByteString
21−bracketedPasteEnd = BS8.pack "\ESC[201~"
18+bracketedPasteStart :: String
19+bracketedPasteStart = "\ESC[200~"
20+
21+bracketedPasteEnd :: String
22+bracketedPasteEnd = "\ESC[201~"
2223
2324-- | Does the input start a bracketed paste?
24−bracketedPasteStarted :: ByteString -> Bool
25−bracketedPasteStarted = BS8.isPrefixOf bracketedPasteStart
25+bracketedPasteStarted :: String -> Bool
26+bracketedPasteStarted = isPrefixOf bracketedPasteStart
2627
2728-- | Does the input contain a complete bracketed paste?
28−bracketedPasteFinished :: ByteString -> Bool
29−bracketedPasteFinished = BS8.isInfixOf bracketedPasteEnd
29+bracketedPasteFinished :: String -> Bool
30+bracketedPasteFinished = isInfixOf bracketedPasteEnd
3031
3132-- | Parse a bracketed paste. This should only be called on a string if
3233-- both 'bracketedPasteStarted' and 'bracketedPasteFinished' return
3334-- 'True'.
34−parseBracketedPaste :: ByteString -> KClass
35+parseBracketedPaste :: String -> KClass
3536parseBracketedPaste s =
36− Valid (EvPaste p) (BS8.drop endLen rest')
37− where
38− startLen = BS8.length bracketedPasteStart
39− endLen = BS8.length bracketedPasteEnd
40− (_, rest ) = BS8.breakSubstring bracketedPasteStart s
41− (p, rest') = BS8.breakSubstring bracketedPasteEnd . BS8.drop startLen $ rest
37+ let (p, rest) = takeUntil (drop (length bracketedPasteStart) s) bracketedPasteEnd
38+ rest' = if bracketedPasteEnd `isPrefixOf` rest
39+ then drop (length bracketedPasteEnd) rest
40+ else rest
41+ in Valid (EvPaste $ BS8.pack p) rest'
42+
43+takeUntil :: (Eq a) => [a] -> [a] -> ([a],[a])
44+takeUntil [] _ = ([], [])
45+takeUntil cs sub
46+ | length cs < length sub = (cs, [])
47+ | take (length sub) cs == sub = ([], drop (length sub) cs)
48+ | otherwise = let (pre, suf) = takeUntil (tail cs) sub
49+ in (head cs:pre, suf)
src/Graphics/Vty/Input/Terminfo.hs+4−6
@@ -74,7 +74,7 @@ visibleChars = [ ([x], EvKey (KChar x) [])
7474ctrlChars :: ClassifyMap
7575ctrlChars =
7676 [ ([toEnum x],EvKey (KChar y) [MCtrl])
77− | (x,y) <- zip [0..31] ('@':['a'..'z']++['['..'_'])
77+ | (x,y) <- zip ([0..31]) ('@':['a'..'z']++['['..'_'])
7878 , y /= 'i' -- Resolve issue #3 where CTRL-i hides TAB.
7979 , y /= 'h' -- CTRL-h should not hide BS
8080 ]
@@ -86,12 +86,10 @@ ctrlMetaChars = map (\(s,EvKey c m) -> ('\ESC':s, EvKey c (MMeta:m))) ctrlChars
8686-- | Esc, meta-esc, delete, meta-delete, enter, meta-enter.
8787specialSupportKeys :: ClassifyMap
8888specialSupportKeys =
89− [ ("\ESC\ESC[5~",EvKey KPageUp [MMeta])
90− , ("\ESC\ESC[6~",EvKey KPageDown [MMeta])
91− -- special support for ESC
92− , ("\ESC",EvKey KEsc []), ("\ESC\ESC",EvKey KEsc [MMeta])
89+ [ -- special support for ESC
90+ ("\ESC",EvKey KEsc []), ("\ESC\ESC",EvKey KEsc [MMeta])
9391 -- 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])
9593 -- Special support for Enter
9694 , ("\ESC\^J",EvKey KEnter [MMeta]), ("\^J",EvKey KEnter [])
9795 -- explicit support for tab
src/Graphics/Vty/Input/Terminfo/ANSIVT.hs+1−1
@@ -59,7 +59,7 @@ navKeys3 =
5959-- This encoding depends on the terminal.
6060functionKeys1 :: ClassifyMap
6161functionKeys1 =
62− let f ff nrs m = [ ("\ESC["++show n++"~",EvKey (KFun $ n-head nrs+ff) m) | n <- nrs ] in
62+ let f ff nrs m = [ ("\ESC["++show n++"~",EvKey (KFun $ n-(nrs!!0)+ff) m) | n <- nrs ] in
6363 concat [f 1 [25,26] [MShift], f 3 [28,29] [MShift], f 5 [31..34] [MShift] ]
6464
6565-- | encoding for meta plus char
src/Graphics/Vty/Output.hs+5−6
@@ -1,4 +1,4 @@
1−{-# LANGUAGE RecordWildCards, CPP #-}
1+{-# LANGUAGE RecordWildCards, NamedFieldPuns, CPP #-}
22-- | This module provides functions for accessing the current terminal
33-- or a specific terminal device.
44--
@@ -58,12 +58,11 @@ import Data.Monoid ((<>))
5858-- * If TERM contains "xterm" or "screen", use XTermColor.
5959-- * otherwise use the TerminfoBased driver.
6060outputForConfig :: Config -> IO Output
61−outputForConfig Config{ outputFd = Just fd, termName = Just termName
62− , colorMode = Just colorMode, .. } = do
61+outputForConfig Config{ outputFd = Just fd, termName = Just termName, .. } = do
6362 t <- if "xterm" `isPrefixOf` termName || "screen" `isPrefixOf` termName
64− then XTermColor.reserveTerminal termName fd colorMode
63+ then XTermColor.reserveTerminal termName fd
6564 -- Not an xterm-like terminal. try for generic terminfo.
66− else TerminfoBased.reserveTerminal termName fd colorMode
65+ else TerminfoBased.reserveTerminal termName fd
6766
6867 case mouseMode of
6968 Just s -> setMode t Mouse s
@@ -78,7 +77,7 @@ outputForConfig config = (<> config) <$> standardIOConfig >>= outputForConfig
7877
7978-- | Sets the cursor position to the given output column and row.
8079--
81−-- This is not necessarily the same as the character position with the
80+-- This is not necessarially the same as the character position with the
8281-- same coordinates. Characters can be a variable number of columns in
8382-- width.
8483--
src/Graphics/Vty/Output/Interface.hs+18−47
@@ -1,9 +1,9 @@
11-- Copyright Corey O'Connor
2+{-# LANGUAGE BangPatterns #-}
23{-# LANGUAGE RankNTypes #-}
34{-# LANGUAGE ExistentialQuantification #-}
45{-# LANGUAGE GADTs #-}
56{-# LANGUAGE FlexibleContexts #-}
6−{-# LANGUAGE ScopedTypeVariables #-}
77-- | This module provides an abstract interface for performing terminal
88-- output. The only user-facing part of this API is 'Output'.
99module Graphics.Vty.Output.Interface
@@ -73,12 +73,13 @@ data Output = Output
7373 -- | Return the display to the state before `reserveDisplay` If no
7474 -- previous state then set the display state to the initial state.
7575 , releaseDisplay :: IO ()
76− -- | Sets the current display bounds (width, height).
77− , setDisplayBounds :: (Int, Int) -> IO ()
7876 -- | Returns the current display bounds.
7977 , displayBounds :: IO DisplayRegion
8078 -- | Output the bytestring to the terminal device.
8179 , outputByteBuffer :: BS.ByteString -> IO ()
80+ -- | Specifies the maximum number of colors supported by the
81+ -- context.
82+ , contextColorCount :: Int
8283 -- | Specifies whether the cursor can be shown / hidden.
8384 , supportsCursorVisibility :: Bool
8485 -- | Indicates support for terminal modes for this output device.
@@ -98,24 +99,6 @@ data Output = Output
9899 , ringTerminalBell :: IO ()
99100 -- | Returns whether the terminal has an audio bell feature.
100101 , supportsBell :: IO 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
119102 }
120103
121104displayContext :: Output -> DisplayRegion -> IO DisplayContext
@@ -206,12 +189,6 @@ outputPicture dc pic = do
206189 AbsoluteCursor x y ->
207190 writeShowCursor dc `mappend`
208191 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)
215192 Cursor x y ->
216193 let m = cursorOutputMap ops $ picCursor pic
217194 (ox, oy) = charToOutputPos m (clampX x, clampY y)
@@ -309,23 +286,17 @@ limitAttrForDisplay t attr
309286 where
310287 clampColor Default = Default
311288 clampColor KeepCurrent = KeepCurrent
312− clampColor (SetTo c) = clampColor' (outputColorMode t) c
313−
314− clampColor' NoColor _ = Default
315−
316− clampColor' ColorMode8 (ISOColor v)
317− | v >= 8 = SetTo $ ISOColor (v - 8)
318− | otherwise = SetTo $ ISOColor v
319− clampColor' ColorMode8 _ = Default
320−
321− clampColor' ColorMode16 c@(ISOColor _) = SetTo c
322− clampColor' ColorMode16 _ = Default
323−
324− clampColor' (ColorMode240 _) c@(ISOColor _) = SetTo c
325− clampColor' (ColorMode240 colorCount) c@(Color240 n)
326− | n <= colorCount = SetTo c
327− | otherwise = Default
328− clampColor' colorMode@(ColorMode240 _) (RGBColor r g b) =
329− clampColor' colorMode (color240 r g b)
330−
331− clampColor' FullColor c = SetTo c
289+ clampColor (SetTo c) = clampColor' c
290+ clampColor' (ISOColor v)
291+ | contextColorCount t < 8 = Default
292+ | contextColorCount t < 16 && v >= 8 = SetTo $ ISOColor (v - 8)
293+ | otherwise = SetTo $ ISOColor v
294+ clampColor' (Color240 v)
295+ -- Should we choose closest ISO color?
296+ | contextColorCount t < 8 = Default
297+ | contextColorCount t < 16 = Default
298+ | contextColorCount t <= 256 = SetTo $ Color240 v
299+ | otherwise
300+ = let p :: Double = fromIntegral v / 240.0
301+ v' = floor $ p * (fromIntegral $ contextColorCount t)
302+ in SetTo $ Color240 v'
src/Graphics/Vty/Output/Mock.hs+2−6
@@ -11,7 +11,6 @@ module Graphics.Vty.Output.Mock
1111where
1212
1313import Graphics.Vty.Image (DisplayRegion)
14−import Graphics.Vty.Attributes.Color (ColorMode(ColorMode16))
1514import Graphics.Vty.Output.Interface
1615
1716import Blaze.ByteString.Builder.Word (writeWord8)
@@ -31,7 +30,7 @@ type MockData = IORef (UTF8.UTF8 BS.ByteString)
3130-- without considering terminal specific issues.
3231--
3332-- The mock implementation is useful in manually determining if the
34−-- sequence of terminal operations matches the expected sequence. The
33+-- sequence of terminal operations matche the expected sequence. The
3534-- requirement of the produced representation is simplicity in parsing
3635-- the text representation and determining how the picture was mapped to
3736-- terminal operations.
@@ -49,19 +48,16 @@ mockTerminal r = liftIO $ do
4948 , releaseDisplay = return ()
5049 , ringTerminalBell = return ()
5150 , supportsBell = return False
52− , supportsItalics = return False
53− , supportsStrikethrough = return False
54− , setDisplayBounds = const $ return ()
5551 , displayBounds = return r
5652 , outputByteBuffer = \bytes -> do
5753 putStrLn $ "mock outputByteBuffer of " ++ show (BS.length bytes) ++ " bytes"
5854 writeIORef outRef $ UTF8.fromRep bytes
55+ , contextColorCount = 16
5956 , supportsCursorVisibility = True
6057 , supportsMode = const False
6158 , setMode = const $ const $ return ()
6259 , getModeStatus = const $ return False
6360 , assumedStateRef = newAssumedStateRef
64− , outputColorMode = ColorMode16
6561 , mkDisplayContext = \tActual rActual -> return $ DisplayContext
6662 { contextRegion = rActual
6763 , contextDevice = tActual
src/Graphics/Vty/Output/TerminfoBased.hs+39−106
@@ -1,3 +1,4 @@
1+{-# LANGUAGE RecordWildCards #-}
12{-# LANGUAGE FlexibleInstances #-}
23{-# LANGUAGE OverloadedStrings #-}
34{-# LANGUAGE CPP #-}
@@ -9,12 +10,10 @@
910-- Copyright Corey O'Connor (coreyoconnor@gmail.com)
1011module Graphics.Vty.Output.TerminfoBased
1112 ( reserveTerminal
12− , setWindowSize
1313 )
1414where
1515
1616import Control.Monad (when)
17−import Data.Bits (shiftL, (.&.))
1817import qualified Data.ByteString as BS
1918import Data.ByteString.Internal (toForeignPtr)
2019import Data.Terminfo.Parse
@@ -25,8 +24,9 @@ import Graphics.Vty.Image (DisplayRegion)
2524import Graphics.Vty.DisplayAttributes
2625import Graphics.Vty.Output.Interface
2726
28−import Blaze.ByteString.Builder (Write, writeToByteString, writeStorable, writeWord8)
27+import Blaze.ByteString.Builder (Write, writeToByteString, writeStorable)
2928
29+import Data.Bits ((.&.))
3030import Data.IORef
3131import Data.Maybe (isJust, isNothing, fromJust)
3232import Data.Word
@@ -49,6 +49,7 @@ data TerminfoCaps = TerminfoCaps
4949 , cup :: CapExpression
5050 , cnorm :: Maybe CapExpression
5151 , civis :: Maybe CapExpression
52+ , supportsNoColors :: Bool
5253 , useAltColorMap :: Bool
5354 , setForeColor :: CapExpression
5455 , setBackColor :: CapExpression
@@ -65,8 +66,6 @@ data DisplayAttrCaps = DisplayAttrCaps
6566 , exitStandout :: Maybe CapExpression
6667 , enterItalic :: Maybe CapExpression
6768 , exitItalic :: Maybe CapExpression
68− , enterStrikethrough :: Maybe CapExpression
69− , exitStrikethrough :: Maybe CapExpression
7069 , enterUnderline :: Maybe CapExpression
7170 , exitUnderline :: Maybe CapExpression
7271 , enterReverseVideo :: Maybe CapExpression
@@ -103,28 +102,28 @@ sendCapToTerminal t cap capParams = do
103102--
104103-- * Providing independent string capabilities for all display
105104-- attributes.
106−reserveTerminal :: String -> Fd -> ColorMode -> IO Output
107−reserveTerminal termName outFd colorMode = do
105+reserveTerminal :: String -> Fd -> IO Output
106+reserveTerminal termName outFd = do
108107 ti <- Terminfo.setupTerm termName
109108 -- assumes set foreground always implies set background exists.
110109 -- if set foreground is not set then all color changing style
111110 -- attributes are filtered.
112111 msetaf <- probeCap ti "setaf"
113112 msetf <- probeCap ti "setf"
114− let (useAlt, setForeCap)
113+ let (noColors, useAlt, setForeCap)
115114 = case msetaf of
116− Just setaf -> (False, setaf)
115+ Just setaf -> (False, False, setaf)
117116 Nothing -> case msetf of
118− Just setf -> (True, setf)
119− Nothing -> (True, error $ "no fore color support for terminal " ++ termName)
117+ Just setf -> (False, True, setf)
118+ Nothing -> (True, True, error $ "no fore color support for terminal " ++ termName)
120119 msetab <- probeCap ti "setab"
121120 msetb <- probeCap ti "setb"
122− let setBackCap
121+ let set_back_cap
123122 = case msetab of
124− Just setab -> setab
125123 Nothing -> case msetb of
126124 Just setb -> setb
127125 Nothing -> error $ "no back color support for terminal " ++ termName
126+ Just setab -> setab
128127
129128 hyperlinkModeStatus <- newIORef False
130129 newAssumedStateRef <- newIORef initialAssumedState
@@ -150,9 +149,10 @@ reserveTerminal termName outFd colorMode = do
150149 <*> requireCap ti "cup"
151150 <*> probeCap ti "cnorm"
152151 <*> probeCap ti "civis"
152+ <*> pure noColors
153153 <*> pure useAlt
154154 <*> pure setForeCap
155− <*> pure setBackCap
155+ <*> pure set_back_cap
156156 <*> requireCap ti "sgr0"
157157 <*> requireCap ti "clear"
158158 <*> requireCap ti "el"
@@ -164,10 +164,6 @@ reserveTerminal termName outFd colorMode = do
164164 sendCap setDefaultAttr []
165165 maybeSendCap cnorm []
166166 , 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))
171167 , ringTerminalBell = maybeSendCap ringBellAudio []
172168 , reserveDisplay = do
173169 -- If there is no support for smcup: Clear the screen
@@ -178,8 +174,6 @@ reserveTerminal termName outFd colorMode = do
178174 , releaseDisplay = do
179175 maybeSendCap rmcup []
180176 maybeSendCap cnorm []
181− , setDisplayBounds = \(w, h) ->
182− setWindowSize outFd (w, h)
183177 , displayBounds = do
184178 rawSize <- getWindowSize outFd
185179 case rawSize of
@@ -192,15 +186,20 @@ reserveTerminal termName outFd colorMode = do
192186 when (toEnum len /= actualLen) $ fail $ "Graphics.Vty.Output: outputByteBuffer "
193187 ++ "length mismatch. " ++ show len ++ " /= " ++ show actualLen
194188 ++ " Please report this bug to vty project."
189+ , contextColorCount
190+ = case supportsNoColors terminfoCaps of
191+ False -> case Terminfo.getCapability ti (Terminfo.tiGetNum "colors" ) of
192+ Nothing -> 8
193+ Just v -> toEnum v
194+ True -> 1
195195 , supportsCursorVisibility = isJust $ civis terminfoCaps
196196 , supportsMode = terminfoModeSupported
197197 , setMode = terminfoSetMode
198198 , getModeStatus = terminfoModeStatus
199199 , assumedStateRef = newAssumedStateRef
200− , outputColorMode = colorMode
201200 -- I think fix would help assure tActual is the only
202201 -- reference. I was having issues tho.
203− , mkDisplayContext = (`terminfoDisplayContext` terminfoCaps)
202+ , mkDisplayContext = \tActual -> terminfoDisplayContext tActual terminfoCaps
204203 }
205204 sendCap s = sendCapToTerminal t (s terminfoCaps)
206205 maybeSendCap s = when (isJust $ s terminfoCaps) . sendCap (fromJust . s)
@@ -232,8 +231,6 @@ currentDisplayAttrCaps ti
232231 <*> probeCap ti "rmso"
233232 <*> probeCap ti "sitm"
234233 <*> probeCap ti "ritm"
235− <*> probeCap ti "smxx"
236− <*> probeCap ti "rmxx"
237234 <*> probeCap ti "smul"
238235 <*> probeCap ti "rmul"
239236 <*> probeCap ti "rev"
@@ -247,13 +244,6 @@ getWindowSize fd = do
247244 (a,b) <- (`divMod` 65536) `fmap` c_getWindowSize fd
248245 return (fromIntegral b, fromIntegral a)
249246
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−
257247terminfoDisplayContext :: Output -> TerminfoCaps -> DisplayRegion -> IO DisplayContext
258248terminfoDisplayContext tActual terminfoCaps r = return dc
259249 where dc = DisplayContext
@@ -269,11 +259,7 @@ terminfoDisplayContext tActual terminfoCaps r = return dc
269259 , writeSetAttr = terminfoWriteSetAttr dc terminfoCaps
270260 , writeDefaultAttr = \urlsEnabled ->
271261 writeCapExpr (setDefaultAttr terminfoCaps) [] `mappend`
272− (if urlsEnabled then writeURLEscapes EndLink else mempty) `mappend`
273− (case exitStrikethrough $ displayAttrCaps terminfoCaps of
274− Just cap -> writeCapExpr cap []
275− Nothing -> mempty
276− )
262+ (if urlsEnabled then writeURLEscapes EndLink else mempty)
277263 , writeRowEnd = writeCapExpr (clearEol terminfoCaps) []
278264 , inlineHack = return ()
279265 }
@@ -295,7 +281,7 @@ writeURLEscapes NoLinkChange =
295281-- | Portably setting the display attributes is a giant pain in the ass.
296282--
297283-- If the terminal supports the sgr capability (which sets the on/off
298−-- state of each style directly; and, for no good reason, resets the
284+-- state of each style directly ; and, for no good reason, resets the
299285-- colors to the default) this procedure is used:
300286--
301287-- 0. set the style attributes. This resets the fore and back color.
@@ -334,9 +320,9 @@ terminfoWriteSetAttr dc terminfoCaps urlsEnabled prevAttr reqAttr diffs =
334320 -- The only way to reset either color, portably, to the default
335321 -- is to use either the set state capability or the set default
336322 -- capability.
337− True -> do
323+ True -> do
338324 case reqDisplayCapSeqFor (displayAttrCaps terminfoCaps)
339− (fixedStyle attr)
325+ (fixedStyle attr )
340326 (styleToApplySeq $ fixedStyle attr) of
341327 -- only way to reset a color to the defaults
342328 EnterExitSeq caps -> writeDefaultAttr dc urlsEnabled
@@ -346,11 +332,11 @@ terminfoWriteSetAttr dc terminfoCaps urlsEnabled prevAttr reqAttr diffs =
346332 setColors
347333 -- implicitly resets the colors to the defaults
348334 SetState state -> writeCapExpr (fromJust $ setAttrStates
349− $ displayAttrCaps terminfoCaps
335+ $ displayAttrCaps
336+ $ terminfoCaps
350337 )
351338 (sgrArgsForState state)
352339 `mappend` setItalics
353− `mappend` setStrikethrough
354340 `mappend` setColors
355341 -- Otherwise the display colors are not changing or changing
356342 -- between two non-default points.
@@ -369,16 +355,15 @@ terminfoWriteSetAttr dc terminfoCaps urlsEnabled prevAttr reqAttr diffs =
369355 -- applied states.
370356 EnterExitSeq caps -> foldMap (\cap -> writeCapExpr cap []) caps
371357 `mappend`
372− writeColorDiff Foreground (foreColorDiff diffs)
358+ writeColorDiff setForeColor (foreColorDiff diffs)
373359 `mappend`
374− writeColorDiff Background (backColorDiff diffs)
360+ writeColorDiff setBackColor (backColorDiff diffs)
375361 -- implicitly resets the colors to the defaults
376362 SetState state -> writeCapExpr (fromJust $ setAttrStates
377363 $ displayAttrCaps terminfoCaps
378364 )
379365 (sgrArgsForState state)
380366 `mappend` setItalics
381− `mappend` setStrikethrough
382367 `mappend` setColors
383368 where
384369 urlAttrs True = writeURLEscapes (urlDiff diffs)
@@ -396,72 +381,31 @@ terminfoWriteSetAttr dc terminfoCaps urlsEnabled prevAttr reqAttr diffs =
396381 , Just sitm <- enterItalic (displayAttrCaps terminfoCaps)
397382 = writeCapExpr sitm []
398383 | otherwise = mempty
399− setStrikethrough
400− | hasStyle (fixedStyle attr) strikethrough
401− , Just smxx <- enterStrikethrough (displayAttrCaps terminfoCaps)
402− = writeCapExpr smxx []
403− | otherwise = mempty
404384 setColors =
405385 (case fixedForeColor attr of
406− Just c -> writeColor Foreground c
386+ Just c -> writeCapExpr (setForeColor terminfoCaps)
387+ [toEnum $ colorMap c]
407388 Nothing -> mempty)
408389 `mappend`
409390 (case fixedBackColor attr of
410− Just c -> writeColor Background c
391+ Just c -> writeCapExpr (setBackColor terminfoCaps)
392+ [toEnum $ colorMap c]
411393 Nothing -> mempty)
412− writeColorDiff _side NoColorChange
394+ writeColorDiff _f NoColorChange
413395 = mempty
414− writeColorDiff _side ColorToDefault
396+ writeColorDiff _f ColorToDefault
415397 = error "ColorToDefault is not a possible case for applyColorDiffs"
416− writeColorDiff side (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]
427−
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"
398+ writeColorDiff f (SetColor c)
399+ = writeCapExpr (f terminfoCaps) [toEnum $ colorMap c]
452400
453401-- | The color table used by a terminal is a 16 color set followed by a
454402-- 240 color set that might not be supported by the terminal.
455403--
456−-- This takes a Color which clearly identifies which palette to use and
457−-- computes the index into the full 256 color palette.
404+-- This takes a Color which clearly identifies which pallete to use and
405+-- computes the index into the full 256 color pallete.
458406ansiColorIndex :: Color -> Int
459407ansiColorIndex (ISOColor v) = fromEnum v
460408ansiColorIndex (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− ]
465409
466410-- | For terminals without setaf/setab
467411--
@@ -478,10 +422,6 @@ altColorIndex (ISOColor 6) = 3
478422altColorIndex (ISOColor 7) = 7
479423altColorIndex (ISOColor v) = fromEnum v
480424altColorIndex (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− ]
485425
486426{- | The sequence of terminfo caps to apply a given style are determined
487427 - according to these rules.
@@ -509,7 +449,6 @@ data DisplayAttrState = DisplayAttrState
509449 { applyStandout :: Bool
510450 , applyUnderline :: Bool
511451 , applyItalic :: Bool
512− , applyStrikethrough :: Bool
513452 , applyReverseVideo :: Bool
514453 , applyBlink :: Bool
515454 , applyDim :: Bool
@@ -546,8 +485,6 @@ reqDisplayCapSeqFor caps s diffs
546485 -- set state cap then just use the set state cap.
547486 ( True, True ) -> SetState $ stateForStyle s
548487 where
549− noEnterExitCap ApplyStrikethrough = isNothing $ enterStrikethrough caps
550− noEnterExitCap RemoveStrikethrough = isNothing $ exitStrikethrough caps
551488 noEnterExitCap ApplyItalic = isNothing $ enterItalic caps
552489 noEnterExitCap RemoveItalic = isNothing $ exitItalic caps
553490 noEnterExitCap ApplyStandout = isNothing $ enterStandout caps
@@ -562,8 +499,6 @@ reqDisplayCapSeqFor caps s diffs
562499 noEnterExitCap RemoveDim = True
563500 noEnterExitCap ApplyBold = isNothing $ enterBoldMode caps
564501 noEnterExitCap RemoveBold = True
565− enterExitCap ApplyStrikethrough = fromJust $ enterStrikethrough caps
566− enterExitCap RemoveStrikethrough = fromJust $ exitStrikethrough caps
567502 enterExitCap ApplyItalic = fromJust $ enterItalic caps
568503 enterExitCap RemoveItalic = fromJust $ exitItalic caps
569504 enterExitCap ApplyStandout = fromJust $ enterStandout caps
@@ -580,7 +515,6 @@ stateForStyle s = DisplayAttrState
580515 { applyStandout = isStyleSet standout
581516 , applyUnderline = isStyleSet underline
582517 , applyItalic = isStyleSet italic
583− , applyStrikethrough = isStyleSet strikethrough
584518 , applyReverseVideo = isStyleSet reverseVideo
585519 , applyBlink = isStyleSet blink
586520 , applyDim = isStyleSet dim
@@ -593,7 +527,6 @@ styleToApplySeq s = concat
593527 [ applyIfRequired ApplyStandout standout
594528 , applyIfRequired ApplyUnderline underline
595529 , applyIfRequired ApplyItalic italic
596− , applyIfRequired ApplyStrikethrough strikethrough
597530 , applyIfRequired ApplyReverseVideo reverseVideo
598531 , applyIfRequired ApplyBlink blink
599532 , applyIfRequired ApplyDim dim
src/Graphics/Vty/Output/XTermColor.hs+18−27
@@ -10,23 +10,17 @@ where
1010import Graphics.Vty.Output.Interface
1111import Graphics.Vty.Input.Mouse
1212import Graphics.Vty.Input.Focus
13−import Graphics.Vty.Attributes.Color (ColorMode)
1413import qualified Graphics.Vty.Output.TerminfoBased as TerminfoBased
1514
1615import Blaze.ByteString.Builder (writeToByteString)
1716import Blaze.ByteString.Builder.Word (writeWord8)
1817
19−import qualified Data.ByteString.Char8 as BS8
20−import Data.ByteString.Char8 (ByteString)
21−import Foreign.Ptr (castPtr)
22−
2318import Control.Monad (void, when)
2419import Control.Monad.Trans
25−import Data.Char (toLower)
2620import Data.IORef
2721
28−import System.Posix.IO (fdWriteBuf)
29−import System.Posix.Types (ByteCount, Fd)
22+import System.Posix.IO (fdWrite)
23+import System.Posix.Types (Fd)
3024import System.Posix.Env (getEnv)
3125
3226import Data.List (isInfixOf)
@@ -36,15 +30,9 @@ import Data.Maybe (catMaybes)
3630import Data.Monoid ((<>))
3731#endif
3832
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−
4533-- | Construct an Xterm output driver. Initialize the display to UTF-8.
46−reserveTerminal :: ( Applicative m, MonadIO m ) => String -> Fd -> ColorMode -> m Output
47−reserveTerminal variant outFd colorMode = liftIO $ do
34+reserveTerminal :: ( Applicative m, MonadIO m ) => String -> Fd -> m Output
35+reserveTerminal variant outFd = liftIO $ do
4836 let flushedPut = void . fdWrite outFd
4937 -- If the terminal variant is xterm-color use xterm instead since,
5038 -- more often than not, xterm-color is broken.
@@ -52,7 +40,7 @@ reserveTerminal variant outFd colorMode = liftIO $ do
5240
5341 utf8a <- utf8Active
5442 when (not utf8a) $ flushedPut setUtf8CharSet
55− t <- TerminfoBased.reserveTerminal variant' outFd colorMode
43+ t <- TerminfoBased.reserveTerminal variant' outFd
5644
5745 mouseModeStatus <- newIORef False
5846 focusModeStatus <- newIORef False
@@ -104,27 +92,30 @@ reserveTerminal variant outFd colorMode = liftIO $ do
10492utf8Active :: IO Bool
10593utf8Active = do
10694 let vars = ["LC_ALL", "LANG", "LC_CTYPE"]
107− results <- map (toLower <$>) . catMaybes <$> mapM getEnv vars
108− let matches = filter ("utf8" `isInfixOf`) results <>
109− filter ("utf-8" `isInfixOf`) results
95+ results <- catMaybes <$> mapM getEnv vars
96+ let matches = filter ("UTF8" `isInfixOf`) results <>
97+ filter ("UTF-8" `isInfixOf`) results
11098 return $ not $ null matches
11199
112100-- | Enable bracketed paste mode:
113101-- http://cirw.in/blog/bracketed-paste
114−enableBracketedPastes :: ByteString
115−enableBracketedPastes = BS8.pack "\ESC[?2004h"
102+enableBracketedPastes :: String
103+enableBracketedPastes = "\ESC[?2004h"
116104
117105-- | Disable bracketed paste mode:
118−disableBracketedPastes :: ByteString
119−disableBracketedPastes = BS8.pack "\ESC[?2004l"
106+disableBracketedPastes :: String
107+disableBracketedPastes = "\ESC[?2004l"
120108
121109-- | These sequences set xterm based terminals to UTF-8 output.
122110--
123111-- There is no known terminfo capability equivalent to this.
124−setUtf8CharSet, setDefaultCharSet :: ByteString
125−setUtf8CharSet = BS8.pack "\ESC%G"
126−setDefaultCharSet = BS8.pack "\ESC%@"
112+setUtf8CharSet, setDefaultCharSet :: String
113+setUtf8CharSet = "\ESC%G"
114+setDefaultCharSet = "\ESC%@"
127115
116+-- | I think xterm is broken: Reseting the background color as the first
117+-- bytes serialized on a new line does not effect the background color
118+-- xterm uses to clear the line. Which is used *after* the next newline.
128119xtermInlineHack :: Output -> IO ()
129120xtermInlineHack t = do
130121 let writeReset = foldMap (writeWord8.toEnum.fromEnum) "\ESC[K"
src/Graphics/Vty/Picture.hs+1−8
@@ -1,3 +1,4 @@
1+{-# LANGUAGE BangPatterns #-}
12-- A 'Picture' is a background paired with a set of 'Image' layers. The
23-- 'Picture' data structure is representative of the final terminal
34-- view.
@@ -79,14 +80,6 @@ picForLayers is = Picture
7980data Cursor =
8081 -- | Hide the cursor
8182 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
9083 -- | Show the cursor at the given logical column accounting for
9184 -- character width in the presence of multi-column characters.
9285 | Cursor !Int !Int
src/Graphics/Vty/PictureToSpans.hs+4−4
@@ -72,7 +72,7 @@ displayOpsForPic pic r = Vector.create (combinedOpsForLayers pic r)
7272-- | Returns the DisplayOps for an image rendered to a window the size
7373-- of the image.
7474--
75−-- largely used only for debugging.
75+-- largerly used only for debugging.
7676displayOpsForImage :: Image -> DisplayOps
7777displayOpsForImage i = displayOpsForPic (picForImage i) (imageWidth i, imageHeight i)
7878
@@ -81,7 +81,7 @@ combinedOpsForLayers :: Picture -> DisplayRegion -> ST s (MRowOps s)
8181combinedOpsForLayers pic r
8282 | regionWidth r == 0 || regionHeight r == 0 = MVector.new 0
8383 | otherwise = do
84− layerOps <- mapM (`buildSpans` r) (picLayers pic)
84+ layerOps <- mapM (\layer -> buildSpans layer r) (picLayers pic)
8585 case layerOps of
8686 [] -> fail "empty picture"
8787 [ops] -> substituteSkips (picBackground pic) ops
@@ -136,8 +136,8 @@ mergeUnder upper lower = do
136136 return upper
137137
138138mergeRowUnder :: SpanOps -> SpanOps -> SpanOps
139−mergeRowUnder upperRowOps =
140− onUpperOp Vector.empty (Vector.head upperRowOps) (Vector.tail upperRowOps)
139+mergeRowUnder upperRowOps lowerRowOps =
140+ onUpperOp Vector.empty (Vector.head upperRowOps) (Vector.tail upperRowOps) lowerRowOps
141141 where
142142 -- H: it will never be the case that we are out of upper ops
143143 -- before lower ops.
src/Graphics/Vty/Span.hs+4−2
@@ -1,4 +1,6 @@
11-- Copyright Corey O'Connor
2+{-# LANGUAGE BangPatterns #-}
3+{-# LANGUAGE NamedFieldPuns #-}
24{-# LANGUAGE GADTs #-}
35-- | A picture is translated into a sequences of state changes and
46-- character spans. The attribute is applied to all following spans,
@@ -50,7 +52,7 @@ dropOps :: Int -> SpanOps -> SpanOps
5052dropOps w = snd . splitOpsAt w
5153
5254splitOpsAt :: Int -> SpanOps -> (SpanOps, SpanOps)
53−splitOpsAt = splitOpsAt'
55+splitOpsAt inW inOps = splitOpsAt' inW inOps
5456 where
5557 splitOpsAt' 0 ops = (Vector.empty, ops)
5658 splitOpsAt' remainingColumns ops = case Vector.head ops of
@@ -101,7 +103,7 @@ displayOpsColumns ops
101103
102104-- | The number of rows the DisplayOps are defined for.
103105displayOpsRows :: DisplayOps -> Int
104−displayOpsRows = Vector.length
106+displayOpsRows ops = Vector.length ops
105107
106108affectedRegion :: DisplayOps -> DisplayRegion
107109affectedRegion ops = (displayOpsColumns ops, displayOpsRows ops)
src/Graphics/Vty/UnicodeWidthTable/IO.hs+33−17
@@ -1,7 +1,6 @@
11{-# LANGUAGE CPP #-}
22module Graphics.Vty.UnicodeWidthTable.IO
33 ( readUnicodeWidthTable
4− , parseUnicodeWidthTable
54 , writeUnicodeWidthTable
65 )
76where
@@ -22,23 +21,20 @@ import Graphics.Vty.UnicodeWidthTable.Types
2221-- This either returns a successfully parsed table or a table parsing
2322-- error message. This does not handle I/O exceptions.
2423readUnicodeWidthTable :: 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
24+readUnicodeWidthTable path = do
25+ body <- BSL.readFile path
26+ case runGetOrFail tableParser body of
3127 Left (_, _, msg) ->
32− Left msg
28+ return $ Left msg
3329
3430 -- Even if we parsed a table, leftover bytes indicate something
3531 -- could be wrong.
3632 Right (remainingBytes, _, _) | not (BSL.null remainingBytes) ->
37− Left $ "Error: " <> show (BSL.length remainingBytes) <>
38− " byte(s) left unconsumed"
33+ return $ Left $ "Error: " <> show (BSL.length remainingBytes) <>
34+ " byte(s) left unconsumed"
3935
4036 Right (_, _, table) ->
41− Right table
37+ return $ Right table
4238
4339-- | Write the unicode width table to the specified path.
4440--
@@ -52,14 +48,30 @@ writeUnicodeWidthTable path table = do
5248widthTableMagic :: Word32
5349widthTableMagic = 0xc1a9f7e0
5450
51+-- NB: This parsing code uses explicit types for parsing each value to
52+-- catch situations where someone changes the types of the fields of
53+-- WidthTableRange or other values and in doing so would silently break
54+-- the parser. If the parser used a style like
55+--
56+-- WidthTableRange <$> get <*> get <*> get
57+--
58+-- then that would result in valid Haskell code that would fail to read
59+-- files that it would have previously parsed. We want those errors
60+-- caught by GHc. At the time of this writing, the library data types
61+-- *happen* to match the binary layout of the version 1 format, but that
62+-- could definitely change in later formats. In those cases we should
63+-- deal with the difference by doing the appropriate conversions.
64+
5565tableParser :: Get UnicodeWidthTable
5666tableParser = do
57− magic <- getWord32le
67+ magic :: Word32
68+ <- getWord32le
5869
5970 when (magic /= widthTableMagic) $
6071 fail "Table magic number invalid"
6172
62− version <- getWord8
73+ version :: Word8
74+ <- get
6375
6476 case version of
6577 1 -> tableV1Parser
@@ -67,12 +79,16 @@ tableParser = do
6779
6880tableV1Parser :: Get UnicodeWidthTable
6981tableV1Parser = do
70− numRanges <- getWord32le
82+ numRanges :: Word32
83+ <- getWord32le
7184
7285 let parseRange = do
73− start <- getWord32le
74− size <- getWord32le
75− cols <- getWord8
86+ start :: Word32
87+ <- getWord32le
88+ size :: Word32
89+ <- getWord32le
90+ cols :: Word8
91+ <- get
7692 return WidthTableRange { rangeStart = start
7793 , rangeSize = size
7894 , rangeColumns = cols
src/Graphics/Vty/UnicodeWidthTable/Install.hs+30−65
@@ -1,38 +1,39 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE ForeignFunctionInterface #-}
33module Graphics.Vty.UnicodeWidthTable.Install
4− ( TableInstallException(..)
5− , installUnicodeWidthTable
4+ ( installUnicodeWidthTable
5+
66 , isCustomTableReady
77 )
88where
99
1010import Control.Monad (when, forM_)
11−import qualified Control.Exception as E
12−import GHC.Conc.Sync (withMVar)
13−import Control.Concurrent.MVar (MVar, newMVar)
1411import Data.Word (Word8, Word32)
1512#if !(MIN_VERSION_base(4,11,0))
1613import Data.Semigroup ((<>))
1714#endif
18−import System.IO.Unsafe (unsafePerformIO)
1915
2016import Graphics.Vty.UnicodeWidthTable.Types
2117
22−-- | The lock used to make functions in this module thread-safe.
23−installLock :: MVar ()
24−{-# NOINLINE installLock #-}
25−installLock = unsafePerformIO $ newMVar ()
18+foreign import ccall unsafe "vty_init_custom_table"
19+ initCustomTable :: Int -> IO Int
20+
21+foreign import ccall unsafe "vty_set_custom_table_range"
22+ setCustomTableRange :: Word32 -> Word32 -> Word8 -> IO Int
23+
24+foreign import ccall unsafe "vty_activate_custom_table"
25+ activateCustomTable :: IO Int
26+
27+foreign import ccall unsafe "vty_custom_table_ready"
28+ c_isCustomTableReady :: IO Int
29+
30+foreign import ccall unsafe "vty_deallocate_custom_table"
31+ deallocateCustomTable :: IO ()
2632
2733-- | 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.
34+-- marked as ready for use. Returns False otherwise.
3135isCustomTableReady :: IO Bool
32−isCustomTableReady = withInstallLock $ (== 1) <$> c_isCustomTableReady
33−
34−withInstallLock :: IO a -> IO a
35−withInstallLock act = withMVar installLock $ const act
36+isCustomTableReady = (== 1) <$> c_isCustomTableReady
3637
3738-- This is the size of the allocated custom character width table, in
3839-- character slots. It's important that this be large enough to hold all
@@ -41,31 +42,11 @@ withInstallLock act = withMVar installLock $ const act
4142tableSize :: Int
4243tableSize = 0x110000
4344
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−
5845-- | Install a custom unicode character width
5946-- table. Such tables are obtained with
6047-- 'Graphics.Vty.UnicodeWidthTable.Query.buildUnicodeWidthTable' and
6148-- 'Graphics.Vty.UnicodeWidthTable.IO.readUnicodeWidthTable'.
6249--
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−--
6950-- This affects the behavior of the 'Graphics.Vty.Image.wcwidth'
7051-- function and functions that call it. It does so by
7152-- changing global state available to the C implementation
@@ -82,20 +63,20 @@ instance E.Exception TableInstallException
8263-- they don't want to control the terminal with 'mkVty' but do want to
8364-- make calls to 'Graphics.Vty.Image.wcwidth'.
8465--
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.
66+-- It's also important to note that once a
67+-- custom table has been installed, it is permanent for the life of the
68+-- process. No new table can be installed, and the new custom table
69+-- cannot be removed.
8870--
8971-- If this function fails for any reason -- if the table cannot be
9072-- 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.
73+-- will raise an exception by calling 'error'.
9474installUnicodeWidthTable :: UnicodeWidthTable -> IO ()
95−installUnicodeWidthTable table = withInstallLock $ do
75+installUnicodeWidthTable table = do
9676 initResult <- initCustomTable tableSize
9777 when (initResult /= 0) $
98− E.throwIO $ TableInitFailure initResult tableSize
78+ error $ "installUnicodeWidthTable: error initializing " <>
79+ "custom table, status " <> show initResult
9980
10081 forM_ (unicodeWidthTableRanges table) $ \r -> do
10182 result <- setCustomTableRange (rangeStart r)
@@ -104,26 +85,10 @@ installUnicodeWidthTable table = withInstallLock $ do
10485
10586 when (result /= 0) $ do
10687 deallocateCustomTable
107− E.throwIO $ TableRangeFailure result r
88+ error $ "installUnicodeWidthTable: error installing range " <>
89+ show r <> ", status " <> show result
10890
10991 actResult <- activateCustomTable
11092 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 ()
93+ error $ "installUnicodeWidthTable: error activating custom " <>
94+ "table, status " <> show actResult
src/Graphics/Vty/UnicodeWidthTable/Query.hs+12−21
@@ -1,7 +1,6 @@
11{-# LANGUAGE TupleSections #-}
22module Graphics.Vty.UnicodeWidthTable.Query
33 ( buildUnicodeWidthTable
4− , defaultUnicodeTableUpperBound
54 )
65where
76
@@ -27,13 +26,6 @@ charWidth c = do
2726 Just (_, col) <- getCursorPosition
2827 return col
2928
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.
3729mkRanges :: [(Char, Int)] -> [WidthTableRange]
3830mkRanges pairs =
3931 let convertedPairs = convert <$> pairs
@@ -54,25 +46,24 @@ mkRanges pairs =
5446
5547-- The uppermost code point to consider when building Unicode width
5648-- tables.
57−defaultUnicodeTableUpperBound :: Char
58−defaultUnicodeTableUpperBound = '\xe0000'
49+--
50+-- This only covers some of the possible Unicode range and is sure to
51+-- become stale eventually. Granted, at the time of this writing, even
52+-- the latest version of Unicode (13) totals 143,859 characters and that
53+-- only gets us to code point 0x231f3 or so. But it's only a matter of
54+-- time before this bound is too low.
55+unicodeTableUpperBound :: Char
56+unicodeTableUpperBound = '\x2FFFF'
5957
6058-- | Construct a unicode character width table by querying the terminal
6159-- connected to stdout. This works by emitting characters to stdout
6260-- and then querying the terminal to determine the resulting cursor
6361-- position in order to measure character widths. Consequently this will
6462-- 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 ->
63+-- system performance.
64+buildUnicodeWidthTable :: IO UnicodeWidthTable
65+buildUnicodeWidthTable = do
66+ pairs <- forM (filter shouldConsider ['\0'..unicodeTableUpperBound]) $ \i ->
7667 (i,) <$> charWidth i
7768
7869 return UnicodeWidthTable { unicodeWidthTableRanges = reverse $ mkRanges pairs
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/VerifyEmptyImageProps.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE ScopedTypeVariables #-}
21module VerifyEmptyImageProps where
32
43import Verify
test/VerifyEvalTerminfoCaps.hs−1
@@ -1,6 +1,5 @@
11{-# LANGUAGE BangPatterns #-}
22{-# LANGUAGE NamedFieldPuns #-}
3−{-# LANGUAGE ScopedTypeVariables #-}
43module VerifyEvalTerminfoCaps where
54
65import Blaze.ByteString.Builder.Internal.Write (runWrite, getBound)
test/VerifyImageOps.hs+1−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE ScopedTypeVariables #-}
21module VerifyImageOps where
32
43import Graphics.Vty.Attributes
@@ -137,7 +136,7 @@ cropBottomLimitsHeight :: Image -> Int -> Property
137136cropBottomLimitsHeight i v = v >= 0 ==>
138137 v >= imageHeight (cropBottom v i)
139138
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
141140canShowImage :: Image -> Bool
142141canShowImage i = length (show i) > 0
143142
test/VerifyOutput.hs+2−7
@@ -1,7 +1,6 @@
1−-- We setup the environment to invoke certain terminals of interest.
1+-- We setup the environment to envoke certain terminals of interest.
22-- This assumes appropriate definitions exist in the current environment
33-- for the terminals of interest.
4−{-# LANGUAGE ScopedTypeVariables #-}
54module VerifyOutput where
65
76import Verify
@@ -35,11 +34,7 @@ smokeTestTermNonMac termName i = liftIOResult $ do
3534smokeTestTerm :: String -> Image -> IO Result
3635smokeTestTerm termName i = do
3736 nullOut <- openFd "/dev/null" WriteOnly Nothing defaultFileFlags
38− t <- outputForConfig $ defaultConfig
39− { outputFd = Just nullOut
40− , termName = Just termName
41− , colorMode = Just NoColor
42− }
37+ t <- outputForConfig $ defaultConfig { outputFd = Just nullOut, termName = Just termName }
4338 -- putStrLn $ "context color count: " ++ show (contextColorCount t)
4439 reserveDisplay t
4540 dc <- displayContext t (100,100)
test/VerifyParseTerminfoCaps.hs−1
@@ -1,5 +1,4 @@
11{-# LANGUAGE NamedFieldPuns #-}
2−{-# LANGUAGE ScopedTypeVariables #-}
32module VerifyParseTerminfoCaps where
43
54import Prelude hiding ( catch )
test/VerifyUsingMockInput.hs+1−4
@@ -1,6 +1,5 @@
11{-# LANGUAGE MultiParamTypeClasses #-}
22{-# LANGUAGE FlexibleInstances #-}
3−{-# LANGUAGE ScopedTypeVariables #-}
43-- Generate some input bytes and delays between blocks of input bytes.
54-- Verify the events produced are as expected.
65module Main where
@@ -132,9 +131,7 @@ assertEventsFromSynInput table inputSpec expectedEvents = do
132131 readLoop 0 = return ()
133132 readLoop n = do
134133 e <- atomically $ readTChan $ input^.eventChannel
135− case e of
136− InputEvent ev -> modifyIORef eventsRef ((:) ev)
137− ResumeAfterSignal -> return ()
134+ modifyIORef eventsRef ((:) e)
138135 readLoop (n - 1)
139136 genEventsUsingIoActions maxDuration writeWaitClose readEvents
140137 outEvents <- reverse <$> readIORef eventsRef
test/interactive_terminal_test.hs+1−1
@@ -364,7 +364,7 @@ Did the test output match the description?
364364|]
365365 defaultSuccessConfirmResults
366366
367−-- Explicitly define the bytes that encode each example text.
367+-- Explicitely definethe bytes that encode each example text.
368368-- This avoids any issues with how the compiler represents string literals.
369369--
370370-- This document is UTF-8 encoded so the UTF-8 string is still included for
tools/BuildWidthTable.hs+10−61
@@ -1,65 +1,40 @@
1−{-# LANGUAGE ScopedTypeVariables #-}
21{-# LANGUAGE CPP #-}
32module Main where
43
5−import qualified Control.Exception as E
64import Control.Monad (when)
75import Data.Maybe (fromMaybe)
86#if !(MIN_VERSION_base(4,11,0))
97import Data.Semigroup ((<>))
108#endif
11−import System.Directory (createDirectoryIfMissing)
129import System.Environment (getArgs, getProgName)
13−import System.FilePath (takeDirectory)
1410import System.Exit (exitFailure)
1511import System.Console.GetOpt
16−import Text.Read (readMaybe)
1712
18−import Graphics.Vty.Config ( terminalWidthTablePath, currentTerminalName
19− , vtyConfigPath, addConfigWidthMap
20− , ConfigUpdateResult(..)
21− )
13+import Graphics.Vty.Config (terminalWidthTablePath, currentTerminalName, vtyConfigPath)
2214import Graphics.Vty.UnicodeWidthTable.IO
2315import Graphics.Vty.UnicodeWidthTable.Query
2416
2517data Arg = Help
2618 | OutputPath String
27− | TableUpperBound String
28− | UpdateConfig
29− | VtyConfigPath String
3019 deriving (Eq, Show)
3120
3221options :: Config -> [OptDescr Arg]
3322options config =
3423 [ Option "h" ["help"] (NoArg Help)
3524 "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) <> ")")
3925 , Option "p" ["path"] (ReqArg OutputPath "PATH")
4026 ("The output path to write to (default: " <>
4127 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 <> ")")
4728 ]
4829
4930data Config =
5031 Config { configOutputPath :: Maybe FilePath
51− , configBound :: Char
52− , configUpdate :: Bool
53− , configPath :: FilePath
5432 }
5533 deriving (Show)
5634
5735mkDefaultConfig :: IO Config
5836mkDefaultConfig = do
5937 Config <$> terminalWidthTablePath
60− <*> pure defaultUnicodeTableUpperBound
61− <*> pure False
62− <*> vtyConfigPath
6338
6439usage :: IO ()
6540usage = do
@@ -78,14 +53,6 @@ usage = do
7853updateConfigFromArg :: Arg -> Config -> Config
7954updateConfigFromArg Help c =
8055 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 }
8956updateConfigFromArg (OutputPath p) c =
9057 c { configOutputPath = Just p }
9158
@@ -112,33 +79,15 @@ main = do
11279 Just path -> return path
11380
11481 putStrLn "Querying terminal:"
115− builtTable <- buildUnicodeWidthTable $ configBound config
116−
117− let dir = takeDirectory outputPath
118− createDirectoryIfMissing True dir
82+ builtTable <- buildUnicodeWidthTable
11983 writeUnicodeWidthTable outputPath builtTable
120−
12184 putStrLn $ "\nOutput table written to " <> outputPath
12285
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
86+ Just tName <- currentTerminalName
87+ configPath <- vtyConfigPath
88+ putStrLn ""
89+ putStrLn "To configure your Vty-based applications to use this map, add"
90+ putStrLn $ "the following line to " <> configPath <> ":"
91+ putStrLn ""
92+ putStrLn $ " widthMap " <> show tName <> " " <> show outputPath
93+ putStrLn ""
vty.cabal+39−51
@@ -1,5 +1,5 @@
11name: vty
2−version: 5.35.1
2+version: 5.27
33license: BSD3
44license-file: LICENSE
55author: AUTHORS
@@ -45,7 +45,7 @@ library
4545 deepseq >= 1.1 && < 1.5,
4646 directory,
4747 filepath >= 1.0 && < 2.0,
48− microlens < 0.4.13,
48+ microlens < 0.4.12,
4949 microlens-mtl,
5050 microlens-th,
5151 hashable >= 1.2,
@@ -69,7 +69,6 @@ library
6969 exposed-modules: Graphics.Vty
7070 Graphics.Vty.Attributes
7171 Graphics.Vty.Attributes.Color
72− Graphics.Vty.Attributes.Color240
7372 Graphics.Vty.Config
7473 Graphics.Vty.Error
7574 Graphics.Vty.Image
@@ -105,7 +104,8 @@ library
105104 Graphics.Vty.UnicodeWidthTable.Query
106105 Graphics.Vty.UnicodeWidthTable.Install
107106
108− other-modules: Graphics.Vty.Debug.Image
107+ other-modules: Graphics.Vty.Attributes.Color240
108+ Graphics.Vty.Debug.Image
109109 Graphics.Vty.Input.Terminfo.ANSIVT
110110
111111 c-sources: cbits/gwinsz.c
@@ -117,6 +117,9 @@ library
117117
118118 hs-source-dirs: src
119119
120+ default-extensions: ScopedTypeVariables
121+ ForeignFunctionInterface
122+
120123 ghc-options: -O2 -funbox-strict-fields -Wall -fspec-constr -fspec-constr-count=10
121124
122125 ghc-prof-options: -O2 -funbox-strict-fields -caf-all -Wall -fspec-constr -fspec-constr-count=10
@@ -128,12 +131,7 @@ executable vty-build-width-table
128131 default-language: Haskell2010
129132 ghc-options: -threaded -Wall
130133
131− if !impl(ghc >= 8.0)
132− build-depends: semigroups >= 0.16
133−
134134 build-depends: vty,
135− directory,
136− filepath,
137135 base >= 4.8 && < 5
138136
139137executable vty-mode-demo
@@ -141,6 +139,7 @@ executable vty-mode-demo
141139 hs-source-dirs: demos
142140
143141 default-language: Haskell2010
142+ default-extensions: ScopedTypeVariables
144143 ghc-options: -threaded
145144
146145 build-depends: vty,
@@ -155,6 +154,7 @@ executable vty-demo
155154 hs-source-dirs: demos
156155
157156 default-language: Haskell2010
157+ default-extensions: ScopedTypeVariables
158158 ghc-options: -threaded
159159
160160 build-depends: vty,
@@ -166,6 +166,7 @@ executable vty-demo
166166
167167test-suite verify-using-mock-terminal
168168 default-language: Haskell2010
169+ default-extensions: ScopedTypeVariables
169170
170171 type: detailed-0.9
171172
@@ -184,7 +185,7 @@ test-suite verify-using-mock-terminal
184185 build-depends: vty,
185186 Cabal >= 1.20,
186187 QuickCheck >= 2.7,
187− random >= 1.0 && < 1.3,
188+ random >= 1.0 && < 1.2,
188189 base >= 4.8 && < 5,
189190 bytestring,
190191 containers,
@@ -198,6 +199,7 @@ test-suite verify-using-mock-terminal
198199
199200test-suite verify-terminal
200201 default-language: Haskell2010
202+ default-extensions: ScopedTypeVariables
201203
202204 type: detailed-0.9
203205
@@ -216,7 +218,7 @@ test-suite verify-terminal
216218 build-depends: vty,
217219 Cabal >= 1.20,
218220 QuickCheck >= 2.7,
219− random >= 1.0 && < 1.3,
221+ random >= 1.0 && < 1.2,
220222 base >= 4.8 && < 5,
221223 bytestring,
222224 containers,
@@ -230,6 +232,7 @@ test-suite verify-terminal
230232
231233test-suite verify-display-attributes
232234 default-language: Haskell2010
235+ default-extensions: ScopedTypeVariables
233236
234237 type: detailed-0.9
235238
@@ -248,7 +251,7 @@ test-suite verify-display-attributes
248251 build-depends: vty,
249252 Cabal >= 1.20,
250253 QuickCheck >= 2.7,
251− random >= 1.0 && < 1.3,
254+ random >= 1.0 && < 1.2,
252255 base >= 4.8 && < 5,
253256 bytestring,
254257 containers,
@@ -261,6 +264,7 @@ test-suite verify-display-attributes
261264
262265test-suite verify-empty-image-props
263266 default-language: Haskell2010
267+ default-extensions: ScopedTypeVariables
264268
265269 type: detailed-0.9
266270
@@ -273,7 +277,7 @@ test-suite verify-empty-image-props
273277 build-depends: vty,
274278 Cabal >= 1.20,
275279 QuickCheck >= 2.7,
276− random >= 1.0 && < 1.3,
280+ random >= 1.0 && < 1.2,
277281 base >= 4.8 && < 5,
278282 bytestring,
279283 containers,
@@ -286,6 +290,7 @@ test-suite verify-empty-image-props
286290
287291test-suite verify-eval-terminfo-caps
288292 default-language: Haskell2010
293+ default-extensions: ScopedTypeVariables
289294
290295 type: detailed-0.9
291296
@@ -299,7 +304,7 @@ test-suite verify-eval-terminfo-caps
299304 build-depends: vty,
300305 Cabal >= 1.20,
301306 QuickCheck >= 2.7,
302− random >= 1.0 && < 1.3,
307+ random >= 1.0 && < 1.2,
303308 base >= 4.8 && < 5,
304309 blaze-builder >= 0.3.3.2 && < 0.5,
305310 bytestring,
@@ -314,6 +319,7 @@ test-suite verify-eval-terminfo-caps
314319
315320test-suite verify-image-ops
316321 default-language: Haskell2010
322+ default-extensions: ScopedTypeVariables
317323
318324 type: detailed-0.9
319325
@@ -328,7 +334,7 @@ test-suite verify-image-ops
328334 build-depends: vty,
329335 Cabal >= 1.20,
330336 QuickCheck >= 2.7,
331− random >= 1.0 && < 1.3,
337+ random >= 1.0 && < 1.2,
332338 base >= 4.8 && < 5,
333339 bytestring,
334340 containers,
@@ -341,6 +347,7 @@ test-suite verify-image-ops
341347
342348test-suite verify-image-trans
343349 default-language: Haskell2010
350+ default-extensions: ScopedTypeVariables
344351
345352 type: detailed-0.9
346353
@@ -355,7 +362,7 @@ test-suite verify-image-trans
355362 build-depends: vty,
356363 Cabal >= 1.20,
357364 QuickCheck >= 2.7,
358− random >= 1.0 && < 1.3,
365+ random >= 1.0 && < 1.2,
359366 base >= 4.8 && < 5,
360367 bytestring,
361368 containers,
@@ -368,6 +375,7 @@ test-suite verify-image-trans
368375
369376test-suite verify-inline
370377 default-language: Haskell2010
378+ default-extensions: ScopedTypeVariables
371379
372380 type: detailed-0.9
373381
@@ -381,7 +389,7 @@ test-suite verify-inline
381389 build-depends: vty,
382390 Cabal >= 1.20,
383391 QuickCheck >= 2.7,
384− random >= 1.0 && < 1.3,
392+ random >= 1.0 && < 1.2,
385393 base >= 4.8 && < 5,
386394 bytestring,
387395 containers,
@@ -394,6 +402,7 @@ test-suite verify-inline
394402
395403test-suite verify-parse-terminfo-caps
396404 default-language: Haskell2010
405+ default-extensions: ScopedTypeVariables
397406
398407 type: detailed-0.9
399408
@@ -408,7 +417,7 @@ test-suite verify-parse-terminfo-caps
408417 build-depends: vty,
409418 Cabal >= 1.20,
410419 QuickCheck >= 2.7,
411− random >= 1.0 && < 1.3,
420+ random >= 1.0 && < 1.2,
412421 base >= 4.8 && < 5,
413422 bytestring,
414423 containers,
@@ -422,6 +431,7 @@ test-suite verify-parse-terminfo-caps
422431
423432test-suite verify-simple-span-generation
424433 default-language: Haskell2010
434+ default-extensions: ScopedTypeVariables
425435
426436 type: detailed-0.9
427437
@@ -439,7 +449,7 @@ test-suite verify-simple-span-generation
439449 build-depends: vty,
440450 Cabal >= 1.20,
441451 QuickCheck >= 2.7,
442− random >= 1.0 && < 1.3,
452+ random >= 1.0 && < 1.2,
443453 base >= 4.8 && < 5,
444454 bytestring,
445455 containers,
@@ -453,6 +463,7 @@ test-suite verify-simple-span-generation
453463
454464test-suite verify-crop-span-generation
455465 default-language: Haskell2010
466+ default-extensions: ScopedTypeVariables
456467
457468 type: detailed-0.9
458469
@@ -470,7 +481,7 @@ test-suite verify-crop-span-generation
470481 build-depends: vty,
471482 Cabal >= 1.20,
472483 QuickCheck >= 2.7,
473− random >= 1.0 && < 1.3,
484+ random >= 1.0 && < 1.2,
474485 base >= 4.8 && < 5,
475486 bytestring,
476487 containers,
@@ -484,6 +495,7 @@ test-suite verify-crop-span-generation
484495
485496test-suite verify-layers-span-generation
486497 default-language: Haskell2010
498+ default-extensions: ScopedTypeVariables
487499
488500 type: detailed-0.9
489501
@@ -501,32 +513,7 @@ test-suite verify-layers-span-generation
501513 build-depends: vty,
502514 Cabal >= 1.20,
503515 QuickCheck >= 2.7,
504− random >= 1.0 && < 1.3,
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,
516+ random >= 1.0 && < 1.2,
530517 base >= 4.8 && < 5,
531518 bytestring,
532519 containers,
@@ -539,6 +526,7 @@ test-suite verify-color-mapping
539526
540527test-suite verify-utf8-width
541528 default-language: Haskell2010
529+ default-extensions: ScopedTypeVariables
542530
543531 type: detailed-0.9
544532
@@ -551,7 +539,7 @@ test-suite verify-utf8-width
551539 build-depends: vty,
552540 Cabal >= 1.20,
553541 QuickCheck >= 2.7,
554− random >= 1.0 && < 1.3,
542+ random >= 1.0 && < 1.2,
555543 base >= 4.8 && < 5,
556544 bytestring,
557545 containers,
@@ -564,6 +552,7 @@ test-suite verify-utf8-width
564552
565553test-suite verify-using-mock-input
566554 default-language: Haskell2010
555+ default-extensions: ScopedTypeVariables
567556
568557 type: exitcode-stdio-1.0
569558
@@ -571,8 +560,6 @@ test-suite verify-using-mock-input
571560
572561 main-is: VerifyUsingMockInput.hs
573562
574− other-modules: Verify.Graphics.Vty.Output
575−
576563 build-depends: vty,
577564 Cabal >= 1.20,
578565 QuickCheck >= 2.7,
@@ -580,7 +567,7 @@ test-suite verify-using-mock-input
580567 quickcheck-assertions >= 0.1.1,
581568 test-framework == 0.8.*,
582569 test-framework-smallcheck == 0.2.*,
583− random >= 1.0 && < 1.3,
570+ random >= 1.0 && < 1.2,
584571 base >= 4.8 && < 5,
585572 bytestring,
586573 containers,
@@ -599,6 +586,7 @@ test-suite verify-using-mock-input
599586
600587test-suite verify-config
601588 default-language: Haskell2010
589+ default-extensions: ScopedTypeVariables
602590
603591 type: exitcode-stdio-1.0
604592
@@ -615,7 +603,7 @@ test-suite verify-config
615603 test-framework == 0.8.*,
616604 test-framework-smallcheck == 0.2.*,
617605 test-framework-hunit,
618− random >= 1.0 && < 1.3,
606+ random >= 1.0 && < 1.2,
619607 base >= 4.8 && < 5,
620608 bytestring,
621609 containers,