From 90d65f6cfbdc809b51ec4d66690cd4b292a1b92a Mon Sep 17 00:00:00 2001 From: Charlie Gordon Date: Sun, 30 Mar 2008 16:10:15 +0000 Subject: [PATCH] added flag BF_UTF8 so set buffer charset to uft-8 at creation time set utf8 charset for buffers: *bufed*, *dired*, *xml-error*, *messages, *errors*, *minibuf*, *Help* remove BF_SYSTEM bit from buffers *messages*, *error* added syntax for messages not stored in *messages*: start message with ~ --- bufed.c | 2 +- buffer.c | 11 +++++++++-- dired.c | 2 +- html.c | 2 +- qe.c | 32 ++++++++++++++++++-------------- qe.h | 2 ++ 6 files changed, 32 insertions(+), 19 deletions(-) diff --git a/bufed.c b/bufed.c index e43e9e4..e58b4c2 100644 --- a/bufed.c +++ b/bufed.c @@ -173,7 +173,7 @@ static void do_list_buffers(EditState *s, int argval) /* XXX: must close this buffer when destroying window: add a special buffer flag to tell this */ - b = eb_scratch("*bufed*", BF_READONLY | BF_SYSTEM); + b = eb_scratch("*bufed*", BF_READONLY | BF_SYSTEM | BF_UTF8); width = qs->width / 5; e = insert_window_left(b, width, WF_MODELINE); diff --git a/buffer.c b/buffer.c index 170c6fa..00c27d4 100644 --- a/buffer.c +++ b/buffer.c @@ -484,8 +484,12 @@ EditBuffer *eb_new(const char *name, int flags) b->next = *pb; *pb = b; - /* CG: default charset should be selectable */ - eb_set_charset(b, &charset_8859_1); + if (flags & BF_UTF8) { + eb_set_charset(b, &charset_utf8); + } else { + /* CG: default charset should be selectable */ + eb_set_charset(b, &charset_8859_1); + } /* add mark move callback */ eb_add_callback(b, eb_offset_callback, &b->mark); @@ -890,6 +894,9 @@ void eb_set_charset(EditBuffer *b, QECharset *charset) charset_decode_close(&b->charset_state); } b->charset = charset; + b->flags &= ~BF_UTF8; + if (charset == &charset_utf8) + b->flags |= BF_UTF8; charset_decode_init(&b->charset_state, charset); } diff --git a/dired.c b/dired.c index ad41cb3..36a6e4a 100644 --- a/dired.c +++ b/dired.c @@ -532,7 +532,7 @@ void do_dired(EditState *s) */ /* Should reuse previous dired buffer for same filespec */ - b = eb_scratch("*dired*", BF_READONLY | BF_SYSTEM); + b = eb_scratch("*dired*", BF_READONLY | BF_SYSTEM | BF_UTF8); /* Remember target as current current buffer filename */ pstrcpy(target, sizeof(target), s->b->filename); diff --git a/html.c b/html.c index 0c525c9..a18f267 100644 --- a/html.c +++ b/html.c @@ -100,7 +100,7 @@ void css_error(const char *filename, int line_num, const char *msg) { EditBuffer *b; - b = eb_find_new(HTML_ERROR_BUFFER, BF_READONLY); + b = eb_find_new(HTML_ERROR_BUFFER, BF_READONLY | BF_UTF8); if (!b) return; b->flags &= ~BF_READONLY; diff --git a/qe.c b/qe.c index a3760ae..2be7658 100644 --- a/qe.c +++ b/qe.c @@ -1447,7 +1447,7 @@ EditBuffer *new_yank_buffer(QEmacsState *qs) } } snprintf(bufname, sizeof(bufname), "*kill-%d*", qs->yank_current + 1); - b = eb_new(bufname, BF_SYSTEM); + b = eb_new(bufname, 0); qs->yank_buffers[qs->yank_current] = b; return b; } @@ -1813,7 +1813,8 @@ void do_convert_buffer_file_coding_system(EditState *s, if (!charset) return; - b1 = eb_new("*tmp*", BF_SYSTEM); + b1 = eb_new("*tmp*", 0); + eb_set_charset(b1, charset); /* well, not very fast, but simple */ b = s->b; @@ -1823,12 +1824,12 @@ void do_convert_buffer_file_coding_system(EditState *s, eb_write(b1, b1->total_size, buf, len); } - /* replace current buffer with convertion */ + /* replace current buffer with conversion */ eb_delete(b, 0, b->total_size); + eb_set_charset(b, charset); eb_insert_buffer(b, 0, b1, 0, b1->total_size); eb_free(b1); - eb_set_charset(b, charset); } void do_toggle_bidir(EditState *s) @@ -4227,7 +4228,7 @@ static void qe_key_process(int key) c->buf[len-1] = ' '; pstrcat(c->buf, sizeof(c->buf), buf1); pstrcat(c->buf, sizeof(c->buf), "-"); - put_status(s, "%s", c->buf); + put_status(s, "~%s", c->buf); dpy_flush(&global_screen); } } @@ -4278,7 +4279,7 @@ static void eb_format_message(QEmacsState *qs, const char *bufname, qs->ec.function); len = strlen(header); } - eb = eb_find_new(bufname, BF_SYSTEM); + eb = eb_find_new(bufname, BF_UTF8); if (eb) { eb_printf(eb, "%s%s\n", header, message); } else { @@ -4312,18 +4313,21 @@ void put_status(__unused__ EditState *s, const char *fmt, ...) vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); + p = buf; + if (*p == '~') + p++; + if (!qs->screen->dpy.dpy_probe) { - eb_format_message(qs, "*errors*", buf); + eb_format_message(qs, "*errors*", p); } else { - if (!strequal(buf, qs->status_shadow)) { + if (!strequal(p, qs->status_shadow)) { print_at_byte(qs->screen, 0, qs->screen->height - qs->status_height, qs->screen->width, qs->status_height, - buf, QE_STYLE_STATUS); - strcpy(qs->status_shadow, buf); - p = buf; + p, QE_STYLE_STATUS); + strcpy(qs->status_shadow, p); skip_spaces(&p); - if (*p) + if (*p && *buf != '~') eb_format_message(qs, "*messages*", buf); } } @@ -4939,7 +4943,7 @@ void minibuffer_edit(const char *input, const char *prompt, minibuffer_cb = cb; minibuffer_opaque = opaque; - b = eb_new("*minibuf*", BF_SYSTEM | BF_SAVELOG); + b = eb_new("*minibuf*", BF_SYSTEM | BF_SAVELOG | BF_UTF8); s = edit_new(b, 0, qs->screen->height - qs->status_height, qs->screen->width, qs->status_height, 0); @@ -6456,7 +6460,7 @@ static EditBuffer *new_help_buffer(int *show_ptr) if (b) { eb_delete(b, 0, b->total_size); } else { - b = eb_new("*Help*", BF_SYSTEM); + b = eb_new("*Help*", BF_UTF8); *show_ptr = 1; } return b; diff --git a/qe.h b/qe.h index 1797a4c..af50f6a 100644 --- a/qe.h +++ b/qe.h @@ -681,6 +681,8 @@ typedef struct EditBufferCallbackList { #define BF_LOADING 0x0010 /* buffer is being loaded */ #define BF_SAVING 0x0020 /* buffer is being saved */ #define BF_DIRED 0x0100 /* buffer is interactive dired */ +#define BF_UTF8 0x0200 /* buffer charset is utf-8 */ +#define BF_RAW 0x0400 /* buffer charset is raw (same as latin1) */ struct EditBuffer { Page *page_table;