rfivet/uemacs
1
0
Fork 0
mirror of https://github.com/rfivet/uemacs.git synced 2024-12-24 01:56:26 -05:00
Code Releases Activity

Make the 'struct video' contain an array of unicode characters rather than bytes

Browse Source 
This is disgusting.  And quite frankly, it's debatable whether this will
ever work.  The "line" structure is still just an array of characters,
so that has to work with utf-8.

But the 'struct video' thing is what represents the actual screen
rectangle, and is fixed-size by the size of the screen.  So making it
contain actual 32-bit unicode characters *may* make sense.

Right now we translate things the same way we always used to, though, so
utf-8 in 'struct line' will not be translated to the proper unicode
array, but to the bytes of the utf-8 representation.  So this really
doesn't improve anything per se yet, just expands the memory use of the
video array.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2012-07-10 14:24:23 -07:00
parent 2dddd4f970
commit e8f984a1b0
2 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
display.c
View File

@ -20,6 +20,8 @@
#include "version.h" #include "version.h"
#include "wrapper.h" #include "wrapper.h"
typedef unsigned int unicode_t;
struct video { struct video {
int v_flag; /* Flags */ int v_flag; /* Flags */
#if COLOR #if COLOR
@ -28,7 +30,7 @@ struct video {
int v_rfcolor; /* requested forground color */ int v_rfcolor; /* requested forground color */
int v_rbcolor; /* requested background color */ int v_rbcolor; /* requested background color */
#endif #endif
char v_text[1]; /* Screen data. */ unicode_t v_text[1]; /* Screen data. */
}; };
#define VFCHG 0x0001 /* Changed flag */ #define VFCHG 0x0001 /* Changed flag */
@ -58,7 +60,7 @@ static void updall(struct window *wp);
static int scrolls(int inserts); static int scrolls(int inserts);
static void scrscroll(int from, int to, int count); static void scrscroll(int from, int to, int count);
static int texttest(int vrow, int prow); static int texttest(int vrow, int prow);
static int endofline(char *s, int n); static int endofline(unicode_t *s, int n);
static void updext(void); static void updext(void);
static int updateline(int row, struct video *vp1, struct video *vp2); static int updateline(int row, struct video *vp1, struct video *vp2);
static void modeline(struct window *wp); static void modeline(struct window *wp);
@ -92,7 +94,7 @@ void vtinit(void)
pscreen = xmalloc(term.t_mrow * sizeof(struct video *)); pscreen = xmalloc(term.t_mrow * sizeof(struct video *));
#endif #endif
for (i = 0; i < term.t_mrow; ++i) { for (i = 0; i < term.t_mrow; ++i) {
vp = xmalloc(sizeof(struct video) + term.t_mcol); vp = xmalloc(sizeof(struct video) + term.t_mcol*4);
vp->v_flag = 0; vp->v_flag = 0;
#if COLOR #if COLOR
vp->v_rfcolor = 7; vp->v_rfcolor = 7;
@ -100,7 +102,7 @@ void vtinit(void)
#endif #endif
vscreen[i] = vp; vscreen[i] = vp;
#if MEMMAP == 0 || SCROLLCODE #if MEMMAP == 0 || SCROLLCODE
vp = xmalloc(sizeof(struct video) + term.t_mcol); vp = xmalloc(sizeof(struct video) + term.t_mcol*4);
vp->v_flag = 0; vp->v_flag = 0;
pscreen[i] = vp; pscreen[i] = vp;
#endif #endif
@ -214,7 +216,7 @@ static void vtputc(unsigned char c)
static void vteeol(void) static void vteeol(void)
{ {
/* struct video *vp; */ /* struct video *vp; */
char *vcp = vscreen[vtrow]->v_text; unicode_t *vcp = vscreen[vtrow]->v_text;
/* vp = vscreen[vtrow]; */ /* vp = vscreen[vtrow]; */
while (vtcol < term.t_ncol) while (vtcol < term.t_ncol)
@ -593,7 +595,7 @@ void upddex(void)
*/ */
void updgar(void) void updgar(void)
{ {
char *txt; unicode_t *txt;
int i, j; int i, j;
for (i = 0; i < term.t_nrow; ++i) { for (i = 0; i < term.t_nrow; ++i) {
@ -700,7 +702,7 @@ static int scrolls(int inserts)
end = endofline(vpv->v_text, cols); end = endofline(vpv->v_text, cols);
if (end == 0) if (end == 0)
target = first; /* newlines */ target = first; /* newlines */
else if (strncmp(vpp->v_text, vpv->v_text, end) == 0) else if (memcmp(vpp->v_text, vpv->v_text, 4*end) == 0)
target = first + 1; /* broken line newlines */ target = first + 1; /* broken line newlines */
else else
target = first; target = first;
@ -759,7 +761,7 @@ static int scrolls(int inserts)
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
vpp = pscreen[to + i]; vpp = pscreen[to + i];
vpv = vscreen[to + i]; vpv = vscreen[to + i];
strncpy(vpp->v_text, vpv->v_text, cols); memcpy(vpp->v_text, vpv->v_text, 4*cols);
vpp->v_flag = vpv->v_flag; /* XXX */ vpp->v_flag = vpv->v_flag; /* XXX */
if (vpp->v_flag & VFREV) { if (vpp->v_flag & VFREV) {
vpp->v_flag &= ~VFREV; vpp->v_flag &= ~VFREV;
@ -778,7 +780,7 @@ static int scrolls(int inserts)
} }
#if MEMMAP == 0 #if MEMMAP == 0
for (i = from; i < to; i++) { for (i = from; i < to; i++) {
char *txt; unicode_t *txt;
txt = pscreen[i]->v_text; txt = pscreen[i]->v_text;
for (j = 0; j < term.t_ncol; ++j) for (j = 0; j < term.t_ncol; ++j)
txt[j] = ' '; txt[j] = ' ';
@ -807,13 +809,13 @@ static int texttest(int vrow, int prow)
struct video *vpv = vscreen[vrow]; /* virtual screen image */ struct video *vpv = vscreen[vrow]; /* virtual screen image */
struct video *vpp = pscreen[prow]; /* physical screen image */ struct video *vpp = pscreen[prow]; /* physical screen image */
return !memcmp(vpv->v_text, vpp->v_text, term.t_ncol); return !memcmp(vpv->v_text, vpp->v_text, 4*term.t_ncol);
} }
/* /*
* return the index of the first blank of trailing whitespace * return the index of the first blank of trailing whitespace
*/ */
static int endofline(char *s, int n) static int endofline(unicode_t *s, int n)
{ {
int i; int i;
for (i = n - 1; i >= 0; i--) for (i = n - 1; i >= 0; i--)
@ -866,8 +868,8 @@ static void updext(void)
static int updateline(int row, struct video *vp1, struct video *vp2) static int updateline(int row, struct video *vp1, struct video *vp2)
{ {
#if SCROLLCODE #if SCROLLCODE
char *cp1; unicode_t *cp1;
char *cp2; unicode_t *cp2;
int nch; int nch;
cp1 = &vp1->v_text[0]; cp1 = &vp1->v_text[0];
@ -908,8 +910,8 @@ static int updateline(int row, struct video *vp1, struct video *vp2)
#if RAINBOW #if RAINBOW
/* UPDATELINE specific code for the DEC rainbow 100 micro */ /* UPDATELINE specific code for the DEC rainbow 100 micro */
char *cp1; unicode_t *cp1;
char *cp2; unicode_t *cp2;
int nch; int nch;
/* since we don't know how to make the rainbow do this, turn it off */ /* since we don't know how to make the rainbow do this, turn it off */
@ -930,11 +932,11 @@ static int updateline(int row, struct video *vp1, struct video *vp2)
#else #else
/* UPDATELINE code for all other versions */ /* UPDATELINE code for all other versions */
char *cp1; unicode_t *cp1;
char *cp2; unicode_t *cp2;
char *cp3; unicode_t *cp3;
char *cp4; unicode_t *cp4;
char *cp5; unicode_t *cp5;
int nbflag; /* non-blanks to the right flag? */ int nbflag; /* non-blanks to the right flag? */
int rev; /* reverse video flag */ int rev; /* reverse video flag */
int req; /* reverse video request flag */ int req; /* reverse video request flag */

35
posix.c
View File

@ -120,24 +120,25 @@ void ttclose(void)
*/ */
int ttputc(int c) int ttputc(int c)
{ {
/* unsigned char utf8[6], *p = utf8+5;
* We always represent things in 1 byte, but if we output int bytes = 1;
* in UTF-8, we may need to expand that into 2 bytes..
* if (c < 0)
* Some day we might even be able to handle UTF-8 _content_. return 0;
* *p = c;
* That day is not today. if (c > 0x7f) {
*/ int prefix = 0x40;
if (utf8_mode()) { do {
c &= 0xff; *p = 0x80 + (c & 0x3f);
if (c >= 0x80) { --p;
unsigned char first = (c >> 6) | 0xc0; bytes++;
fputc(first, stdout); prefix >>= 1;
c = (c & 0x3f) | 0x80; c >>= 6;
} } while (c > prefix);
*p = c - 2*prefix;
} }
fputc(c, stdout); fwrite(p, 1, bytes, stdout);
return TRUE; return 0;
} }
/* /*