Skip to content

Add support for OSC reset fg, bg, and cursor color. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keithr-git wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add support for OSC reset fg, bg, and cursor color. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb39b5c
Add support for OSC reset fg, bg, and cursor.
keithr-git Mar 7, 2025
57f200b
Add support for OSC reset fg, bg, and cursor colors.
keithr-git Mar 7, 2025
5071fba
Merge branch 'main' of github.com:keithr-git/rxvt-unicode
keithr-git Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/command.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3310,6 +3310,7 @@ rxvt_term::process_dcs_seq ()
/*----------------------------------------------------------------------*/
/*
* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
* or `ESC ] Ps (ST|BEL)'
*/
void
rxvt_term::process_osc_seq ()
Expand All @@ -3320,14 +3321,17 @@ rxvt_term::process_osc_seq ()
for (arg = 0; isdigit (ch); ch = cmd_getc ())
arg = arg * 10 + (ch - '0');

if (ch == ';')
if (ch == ';' || ch == C0_BEL)
{
string_term st;
char *s = get_to_st (st);
char *s = nullptr;

if (ch == ';')
s = get_to_st (st);
process_xterm_seq (arg, s, st);

if (s)
{
process_xterm_seq (arg, s, st);
free (s);
}
}
Expand Down Expand Up @@ -3462,20 +3466,18 @@ rxvt_term::process_color_seq (int report, int color, const char *str, string_ter
}

/*
* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) and ESC ] Ps BEL
*/
void
rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
{
int color;
char *buf, *name;
bool query = str[0] == '?' && !str[1];
bool query = (str == NULL) ? false : str[0] == '?' && !str[1];
int saveop = op;

dLocal (Display *, dpy);

assert (str != NULL);

if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
return;

Expand Down Expand Up @@ -3551,14 +3553,23 @@ rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
case XTerm_Color00:
process_color_seq (op, Color_fg, str, st);
break;
case XTerm_Color00_reset:
set_window_color (Color_fg, rs[Rs_color + Color_fg_orig]);
break;
case Rxvt_restoreBG:
case XTerm_Color01:
process_color_seq (op, Color_bg, str, st);
break;
case XTerm_Color01_reset:
set_window_color (Color_bg, rs[Rs_color + Color_bg_orig]);
break;
#ifndef NO_CURSORCOLOR
case XTerm_Color_cursor:
process_color_seq (op, Color_cursor, str, st);
break;
case XTerm_Color_cursor_reset:
set_window_color (Color_cursor, rs[Rs_color + Color_cursor_orig]);
break;
#endif
case XTerm_Color_pointer_fg:
process_color_seq (op, Color_pointer_fg, str, st);
Expand Down
3 changes: 3 additions & 0 deletions src/init.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,9 +777,12 @@ rxvt_term::init_resources (int argc, const char *const *argv)

/* convenient aliases for setting fg/bg to colors */
color_aliases (Color_fg);
alias_color (Color_fg_orig, Color_fg);
color_aliases (Color_bg);
alias_color (Color_bg_orig, Color_bg);
#ifndef NO_CURSORCOLOR
color_aliases (Color_cursor);
alias_color (Color_cursor_orig, Color_cursor);
color_aliases (Color_cursor2);
#endif /* NO_CURSORCOLOR */
color_aliases (Color_pointer_fg);
Expand Down
6 changes: 6 additions & 0 deletions src/rxvt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,9 @@ enum {
XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
XTerm_logfile = 46, // not implemented
XTerm_font = 50,
XTerm_Color00_reset = 110, // reset fg color
XTerm_Color01_reset = 111, // reset bg color
XTerm_Color_cursor_reset = 112, // reset actual 'Cursor' color

XTerm_konsole30 = 30, // reserved for konsole
XTerm_konsole31 = 31, // reserved for konsole
Expand Down Expand Up @@ -509,6 +512,7 @@ enum colour_list {
RGB24_CUBE_SIZE - 1,
#ifndef NO_CURSORCOLOR
Color_cursor,
Color_cursor_orig,
Color_cursor2,
#endif
Color_pointer_fg,
Expand All @@ -534,6 +538,8 @@ enum colour_list {
#if OFF_FOCUS_FADING
Color_fade,
#endif
Color_fg_orig,
Color_bg_orig,
NRS_COLORS, /* */
#ifdef RXVT_SCROLLBAR
Color_topShadow = NRS_COLORS,
Expand Down