[uim-commit] r906 - trunk/fep
yamamoto at freedesktop.org
yamamoto at freedesktop.org
Sat Jun 25 07:26:04 PDT 2005
Author: yamamoto
Date: 2005-06-25 07:25:57 -0700 (Sat, 25 Jun 2005)
New Revision: 906
Modified:
trunk/fep/README.ja
trunk/fep/escseq.c
Log:
* fep/escseq.c(check_escseq) : fix to check escape sequence accurately
Modified: trunk/fep/README.ja
===================================================================
--- trunk/fep/README.ja 2005-06-23 15:56:50 UTC (rev 905)
+++ trunk/fep/README.ja 2005-06-25 14:25:57 UTC (rev 906)
@@ -48,7 +48,7 @@
¤³¤ì¤¬Å¬ÀÚ¤ËÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È»È¤¨¤Þ¤»¤ó¡£
o SHELL
- µ¯Æ°¤¹¤ë¥³¥Þ¥ó¥É¤ò»ØÄꤷ¤Þ¤¹¡£
+ -e¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¤¤Ëµ¯Æ°¤µ¤ì¤ë¥³¥Þ¥ó¥É¤ò»ØÄꤷ¤Þ¤¹¡£
¥³¥Þ¥ó¥É̾¤«ÀäÂХѥ¹¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
o LC_ALL LC_CTYPE LANG
@@ -76,7 +76,6 @@
* ¥ª¥×¥·¥ç¥ó
- Ʊ¤¸ÀßÄê¤ò¤¹¤ë´Ä¶ÊÑ¿ô¤¬¤¢¤ë¤È¤¤Ï¥ª¥×¥·¥ç¥ó¤¬Í¥À褵¤ì¤Þ¤¹¡£
o -u <engine>
ÊÑ´¹¥¨¥ó¥¸¥ó¤ò»ØÄꤷ¤Þ¤¹¡£
@@ -98,7 +97,7 @@
¤½¤Î¤è¤¦¤Ê¾ì¹ç¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¥¨¥¹¥±¡¼¥×¤Î¤¢¤È¤ÎÂÔ¤Á»þ´Ö¤òÀßÄꤷ
¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤Ê¤¤¤È¤¤ÎÂÔ¤Á»þ´Ö¤Ï0ÉäǤ¹¡£
Îã ÂÔ¤Á»þ´Ö¤ò0.1Éäˤ¹¤ë
- uim-fep -t 0.1
+ $ uim-fep -t 0.1
o -C [<foreground color>]:[<background color>]
¥×¥ê¥¨¥Ç¥£¥Ã¥È¤ä-s lastline¤Î¤È¤¤Î¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤Î¿§¤ò»ØÄꤷ¤Þ
@@ -133,33 +132,39 @@
Îã Á°·Ê¿§¤ò²«¿§¤Ë¤¹¤ë
$ uim-fep -C yellow:
- o -c ¥«¡¼¥½¥ë°ÌÃÖ¤Îʸ»ú¤òȿžɽ¼¨¤·¤Þ¤¹¡£
- kterm, aterm, rxvt, teraterm(¥«¡¼¥½¥ëÅÀÌǤʤ·¤Î¾õÂÖ)¤Ê¤É¤ÎüËö
- ¤Ç¤Ïȿž¤µ¤ì¤¿Ê¸»ú¤Ë¥«¡¼¥½¥ë¤¬¤¢¤ë¤Èȿž¤¬¾Ã¤¨¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
- ¤³¤Î¤è¤¦¤Ê¾ì¹ç¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤ë¤Èȿžʸ»ú¤Ë¥«¡¼¥½¥ë¤¬
- ¤¢¤ë¤È¤¤Ëȿž¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
+ o -c
+ ¥«¡¼¥½¥ë°ÌÃÖ¤Îʸ»ú¤òȿžɽ¼¨¤·¤Þ¤¹¡£
+ kterm, aterm, rxvt, teraterm(¥«¡¼¥½¥ëÅÀÌǤʤ·¤Î¾õÂÖ)¤Ê¤É¤ÎüËö
+ ¤Ç¤Ïȿž¤µ¤ì¤¿Ê¸»ú¤Ë¥«¡¼¥½¥ë¤¬¤¢¤ë¤Èȿž¤¬¾Ã¤¨¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
+ ¤³¤Î¤è¤¦¤Ê¾ì¹ç¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤ë¤Èȿžʸ»ú¤Ë¥«¡¼¥½¥ë¤¬
+ ¤¢¤ë¤È¤¤Ëȿž¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
- o -i ¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤òÉÁ²è¤·¤Æ¤¤¤ë¤È¤¤ä¥×¥ê¥¨¥Ç¥£¥Ã¥È(̤³ÎÄêʸ»úÎó)
- ¤ÎËöÈø°Ê³°¤òÊÔ½¸¤·¤Æ¤¤¤ë¤È¤¤Ë¥«¡¼¥½¥ë¤ò°ì»þŪ¤Ë¾Ã¤·¤Þ¤¹¡£¥«¡¼
- ¥½¥ë¤Î»ÄÁü¤¬µ¤¤Ë¤Ê¤ë¤È¤¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤Æ¤¯¤À¤µ¤¤¡£
+ o -i
+ ¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¤òÉÁ²è¤·¤Æ¤¤¤ë¤È¤¤ä¥×¥ê¥¨¥Ç¥£¥Ã¥È(̤³ÎÄêʸ»úÎó)
+ ¤ÎËöÈø°Ê³°¤òÊÔ½¸¤·¤Æ¤¤¤ë¤È¤¤Ë¥«¡¼¥½¥ë¤ò°ì»þŪ¤Ë¾Ã¤·¤Þ¤¹¡£¥«¡¼
+ ¥½¥ë¤Î»ÄÁü¤¬µ¤¤Ë¤Ê¤ë¤È¤¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤Æ¤¯¤À¤µ¤¤¡£
- o -o ¥×¥ê¥¨¥Ç¥£¥Ã¥È¤Îɽ¼¨¥¹¥¿¥¤¥ë¤òOn The Spot¤Ë¤·¤Þ¤¹¡£jed¤Ê¤É¤ÎÇØ
- ·Ê¿§¤¬¤¢¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò»È¤¦¤È±¦Ã¼¤ÎÇØ·Ê¿§¤¬¾Ã¤¨¤ë¤³¤È¤¬¤¢
- ¤ê¤Þ¤¹¡£
+ o -o
+ ¥×¥ê¥¨¥Ç¥£¥Ã¥È¤Îɽ¼¨¥¹¥¿¥¤¥ë¤òOn The Spot¤Ë¤·¤Þ¤¹¡£jed¤Ê¤É¤ÎÇØ
+ ·Ê¿§¤¬¤¢¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò»È¤¦¤È±¦Ã¼¤ÎÇØ·Ê¿§¤¬¾Ã¤¨¤ë¤³¤È¤¬¤¢
+ ¤ê¤Þ¤¹¡£
- o -S GNU screen¤Ç¥Õ¥£¥ë¥¿¤È¤·¤Æ»È¤¨¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£(GNU screen 4.0.2°Ê¹ß)
- Î㤨¤Ð¡¢~/.screenrc¤Ë
- bind J exec | uim-fep -S
- bind K eval 'exec cat' kill redisplay
- ¤³¤Î¤è¤¦¤Ë½ñ¤±¤Ð¡¢C-a J¤Çuim-fep¤ò¥Õ¥£¥ë¥¿¤È¤·¤Æµ¯Æ°¤·¡¢C-a K
- ¤Ç½ªÎ»¤Ç¤¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
- -s¥ª¥×¥·¥ç¥ó¤Ë¤«¤«¤ï¤é¤º¥â¡¼¥Éɽ¼¨¤Ë¤Ï
- backtick¤¬»È¤ï¤ì¤Þ¤¹¡£
+ o -S
+ GNU screen¤Ç¥Õ¥£¥ë¥¿¤È¤·¤Æ»È¤¨¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£(GNU screen 4.0.2°Ê¹ß)
+ Î㤨¤Ð¡¢~/.screenrc¤Ë
+ bind J exec | uim-fep -S
+ bind K eval 'exec cat' kill redisplay
+ ¤³¤Î¤è¤¦¤Ë½ñ¤±¤Ð¡¢C-a J¤Çuim-fep¤ò¥Õ¥£¥ë¥¿¤È¤·¤Æµ¯Æ°¤·¡¢C-a K
+ ¤Ç½ªÎ»¤Ç¤¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
+ -s¥ª¥×¥·¥ç¥ó¤Ë¤«¤«¤ï¤é¤º¥â¡¼¥Éɽ¼¨¤Ë¤Ï
+ backtick¤¬»È¤ï¤ì¤Þ¤¹¡£
- o -d ¸õÊä°ìÍ÷¤Îɽ¼¨¥¹¥¿¥¤¥ë¤òddskk¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
+ o -d
+ ¸õÊä°ìÍ÷¤Îɽ¼¨¥¹¥¿¥¤¥ë¤òddskk¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
- o -K ²¡¤µ¤ì¤¿¥¡¼¤Î~/.uim¤Ç¤Îɽµ¤ò¼¨¤·¤Þ¤¹¡£
- -t¥ª¥×¥·¥ç¥ó°Ê³°¤Î¥ª¥×¥·¥ç¥ó¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
+ o -K
+ ²¡¤µ¤ì¤¿¥¡¼¤Î~/.uim¤Ç¤Îɽµ¤ò¼¨¤·¤Þ¤¹¡£
+ -t¥ª¥×¥·¥ç¥ó°Ê³°¤Î¥ª¥×¥·¥ç¥ó¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
o -e command arg1 arg2 ...
µ¯Æ°¤¹¤ë¥³¥Þ¥ó¥É¤ò»ØÄꤷ¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó°Ê¹ß¤Î°ú¿ô¤Ï
Modified: trunk/fep/escseq.c
===================================================================
--- trunk/fep/escseq.c 2005-06-23 15:56:50 UTC (rev 905)
+++ trunk/fep/escseq.c 2005-06-25 14:25:57 UTC (rev 906)
@@ -200,35 +200,37 @@
printf("exit_attribute_mode is not available\n");
done(EXIT_FAILURE);
}
- if (clr_eol == NULL) {
- printf("clr_eol is not available\n");
- done(EXIT_FAILURE);
- }
- if (cursor_address == NULL) {
- printf("cursor_address is not available\n");
- done(EXIT_FAILURE);
- }
+
if (g_opt.status_type == LASTLINE) {
+ if (cursor_address == NULL) {
+ printf("cursor_address is not available\n");
+ done(EXIT_FAILURE);
+ }
+ if (clr_eol == NULL) {
+ printf("clr_eol is not available\n");
+ done(EXIT_FAILURE);
+ }
if (change_scroll_region == NULL) {
printf("change_scroll_region is not available\n");
done(EXIT_FAILURE);
}
if (g_opt.no_report_cursor) {
- if (save_cursor == NULL) {
- printf("save_cursor is not available.\n");
- done(EXIT_FAILURE);
- }
- if (restore_cursor == NULL) {
- printf("restore_cursor is not available.\n");
- done(EXIT_FAILURE);
- }
if (cursor_up == NULL) {
printf("cursor_up is not available.\n");
done(EXIT_FAILURE);
}
}
}
+
if (g_opt.no_report_cursor) {
+ if (save_cursor == NULL) {
+ printf("save_cursor is not available.\n");
+ done(EXIT_FAILURE);
+ }
+ if (restore_cursor == NULL) {
+ printf("restore_cursor is not available.\n");
+ done(EXIT_FAILURE);
+ }
if (cursor_left == NULL) {
printf("cursor_left is not available\n");
done(EXIT_FAILURE);
@@ -237,7 +239,13 @@
printf("cursor_right is not available\n");
done(EXIT_FAILURE);
}
+ } else {
+ if (cursor_address == NULL) {
+ printf("cursor_address is not available\n");
+ done(EXIT_FAILURE);
+ }
}
+
if (g_opt.on_the_spot) {
if (parm_ich == NULL) {
printf("parm_ich is not available\n");
More information about the uim-commit
mailing list