X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=example%2Fmedit.c;h=63701cae3a03c6a50de22d15e164690580097173;hb=25f86deb0d70cf889849019fa18adfc76573ee22;hp=d8d25d2d177804bf8d9f52193170255a0f9f0ce2;hpb=a38cb62ffc29ec9fb74628e8850ac801aef9f548;p=m17n%2Fm17n-lib.git diff --git a/example/medit.c b/example/medit.c index d8d25d2..63701ca 100644 --- a/example/medit.c +++ b/example/medit.c @@ -21,13 +21,13 @@ 02111-1307, USA. */ /***en - @enpage medit edit multilingual text + @enpage m17n-edit edit multilingual text - @section medit-synopsis SYNOPSIS + @section m17n-edit-synopsis SYNOPSIS - medit [ XT-OPTION ...] [ OPTION ... ] FILE + m17n-edit [ XT-OPTION ...] [ OPTION ... ] FILE - @section medit-description DESCRIPTION + @section m17n-edit-description DESCRIPTION Display FILE on a window and allow users to edit it. @@ -48,18 +48,18 @@ This program is to demonstrate how to use the m17n GUI API. - Although medit directly uses the GUI API, the API is mainly for - toolkit libraries or to implement XOM (X Outout Method), not for - direct use from application programs. + Although m17n-edit directly uses the GUI API, the API is mainly + for toolkit libraries or to implement XOM (X Outout Method), not + for direct use from application programs. */ /***ja - @japage medit ¿¸À¸ì¥Æ¥­¥¹¥È¤ÎÊÔ½¸ + @japage m17n-edit ¿¸À¸ì¥Æ¥­¥¹¥È¤ÎÊÔ½¸ - @section medit-synopsis SYNOPSIS + @section m17n-edit-synopsis SYNOPSIS - medit [ XT-OPTION ...] [ OPTION ... ] FILE + m17n-edit [ XT-OPTION ...] [ OPTION ... ] FILE - @section medit-description DESCRIPTION + @section m17n-edit-description DESCRIPTION FILE ¤ò¥¦¥£¥ó¥É¥¦¤Ëɽ¼¨¤·¡¢¥æ¡¼¥¶¤¬ÊÔ½¸¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¡£ @@ -79,10 +79,10 @@ - ¤³¤Î¥×¥í¥°¥é¥à¤Ï m17n GUI API ¤Î»È¤¤Êý¤ò¼¨¤¹¤â¤Î¤Ç¤¢¤ë¡£medit ¤Ïľ - ÀÜ GUI API ¤ò»È¤Ã¤Æ¤¤¤ë¤¬¡¢¤³¤Î API ¤Ï¼ç¤Ë¥Ä¡¼¥ë¥­¥Ã¥È¥é¥¤¥Ö¥é¥ê¤ä - XOM (X Outout Method) ¤Î¼ÂÁõÍѤǤ¢¤ê¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥×¥í¥°¥é ¥à - ¤«¤é¤ÎľÀܤÎÍøÍѤò°Õ¿Þ¤·¤Æ¤¤¤Ê¤¤¡£ + ¤³¤Î¥×¥í¥°¥é¥à¤Ï m17n GUI API ¤Î»È¤¤Êý¤ò¼¨¤¹¤â¤Î¤Ç¤¢¤ë¡£m17n-edit + ¤ÏľÀÜ GUI API ¤ò»È¤Ã¤Æ¤¤¤ë¤¬¡¢¤³¤Î API ¤Ï¼ç¤Ë¥Ä¡¼¥ë¥­¥Ã¥È¥é¥¤¥Ö¥é + ¥ê¤äXOM (X Outout Method) ¤Î¼ÂÁõÍѤǤ¢¤ê¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥×¥í¥°¥é + ¥à¤«¤é¤ÎľÀܤÎÍøÍѤò°Õ¿Þ¤·¤Æ¤¤¤Ê¤¤¡£ */ #ifndef FOR_DOXYGEN @@ -95,12 +95,22 @@ #include #include #include +#include #include #include #include #include #include + +#include +#include +#include + +#include + +#ifdef HAVE_X11_XAW_COMMAND_H + #include #include #include @@ -112,11 +122,7 @@ #include #include -#include -#include -#include - -#define VERSION "1.0.1" +#define VERSION "1.2.0" /* Global variables. */ @@ -172,6 +178,8 @@ int nchars; /* == mtext_len (mt) */ MDrawControl control, input_status_control; MTextProperty *selection; +MSymbol Mword; + MFace *face_default; MFace *face_xxx_large; MFace *face_box; @@ -334,8 +342,8 @@ update_top (int pos) top.from = info.line_from; top.to = info.line_to; top.y0 = 0; - top.y1 = info.this.height; - top.ascent = - info.this.y; + top.y1 = info.metrics.height; + top.ascent = - info.metrics.y; } @@ -382,21 +390,21 @@ redraw (int y0, int y1, int clear, int scroll_bar) from = line->from; y = line->y0; - info.this.height = line->y1 - y; - info.this.y = - line->ascent; + info.metrics.height = line->y1 - y; + info.metrics.y = - line->ascent; info.line_to = line->to; - while (from < nchars && y + info.this.height <= y0) + while (from < nchars && y + info.metrics.height <= y0) { - y += info.this.height; + y += info.metrics.height; from = info.line_to; GLYPH_INFO (from, from, info); } - y0 = y - info.this.y; + y0 = y - info.metrics.y; to = from; while (to < nchars && y < y1) { GLYPH_INFO (to, to, info); - y += info.this.height; + y += info.metrics.height; to = info.line_to; } if (to == nchars) @@ -408,10 +416,10 @@ redraw (int y0, int y1, int clear, int scroll_bar) while (to < nchars) { GLYPH_INFO (to, to, info); - if (y + info.this.height >= win_height) + if (y + info.metrics.height >= win_height) break; to = info.line_to; - y += info.this.height; + y += info.metrics.height; } update_scroll_bar (top.from, to); } @@ -425,16 +433,19 @@ set_input_method_spot () int x = cursor.x + (control.orientation_reversed ? win_width : 0); int pos = cursor.from > 0 ? cursor.from - 1 : 0; MFace *faces[256]; - int n = mtext_get_prop_values (mt, pos, Mface, (void **) faces, 256); + int n = 0; int size = 0, ratio = 0, i; - for (i = n - 1; i >= 0; i--) - { - if (! size) - size = (int) mface_get_prop (faces[i], Msize); - if (! ratio) - ratio = (int) mface_get_prop (faces[i], Mratio); - } + if (nchars > 0) + n = mtext_get_prop_values (mt, pos, Mface, (void **) faces, 256); + if (n > 0) + for (i = n - 1; i >= 0; i--) + { + if (! size) + size = (int) mface_get_prop (faces[i], Msize); + if (! ratio) + ratio = (int) mface_get_prop (faces[i], Mratio); + } if (! size) size = default_font_size; if (ratio) @@ -458,12 +469,12 @@ redraw_cursor (int clear) MDrawMetric rect; int y0 = cur.y0, y1 = cur.y1; - if (beg != cur.from) + if (beg < cur.from) { TEXT_EXTENTS (beg, cur.from, rect); y0 -= rect.height; } - if (end != cur.to) + if (end > cur.to) { TEXT_EXTENTS (cur.to, end, rect); y1 += rect.height; @@ -478,7 +489,7 @@ redraw_cursor (int clear) if (control.orientation_reversed) x += win_width - cursor.logical_width; - CLEAR_AREA (x, cur.y0, cursor.logical_width, cursor.this.height); + CLEAR_AREA (x, cur.y0, cursor.logical_width, cursor.metrics.height); } DRAW_TEXT (cursor.x, cur.y0 + cur.ascent, cursor.from, cursor.to); } @@ -487,7 +498,7 @@ redraw_cursor (int clear) /* Update the information about the location of cursor to the position $POS. If $FULL is nonzero, update the information fully only from - the information about the top line. Otherwise, truct the current + the information about the top line. Otherwise, trust the current information in the structure $CUR. */ void update_cursor (int pos, int full) @@ -498,7 +509,7 @@ update_cursor (int pos, int full) { /* CUR is inaccurate. We can trust only TOP. */ GLYPH_INFO (top.from, pos, cursor); - cur.y0 = top.ascent + cursor.y + cursor.this.y; + cur.y0 = top.ascent + cursor.y + cursor.metrics.y; } else if (pos < cur.from) { @@ -506,7 +517,7 @@ update_cursor (int pos, int full) TEXT_EXTENTS (from, cur.from, rect); GLYPH_INFO (from, pos, cursor); - cur.y0 -= (rect.height + rect.y) - (cursor.y + cursor.this.y); + cur.y0 -= (rect.height + rect.y) - (cursor.y + cursor.metrics.y); } else if (pos < cur.to) { @@ -515,13 +526,13 @@ update_cursor (int pos, int full) else { GLYPH_INFO (cur.from, pos, cursor); - cur.y0 += cur.ascent + cursor.y + cursor.this.y; + cur.y0 += cur.ascent + cursor.y + cursor.metrics.y; } cur.from = cursor.line_from; cur.to = cursor.line_to; - cur.y1 = cur.y0 + cursor.this.height; - cur.ascent = - cursor.this.y; + cur.y1 = cur.y0 + cursor.metrics.height; + cur.ascent = - cursor.metrics.y; } @@ -547,34 +558,28 @@ update_selection () sel_start.ascent = - rect.y; GLYPH_INFO (pos, from, info); if (pos < info.line_from) - sel_start.y0 += - rect.y + info.y + info.this.y; + sel_start.y0 += - rect.y + info.y + info.metrics.y; } else { GLYPH_INFO (top.from, from, info); - sel_start.y0 = top.ascent + info.y + info.this.y; + sel_start.y0 = top.ascent + info.y + info.metrics.y; } - sel_start.ascent = -info.this.y; - sel_start.y1 = sel_start.y0 + info.this.height; + sel_start.ascent = -info.metrics.y; + sel_start.y1 = sel_start.y0 + info.metrics.height; sel_start.from = info.line_from; sel_start.to = info.line_to; if (to <= sel_start.to) { sel_end = sel_start; - if (to >= sel_end.to) - { - GLYPH_INFO (sel_start.from, to, info); - sel_end.y1 = sel_end.y0 + info.y + info.this.height; - sel_end.to = info.line_to; - } } else { GLYPH_INFO (sel_start.from, to, info); - sel_end.y0 = sel_start.y0 + sel_start.ascent + info.y + info.this.y; - sel_end.y1 = sel_end.y0 + info.this.height; - sel_end.ascent = - info.this.y; + sel_end.y0 = sel_start.y0 + sel_start.ascent + info.y + info.metrics.y; + sel_end.y1 = sel_end.y0 + info.metrics.height; + sel_end.ascent = - info.metrics.y; sel_end.from = info.line_from; sel_end.to = info.line_to; } @@ -741,70 +746,65 @@ show_cursor (XtPointer client_data) if (current_input_context) set_input_method_spot (); - { - int pos = (SELECTEDP () ? mtext_property_start (selection) - : cursor.from > 0 ? cursor.from - 1 - : cursor.from); - MFace *face = mface (); - MTextProperty *props[256]; - int n = mtext_get_properties (mt, pos, Mface, props, 256); - int i; - char buf[256], *p = buf; - MSymbol sym; - - buf[0] = '\0'; - if (cursor.font) - { - int size = (int) mfont_get_prop (cursor.font, Msize); - MSymbol family = mfont_get_prop (cursor.font, Mfamily); - MSymbol weight = mfont_get_prop (cursor.font, Mweight); - MSymbol style = mfont_get_prop (cursor.font, Mstyle); - MSymbol registry = mfont_get_prop (cursor.font, Mregistry); - - sprintf (p, "%dpt", size / 10), p += strlen (p); - if (family) - strcat (p, ","), strcat (p, msymbol_name (family)), p += strlen (p); - if (weight) - strcat (p, ","), strcat (p, msymbol_name (weight)), p += strlen (p); - if (style) - strcat (p, ","), strcat (p, msymbol_name (style)), p += strlen (p); - if (registry) - strcat (p, ","), strcat (p, msymbol_name (registry)), p += strlen (p); - p += strlen (p); - } + if (nchars > 0) + { + int pos = (SELECTEDP () ? mtext_property_start (selection) + : cursor.from > 0 ? cursor.from - 1 + : cursor.from); + MFace *face = mface (); + MTextProperty *props[256]; + int n = mtext_get_properties (mt, pos, Mface, props, 256); + int i; + char buf[256], *p = buf; + MSymbol sym; - mface_merge (face, face_default); - for (i = 0; i < n; i++) - if (props[i] != selection) - mface_merge (face, (MFace *) mtext_property_value (props[i])); - sym = (MSymbol) mface_get_prop (face, Mforeground); - if (sym != Mnil) - strcat (p, ","), strcat (p, msymbol_name (sym)), p += strlen (p); - if ((MSymbol) mface_get_prop (face, Mvideomode) == Mreverse) - strcat (p, ",rev"), p += strlen (p); - hline = mface_get_prop (face, Mhline); - if (hline && hline->width > 0) - strcat (p, ",ul"), p += strlen (p); - box = mface_get_prop (face, Mbox); - if (box && box->width > 0) - strcat (p, ",box"), p += strlen (p); - m17n_object_unref (face); + buf[0] = '\0'; + if (cursor.font) + { + int size = (int) mfont_get_prop (cursor.font, Msize); + MSymbol family = mfont_get_prop (cursor.font, Mfamily); + MSymbol weight = mfont_get_prop (cursor.font, Mweight); + MSymbol style = mfont_get_prop (cursor.font, Mstyle); + MSymbol registry = mfont_get_prop (cursor.font, Mregistry); + + sprintf (p, "%dpt", size / 10), p += strlen (p); + if (family) + strcat (p, ","), strcat (p, msymbol_name (family)), p += strlen (p); + if (weight) + strcat (p, ","), strcat (p, msymbol_name (weight)), p += strlen (p); + if (style) + strcat (p, ","), strcat (p, msymbol_name (style)), p += strlen (p); + if (registry) + strcat (p, ","), strcat (p, msymbol_name (registry)), p += strlen (p); + p += strlen (p); + } - XtSetArg (arg[0], XtNborderWidth, 1); - XtSetArg (arg[1], XtNlabel, buf); - XtSetValues (CurFaceWidget, arg, 2); - } + mface_merge (face, face_default); + for (i = 0; i < n; i++) + if (props[i] != selection) + mface_merge (face, (MFace *) mtext_property_value (props[i])); + sym = (MSymbol) mface_get_prop (face, Mforeground); + if (sym != Mnil) + strcat (p, ","), strcat (p, msymbol_name (sym)), p += strlen (p); + if ((MSymbol) mface_get_prop (face, Mvideomode) == Mreverse) + strcat (p, ",rev"), p += strlen (p); + hline = mface_get_prop (face, Mhline); + if (hline && hline->width > 0) + strcat (p, ",ul"), p += strlen (p); + box = mface_get_prop (face, Mbox); + if (box && box->width > 0) + strcat (p, ",box"), p += strlen (p); + m17n_object_unref (face); + + XtSetArg (arg[0], XtNborderWidth, 1); + XtSetArg (arg[1], XtNlabel, buf); + XtSetValues (CurFaceWidget, arg, 2); + } if (control.cursor_pos < nchars) { - MSymbol sym = Mnil; + MSymbol sym = mtext_get_prop (mt, control.cursor_pos, Mlanguage); - if (control.cursor_pos > 0 - && mtext_ref_char (mt, control.cursor_pos - 1) != '\n') - sym = mtext_get_prop (mt, control.cursor_pos - 1, Mlanguage); - if (sym == Mnil) - sym = mtext_get_prop (mt, control.cursor_pos, Mlanguage); - if (sym == Mnil) { XtSetArg (arg[0], XtNborderWidth, 0); @@ -904,8 +904,9 @@ delete_char (int n) { MDrawMetric rect; MDrawGlyphInfo info; - int old_y1, new_y1; + int y0, old_y1, new_y1; int from, to; + int line_from = cursor.line_from; if (n > 0) from = cursor.from, to = from + n; @@ -939,11 +940,15 @@ delete_char (int n) /* Now delete a character. */ mtext_del (mt, from, to); - nchars--; + nchars -= to - from; if (from >= top.from && from < top.to) update_top (top.from); update_cursor (from, 1); + y0 = cur.y0; + if (line_from != cursor.line_from) + y0 -= 1; + TEXT_EXTENTS (cur.from, bol (to, 1), rect); new_y1 = cur.y0 + rect.height; @@ -958,6 +963,7 @@ insert_chars (MText *newtext) int n = mtext_len (newtext); MDrawMetric rect; int y0, old_y1, new_y1; + int line_from; if (SELECTEDP ()) { @@ -968,9 +974,15 @@ insert_chars (MText *newtext) } y0 = cur.y0; + if (cursor.line_from > 0 + && mtext_ref_char (mt, cursor.line_from - 1) != '\n') + y0 -= control.min_line_descent; + TEXT_EXTENTS (cur.from, bol (cur.to - 1, 1), rect); old_y1 = y0 + rect.height; + line_from = cursor.line_from; + /* Now insert chars. */ mtext_ins (mt, cursor.from, newtext); nchars += n; @@ -986,6 +998,57 @@ insert_chars (MText *newtext) } +int +word_constituent_p (int c) +{ + MSymbol category = (MSymbol) mchar_get_prop (c, Mcategory); + char *name = category != Mnil ? msymbol_name (category) : NULL; + + return (name && (name[0] == 'L' || name[0] == 'M')); +} + + +void +forward_word () +{ + int pos = cursor.from; + + while (pos < nchars && ! word_constituent_p (mtext_ref_char (mt, pos))) + pos++; + if (pos < nchars) + { + MTextProperty *prop = mtext_get_property (mt, pos, Mword); + + if (prop) + pos = mtext_property_end (prop); + else + while (pos < nchars && word_constituent_p (mtext_ref_char (mt, pos))) + pos++; + } + update_cursor (pos, 0); +} + +void +backward_word () +{ + int pos = cursor.from; + + while (pos > 0 && ! word_constituent_p (mtext_ref_char (mt, pos - 1))) + pos--; + if (pos > 0) + { + MTextProperty *prop = mtext_get_property (mt, pos - 1, Mword); + + if (prop) + pos = mtext_property_start (prop); + else + while (pos > 0 && word_constituent_p (mtext_ref_char (mt, pos - 1))) + pos--; + } + update_cursor (pos, 0); +} + + /* Convert the currently selected text to UTF8-STRING or COMPOUND-TEXT. It is called when someone requests the current value of the selection. */ @@ -999,6 +1062,7 @@ covert_selection (Widget w, Atom *selection_atom, int from = mtext_property_start (selection); int to = mtext_property_end (selection); MSymbol coding; + int len; mtext_copy (this_mt, 0, mt, from, to); if (*target == XA_TEXT) @@ -1011,11 +1075,16 @@ covert_selection (Widget w, Atom *selection_atom, *return_type = XA_COMPOUND_TEXT; #endif } + else if (*target == XA_UTF8_STRING) + { + coding = Mcoding_utf_8; + *return_type = XA_UTF8_STRING; + } else if (*target == XA_STRING) { - int len = to - from; int i; + len = to - from; for (i = 0; i < len; i++) if (mtext_ref_char (this_mt, i) >= 0x100) /* Can't encode in XA_STRING */ @@ -1028,10 +1097,14 @@ covert_selection (Widget w, Atom *selection_atom, coding = Mcoding_compound_text; *return_type = XA_COMPOUND_TEXT; } - *length = mconv_encode_buffer (coding, this_mt, buf, 4096); + else + return False; + + len = mconv_encode_buffer (coding, this_mt, buf, 4096); m17n_object_unref (this_mt); - if (*length == 0) + if (len < 0) return False; + *length = len; *value = (XtPointer) buf; *format = 8; return True; @@ -1070,6 +1143,12 @@ get_selection (Widget w, XtPointer cliend_data, Atom *selection, Atom *type, goto err; this_mt = mconv_decode_buffer (coding, (unsigned char *) value, *length); + if (! this_mt && *type != XA_UTF8_STRING) + { + XtGetSelectionValue (w, XA_PRIMARY, XA_UTF8_STRING, get_selection, NULL, + CurrentTime); + goto err; + } if (this_mt) { hide_cursor (); @@ -1113,6 +1192,19 @@ ExposeProc (Widget w, XEvent *event, String *str, Cardinal *num) update_top (0); update_cursor (0, 1); redraw (0, win_height, 0, 1); + if (current_input_method >= 0) + { + int idx = current_input_method; + + current_input_method = -1; + input_method_table[idx].im = + minput_open_im (input_method_table[idx].language, + input_method_table[idx].name, NULL); + if (input_method_table[idx].im) + select_input_method (idx); + else + input_method_table[idx].available = -1; + } show_cursor (NULL); } else @@ -1157,6 +1249,20 @@ ButtonProc (Widget w, XEvent *event, String *str, Cardinal *num) redraw (sel_start.y0, sel_end.y1, 1, 0); } hide_cursor (); + if (current_input_context) + { + MText *produced = mtext (); + + minput_reset_ic (current_input_context); + minput_lookup (current_input_context, Mnil, NULL, produced); + if (mtext_len (produced) > 0) + { + insert_chars (produced); + if (pos >= cursor.from) + pos += mtext_len (produced); + } + m17n_object_unref (produced); + } update_cursor (pos, 0); } @@ -1319,9 +1425,9 @@ ScrollProc (Widget w, XtPointer client_data, XtPointer position) { pos = bol (from - 1, 0); GLYPH_INFO (pos, from - 1, info); - if (height + info.this.height > win_height) + if (height + info.metrics.height > win_height) break; - height += info.this.height; + height += info.metrics.height; from = info.line_from; } if (cursor_pos >= top.to) @@ -1331,9 +1437,9 @@ ScrollProc (Widget w, XtPointer client_data, XtPointer position) while (cursor_pos < nchars) { GLYPH_INFO (pos, pos, info); - if (height + info.this.height > win_height) + if (height + info.metrics.height > win_height) break; - height += info.this.height; + height += info.metrics.height; cursor_pos = pos; pos = info.line_to; } @@ -1347,10 +1453,10 @@ ScrollProc (Widget w, XtPointer client_data, XtPointer position) while (from < nchars) { GLYPH_INFO (from, from, info); - if (height + info.this.height > win_height + if (height + info.metrics.height > win_height || info.line_to >= nchars) break; - height += info.this.height; + height += info.metrics.height; from = info.line_to; } if (from == nchars) @@ -1548,6 +1654,22 @@ KeyProc (Widget w, XEvent *event, String *str, Cardinal *num) ScrollProc (w, NULL, (XtPointer) -1); break; + case XK_b: + if (key_event->state >= Mod1Mask) + { + lose_selection (NULL, NULL); + backward_word (); + break; + } + + case XK_f: + if (key_event->state >= Mod1Mask) + { + lose_selection (NULL, NULL); + forward_word (); + break; + } + default: if (ret > 0) { @@ -1565,7 +1687,8 @@ KeyProc (Widget w, XEvent *event, String *str, Cardinal *num) { MText *temp = mtext (); - mtext_cat_char (temp, buf[0] == '\r' ? '\n' : buf[0]); + mtext_cat_char (temp, buf[0] == '\r' ? '\n' + : ((unsigned char *) buf)[0]); if (current_input_context) mtext_put_prop (temp, 0, 1, Mlanguage, current_input_context->im->language); @@ -1606,7 +1729,7 @@ SaveProc (Widget w, XtPointer client_data, XtPointer call_data) mtext_detach_property (selection); } - mconv_encode_stream (Mcoding_utf_8, mt, fp); + mconv_encode_stream (Mcoding_utf_8_full, mt, fp); fclose (fp); if (from >= 0) select_region (from, to); @@ -1657,7 +1780,7 @@ read_file () if (! fp) FATAL_ERROR ("Can't read \"%s\"!\n", filename); - mt = mconv_decode_stream (Mcoding_utf_8, fp); + mt = mconv_decode_stream (Mcoding_utf_8_full, fp); fclose (fp); if (! mt) FATAL_ERROR ("Can't decode \"%s\" by UTF-8!\n", filename); @@ -1693,8 +1816,6 @@ BidiProc (Widget w, XtPointer client_data, XtPointer call_data) redraw (0, win_height, 1, 0); } -extern int line_break (MText *mt, int pos, int from, int to, int line, int y); - void LineBreakProc (Widget w, XtPointer client_data, XtPointer call_data) { @@ -1706,7 +1827,7 @@ LineBreakProc (Widget w, XtPointer client_data, XtPointer call_data) else { control.max_line_width = win_width; - control.line_break = (data == 1 ? NULL : line_break); + control.line_break = (data == 1 ? NULL : mdraw_default_line_break); } for (i = 0; i < 3; i++) { @@ -1722,6 +1843,25 @@ LineBreakProc (Widget w, XtPointer client_data, XtPointer call_data) } void +FilterProc (Widget w, XtPointer client_data, XtPointer call_data) +{ + char *filter_module = (char *) client_data; + void *handle; + void (*func) (MText *, int, int); + + if (! SELECTEDP ()) + return; + handle = dlopen (filter_module, RTLD_NOW); + if (! handle) + return; + *(void **) (&func) = dlsym (handle, "filter"); + if (func) + (*func) (mt, mtext_property_start (selection), + mtext_property_end (selection)); + dlclose (handle); +} + +void CursorProc (Widget w, XtPointer client_data, XtPointer call_data) { int data = (int) client_data; @@ -1760,6 +1900,7 @@ CursorProc (Widget w, XtPointer client_data, XtPointer call_data) XtSetValues (CursorMenus[i], arg, 1); } + update_cursor (cursor.from, 0); redraw (0, win_height, 1, 0); } @@ -1815,6 +1956,7 @@ FaceProc (Widget w, XtPointer client_data, XtPointer call_data) int from, to; int old_y1; + hide_cursor (); if (! SELECTEDP ()) { MPlist *plist; @@ -1939,7 +2081,7 @@ DumpImageProc (Widget w, XtPointer client_data, XtPointer call_data) mdump = popen ("mdump -q", "w"); if (! mdump) return; - converter = mconv_stream_converter (Mcoding_utf_8, mdump); + converter = mconv_stream_converter (Mcoding_utf_8_full, mdump); mconv_encode_range (converter, mt, from, to); mconv_free_converter (converter); fclose (mdump); @@ -1991,14 +2133,24 @@ compare_input_method (const void *elt1, const void *elt2) } void -setup_input_methods (int with_xim) +setup_input_methods (int with_xim, char *initial_input_method) { MInputMethod *im = NULL; MPlist *plist = mdatabase_list (msymbol ("input-method"), Mnil, Mnil, Mnil); MPlist *pl; int i = 0; + char *lang_name = NULL, *method_name = NULL; + + if (initial_input_method) + { + char *p = strchr (initial_input_method, '-'); + if (p) + lang_name = initial_input_method, method_name = p + 1, *p = '\0'; + else + method_name = initial_input_method; + } - num_input_methods = mplist_length (plist); + num_input_methods = plist ? mplist_length (plist) : 0; if (with_xim) { @@ -2023,20 +2175,23 @@ setup_input_methods (int with_xim) i++; } - for (pl = plist; mplist_key (pl) != Mnil; pl = mplist_next (pl)) + if (plist) { - MDatabase *mdb = mplist_value (pl); - MSymbol *tag = mdatabase_tag (mdb); - - if (tag[1] != Mnil) + for (pl = plist; mplist_key (pl) != Mnil; pl = mplist_next (pl)) { - input_method_table[i].language = tag[1]; - input_method_table[i].name = tag[2]; - i++; + MDatabase *mdb = mplist_value (pl); + MSymbol *tag = mdatabase_tag (mdb); + + if (tag[1] != Mnil) + { + input_method_table[i].language = tag[1]; + input_method_table[i].name = tag[2]; + i++; + } } - } - m17n_object_unref (plist); + m17n_object_unref (plist); + } num_input_methods = i; qsort (input_method_table, num_input_methods, sizeof input_method_table[0], compare_input_method); @@ -2048,6 +2203,17 @@ setup_input_methods (int with_xim) (void *) input_status); mplist_put (minput_driver->callback_list, Minput_status_done, (void *) input_status); + + if (method_name) + for (i = 0; i < num_input_methods; i++) + if (strcmp (method_name, msymbol_name (input_method_table[i].name)) == 0 + && (lang_name + ? strcmp (lang_name, msymbol_name (input_method_table[i].language)) == 0 + : input_method_table[i].language == Mt)) + { + current_input_method = i; + break; + } } @@ -2149,7 +2315,7 @@ FileDialogProc (Widget w, XtPointer client_data, XtPointer call_data) m17n_object_unref (mt); if (fp) { - mt = mconv_decode_stream (Mcoding_utf_8, fp); + mt = mconv_decode_stream (Mcoding_utf_8_full, fp); fclose (fp); if (! mt) mt = mtext (); @@ -2308,8 +2474,14 @@ help_exit (char *prog, int exit_code) printf ("Display FILE on a window and allow users to edit it.\n"); printf ("XT-OPTIONs are standard Xt arguments (e.g. -fn, -fg).\n"); printf ("The following OPTIONs are available.\n"); + printf (" %-13s\n\t\t%s", "--fontset FONTSET", + "Use the specified fontset\n"); + printf (" %-13s %s", "-s SIZE", "Font size in 1/10 point (default 120).\n"); + printf (" %-13s\n\t\t%s", "--im INPUT-METHOD", + "Input method activated initially.\n"); printf (" %-13s %s", "--version", "print version number\n"); printf (" %-13s %s", "-h, --help", "print this message\n"); + exit (exit_code); } @@ -2318,6 +2490,8 @@ main (int argc, char **argv) { Widget form, BodyWidget, w; char *fontset_name = NULL; + int fontsize = 0; + char *initial_input_method = NULL; int col = 80, row = 32; /* Translation table for TextWidget. */ String trans = ": Expose()\n\ @@ -2344,11 +2518,12 @@ main (int argc, char **argv) int font_width, font_ascent, font_descent; int with_xim = 0; int i, j; + char *filter = NULL; setlocale (LC_ALL, ""); /* Create the top shell. */ XtSetLanguageProc (NULL, NULL, NULL); - ShellWidget = XtOpenApplication (&context, "MEdit", NULL, 0, &argc, argv, + ShellWidget = XtOpenApplication (&context, "M17NEdit", NULL, 0, &argc, argv, NULL, sessionShellWidgetClass, NULL, 0); display = XtDisplay (ShellWidget); screen = XScreenNumberOfScreen (XtScreen (ShellWidget)); @@ -2361,7 +2536,7 @@ main (int argc, char **argv) help_exit (argv[0], 0); else if (! strcmp (argv[i], "--version")) { - printf ("medit (m17n library) %s\n", VERSION); + printf ("m17n-edit (m17n library) %s\n", VERSION); printf ("Copyright (C) 2003 AIST, JAPAN\n"); exit (0); } @@ -2371,39 +2546,59 @@ main (int argc, char **argv) if (sscanf (argv[i], "%dx%d", &col, &row) != 2) help_exit (argv[0], 1); } + else if (! strcmp (argv[i], "-s")) + { + i++; + fontsize = atoi (argv[i]); + if (fontsize < 0) + fontsize = 120; + } else if (! strcmp (argv[i], "--fontset")) { i++; fontset_name = strdup (argv[i]); } + else if (! strcmp (argv[i], "--im")) + { + i++; + initial_input_method = strdup (argv[i]); + } else if (! strcmp (argv[i], "--with-xim")) { with_xim = 1; } + else if (! strcmp (argv[i], "--filter")) + { + i++; + filter = argv[i]; + } else if (argv[i][0] != '-') { filename = strdup (argv[i]); } else { - fprintf (stderr, "Unknown option: %s", argv[i]); + fprintf (stderr, "Unknown option: %s\n", argv[i]); help_exit (argv[0], 1); } } if (! filename) - help_exit (argv[0], 1); + filename = strdup ("/dev/null"); mdatabase_dir = "."; /* Initialize the m17n library. */ M17N_INIT (); if (merror_code != MERROR_NONE) FATAL_ERROR ("%s\n", "Fail to initialize the m17n library!"); + minput_driver = &minput_gui_driver; mt = read_file (filename); serialized = 0; nchars = mtext_len (mt); + Mword = msymbol ("word"); + { MFace *face = mface (); @@ -2430,12 +2625,13 @@ main (int argc, char **argv) MFont *font; mplist_put (plist, msymbol ("widget"), ShellWidget); - if (fontset_name) + if (fontset_name || fontsize > 0) { MFontset *fontset = mfontset (fontset_name); face = mface (); mface_put_prop (face, Mfontset, fontset); + mface_put_prop (face, Msize, (void *) fontsize); m17n_object_unref (fontset); mplist_add (plist, Mface, face); m17n_object_unref (face); @@ -2525,7 +2721,7 @@ main (int argc, char **argv) free (tib_font); } - setup_input_methods (with_xim); + setup_input_methods (with_xim, initial_input_method); gc = DefaultGC (display, screen); @@ -2660,6 +2856,14 @@ main (int argc, char **argv) for (i = 0; i < num_input_methods + 2; i++) InputMethodMenus[i] = menus[i].w; + if (filter) + { + SetMenu (menus[0], 0, filter, NULL, FilterProc, filter, 0); + w = create_menu_button (ShellWidget, HeadWidget, w, "Filter", + "Filter Menu", menus, 1, + "Select filter to run"); + } + input_status_width = font_width * 8; input_status_height = (font_ascent + font_descent) * 2.4; input_status_pixmap = XCreatePixmap (display, RootWindow (display, screen), @@ -2754,9 +2958,9 @@ main (int argc, char **argv) char *name = msymbol_name (fullname); char c = name[0]; - if (c >= 'A' && c <= 'Z') + if (c >= 'a' && c <= 'z') { - int idx = (c < 'U') ? (c - 'A') / 2 : 10; + int idx = (c < 'u') ? (c - 'a') / 2 : 10; pl = plist[idx]; if (! pl) @@ -2898,4 +3102,17 @@ main (int argc, char **argv) exit (0); } + +#else /* not HAVE_X11_XAW_COMMAND_H */ + +int +main (int argc, char **argv) +{ + fprintf (stderr, + "Building of this program failed (lack of some header files)\n"); + exit (1); +} + +#endif /* not HAVE_X11_XAW_COMMAND_H */ + #endif /* not FOR_DOXYGEN */