aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* meson: bump version to 1.10.21.10.2Daniel Eklöf2021-12-02-1/+1
|
* changelog: prepare for 1.10.2Daniel Eklöf2021-12-02-6/+4
|
* Merge branch 'master' into releases/1.10Daniel Eklöf2021-12-02-447/+1228
|\
| * Merge branch 'osc4-dont-modify-rgb-colors'Daniel Eklöf2021-12-01-11/+13
| |\ | | | | | | | | | Closes #678
| | * osc-4: don’t update the color of cells with RGB fg/bg colorsDaniel Eklöf2021-12-01-11/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OSC 4/104 changes the 256-color palette. We also run a pass over the visible cells, and update their colors. This was previously done by comparing the actual color of the cell, with the “old” color in the palette. If they matched, the cell was updated. This meant that cells with an RGB color (i.e. not a palette based color) was also updated, _if_ its color matched the palette color. Now that each cell tracks its color *source*, we can ignore all non-palette based cells. Note that this still isn’t perfect: if the palette contains multiple entries with the same color, we’ll end up updating the “wrong” cells. Closes #678
| * input: always update the xcursor shape in pointer enter/motion eventsDaniel Eklöf2021-12-01-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that term_xcursor_update_for_seat() takes the current surface into account (i.e. doesn’t assume the cursor is over the main grid), there’s no longer any need to call render_xcursor_set() directly. Thus, we can simply call term_xcursor_update_for_seat() on **all** pointer enter and motion events. As long as we take care to update the internal state to reflect the, possibly new, current surface before doing so. Also make sure to **always** reset the seat’s “current” xcursor pointer on pointer leave events. This is done without actually sending anything to the compositor, but is necessary to ensure that we *do* send a request to update the xcursor on the next pointer enter event.
| * input: fix debug log format specifier; ‘count’ is a size_tDaniel Eklöf2021-12-01-1/+1
| |
| * pgo: add stub for xcursor_for_csd_border()Daniel Eklöf2021-11-30-1/+7
| |
| * term: xcursor_update_for_seat(): BUG on xcursor == NULLDaniel Eklöf2021-11-30-1/+4
| |
| * input: make csd_data variable ‘const’Daniel Eklöf2021-11-30-2/+1
| |
| * term: xcursor_update_for_seat(): remove duplicate check for term->is_searchingDaniel Eklöf2021-11-30-1/+0
| |
| * term: xcursor_update_for_seat(): remove switch default caseDaniel Eklöf2021-11-30-1/+0
| | | | | | | | Let the compiler catch missing enum values
| * changelog: window-menuDaniel Eklöf2021-11-30-0/+2
| |
| * Merge branch 'window-menu'Daniel Eklöf2021-11-30-22/+67
| |\
| | * input: Add support for xdg_toplevl.show_window_menu()Jonas Ådahl2021-11-29-8/+20
| | | | | | | | | | | | | | | This makes, if the compositor supports it, the window menu appear when right clicking on the title bar.
| | * input: Update mouse x/y coordinates on wl_pointer_enterJonas Ådahl2021-11-29-5/+9
| | | | | | | | | | | | | | | | | | | | | Otherwise if you don't receive motion event before e.g. button pressed, the coordinates will be incorrect. This happens when e.g. you get alt-tabbed so that the mouse cursor ends up on top of the terminal window, but the mouse never actually moved.
| | * terminal: Make seat xcursor update focus awareJonas Ådahl2021-11-29-9/+38
| | | | | | | | | | | | | | | | | | | | | When term_xcursor_update_for_seat() was called on e.g. keyboard focus loss, it'd update the curret xcursor to 'text' even if it was e.g. on top of the window title, or resize areas. This makes the function a bit more focus aware, and will not be so eager to set the text xcursor.
| * | Merge branch 'csd-border-render-glitch'Daniel Eklöf2021-11-29-4/+25
| |\ \ | | | | | | | | | | | | Closes #823
| | * | render: fix csd border rendering glitch when width > 5pxDaniel Eklöf2021-11-29-4/+25
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSD borders are always *at least* 5px. If url.border-width=0, those 5px are all fully transparent (and act as interactive resize handles). As csd.border-width increases, the number of transparent pixels decrease. Once csd.border-width >= 5, the border is fully opaque. When csd.border-width > 5, then width of the border is (obviously) more than 5px. But, when rendering the opaque part of the border, we still used 5px for the invisible part, which caused some pixman rectangles to have negative x/y coordinates. This resulted in rendering glitches due to overflows in pixman when rendering the borders. The fix is to ensure the total border size is always at least, but not *always* 5px. That is, set it to max(5, csd.border-width). This patch also fixes an issue where the CSD borders were not dimmed (like the titlebar) when the window looses input focus. Closes #823
| * | input: regression: reset view (and cancel selection) on “handled” inputDaniel Eklöf2021-11-29-16/+18
| | | | | | | | | | | | | | | | | | This fixes a regression, where the view (and selection) was only reset if the keyboard input resulted in plain text. That is, key presses like enter, arrows etc did not.
| * | input: regression: special keys don’t reset view and cancel selectionDaniel Eklöf2021-11-28-2/+4
| | | | | | | | | | | | | | | This fixes an issue where e.g. holding down ctrl would cancel the selection, thus making it impossible to copy text to the clipboard.
| * | Merge branch 'kitty-kbd'Daniel Eklöf2021-11-28-149/+619
| |\ \ | | | | | | | | | | | | Part of #319
| | * | changelog: kitty keyboard protocol - disambiguate escape codesDaniel Eklöf2021-11-28-0/+3
| | | |
| | * | input: kitty: use `XKB_CONSUMED_MODE_GTK` when retrieving consumed modsDaniel Eklöf2021-11-28-1/+2
| | | |
| | * | input: get_current_modifiers(): use xkb_state_key_get_consumed_mods2()Daniel Eklöf2021-11-28-2/+4
| | | | | | | | | | | | | | | | Explicitly request consumed modifiers using the `XKB` mode.
| | * | term: rename: KITTY_KBD_MASK -> KITTY_KBD_SUPPORTEDDaniel Eklöf2021-11-28-3/+3
| | | |
| | * | input: legacy: use ALEN(mod_param_map)Daniel Eklöf2021-11-28-1/+1
| | | |
| | * | input: grammar: “an UTF-8” -> “a UTF-8”Daniel Eklöf2021-11-28-4/+4
| | | |
| | * | input: legacy: reduce size of reply bufferDaniel Eklöf2021-11-28-1/+1
| | | | | | | | | | | | | | | | | | | | Its maximum size is known; the only two variables are two integers. We know the maximum length of an integer converted to a string.
| | * | csi: kitty: remove unneeded xassertsDaniel Eklöf2021-11-28-2/+0
| | | | | | | | | | | | | | | | | | | | ‘idx’ is calculated just above, and the logic is simple enough that we don’t really need to assert it.
| | * | input: only report modifiers when “Report all keys as escape codes” is enabledDaniel Eklöf2021-11-28-60/+16
| | | |
| | * | input: kitty: add shift/alt/ctrl/super/hyper/meta keysDaniel Eklöf2021-11-28-0/+48
| | | |
| | * | input: kitty: add ‘media’ keysDaniel Eklöf2021-11-28-0/+14
| | | |
| | * | input: kitty: map ISO_Left_Tab to TabDaniel Eklöf2021-11-28-0/+1
| | | |
| | * | input: rename ‘meta’ to ‘super’Daniel Eklöf2021-11-28-14/+14
| | | |
| | * | input: kitty: only emit CSIs for Caps- and Num-Lock when they aren’t modifiersDaniel Eklöf2021-11-28-2/+14
| | | |
| | * | input: handle “invalid” XKB modifiersDaniel Eklöf2021-11-28-30/+56
| | | | | | | | | | | | | | | | | | | | A modifier may not exist in a specific layout. This is indicated by XKB returning XKB_MOD_INVALID from xkb_keymap_mod_get_index().
| | * | input: kitty: disable CSI for Caps- and Num-LockDaniel Eklöf2021-11-28-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure why these keys have CSIs in the kitty spec; they don’t emit anything. Could it be that they are used if the keys are *not* modifiers in the current layout?
| | * | input: kitty: printables are emitted as text, even if Caps- or Num-Lock is in effectDaniel Eklöf2021-11-28-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure if this is the best/correct way to do it. But kitty seems to ignore at least Num-Lock for printables, while it _does_ affect other keys. For example, Return, which usually emits ‘\r’, are affected by Num-Lock and emit ‘CSI 13;129u’. Note that as soon as some other modifier is in effect, the Num-Lock modifier *is* encoded in the CSI, also for printables.
| | * | input: get_current_modifiers() no longer strips insignificant modsDaniel Eklöf2021-11-28-34/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our internal binding handling cares about a different set of modifiers, compared to the kitty keyboard protocol. To handle this, get_current_modifiers() has been modified, to no longer strip the “unsignificant” modifiers. This is now up to the caller to do. To help, we keep two masks (for significant modifiers) in the seat struct; one for our internal binding handling (and the legacy keyboard protocol), and one for the kitty keyboard protocol. These two masks are updated when the seat’s keymap is updated/changed.
| | * | input: kitty: use base symbol instead of lowering the symbolDaniel Eklöf2021-11-28-21/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When emitting an escape sequence for a printable character, with modifiers (e.g. ctrl+a), use the key’s base symbol instead of “lowering” it. This means we now handle e.g. ctrl+2 and ctrl+shift+2, with Swedish layout. There’s a twist however. We *only* use the base symbol if the modifiers that is used to “generate” the symbol are “significant”. Significant modifiers are, in this context, modifiers we can encode in the kitty escape sequences. In the Swedish layout, pressing AltGr+2 results in ‘@’. AltGr cannot be encoded in the kitty protocol. If we were to use the base symbol, AltGr+Alt+2 would result in exactly the same escape sequence as Alt+2.
| | * | input: wip: add support for kitty kbd protocol “Disambiguate escape codes”Daniel Eklöf2021-11-28-21/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most things appear to work as in kitty. There’s one known difference: tri-state keys don’t generate the same unshifted symbol while holding Shift (but e.g. Ctrl+a and Ctrl+Shift+a *does* generate the same base symbol). For example, the Swedish keyboard layout has double quote, ‘2’ and ‘@’ on the same key. ‘2’ is the base (unshifted) symbol. Double quote is Shift+2. ‘@’ is AltGr+2. Kitty generates the same base symbol for ‘2’ and double quote (the base symbol is, as expected, ‘2’). But, for ‘@’ kitty generates the base symbol ‘@’. Currently, foot generates the base symbol by calling xkb_keysym_to_lower(). I _think_ what we need to do is “consume” the shift modifier, and then re-retrieve the symbol (given the current xkb state and key pressed).
| | * | input: enable repeat while COMPOSINGDaniel Eklöf2021-11-28-4/+2
| | | |
| | * | input: refactor: new function: legacy_kbd_protocol()Daniel Eklöf2021-11-28-105/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This breaks out all handling of key escapes to-be-sent to the client, to a separate function, legacy_kbd_protocol(). That is, the key press/release handler first handles key generic handling, such as starting and stopping the repeat timer. Then it checks for foot keyboard bindings. If not bindings match, we need to pass the keyboard event to the client. This code has now been separated out into a new function.
| | * | term: kitty kbd: fix typo: ‘BKD’ -> ‘KBD’Daniel Eklöf2021-11-28-1/+1
| | | |
| | * | csi: kitty: log flags after ‘update’ operationDaniel Eklöf2021-11-28-0/+3
| | | |
| | * | csi: kitty: s/mode/flags in debug logsDaniel Eklöf2021-11-28-2/+2
| | | |
| | * | kitty kbd: add flag state, implement push/pop/update/queryDaniel Eklöf2021-11-28-0/+110
| |/ /
| * | grid: uri_range_erase(): unittest: try erasing a row without any URIsDaniel Eklöf2021-11-28-0/+4
| | |
| * | grid: uri_range_erase: walk the ranges backwardsDaniel Eklöf2021-11-28-5/+4
| | | | | | | | | | | | | | | This way, ranges are deleted last-to-first, thus avoiding memmoving multiple ranges over and over again when erasing e.g. a full line.
| * | grid: remove useless assertionDaniel Eklöf2021-11-27-1/+0
| | | | | | | | | | | | grid.c:1041:24: warning: comparison of unsigned expression in ‘>= 0’ is always true [-Wtype-limits]
| * | Merge branch 'osc8-dont-use-tllist'Daniel Eklöf2021-11-27-210/+381
| |\ \
| | * | grid: resize without reflowing: use URI range utility functionsDaniel Eklöf2021-11-27-10/+13
| | | |
| | * | grid: uri_range_{append,insert}: pass range attributes as separate parametersDaniel Eklöf2021-11-27-64/+54
| | | |
| | * | grid: snapshot: use uri range utility functionsDaniel Eklöf2021-11-27-19/+14
| | | |
| | * | grid: uri_range_ensure_size(): add the requested amount of entriesDaniel Eklöf2021-11-27-1/+1
| | | |
| | * | grid: reflow: no need to keep a uri-range-idx variableDaniel Eklöf2021-11-26-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The URI ranges are now an array, which means we can get the next URI range by incrementing the pointer. Instead of checking if range is not NULL, check that it isn’t the range terminator (which is NULL when we don’t have any ranges, and the first address *after* the last range otherwise).
| | * | grid: resize without reflow: only verify URI ranges in debug buildsDaniel Eklöf2021-11-26-0/+2
| | | |
| | * | grid: bug: OSC-8 URIs were incorrectly skipped while resizing the alt screenDaniel Eklöf2021-11-26-1/+3
| | | |
| | * | osc8: replace grid_row_uri_range_add() with internal uri_range_append()Daniel Eklöf2021-11-26-151/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grid_row_uri_range_add() was only used while reflowing. In this case, we know the new URIs being added are always going at the end of the URI list (since we’re going top-to-bottom, left-to-right). Thus, we don’t need the insertion logic, and can simply append instead.
| | * | osc8: uri ranges: use a dynamically re-sizable array instead of a tllistDaniel Eklöf2021-11-26-120/+316
| |/ /
| * | ci: fcft:text-shaping -> fcft:grapheme-shaping + fcft:run-shapingDaniel Eklöf2021-11-26-2/+2
| | |
| * | Merge branch 'osc8-more-sgr-like'Daniel Eklöf2021-11-26-116/+143
| |\ \
| | * | osc8: update URI ranges as we print data, *not* when the URI is closedDaniel Eklöf2021-11-25-116/+143
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At first, an OSC-8 URI range was added when we received the closing OSC-8 escape (i.e. with an empty URI). But, this meant that cursor movements while the OSC-8 escape was in effect wasn’t handled correctly, since we’d add a range that spanned the cursor movements. Attempts were made to handle this in the cursor movement functions, by closing and re-opening the URI. However, there are too many corner cases to make this a viable approach. Scrolling is one such example, line-wrapping another. This patch takes a different approach; emit, or update the URI range when we print to the grid. This models the intended behavior much more closely, where an active OSC-8 URI act like any other SGR attribute - it is applied to all cells printed to, but otherwise have no effect. To avoid killing performance, this is only done in the “generic” printer. This means OSC-8 open/close calls must now “switch” the ASCII printer. Note that the “fast” printer still needs to *erase* pre-existing OSC-8 URIs. Closes #816
| * | Merge branch 'finalize-selection-on-pointer-leave'Daniel Eklöf2021-11-25-1/+9
| |\ \
| | * | input: finalize mouse selection on a pointer-leave event on the GRID surfaceDaniel Eklöf2021-11-25-1/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | If a mouse selection was ongoing, and the user switched workspace (probably using the keyboard...), and then back, the selection was still treated as ongoing, while all other mouse state has been reset. This meant the user had to tap at least once to stop the selection.
| * | Merge branch 'grapheme-width-max'Daniel Eklöf2021-11-25-3/+18
| |\ \
| | * | config: add tweak.grapheme-width-method=maxDaniel Eklöf2021-11-23-3/+18
| |/ / | | | | | | | | | | | | | | | ‘max’ is a new value for ‘tweak.grapheme-width-method’. When enabled, the width of a grapheme cluster is that of the cluster’s widest codepoint.
| * | changelog: add new ‘unreleased’ sectionDaniel Eklöf2021-11-22-0/+11
| | |
| * | changelog: add #801 to “OSC-8 data not being cleared...”Daniel Eklöf2021-11-22-1/+2
| | |
| * | Merge branch 'releases/1.10'Daniel Eklöf2021-11-22-7/+8
| |\ \ | |/ / |/| |
* | | meson: bump version to 1.10.11.10.1Daniel Eklöf2021-11-22-1/+1
| | |
* | | changelog: prepare for 1.10.1Daniel Eklöf2021-11-22-6/+7
| | |
* | | Merge branch 'master' into releases/1.10Daniel Eklöf2021-11-22-240/+421
|\| |
| * | Merge branch 'osc8-overwrite-2'Daniel Eklöf2021-11-22-101/+190
| |\ \ | | | | | | | | | | | | | | | | Closes #801 Closes #804
| | * | term: print: reset ‘col’ after padding the right marginDaniel Eklöf2021-11-21-0/+1
| | | |
| | * | Revert "term: print: erase URI range when printing right-margin padding"Daniel Eklöf2021-11-21-3/+0
| | | | | | | | | | | | | | | | This reverts commit bb967fd2f927d90e881ed2b05db1fa6946033580.
| | * | term: print: erase URI range when printing right-margin paddingDaniel Eklöf2021-11-21-0/+3
| | | |
| | * | term: print: re-order col/row/cell assigmentsDaniel Eklöf2021-11-21-10/+9
| | | |
| | * | changelog: osc-8 data not being cleared when cell is overwrittenDaniel Eklöf2021-11-21-0/+2
| | | |
| | * | grid: refactor grid_row_uri_range_erase()Daniel Eklöf2021-11-21-43/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old algorithm always created a new URI, followed by (maybe) removing the existing URI, when an URI needed to be modified. That is, if e.g. the tail of an URI was being erased, the old algorithm would create a new URI for the part of the URI that should remain, and then removed the old URI. This isn’t very effective. The new algorithm instead identifies all possible overlap cases, and handles each one differently: * URI ends *before* erase range starts - continue with the next URI without further checks * URI starts *after* the erase range ends - return, we’re done * Erase range erases the entire URI - remove the URI * Erase range erases a part in the middle - split the URI * Erase range erases the head of the URI - adjust the URI’s start * Erase range erases the tail of the URI - adjust the URI’s end
| | * | grid: row_uri_range_erase(): assume caller has checked row->extra != NULLDaniel Eklöf2021-11-21-2/+1
| | | |
| | * | term: erase_cell_range(): check if row->extra != NULLDaniel Eklöf2021-11-21-1/+2
| | | |
| | * | term: tail-call optimize calls to grid_row_uri_range_erase()Daniel Eklöf2021-11-21-2/+8
| | | |
| | * | term: call grid_row_uri_range_erase() when printing cellsDaniel Eklöf2021-11-21-19/+34
| | | |
| | * | grid: add grid_row_uri_range_erase()Daniel Eklöf2021-11-21-78/+155
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | This function handles erasing of an URI range. That is, a range of the row is being either erased, or overwritten (from the URI perspective, these two are the same thing). We handle both partial overwrites (split up, or truncate URI), as well as complete overwrites (remove URI).
| * | changelog: pipe-* key bindings not being parsed correctlyDaniel Eklöf2021-11-21-0/+3
| | |
| * | config: argv_compare(): change parameters to ‘struct argv *’Daniel Eklöf2021-11-21-40/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of passing raw char** pointers to argv_compare(), pass pointers to ‘struct argv’. This lets argv_compare() handle both argv’s being NULL, or one of them being NULL. That is, the caller no longer needs to check that both argv’s are non-NULL before calling argv_compare(). Furthermore, update has_key_binding_collisions() to require the pipe argv to match, in addition to matching the ‘action’, when allowing a key collision.
| * | config: pipe_argv_from_value(): plug memory leakDaniel Eklöf2021-11-21-22/+18
| | | | | | | | | | | | | | | | | | When parsing a key binding with a pipe-argv, we failed to free the argv vector (or to be precise, the strdup:ed entries in the array) when failing to parse the remainder of the binding.
| * | Merge branch 'fix-809'Daniel Eklöf2021-11-21-6/+2
| |\ \ | | | | | | | | | | | | Closes #809
| | * | Fix parsing key-bindings config to not read past the end of the string.Arnavion2021-11-21-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | pipe_argv_from_value itself stripped the cmd-to-exec from ctx->value, so the callers should not be doing that themselves. Fixes #809
| * | | Merge branch 'remove-unreachable'Craig Barnes2021-11-21-27/+4
| |\ \ \
| | * | | config: Simplify render-timer option handlingXiretza2021-11-20-23/+4
| | | | |
| | * | | config: Remove some "UNREACHABLE" UB footgunsXiretza2021-11-20-4/+0
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every branch of these long if/else if/else chains returns, so the compiler can figure out on its own that the last line is never reached. If, for some reason, one of the branches does not return (as was the case after 205f1f7, fixed by b22322b), this would usually result in a compiler error ("control reaches end of non-void function"), but adding UNREACHABLE transforms this into silent undefined behaviour.
| * | | Merge branch 'theme-papercolor'Daniel Eklöf2021-11-21-0/+56
| |\ \ \
| | * | | Comment out `selection-*` for consistencySoc Virnyl Silab Estela2021-11-20-4/+4
| | | | | | | | | | | | | | | | | | | | - Changes in PaperColor Themes
| | * | | Add PaperColor theme variantsSoc Virnyl Silab Estela2021-11-17-0/+56
| | |/ / | | | | | | | | | | | | - color palettes taken from https://github.com/NLKNguyen/papercolor-theme
| * | / config: create a copy of the section nameDaniel Eklöf2021-11-21-2/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parsing context keeps a pointer to the current section name. This is used when logging errors. However, the pointer was into a buffer allocated by getline(). This buffer are often re-used in the next call to getline(), or free:d. Regardless, the section name pointer is invalid after the next call to getline(), which meant all error messages were logging a correct section name.
| * | Merge branch 'cell-color-source'Daniel Eklöf2021-11-20-26/+34
| |\ \
| | * | term: track cell color sourceDaniel Eklöf2021-11-20-26/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each cell now tracks it’s current color source: * default fg/bg * base16 fg/bg (maps to *both* the regular and bright colors) * base256 fg/bg * RGB Note that we don’t have enough bits to separate the regular from the bright colors. These _shouldn’t_ be the same, so we ought to be fine...