command: highlight selected list items with color #15286
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Download the artifacts for this pull request: |
kasper93
reviewed
Nov 26, 2024
kasper93
reviewed
Nov 26, 2024
| @@ -390,6 +390,11 @@ local function fuzzy_find(needle, haystacks) | |||
| return result | |||
| end | |||
|
|
|||
| local function mpv_color_to_ass(color) | |||
There was a problem hiding this comment.
Shouldn't this be added to assdraw.lua?
kasper93
reviewed
Nov 26, 2024
player/command.c
Outdated
| : TERM_ESC_REVERSE_COLORS; | ||
| } | ||
|
|
||
| static char *get_style_reset(struct MPContext *mpctx) |
There was a problem hiding this comment.
This should be static const char *
kasper93
reviewed
Nov 26, 2024
player/command.c
Outdated
| @@ -1056,10 +1081,11 @@ static int mp_property_list_chapters(void *ctx, struct m_property *prop, | |||
| char *name = chapter_name(mpctx, n); | |||
| double t = chapter_start_time(mpctx, n); | |||
| char* time = mp_format_time(t, false); | |||
| res = talloc_asprintf_append(res, "%s", time); | |||
| const char *selected_style = n == cur ? get_selected_style(mpctx, res) : ""; | |||
There was a problem hiding this comment.
This is not freed anywhere.
kasper93
reviewed
Nov 26, 2024
player/command.c
Outdated
| @@ -1056,10 +1081,11 @@ static int mp_property_list_chapters(void *ctx, struct m_property *prop, | |||
| char *name = chapter_name(mpctx, n); | |||
| double t = chapter_start_time(mpctx, n); | |||
| char* time = mp_format_time(t, false); | |||
| res = talloc_asprintf_append(res, "%s", time); | |||
| const char *selected_style = n == cur ? get_selected_style(mpctx, res) : ""; | |||
| const char *reset = n == cur ? get_style_reset(mpctx) : ""; | |||
kasper93
reviewed
Nov 26, 2024
player/command.c
Outdated
| res = talloc_strdup_append(res, n == current ? list_current | ||
| : list_normal); | ||
| if (n == current) | ||
| res = talloc_strdup_append(res, get_selected_style(mpctx, res)); |
There was a problem hiding this comment.
get_selected_style result is not freed
kasper93
reviewed
Nov 26, 2024
player/command.c
Outdated
| res = talloc_strdup_append(res, pl->current == e ? list_current | ||
| : list_normal); | ||
| if (pl->current == e) | ||
| res = talloc_strdup_append(res, get_selected_style(mpctx, res)); |
There was a problem hiding this comment.
get_selected_style result is not freed
kasper93
reviewed
Nov 26, 2024
video/out/vo_tct.c
Outdated
| @@ -160,7 +159,7 @@ static void write_plain(bstr *frame, | |||
| if (buffering <= VO_TCT_BUFFER_PIXEL) | |||
| print_buffer(frame); | |||
| } | |||
| bstr_xappend(NULL, frame, TERM_ESC_CLEAR_COLORS); | |||
| bstr_xappend(NULL, frame, (bstr)bstr0_lit(TERM_ESC_CLEAR_COLORS)); | |||
There was a problem hiding this comment.
Maybe we should add bstr_xappend0 in bstr.h, I've seen it used in other places too.
guidocella
force-pushed
the
selected-style
branch
from
330efce
to
7702b78
Compare
kasper93
reviewed
Nov 26, 2024
misc/bstr.h
Outdated
| @@ -150,6 +150,8 @@ struct bstr bstr_strip_linebreaks(struct bstr str); | |||
| */ | |||
| void bstr_xappend(void *talloc_ctx, bstr *s, bstr append); | |||
|
|
|||
| #define bstr_xappend0(ctx, dst, s) bstr_xappend(ctx, dst, bstr0(s)) | |||
There was a problem hiding this comment.
Need parentheses around ctx and dst. Also generally we define it as inline functions in this header.
guidocella
force-pushed
the
selected-style
branch
2 times, most recently
from
c4464ea
to
f5badf3
Compare
kasper93
reviewed
Nov 27, 2024
player/command.c
Outdated
Comment on lines
1084
to
1087
| char *selected_style = get_selected_style(mpctx, res); | ||
| res = talloc_strdup_append(res, selected_style); | ||
| if (mpctx->video_out && mpctx->opts->video_osd) | ||
| talloc_free(selected_style); |
There was a problem hiding this comment.
How about instead get style, we do append style directly to res? So we avoid the need to keep track of the allocation and directly write to the result buffer?
Instead of printing circles in show-text ${playlist}, ${chapter-list}
and ${edition-list}, introduce --osd-selected-color and
--osd-selected-outline-color to reduce clutter, make the selected item
easier to differentiate, and have visual consistency with select.lua.
The defaults are taken from the style of the selected item in the
console. These new options are also used there, replacing the hardcoded
styles. Due to being user-configurable, selected item styles are changed
to take priority over default item styles.
The default selected style is yellow and bold. The bold (hardcoded)
allows differentiating the selected item with color blindness. There is
also a separate --osd-selected-outline-color option defaulting to black,
since without it if the user changes --osd-outline-color yellow text
becomes unreadable without a black border. --osd-selected-back-color is
omitted for now.
Text and background colors are inverted for the selected item in the
terminal. This is hardcoded, adding an option is overkill.
A disadvantage of this commit is that if you run print-text ${playlist}
with a VO, the selected style ASS is printed to the terminal (but ASS
printed in the console is interpreted). This commit avoids printing the
reset ASS sequence for non-selected items to reduce clutter in this
case.
guidocella
force-pushed
the
selected-style
branch
from
f5badf3
to
8c8785b
Compare
kasper93
reviewed
Nov 27, 2024
| @@ -4592,6 +4592,14 @@ OSD | |||
| Specify the color used for OSD. | |||
| See ``--sub-color`` for details. | |||
|
|
|||
| ``--osd-selected-color=<color>`` | |||
There was a problem hiding this comment.
Should we mention default value?
kasper93
approved these changes
Nov 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Instead of printing circles in show-text ${playlist}, ${chapter-list} and ${edition-list}, introduce --osd-selected-color and --osd-selected-outline-color to reduce clutter, make the selected item easier to differentiate, and have visual consistency with select.lua.
The defaults are taken from the style of the selected item in the console. These new options are also used there, replacing the hardcoded styles. Due to being user-configurable, selected item styles are changed to take priority over default item styles.
The default selected style is yellow and bold. The bold (hardcoded) allows differentiating the selected item with color blindness. There is also a separate --osd-selected-outline-color option defaulting to black, since without it if the user changes --osd-outline-color yellow text becomes unreadable without a black border. --osd-selected-back-color is omitted for now.
Text and background colors are inverted for the selected item in the terminal. This is hardcoded, adding an option is overkill.
A disadvantage of this commit is that if you run print-text ${playlist} with a VO, the selected style ASS is printed to the terminal (but ASS printed in the console is interpreted). This commit avoids printing the reset ASS sequence for non-selected items to reduce clutter in this case.