evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vt: selection, introduce vc_is_sel

Browse source 
commit dce05aa6eec977f1472abed95ccd71276b9a3864 upstream.

Avoid global variables (namely sel_cons) by introducing vc_is_sel. It
checks whether the parameter is the current selection console. This will
help putting sel_cons to a struct later.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200219073951.16151-1-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2020-02-19 08:39:43 +01:00 • committed by Greg Kroah-Hartman
parent 89fb5aa765
commit 10f89ef408
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/tty/vt/selection.c
View file

@ -80,6 +80,11 @@ void clear_selection(void)
} }
} }
bool vc_is_sel(struct vc_data *vc)
{
return vc == sel_cons;
}
/* /*
* User settable table: what characters are to be considered alphabetic? * User settable table: what characters are to be considered alphabetic?
* 256 bits. Locked by the console lock. * 256 bits. Locked by the console lock.

7
drivers/tty/vt/vt.c
View file

@ -600,8 +600,9 @@ static void hide_softcursor(struct vc_data *vc)
static void hide_cursor(struct vc_data *vc) static void hide_cursor(struct vc_data *vc)
{ {
if (vc == sel_cons) if (vc_is_sel(vc))
clear_selection(); clear_selection();
vc->vc_sw->con_cursor(vc, CM_ERASE); vc->vc_sw->con_cursor(vc, CM_ERASE);
hide_softcursor(vc); hide_softcursor(vc);
} }
@ -612,7 +613,7 @@ static void set_cursor(struct vc_data *vc)
vc->vc_mode == KD_GRAPHICS) vc->vc_mode == KD_GRAPHICS)
return; return;
if (vc->vc_deccm) { if (vc->vc_deccm) {
if (vc == sel_cons) if (vc_is_sel(vc))
clear_selection(); clear_selection();
add_softcursor(vc); add_softcursor(vc);
if ((vc->vc_cursor_type & 0x0f) != 1) if ((vc->vc_cursor_type & 0x0f) != 1)
@ -878,7 +879,7 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
if (!newscreen) if (!newscreen)
return -ENOMEM; return -ENOMEM;
if (vc == sel_cons) if (vc_is_sel(vc))
clear_selection(); clear_selection();
old_rows = vc->vc_rows; old_rows = vc->vc_rows;

2
drivers/tty/vt/vt_ioctl.c
View file

@ -42,7 +42,7 @@ char vt_dont_switch;
extern struct tty_driver *console_driver; extern struct tty_driver *console_driver;
#define VT_IS_IN_USE(i) (console_driver->ttys[i] && console_driver->ttys[i]->count) #define VT_IS_IN_USE(i) (console_driver->ttys[i] && console_driver->ttys[i]->count)
#define VT_BUSY(i) (VT_IS_IN_USE(i) || i == fg_console || vc_cons[i].d == sel_cons) #define VT_BUSY(i) (VT_IS_IN_USE(i) || i == fg_console || vc_is_sel(vc_cons[i].d))
/* /*
* Console (vt and kd) routines, as defined by USL SVR4 manual, and by * Console (vt and kd) routines, as defined by USL SVR4 manual, and by

4
include/linux/selection.h
View file

@ -12,8 +12,8 @@
struct tty_struct; struct tty_struct;
extern struct vc_data *sel_cons;
struct tty_struct; struct tty_struct;
struct vc_data;
extern void clear_selection(void); extern void clear_selection(void);
extern int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *tty); extern int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *tty);
@ -22,6 +22,8 @@ extern int sel_loadlut(char __user *p);
extern int mouse_reporting(void); extern int mouse_reporting(void);
extern void mouse_report(struct tty_struct * tty, int butt, int mrx, int mry); extern void mouse_report(struct tty_struct * tty, int butt, int mrx, int mry);
bool vc_is_sel(struct vc_data *vc);
extern int console_blanked; extern int console_blanked;
extern unsigned char color_table[]; extern unsigned char color_table[];