Pull more post-3.2.0 fixes from upstream (leaf package bug fixes):

http://mlterm.sf.net/mlterm-3.2.0-fixes.patch
 - Fix the bug which caused segmentation fault in closing input method
   status window.
 - Fix the error message in the failure of loading US-ASCII font.
 - Resize the window in attaching a new pty. (enbugged at 3.2.0)
 - Fix the bug which lets parcellite reset the selected region.
 - Fix the bug which disabled mlconfig and mlterm-menu. (enbugged at 3.2.0)
 - SF Bug #3614192

Bump PKGREVISION.

8 files changed, 262 insertions, 3 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 2360d23f2b8..c26bad76e75 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.87 2013/06/06 12:55:20 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2013/06/23 06:02:39 tsutsui Exp $
 
 DISTNAME=	mlterm-3.2.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index c3457922268..20721b673e2 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2013/05/28 15:22:18 tsutsui Exp $
+$NetBSD: distinfo,v 1.32 2013/06/23 06:02:39 tsutsui Exp $
 
 SHA1 (mlterm-3.2.0.tar.gz) = 66478d4f345bb2fe225c498b585797e66f2f931f
 RMD160 (mlterm-3.2.0.tar.gz) = b14f5304e690eb300093ce905f89c89f1a5f4bb7
@@ -6,4 +6,10 @@ Size (mlterm-3.2.0.tar.gz) = 3509742 bytes
 SHA1 (patch-configure) = b09182d7cb0ceb73557cf9e568445ad2d46aa04c
 SHA1 (patch-etc_font-fb) = 95a39d6e2aa56ecc745edec3d324f3dcf57b3b39
 SHA1 (patch-mkf_lib_mkf__ucs4__map.c) = 1bec2e100d5a53a84ca81436389c5cf2ce67f34b
+SHA1 (patch-xwindow_fb_x__display.c) = 8a78d78036e83928c4a81dc41510789ea420aa75
+SHA1 (patch-xwindow_fb_x__font.c) = a55515411ed9063e609eb70bddf40ad6c486376b
 SHA1 (patch-xwindow_fb_x__window.c) = bbeafd847b6654bec9dd517bf669194e964a2758
