5
0
mirror of git://git.proxmox.com/git/spiceterm.git synced 2024-12-22 13:34:06 +03:00

white space cleanups

This commit is contained in:
Dietmar Maurer 2013-09-12 14:23:57 +02:00
parent 60b9ef6325
commit 44a222152c

View File

@ -1,6 +1,3 @@
#ifndef __SPICETERM_H__
#define __SPICETERM_H__
#include <glib.h>
#include <spice.h>
@ -8,18 +5,18 @@
#define MAX_ESC_PARAMS 16
typedef struct TextAttributes {
unsigned int fgcol:4;
unsigned int bgcol:4;
unsigned int bold:1;
unsigned int uline:1;
unsigned int blink:1;
unsigned int invers:1;
unsigned int unvisible:1;
unsigned int fgcol:4;
unsigned int bgcol:4;
unsigned int bold:1;
unsigned int uline:1;
unsigned int blink:1;
unsigned int invers:1;
unsigned int unvisible:1;
} TextAttributes;
typedef struct TextCell {
gunichar2 ch;
TextAttributes attrib;
gunichar2 ch;
TextAttributes attrib;
} TextCell;
#define COMMANDS_SIZE 1024
@ -65,74 +62,70 @@ SpiceScreen* spice_screen_new(SpiceCoreInterface* core, guint timeout);
void spice_screen_draw_char(SpiceScreen *spice_screen, int x, int y, gunichar2 ch, TextAttributes attrib);
void spice_screen_scroll(SpiceScreen *spice_screen, int x1, int y1, int x2, int y2, int src_x, int src_y);
void spice_screen_clear(SpiceScreen *spice_screen, int x1, int y1, int x2, int y2);
uint32_t spice_screen_get_width(void);
uint32_t spice_screen_get_height(void);
typedef struct spiceTerm {
int maxx;
int maxy;
int maxx;
int maxy;
int width;
int height;
int width;
int height;
int total_height;
int scroll_height;
int y_base;
int y_displ;
int altbuf:1;
int total_height;
int scroll_height;
int y_base;
int y_displ;
int altbuf:1;
unsigned int utf8:1; // utf8 mode
long utf_char; // used by utf8 parser
int utf_count; // used by utf8 parser
unsigned int utf8:1; // utf8 mode
long utf_char; // used by utf8 parser
int utf_count; // used by utf8 parser
TextAttributes default_attrib;
TextAttributes default_attrib;
TextCell *cells;
TextCell *altcells;
TextCell *cells;
TextCell *altcells;
SpiceScreen *screen;
SpiceKbdInstance keyboard_sin;
SpiceCharDeviceInstance vdagent_sin;
SpiceScreen *screen;
SpiceKbdInstance keyboard_sin;
SpiceCharDeviceInstance vdagent_sin;
// cursor
TextAttributes cur_attrib;
TextAttributes cur_attrib_saved;
int tty_state; // 0 - normal, 1 - ESC, 2 - CSI
int cx; // cursor x position
int cy; // cursor y position
int cx_saved; // saved cursor x position
int cy_saved; // saved cursor y position
int esc_buf[MAX_ESC_PARAMS];
int esc_count;
int esc_ques;
int esc_has_par;
char osc_textbuf[4096];
char osc_cmd;
int region_top;
int region_bottom;
// cursor
TextAttributes cur_attrib;
TextAttributes cur_attrib_saved;
int tty_state; // 0 - normal, 1 - ESC, 2 - CSI
int cx; // cursor x position
int cy; // cursor y position
int cx_saved; // saved cursor x position
int cy_saved; // saved cursor y position
int esc_buf[MAX_ESC_PARAMS];
int esc_count;
int esc_ques;
int esc_has_par;
char osc_textbuf[4096];
char osc_cmd;
int region_top;
int region_bottom;
unsigned int charset:1; // G0 or G1
unsigned int charset_saved:1; // G0 or G1
unsigned int g0enc:2;
unsigned int g0enc_saved:2;
unsigned int g1enc:2;
unsigned int g1enc_saved:2;
unsigned int cur_enc:2;
unsigned int cur_enc_saved:2;
unsigned int charset:1; // G0 or G1
unsigned int charset_saved:1; // G0 or G1
unsigned int g0enc:2;
unsigned int g0enc_saved:2;
unsigned int g1enc:2;
unsigned int g1enc_saved:2;
unsigned int cur_enc:2;
unsigned int cur_enc_saved:2;
// input buffer
char ibuf[IBUFSIZE];
int ibuf_count;
// input buffer
char ibuf[IBUFSIZE];
int ibuf_count;
gunichar2 *selection;
int selection_len;
gunichar2 *selection;
int selection_len;
unsigned int mark_active:1;
unsigned int mark_active:1;
unsigned int report_mouse:1;
unsigned int report_mouse:1;
} spiceTerm;
#endif /* __SPICETERM_H__ */