xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vt: selection, introduce vc_is_sel

Browse Source 
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 80967ff2d1
commit dce05aa6ee
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,6 +84,11 @@ void clear_selection(void)
} }
EXPORT_SYMBOL_GPL(clear_selection); EXPORT_SYMBOL_GPL(clear_selection);
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?
* 128 bits. Locked by the console lock. * 128 bits. Locked by the console lock.

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

@@ -890,8 +890,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);
} }
@@ -901,7 +902,7 @@ static void set_cursor(struct vc_data *vc)
if (!con_is_fg(vc) || console_blanked || vc->vc_mode == KD_GRAPHICS) if (!con_is_fg(vc) || console_blanked || 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)
@@ -1196,7 +1197,7 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
} }
} }
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

@@ -43,7 +43,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

@@ -11,8 +11,8 @@
#include <linux/tiocl.h> #include <linux/tiocl.h>
#include <linux/vt_buffer.h> #include <linux/vt_buffer.h>
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_user(const struct tiocl_selection __user *sel, extern int set_selection_user(const struct tiocl_selection __user *sel,
@@ -24,6 +24,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 const unsigned char color_table[]; extern const unsigned char color_table[];