commit 25dc8a177fe2961126ad2860ecb77e46be4d356b · pci.express/flanterm.zig

+18

backends/framebuffer.c

···

       7
       7
        
       void *memset(void *, int, size_t);

     

       8
       8
        
       void *memcpy(void *, const void *, size_t);

     

       9
       9
        
       

     

       10
       10
       +
       static void fbterm_save_state(struct term_context *_ctx) {

     

       11
       11
       +
           struct fbterm_context *ctx = (void *)_ctx;

     

       12
       12
       +
           ctx->saved_state_text_fg = ctx->text_fg;

     

       13
       13
       +
           ctx->saved_state_text_bg = ctx->text_bg;

     

       14
       14
       +
           ctx->saved_state_cursor_x = ctx->cursor_x;

     

       15
       15
       +
           ctx->saved_state_cursor_y = ctx->cursor_y;

     

       16
       16
       +
       }

     

       17
       17
       +
       

     

       18
       18
       +
       static void fbterm_restore_state(struct term_context *_ctx) {

     

       19
       19
       +
           struct fbterm_context *ctx = (void *)_ctx;

     

       20
       20
       +
           ctx->text_fg = ctx->saved_state_text_fg;

     

       21
       21
       +
           ctx->text_bg = ctx->saved_state_text_bg;

     

       22
       22
       +
           ctx->cursor_x = ctx->saved_state_cursor_x;

     

       23
       23
       +
           ctx->cursor_y = ctx->saved_state_cursor_y;

     

       24
       24
       +
       }

     

       25
       25
       +
       

     

       10
       26
        
       static void fbterm_swap_palette(struct term_context *_ctx) {

     

       11
       27
        
           struct fbterm_context *ctx = (void *)_ctx;

     

       12
       28
        
           uint32_t tmp = ctx->text_bg;

     
···

       554
       570
        
           _ctx->scroll = fbterm_scroll;

     

       555
       571
        
           _ctx->revscroll = fbterm_revscroll;

     

       556
       572
        
           _ctx->swap_palette = fbterm_swap_palette;

     

       573
       573
       +
           _ctx->save_state = fbterm_save_state;

     

       574
       574
       +
           _ctx->restore_state = fbterm_restore_state;

     

       557
       575
        
           _ctx->double_buffer_flush = fbterm_double_buffer_flush;

     

       558
       576
        
           _ctx->full_refresh = fbterm_full_refresh;

     

       559
       577
        
           _ctx->deinit = fbterm_deinit;

+8 -8

term.c

···

       44
       44
        
       #define CHARSET_DEC_SPECIAL 1

     

       45
       45
        
       

     

       46
       46
        
       void term_context_reinit(struct term_context *ctx) {

     

       47
       47
       -
           ctx->scroll_enabled = true;

     

       48
       47
        
           ctx->tab_size = 8;

     

       49
       49
       -
           ctx->escape_offset = 0;

     

       48
       48
       +
           ctx->autoflush = true;

     

       49
       49
       +
           ctx->scroll_enabled = true;

     

       50
       50
        
           ctx->control_sequence = false;

     

       51
       51
        
           ctx->csi = false;

     

       52
       52
        
           ctx->escape = false;

     
···

       55
       55
        
           ctx->bold = false;

     

       56
       56
        
           ctx->reverse_video = false;

     

       57
       57
        
           ctx->dec_private = false;

     

       58
       58
       +
           ctx->insert_mode = false;

     

       59
       59
       +
           ctx->g_select = 0;

     

       60
       60
       +
           ctx->charsets[0] = CHARSET_DEFAULT;

     

       61
       61
       +
           ctx->charsets[1] = CHARSET_DEC_SPECIAL;

     

       62
       62
       +
           ctx->current_charset = 0;

     

       63
       63
       +
           ctx->escape_offset = 0;

     

       58
       64
        
           ctx->esc_values_i = 0;

     

       59
       65
        
           ctx->saved_cursor_x = 0;

     

       60
       66
        
           ctx->saved_cursor_y = 0;

     

       61
       67
        
           ctx->current_primary = (size_t)-1;

     

       62
       62
       -
           ctx->insert_mode = false;

     

       63
       68
        
           ctx->scroll_top_margin = 0;

     

       64
       69
        
           ctx->scroll_bottom_margin = ctx->rows;

     

       65
       65
       -
           ctx->current_charset = 0;

     

       66
       66
       -
           ctx->g_select = 0;

     

       67
       67
       -
           ctx->charsets[0] = CHARSET_DEFAULT;

     

       68
       68
       -
           ctx->charsets[1] = CHARSET_DEC_SPECIAL;

     

       69
       69
       -
           ctx->autoflush = true;

     

       70
       70
        
       }

     

       71
       71
        
       

     

       72
       72
        
       static void term_putchar(struct term_context *ctx, uint8_t c);

+8 -6

term.h

···

       17
       17
        
       #define TERM_CB_LINUX 80

     

       18
       18
        
       

     

       19
       19
        
       struct term_context {

     

       20
       20
       -
           size_t rows, cols;

     

       20
       20
       +
           /* internal use */

     

       21
       21
        
       

     

       22
       22
        
           size_t tab_size;

     

       23
       23
       -
       

     

       24
       23
        
           bool autoflush;

     

       25
       25
       -
       

     

       26
       26
       -
           bool in_bootloader;

     

       27
       27
       -
       

     

       28
       24
        
           bool scroll_enabled;

     

       29
       25
        
           bool control_sequence;

     

       30
       26
        
           bool csi;

     
···

       46
       42
        
           size_t scroll_top_margin;

     

       47
       43
        
           size_t scroll_bottom_margin;

     

       48
       44
        
           uint32_t esc_values[TERM_MAX_ESC_VALUES];

     

       49
       49
       -
       

     

       50
       45
        
           bool saved_state_bold;

     

       51
       46
        
           bool saved_state_reverse_video;

     

       52
       47
        
           size_t saved_state_current_charset;

     

       53
       48
        
           size_t saved_state_current_primary;

     

       54
       49
        
       

     

       50
       50
       +
           /* to be set by backend */

     

       51
       51
       +
       

     

       52
       52
       +
           size_t rows, cols;

     

       53
       53
       +
           bool in_bootloader;

     

       54
       54
       +
       

     

       55
       55
        
           void (*raw_putchar)(struct term_context *, uint8_t c);

     

       56
       56
        
           void (*clear)(struct term_context *, bool move);

     

       57
       57
        
           void (*enable_cursor)(struct term_context *);

     
···

       75
       75
        
           void (*double_buffer_flush)(struct term_context *);

     

       76
       76
        
           void (*full_refresh)(struct term_context *);

     

       77
       77
        
           void (*deinit)(struct term_context *, void (*)(void *, size_t));

     

       78
       78
       +
       

     

       79
       79
       +
           /* to be set by client */

     

       78
       80
        
       

     

       79
       81
        
           void (*callback)(struct term_context *, uint64_t, uint64_t, uint64_t, uint64_t);

     

       80
       82
        
       };