+SHA1 (patch-xwindow_win32_x__font.c) = 3c33fe26bbac54ee6ec9ad6add086f8903269a31
+SHA1 (patch-xwindow_x__screen.c) = 1408ec3a64a9b6f9455bd1937c2a9a78600986c2
+SHA1 (patch-xwindow_x__shortcut.c) = 8ec6c9a5dcfbc68d034a4d1c359ac7402684c9f9
+SHA1 (patch-xwindow_xlib_x__window.c) = dc1ca6adb74e0cbd086ba81ad448edcc5ec78743
diff --git a/x11/mlterm/patches/patch-xwindow_fb_x__display.c b/x11/mlterm/patches/patch-xwindow_fb_x__display.c
new file mode 100644
index 00000000000..24bf0f6de01
--- /dev/null
+++ b/x11/mlterm/patches/patch-xwindow_fb_x__display.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-xwindow_fb_x__display.c,v 1.1 2013/06/23 06:02:39 tsutsui Exp $
+
+Pull fix from http://mlterm.sf.net/mlterm-3.2.0-fixes.patch
+> Fix the bug which caused segmentation fault in closing input method
+> status window.
+
+--- xwindow/fb/x_display.c.orig	2013-05-26 02:13:13.000000000 +0000
++++ xwindow/fb/x_display.c
+@@ -849,19 +849,17 @@ receive_event_for_multi_roots(
+ 
+ 	x_window_receive_event( _disp.roots[0] , xev) ;
+ 
+-	if( redraw_im_win)
++	if( redraw_im_win && _disp.num_of_roots == 2)
+ 	{
+ 		/* Restart drawing input method window */
+ 		_disp.roots[1]->is_mapped = 1 ;
+ 	}
+ 
+-	if( ! check_visibility_of_im_window())
++	if( check_visibility_of_im_window())
+ 	{
+-		return ;
++		expose_window( _disp.roots[1] , _disp.roots[1]->x , _disp.roots[1]->y ,
++				ACTUAL_WIDTH(_disp.roots[1]) , ACTUAL_HEIGHT(_disp.roots[1])) ;
+ 	}
+-
+-	expose_window( _disp.roots[1] , _disp.roots[1]->x , _disp.roots[1]->y ,
+-			ACTUAL_WIDTH(_disp.roots[1]) , ACTUAL_HEIGHT(_disp.roots[1])) ;
+ }
+ 
+ #ifndef  __FreeBSD__
diff --git a/x11/mlterm/patches/patch-xwindow_fb_x__font.c b/x11/mlterm/patches/patch-xwindow_fb_x__font.c
new file mode 100644
index 00000000000..7d35d4dd143
--- /dev/null
+++ b/x11/mlterm/patches/patch-xwindow_fb_x__font.c
@@ -0,0 +1,27 @@
+$NetBSD: patch-xwindow_fb_x__font.c,v 1.1 2013/06/23 06:02:39 tsutsui Exp $
+
+Pull fix from http://mlterm.sf.net/mlterm-3.2.0-fixes.patch
+> Fix the error message in the failure of loading US-ASCII font.
+
+--- xwindow/fb/x_font.c.orig	2013-05-26 02:13:13.000000000 +0000
++++ xwindow/fb/x_font.c
+@@ -1066,7 +1066,18 @@ x_font_get_encoding_names(
+ 	mkf_charset_t  cs
+ 	)
+ {
+-	return  NULL ;
++	static char *  csnames[] = { NULL , NULL , } ;	/* dummy */
++
++	if( cs == ISO10646_UCS4_1)
++	{
++		csnames[0] = "iso10646-1" ;
++	}
++	else
++	{
++		csnames[0] = "iso8859" ;
++	}
++
++	return  csnames ;
+ }
+ 
+ /* Return written size */
diff --git a/x11/mlterm/patches/patch-xwindow_win32_x__font.c b/x11/mlterm/patches/patch-xwindow_win32_x__font.c
new file mode 100644
index 00000000000..572cd682464
--- /dev/null
+++ b/x11/mlterm/patches/patch-xwindow_win32_x__font.c
@@ -0,0 +1,27 @@
+$NetBSD: patch-xwindow_win32_x__font.c,v 1.1 2013/06/23 06:02:39 tsutsui Exp $
+
+Pull fix from http://mlterm.sf.net/mlterm-3.2.0-fixes.patch
+> Fix the error message in the failure of loading US-ASCII font.
+
+--- xwindow/win32/x_font.c.orig	2013-05-26 02:13:12.000000000 +0000
++++ xwindow/win32/x_font.c
+@@ -862,8 +862,17 @@ x_font_get_encoding_names(
+ 	mkf_charset_t  cs
+ 	)
+ {
+-	static char *  csnames[] = { "iso8859-1" } ;	/* dummy */
+-	
++	static char *  csnames[] = { NULL , NULL , } ;	/* dummy */
++
++	if( cs == ISO10646_UCS4_1)
++	{
++		csnames[0] = "iso10646-1" ;
++	}
++	else
++	{
++		csnames[0] = "iso8859" ;
++	}
++
+ 	return  csnames ;
+ }
+ 
diff --git a/x11/mlterm/patches/patch-xwindow_x__screen.c b/x11/mlterm/patches/patch-xwindow_x__screen.c
new file mode 100644
index 00000000000..d1479d4a52c
--- /dev/null
+++ b/x11/mlterm/patches/patch-xwindow_x__screen.c
@@ -0,0 +1,104 @@
+$NetBSD: patch-xwindow_x__screen.c,v 1.1 2013/06/23 06:02:39 tsutsui Exp $
+
+Pull fix from http://mlterm.sf.net/mlterm-3.2.0-fixes.patch
+> Resize the window in attaching a new pty. (enbugged at 3.2.0)
+> Fix the bug which lets parcellite reset the selected region.
+
+--- xwindow/x_screen.c.orig	2013-05-26 02:13:14.000000000 +0000
++++ xwindow/x_screen.c
+@@ -3696,12 +3696,6 @@ selecting_with_motion(
+ 	if( ! x_is_selecting( &screen->sel))
+ 	{
+ 		restore_selected_region_color_instantly( screen) ;
+-
+-		if( ! x_window_set_selection_owner( &screen->window , time))
+-		{
+-			return ;
+-		}
+-
+ 		start_selection( screen , char_index , row , SEL_CHAR) ;
+ 	}
+ 	else
+@@ -3787,12 +3781,6 @@ selecting_word(
+ 	if( ! x_is_selecting( &screen->sel))
+ 	{
+ 		restore_selected_region_color_instantly( screen) ;
+-
+-		if( ! x_window_set_selection_owner( &screen->window , time))
+-		{
+-			return ;
+-		}
+-
+ 		start_selection( screen , beg_char_index , beg_row , SEL_WORD) ;
+ 		selecting( screen , end_char_index , end_row) ;
+ 		x_sel_lock( &screen->sel) ;
+@@ -3858,12 +3846,6 @@ selecting_line(
+ 	if( ! x_is_selecting( &screen->sel))
+ 	{
+ 		restore_selected_region_color_instantly( screen) ;
+-
+-		if( ! x_window_set_selection_owner( &screen->window , time))
+-		{
+-			return ;
+-		}
+-
+ 		start_selection( screen , beg_char_index , beg_row , SEL_LINE) ;
+ 		selecting( screen , end_char_index , end_row) ;
+ 		x_sel_lock( &screen->sel) ;
+@@ -4518,7 +4500,7 @@ change_font_present(
+ 	font_size_changed( screen) ;
+ }
+ 
+-static void
++static int
+ usascii_font_cs_changed(
+ 	x_screen_t *  screen ,
+ 	ml_char_encoding_t  encoding
+@@ -4548,6 +4530,12 @@ usascii_font_cs_changed(
+ 		 * x_font_manager_usascii_font_cs_changed()
+ 		 */
+ 		x_xic_font_set_changed( &screen->window) ;
++
++		return  1 ;
++	}
++	else
++	{
++		return  0 ;
+ 	}
+ }
+ 
+@@ -6188,7 +6176,16 @@ select_in_window(
+ 	}
+ #endif
+ 
+-	return  1 ;
++	if( ! x_window_set_selection_owner( &screen->window , CurrentTime))
++	{
++		ml_str_delete( *chars , size) ;
++
++		return  0 ;
++	}
++	else
++	{
++		return  1 ;
++	}
+ }
+ 
+ 
+@@ -7923,12 +7920,10 @@ x_screen_attach(
+ 		return  1 ;
+ 	}
+ 
+-	/* XXX */
+-#ifdef  USE_FRAMEBUFFER
+-	window_resized( &screen->window) ;
+-#endif
+-
+-	usascii_font_cs_changed( screen , ml_term_get_encoding( screen->term)) ;
++	if( ! usascii_font_cs_changed( screen , ml_term_get_encoding( screen->term)))
++	{
++		resize_window( screen) ;
++	}
+ 
+ 	update_special_visual( screen) ;
+ 	/* Even if update_special_visual succeeded or not, all screen should be redrawn. */
diff --git a/x11/mlterm/patches/patch-xwindow_x__shortcut.c b/x11/mlterm/patches/patch-xwindow_x__shortcut.c
new file mode 100644
index 00000000000..36c3732ced3
--- /dev/null
+++ b/x11/mlterm/patches/patch-xwindow_x__shortcut.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-xwindow_x__shortcut.c,v 1.1 2013/06/23 06:02:39 tsutsui Exp $
+
+Pull fix from http://mlterm.sf.net/mlterm-3.2.0-fixes.patch
+> Fix the bug which disabled mlconfig and mlterm-menu. (enbugged at 3.2.0)
+
+--- xwindow/x_shortcut.c.orig	2013-05-26 02:13:14.000000000 +0000
++++ xwindow/x_shortcut.c
+@@ -194,6 +194,7 @@ x_shortcut_init(
+ 							".exe"
+ 						#endif
+ 						) ;
++		button_mask |= (Button1Mask|Button3Mask) ;
+ 	}
+ 	else
+ 	{
diff --git a/x11/mlterm/patches/patch-xwindow_xlib_x__window.c b/x11/mlterm/patches/patch-xwindow_xlib_x__window.c
new file mode 100644
index 00000000000..5b062d7eb5e
--- /dev/null
+++ b/x11/mlterm/patches/patch-xwindow_xlib_x__window.c
@@ -0,0 +1,48 @@
+$NetBSD: patch-xwindow_xlib_x__window.c,v 1.1 2013/06/23 06:02:39 tsutsui Exp $
+
+Pull fix from http://mlterm.sf.net/mlterm-3.2.0-fixes.patch
+> SF Bug #3614192
+
+--- xwindow/xlib/x_window.c.orig	2013-05-26 02:13:13.000000000 +0000
++++ xwindow/xlib/x_window.c
+@@ -3664,14 +3664,36 @@ x_window_set_icon(
+ 	/* set extended window manager hint's icon */
+ 	if( icon->cardinal && icon->cardinal[0] && icon->cardinal[1])
+ 	{
++		int  num ;
++		u_long *  data ;
++
++		/* width * height + 2 */
++		num = icon->cardinal[0] * icon->cardinal[1] + 2 ;
++
++		if( sizeof(u_long) != 4)
++		{
++			int  count ;
++
++			if( ! ( data = alloca( sizeof(u_long) * num)))
++			{
++				return  0 ;
++			}
++
++			for( count = 0 ; count < num ; count++)
++			{
++				data[count] = icon->cardinal[count] ;
++			}
++		}
++		else
++		{
++			data = icon->cardinal ;
++		}
++
+ 		/*it should be possible to set multiple icons...*/
+ 		XChangeProperty( root->disp->display, root->my_window,
+ 				 XA_NET_WM_ICON( root->disp->display),
+ 				 XA_CARDINAL, 32, PropModeReplace,
+-				 (unsigned char *)(icon->cardinal),
+-				 /* (cardinal[0])*(cardinal[1])
+-				  *          = width * height */
+-				 (icon->cardinal[0])*(icon->cardinal[1]) +2) ;
++				 data , num) ;
+ 	}
+ 
+ 	if( ( hints = XGetWMHints( root->disp->display , root->my_window)) == NULL &&