VT consoles fbcon and vgacon implement various cursor sizes (i.e.,
underline, block, half-block, etc). Share related code and harmonize
the look and behaviour.
In patches 1 to 3, move VT cursor-size calculations to the VT subsystem
and use the new helpers from vgacon. Replace similar code in the console.
The new helpers also take VT's default cursor size into account.
Fbcon implments a custom helper that creates a cursor glyph for the
given cursor size. In patches 4 and 5, move the code into the font
library and update fbcon to use the new helper. The cursor-glyph shape
rendering is tied to the font in use. Hence move them next to each other.
Also update fbcon to use the shared cursor-size helpers.
Tested with fbcon under bochs (qemu) and with vgacon on an old SiS
6202 VGA card. Other consoles (newport_con, sticon) don't support cursor
sizes, so leave them as-is.
v2:
- restore vc_cell_height in vgacon
- avoid interference from concurrent user space
- fix docs
Thomas Zimmermann (5):
vt: Add cursor-size helpers
vgacon: Remove trailing whitespaces
vgacon: Use vt_cursor_{start,end}()
lib/fonts: Add font_glyph_cursor() helper
fbcon: Replace fbcon_fill_cursor_mask() with fbcon_cursor_glyph()
drivers/tty/vt/vt.c | 93 ++++++++++++++++++++++++++++
drivers/video/console/vgacon.c | 43 +++----------
drivers/video/fbdev/core/bitblit.c | 3 +-
drivers/video/fbdev/core/fbcon.c | 45 ++++----------
drivers/video/fbdev/core/fbcon.h | 2 +-
drivers/video/fbdev/core/fbcon_ccw.c | 3 +-
drivers/video/fbdev/core/fbcon_cw.c | 3 +-
drivers/video/fbdev/core/fbcon_ud.c | 3 +-
include/linux/console_struct.h | 7 +++
include/linux/font.h | 4 ++
lib/fonts/Makefile | 3 +-
lib/fonts/font_cursor.c | 56 +++++++++++++++++
12 files changed, 188 insertions(+), 77 deletions(-)
create mode 100644 lib/fonts/font_cursor.c
base-commit: 2535e80aa0dd3d4269a43bf86a1686baddcf08d6
--
2.55.0
