[Mlterm-dev-ja] mlconfig with multi display

[MINAMI H. <mi...@ch...>]

みなみです

>mlconfigは常に最初のディスプレイに表
>示されてしまう

のへのパッチです。
手近にテストできる環境がないので、どなたかよろしくおねがいします。

--- xwindow/x_screen.c	9 Feb 2003 07:08:07 -0000	1.43
+++ xwindow/x_screen.c	11 Feb 2003 10:30:41 -0000
@@ -2427,5 +2427,5 @@
 		&global_x , &global_y , &child) ;
 
-	ml_term_start_config_menu( screen->term , NULL , global_x , global_y) ;
+	ml_term_start_config_menu( screen->term , NULL , global_x , global_y, DisplayString(screen->window.display)) ;
 }
 
--- mlterm/ml_config_menu.c	2 Jun 2002 17:24:50 -0000	1.1
+++ mlterm/ml_config_menu.c	11 Feb 2003 10:30:41 -0000
@@ -67,4 +67,5 @@
 	int  x ,
 	int  y ,
+	char *  display_string ,
 	int  pty_fd
 	)
@@ -95,5 +96,5 @@
 		/* child process */
 
-		char *  args[4] ;
+		char *  args[5] ;
 		char  geom_x[10] ;
 		char  geom_y[10] ;
@@ -112,5 +113,7 @@
 		args[2] = geom_y ;
 
-		args[3] = NULL ;
+		args[3] = display_string ;
+
+		args[4] = NULL ;
 
 		close( fds[1]) ;
--- mlterm/ml_config_menu.h	2 Jun 2002 17:24:50 -0000	1.1
+++ mlterm/ml_config_menu.h	11 Feb 2003 10:30:41 -0000
@@ -22,5 +22,5 @@
 int  ml_config_menu_final( ml_config_menu_t *  config_menu) ;
 
-int  ml_config_menu_start( ml_config_menu_t *  config_menu , char *  cmd_path , int  x , int  y , int  fd) ;
+int  ml_config_menu_start( ml_config_menu_t *  config_menu , char *  cmd_path , int  x , int  y , char *  display_string , int  fd) ;
 
 int  ml_config_menu_write( ml_config_menu_t *  config_menu , u_char *  buf , size_t  len) ;
--- mlterm/ml_term.c	2 Feb 2003 14:47:43 -0000	1.12
+++ mlterm/ml_term.c	11 Feb 2003 10:30:41 -0000
@@ -752,8 +752,9 @@
 	char *  cmd_path ,
 	int  x ,
-	int  y
+	int  y ,
+	char *  display_string
 	)
 {
-	ml_config_menu_start( &term->config_menu , cmd_path , x , y , term->pty->slave) ;
+	ml_config_menu_start( &term->config_menu , cmd_path , x , y , display_string, term->pty->slave) ;
 	
 	return  1 ;
--- mlterm/ml_term.h	2 Feb 2003 14:47:43 -0000	1.11
+++ mlterm/ml_term.h	11 Feb 2003 10:30:41 -0000
@@ -159,5 +159,5 @@
 int  ml_term_is_using_multi_col_char( ml_term_t *  term) ;
 
-int  ml_term_start_config_menu( ml_term_t *  term , char *  cmd_path , int  x , int  y) ;
+int  ml_term_start_config_menu( ml_term_t *  term , char *  cmd_path , int  x , int  y , char *  display_string) ;