Re: [Mlterm-dev-ja] cursor fg/bg color

[<hs...@mt...>]

$B:dK\$G$9!#(B

> 	$B9SLZ$G$9(B:-)
>         $B%+!<%=%k$NA07J!"GX7J?'$r!"$=$l$>$l(B
>         -9/--crfg/cursor_fg_color,-0/--crbg/cursor_bg_color
>         $B$G;XDj$G$-$k$h$&$K$7$^$7$?!#(B

$B$"$j$,$H$&$4$6$$$^$9!#$,!">e<j$/F0$+$J$$$G$9!#(B
patch $B$NMM$K!"(Bx_color_manager_{begin,end}_cursor_color $B$G!"(B
fg/bg $B$H(B cursor_fg/bg $B$rC1=c$KF~$l49$($kMM$K$9$k$HF0$/$N$G$9$,!"(B
$BLdBj$"$j$^$9$G$7$g$&$+!#(B

$B$D$$$G$K!"(Bml_iscii_lang_new() $B$N0z?t$,$*$+$7$$MM$J$N$G=$@5!#(B
-----------------------------------
$B:dK\(B $B9@B'(B <hs...@mt...>
 http://www2u.biglobe.ne.jp/~hsaka/

--- mlterm/ml_iscii.c.orig	Mon Feb  3 00:37:55 2003
+++ mlterm/ml_iscii.c	Mon Feb  3 00:03:14 2003
@@ -352,7 +352,9 @@
 /* --- global functions --- */
 
 ml_iscii_lang_t
-ml_iscii_lang_new(void)
+ml_iscii_lang_new(
+	ml_iscii_lang_type_t  type
+	)
 {
 	return  NULL ;
 }
--- xwindow/x_color_manager.c.orig	Mon Feb  3 00:03:18 2003
+++ xwindow/x_color_manager.c	Mon Feb  3 00:36:54 2003
@@ -466,26 +466,20 @@
 	if( color_man->cursor_colors[0].color)
 	{
 		color_man->fg_color = color_man->cursor_colors[0].color ;
+		color_man->xcolors[ML_FG_COLOR] = color_man->cursor_colors[0].xcolor ;
+		color_man->is_loaded[ML_FG_COLOR] = color_man->cursor_colors[0].is_loaded ;
 	}
 	else
 	{
 		color_man->fg_color = bg_color ;
-
-		/* use bg color as cursor fg color */
-		color_man->cursor_colors[0].xcolor = bg_xcolor ;
-		color_man->cursor_colors[0].is_loaded = bg_is_loaded ;
+		color_man->xcolors[ML_FG_COLOR] = bg_xcolor ;
+		color_man->is_loaded[ML_FG_COLOR] = bg_is_loaded ;
 	}
 	
 	/* backup */
 	color_man->cursor_colors[0].color = fg_color ;
-	
-	if( ( color_man->is_loaded[ML_FG_COLOR] = color_man->cursor_colors[0].is_loaded))
-	{
-		color_man->xcolors[ML_FG_COLOR] = color_man->cursor_colors[0].xcolor ;
-		
-		/* backup */
-		color_man->cursor_colors[0].xcolor = fg_xcolor ;
-	}
+	color_man->cursor_colors[0].xcolor = fg_xcolor ;
+	color_man->cursor_colors[0].is_loaded = fg_is_loaded;
 	
 	/*
 	 * bg color <=> cursor bg color
@@ -493,26 +487,20 @@
 	if( color_man->cursor_colors[1].color)
 	{
 		color_man->bg_color = color_man->cursor_colors[1].color ;
+		color_man->xcolors[ML_BG_COLOR] = color_man->cursor_colors[1].xcolor ;
+		color_man->is_loaded[ML_BG_COLOR] = color_man->cursor_colors[1].is_loaded ;
 	}
 	else
 	{
 		color_man->bg_color = fg_color ;
-		
-		/* use fg color as cursor bg color */
-		color_man->cursor_colors[1].xcolor = fg_xcolor ;
-		color_man->cursor_colors[1].is_loaded = fg_is_loaded ;
+		color_man->xcolors[ML_BG_COLOR] = fg_xcolor ;
+		color_man->is_loaded[ML_BG_COLOR] = fg_is_loaded ;
 	}
 
 	/* backup */
 	color_man->cursor_colors[1].color = bg_color ;
-	
-	if( ( color_man->is_loaded[ML_BG_COLOR] = color_man->cursor_colors[1].is_loaded))
-	{
-		color_man->xcolors[ML_BG_COLOR] = color_man->cursor_colors[1].xcolor ;
-
-		/* backup */
-		color_man->cursor_colors[1].xcolor = bg_xcolor ;
-	}
+	color_man->cursor_colors[1].xcolor = bg_xcolor ;
+	color_man->cursor_colors[1].is_loaded = bg_is_loaded;
 
 	return  1 ;
 }
@@ -543,10 +531,8 @@
 	{
 		color_man->cursor_colors[0].color = color_man->fg_color ;
 		
-		if( ( color_man->cursor_colors[0].is_loaded = color_man->is_loaded[ML_FG_COLOR]))
-		{
-			color_man->cursor_colors[0].xcolor = color_man->xcolors[ML_FG_COLOR] ;
-		}
+		color_man->cursor_colors[0].is_loaded = color_man->is_loaded[ML_FG_COLOR] ;
+		color_man->cursor_colors[0].xcolor = color_man->xcolors[ML_FG_COLOR] ;
 	}
 	else
 	{
@@ -565,10 +551,8 @@
 	{
 		color_man->cursor_colors[1].color = color_man->bg_color ;
 		
-		if( ( color_man->cursor_colors[1].is_loaded = color_man->is_loaded[ML_BG_COLOR]))
-		{
-			color_man->cursor_colors[1].xcolor = color_man->xcolors[ML_BG_COLOR] ;
-		}
+		color_man->cursor_colors[1].is_loaded = color_man->is_loaded[ML_BG_COLOR] ;
+		color_man->cursor_colors[1].xcolor = color_man->xcolors[ML_BG_COLOR] ;
 	}
 	else
 	{