norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

console: rewrite console layer

Browse Source 
This is a rewrite of the whole console layer so we can remove the
kmscon_buffer object to speed up the console.

This removes the split between the scroll region and the two margins so we
can resize margins in O(1). This also correctly merges the remaining
console modes so vte does not have to track them.

Btw. vim runs smoothly on kmscon with this console layer now (finally!).

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-06-17 15:53:33 +02:00
parent 6081905edf
commit b0c19c5c42
3 changed files with 484 additions and 951 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1392
src/console.c
View File

File diff suppressed because it is too large Load Diff

21
src/console.h
View File

@ -44,13 +44,12 @@ struct kmscon_console;
/* console objects */
/* modes for kmscon_console_write() */
#define KMSCON_CONSOLE_INSERT 0x01
#define KMSCON_CONSOLE_WRAP 0x02
/* modes for kmscon_console_re/set() */
#define KMSCON_CONSOLE_INSERT_MODE 0x01
#define KMSCON_CONSOLE_AUTO_WRAP 0x02
#define KMSCON_CONSOLE_REL_ORIGIN 0x04
#define KMSCON_CONSOLE_INVERSE 0x08
#define KMSCON_CONSOLE_HIDE_CURSOR 0x10
#define KMSCON_CONSOLE_FIXED_POS 0x20
int kmscon_console_new(struct kmscon_console **out);
void kmscon_console_ref(struct kmscon_console *con);
@ -59,9 +58,12 @@ void kmscon_console_unref(struct kmscon_console *con);
unsigned int kmscon_console_get_width(struct kmscon_console *con);
unsigned int kmscon_console_get_height(struct kmscon_console *con);
int kmscon_console_resize(struct kmscon_console *con, unsigned int x,
unsigned int y, unsigned int height);
unsigned int y);
int kmscon_console_set_margins(struct kmscon_console *con,
unsigned int top, unsigned int bottom);
void kmscon_console_set_max_sb(struct kmscon_console *con, unsigned int max);
void kmscon_console_clear_sb(struct kmscon_console *con);
void kmscon_console_reset(struct kmscon_console *con);
void kmscon_console_set_flags(struct kmscon_console *con, unsigned int flags);
void kmscon_console_reset_flags(struct kmscon_console *con, unsigned int flags);
@ -70,15 +72,14 @@ unsigned int kmscon_console_get_flags(struct kmscon_console *con);
void kmscon_console_draw(struct kmscon_console *con, struct font_screen *fscr);
void kmscon_console_write(struct kmscon_console *con, kmscon_symbol_t ch,
const struct font_char_attr *attr,
unsigned int flags);
const struct font_char_attr *attr);
void kmscon_console_newline(struct kmscon_console *con);
void kmscon_console_move_to(struct kmscon_console *con, unsigned int x,
unsigned int y);
unsigned int y);
void kmscon_console_move_up(struct kmscon_console *con, unsigned int num,
bool scroll);
bool scroll);
void kmscon_console_move_down(struct kmscon_console *con, unsigned int num,
bool scroll);
bool scroll);
void kmscon_console_move_left(struct kmscon_console *con, unsigned int num);
void kmscon_console_move_right(struct kmscon_console *con, unsigned int num);
void kmscon_console_move_line_end(struct kmscon_console *con);

22
src/vte.c
View File

@ -282,15 +282,7 @@ static void vte_write_debug(struct kmscon_vte *vte, const char *u8, size_t len,
/* write to console */
static void write_console(struct kmscon_vte *vte, kmscon_symbol_t sym)
{
unsigned int flags;
flags = 0;
if (vte->flags & FLAG_INSERT_REPLACE_MODE)
flags |= KMSCON_CONSOLE_INSERT;
if (vte->flags & FLAG_AUTO_WRAP_MODE)
flags |= KMSCON_CONSOLE_WRAP;
kmscon_console_write(vte->con, sym, &vte->cattr, flags);
kmscon_console_write(vte->con, sym, &vte->cattr);
}
/*
@ -856,6 +848,12 @@ static void csi_mode(struct kmscon_vte *vte, bool set)
case 4: /* IRM */
set_reset_flag(vte, set,
FLAG_INSERT_REPLACE_MODE);
if (set)
kmscon_console_set_flags(vte->con,
KMSCON_CONSOLE_INSERT_MODE);
else
kmscon_console_reset_flags(vte->con,
KMSCON_CONSOLE_INSERT_MODE);
continue;
case 12: /* SRM */
set_reset_flag(vte, set,
@ -926,6 +924,12 @@ static void csi_mode(struct kmscon_vte *vte, bool set)
continue;
case 7: /* DECAWN */
set_reset_flag(vte, set, FLAG_AUTO_WRAP_MODE);
if (set)
kmscon_console_set_flags(vte->con,
KMSCON_CONSOLE_AUTO_WRAP);
else
kmscon_console_reset_flags(vte->con,
KMSCON_CONSOLE_AUTO_WRAP);
continue;
case 8: /* DECARM */
set_reset_flag(vte, set, FLAG_AUTO_REPEAT_MODE);