I refuse to surrender to SFs attachment stripping just yet...
diff --git a/src/command.h b/src/command.h
index 4b40713..f7d91e3 100644
--- a/src/command.h
+++ b/src/command.h
@@ -269,7 +269,7 @@ if (test) PrivateModes |= (bit); else PrivateModes &= ~(bit);} while (0)
#define CHARS_READ() (cmdbuf_ptr < cmdbuf_endp)
#define CHARS_BUFFERED() (count != CMD_BUF_SIZE)
#define RETURN_CHAR() do { \
- char c = *cmdbuf_ptr++; \
+ unsigned char c = *cmdbuf_ptr++; \
refreshed = 0; \
if (c < 32) D_VT(("RETURN_CHAR(): \'%s\' (%d 0x%02x %03o)\n", get_ctrl_char_name(c), c, c, c)); \
else D_VT(("RETURN_CHAR(): \'%c\' (%d 0x%02x %03o)\n", c, c, c, c)); \
diff --git a/src/screen.c b/src/screen.c
index 605f5cf..2835876 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -29,6 +29,7 @@ static const char cvs_ident[] = "$Id: screen.c 34573 2008-05-14 22:26:36Z mej $"
#ifdef HAVE_X11_XMU_ATOMS_H
# include <X11/Xmu/Atoms.h>
#endif
+#include <iconv.h>
#include "buttons.h"
#include "command.h"
@@ -112,9 +113,10 @@ blank_line(text_t *et, rend_t *er, int width, rend_t efs)
register unsigned int i = width;
rend_t *r = er, fs = efs;
- MEMSET(et, ' ', i);
- for (; i--;)
+ for (; i--;) {
+ *et++ = ' ';
*r++ = fs;
+ }
}
/* Create a new row in the screen buffer and initialize it. */
@@ -124,15 +126,18 @@ blank_screen_mem(text_t **tp, rend_t **rp, int row, rend_t efs)
{
register unsigned int i = TERM_WINDOW_GET_REPORTED_COLS();
rend_t *r, fs = efs;
+ text_t *et;
if (tp[row] == NULL) {
tp[row] = MALLOC(sizeof(text_t) * (TERM_WINDOW_GET_REPORTED_COLS() + 1));
rp[row] = MALLOC(sizeof(rend_t) * TERM_WINDOW_GET_REPORTED_COLS());
}
- MEMSET(tp[row], ' ', i);
tp[row][i] = 0;
- for (r = rp[row]; i--;)
+ et = tp[row];
+ for (r = rp[row]; i--;) {
+ *et++ = ' ';
*r++ = fs;
+ }
}
void
@@ -690,6 +695,39 @@ scroll_text(int row1, int row2, int count, int spec)
return count;
}
+#undef FIXME_BLOCK
+#define FIXME_BLOCK 1
+
+#define UTF8_DEBUG 0
+
+static text_t *
+mb2text(const char *str, int *len)
+{
+ static iconv_t ih = (iconv_t)-1;
+ text_t *tstr;
+ char *pi, *po;
+ int olen, maxolen;
+
+ maxolen = *len * sizeof(text_t);
+ tstr = MALLOC(maxolen);
+ pi = (char*)str;
+ po = (char*)tstr;
+ if (ih == (iconv_t)-1)
+ ih = iconv_open("UCS-2", "UTF-8");
+ olen = maxolen;
+ iconv(ih, &pi, len, &po, &olen);
+ olen = (maxolen - olen) / 2;
+#if UTF8_DEBUG
+ int i;
+ printf("TO UCS2:");
+ for (i = 0; i < olen; i++)
+ printf(" %04x", tstr[i]);
+ printf(" UCS2 len=%d\n", olen);
+#endif
+ *len = olen;
+ return tstr;
+}
+
/*
* Add text given in <str> of length <len> to screen struct
*/
@@ -697,12 +735,12 @@ void
scr_add_lines(const unsigned char *str, int nlines, int len)
{
/* char c; */
- register char c;
+ register text_t c;
/* int i, j, row, last_col; */
int last_col;
register int i, j, row;
- text_t *stp;
+ text_t *stp, *tstr;
rend_t *srp;
row_col_t beg, end;
@@ -745,8 +783,11 @@ scr_add_lines(const unsigned char *str, int nlines, int len)
chstat = WBYTE;
#endif
+ /* Convert incoming (mb) string to UCS-2 */
+ tstr = mb2text(str, &len);
+
for (i = 0; i < len;) {
- c = str[i++];
+ c = tstr[i++];
#ifdef MULTI_CHARSET
if ((encoding_method != LATIN1) && (chstat == WBYTE)) {
rstyle |= RS_multiMask; /* multibyte 2nd byte */
@@ -829,6 +870,9 @@ scr_add_lines(const unsigned char *str, int nlines, int len)
screen.flags &= ~Screen_WrapNext;
}
}
+
+ FREE(tstr);
+
LOWER_BOUND(stp[last_col], screen.col);
if (screen.col == 0) {
end.col = last_col - 1;
@@ -1629,6 +1673,50 @@ scr_multi2(void)
}
#endif /* MULTI_CHARSET */
+static int
+scr_draw_string(Display *dpy, Drawable draw, GC gc, int x, int y, text_t *str, int len)
+{
+ unsigned short buf[2048];
+ int i;
+
+ if (len > 2048)
+ len = 2048;
+#if UTF8_DEBUG
+ for (i = 0; i < len; i++)
+ {
+ buf[i] = (str[i] >> 8) | (str[i] << 8);
+ printf(" %04x", buf[i]);
+ }
+ printf("\n");
+#else
+ for (i = 0; i < len; i++)
+ buf[i] = (str[i] >> 8) | (str[i] << 8);
+#endif
+ XDrawString16(dpy, draw, gc, x, y, (XChar2b*)buf, len);
+}
+
+static int
+scr_draw_image_string(Display *dpy, Drawable draw, GC gc, int x, int y, text_t *str, int len)
+{
+ unsigned short buf[2048];
+ int i;
+
+ if (len > 2048)
+ len = 2048;
+#if UTF8_DEBUG
+ for (i = 0; i < len; i++)
+ {
+ buf[i] = (str[i] >> 8) | (str[i] << 8);
+ printf(" %04x", buf[i]);
+ }
+ printf("\n");
+#else
+ for (i = 0; i < len; i++)
+ buf[i] = (str[i] >> 8) | (str[i] << 8);
+#endif
+ XDrawImageString16(dpy, draw, gc, x, y, (XChar2b*)buf, len);
+}
+
/*
* Refresh the screen
* drawn_text/drawn_rend contain the screen information before the update.
@@ -1661,8 +1749,8 @@ scr_refresh(int type)
rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
XGCValues gcvalue; /* Graphics Context values */
- char buf[MAX_COLS + 1];
- register char *buffer = buf;
+ text_t buf[MAX_COLS + 1];
+ register text_t *buffer = buf;
Pixmap pmap = images[image_bg].current->pmap->pixmap;
int (*draw_string) (), (*draw_image_string) ();
register int low_x = 99999, low_y = 99999, high_x = 0, high_y = 0;
@@ -1709,8 +1797,8 @@ scr_refresh(int type)
XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
#if FIXME_BLOCK
- draw_string = XmbDrawString;
- draw_image_string = XmbDrawImageString;
+ draw_string = scr_draw_string;
+ draw_image_string = scr_draw_image_string;
#else
draw_string = XDrawString;
draw_image_string = XDrawImageString;
@@ -1800,8 +1888,8 @@ scr_refresh(int type)
wbyte = 1;
XSetFont(Xdisplay, TermWin.gc, TermWin.mfont->fid);
# if FIXME_BLOCK
- draw_string = XmbDrawString;
- draw_image_string = XmbDrawImageString;
+ draw_string = scr_draw_string;
+ draw_image_string = scr_draw_image_string;
# else
draw_string = XDrawString16;
draw_image_string = XDrawImageString16;
@@ -1843,8 +1931,8 @@ scr_refresh(int type)
wbyte = 0;
XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
# if FIXME_BLOCK
- draw_string = XmbDrawString;
- draw_image_string = XmbDrawImageString;
+ draw_string = scr_draw_string;
+ draw_image_string = scr_draw_image_string;
# else
draw_string = XDrawString;
draw_image_string = XDrawImageString;
@@ -2225,7 +2313,7 @@ scr_strmatch(unsigned long row, unsigned long col, const char *str)
void
scr_search_scrollback(char *str)
{
- unsigned char *c;
+ text_t *c;
char *s;
static char *last_str = NULL;
unsigned int *i;
diff --git a/src/screen.h b/src/screen.h
index e9281f2..2e3e7fb 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -159,7 +159,7 @@ enum {
many lines back into the scrollback buffer the currently-visible data
is. (0 means we're at the bottom and not in scrollback.)
*/
-typedef unsigned char text_t;
+typedef unsigned short text_t;
typedef unsigned int rend_t;
typedef enum {
SELECTION_CLEAR = 0,
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
