diff options
| author | Sadrul Habib Chowdhury <sadrul@users.sourceforge.net> | 2012-01-19 16:35:03 -0500 |
|---|---|---|
| committer | Sadrul Habib Chowdhury <sadrul@users.sourceforge.net> | 2012-01-19 16:35:03 -0500 |
| commit | c795ac322ff7c81c8d57445337c9f70cba226d1f (patch) | |
| tree | 00362a9b3c203b64de2400f0a124f9dc9e2a5397 /src/window.h | |
| parent | 869278e490913531a98602b8bec5cc08831aa46d (diff) | |
| parent | 8cf5efc07048abee125a24652768f4b24fc761bf (diff) | |
| download | screen-unicode++.tar.gz | |
Merge remote-tracking branch 'origin/master' into unicode++unicode++
Diffstat (limited to 'src/window.h')
| -rw-r--r-- | src/window.h | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/src/window.h b/src/window.h index 47f5c9e..7311ecb 100644 --- a/src/window.h +++ b/src/window.h @@ -188,14 +188,16 @@ struct win int w_charsets[4]; /* Font = charsets[Charset] */ #endif int w_ss; - int w_saved; - int w_Saved_x, w_Saved_y; - struct mchar w_SavedRend; + struct cursor { + int on; + int x, y; + struct mchar Rend; #ifdef FONT - int w_SavedCharset; - int w_SavedCharsetR; - int w_SavedCharsets[4]; + int Charset; + int CharsetR; + int Charsets[4]; #endif + } w_saved; int w_top, w_bot; /* scrollregion */ int w_wrap; /* autowrap */ int w_origin; /* origin mode */ @@ -276,16 +278,20 @@ struct win int w_telsubidx; struct event w_telconnev; #endif - struct mline *w_alt_mlines; - int w_alt_width; - int w_alt_height; - int w_alt_histheight; - int w_alt_x, w_alt_y; + struct { + int on; /* Is the alternate buffer currently being used? */ + struct mline *mlines; + int width; + int height; #ifdef COPY_PASTE - struct mline *w_alt_hlines; - int w_alt_histidx; + int histheight; + struct mline *hlines; + int histidx; +#else + int histheight; /* 0 */ #endif - int w_alt_current; /* Is the alternate buffer currently being used? */ + struct cursor cursor; + } w_alt; struct event w_destroyev; /* window destroy event */ #ifdef BSDWAIT |