|
@@ -1592,7 +1592,7 @@ static void restore_cur(struct vc_data *vc)
|
|
|
|
|
|
enum { ESnormal, ESesc, ESsquare, ESgetpars, ESfunckey,
|
|
enum { ESnormal, ESesc, ESsquare, ESgetpars, ESfunckey,
|
|
EShash, ESsetG0, ESsetG1, ESpercent, ESignore, ESnonstd,
|
|
EShash, ESsetG0, ESsetG1, ESpercent, ESignore, ESnonstd,
|
|
- ESpalette };
|
|
|
|
|
|
+ ESpalette, ESosc };
|
|
|
|
|
|
/* console_lock is held (except via vc_init()) */
|
|
/* console_lock is held (except via vc_init()) */
|
|
static void reset_terminal(struct vc_data *vc, int do_clear)
|
|
static void reset_terminal(struct vc_data *vc, int do_clear)
|
|
@@ -1652,11 +1652,15 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
|
|
* Control characters can be used in the _middle_
|
|
* Control characters can be used in the _middle_
|
|
* of an escape sequence.
|
|
* of an escape sequence.
|
|
*/
|
|
*/
|
|
|
|
+ if (vc->vc_state == ESosc && c>=8 && c<=13) /* ... except for OSC */
|
|
|
|
+ return;
|
|
switch (c) {
|
|
switch (c) {
|
|
case 0:
|
|
case 0:
|
|
return;
|
|
return;
|
|
case 7:
|
|
case 7:
|
|
- if (vc->vc_bell_duration)
|
|
|
|
|
|
+ if (vc->vc_state == ESosc)
|
|
|
|
+ vc->vc_state = ESnormal;
|
|
|
|
+ else if (vc->vc_bell_duration)
|
|
kd_mksound(vc->vc_bell_pitch, vc->vc_bell_duration);
|
|
kd_mksound(vc->vc_bell_pitch, vc->vc_bell_duration);
|
|
return;
|
|
return;
|
|
case 8:
|
|
case 8:
|
|
@@ -1767,7 +1771,9 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
|
|
} else if (c=='R') { /* reset palette */
|
|
} else if (c=='R') { /* reset palette */
|
|
reset_palette(vc);
|
|
reset_palette(vc);
|
|
vc->vc_state = ESnormal;
|
|
vc->vc_state = ESnormal;
|
|
- } else
|
|
|
|
|
|
+ } else if (c>='0' && c<='9')
|
|
|
|
+ vc->vc_state = ESosc;
|
|
|
|
+ else
|
|
vc->vc_state = ESnormal;
|
|
vc->vc_state = ESnormal;
|
|
return;
|
|
return;
|
|
case ESpalette:
|
|
case ESpalette:
|
|
@@ -2021,6 +2027,8 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
|
|
vc->vc_translate = set_translate(vc->vc_G1_charset, vc);
|
|
vc->vc_translate = set_translate(vc->vc_G1_charset, vc);
|
|
vc->vc_state = ESnormal;
|
|
vc->vc_state = ESnormal;
|
|
return;
|
|
return;
|
|
|
|
+ case ESosc:
|
|
|
|
+ return;
|
|
default:
|
|
default:
|
|
vc->vc_state = ESnormal;
|
|
vc->vc_state = ESnormal;
|
|
}
|
|
}
|