From: Araki K. <j00...@ip...> - 2002-01-14 21:18:34
|
荒木です:-) Subject: Re: [Mlterm-dev-ja] w3mmlconfig (was: image escape sqeuence) From: hs...@mt... (Hironori Sakamoto) Message-ID: <200...@mt...> Date: Tue, 15 Jan 2002 05:57:06 +0900 (JST) > #<key>=#error と返るようになりましたが、#error だけ返らないと > 意味がありません。 すみません、勘違いしておりました。 > また、wall_picture が OFF の場合は、#wall_picture= と返るべきと > 思います。 これもそうですね。 両方あわせて、添付のパッチような感じで修正するように致します。 では -- kiken j00...@ip... Index: doc/en/PROTOCOL =================================================================== RCS file: /home/ken/cvsroot/mlterm/doc/en/PROTOCOL,v retrieving revision 1.4 diff -u -r1.4 PROTOCOL --- doc/en/PROTOCOL 2002/01/14 12:51:26 1.4 +++ doc/en/PROTOCOL 2002/01/14 20:54:37 @@ -4,7 +4,7 @@ * mlterm proper set = "\x1b" "]" "5379" ";" <set key> "=" <value> "\x07" get = "\x1b" "]" "5380" ";" <get key> "\x07" - return value = "#" <key> "=" <value> "\x0a" + return value = "#" <key> "=" <value> "\x0a" | "#error" set key = encoding | fg_color | bg_color | tabsize | logsize | fontsize | fade_ratio | mod_meta_mode | bel_mode | use_anti_alias | use_variable_column_width | use_combining | use_transbg | use_bidi | copy_paste_via_ucs | xim | @@ -13,7 +13,7 @@ mod_meta_mode | bel_mode | use_anti_alias | use_variable_column_width | use_combining | use_transbg | use_bidi | copy_paste_via_ucs | xim | locale | wall_picture | pwd - value = #error | <values for each key> + value = <values for each key> * compatible with other terminals set fg color = "\x1b" "]" "39" ";" <color name> "\x07" Index: src/ml_vt100_command.c =================================================================== RCS file: /home/ken/cvsroot/mlterm/src/ml_vt100_command.c,v retrieving revision 1.9 diff -u -r1.9 ml_vt100_command.c --- src/ml_vt100_command.c 2002/01/14 12:51:27 1.9 +++ src/ml_vt100_command.c 2002/01/14 20:54:00 @@ -1146,7 +1146,14 @@ } else if( strcmp( key , "wall_picture") == 0) { - value = termscr->pic_file_path ; + if( termscr->pic_file_path) + { + value = termscr->pic_file_path ; + } + else + { + value = "" ; + } } else if( strcmp( key , "pwd") == 0) { @@ -1154,12 +1161,12 @@ } else { - value = "#error" ; + goto error ; } if( value == NULL) { - value = "#error" ; + goto error ; } ml_write_to_pty( termscr->pty , "#" , 1) ; @@ -1173,4 +1180,15 @@ #endif return 1 ; + +error: + ml_write_to_pty( termscr->pty , "#" , 1) ; + ml_write_to_pty( termscr->pty , "error" , 5) ; + ml_write_to_pty( termscr->pty , "\n" , 1) ; + +#ifdef DEBUG + kik_debug_printf( KIK_DEBUG_TAG " #error\n") ; +#endif + + return 0 ; } |