--- np2/x11/gtk2/gtk_main.c	2007/01/10 17:53:27	1.5
+++ np2/x11/gtk2/gtk_main.c	2007/01/24 14:09:32	1.9
@@ -1,4 +1,4 @@
-/*	$Id: gtk_main.c,v 1.5 2007/01/10 17:53:27 monaka Exp $	*/
+/*	$Id: gtk_main.c,v 1.9 2007/01/24 14:09:32 monaka Exp $	*/
 
 /*
  * Copyright (c) 2004 NONAKA Kimihiro <aw9k-nnk@asahi-net.or.jp>
@@ -62,14 +62,20 @@
 			 | GDK_LEAVE_NOTIFY_MASK	\
 			 | GDK_EXPOSURE_MASK)
 
-
+/*
+ - Signal: gboolean GtkWidget::destroy_event (GtkWidget *widget,
+          GdkEventAny *event, gpointer user_data)
+*/
 static gboolean
-destroy_evhandler(GtkWidget *w)
+destroy_evhandler(GtkWidget *w, GdkEventAny *ev, gpointer p)
 {
 
 	UNUSED(w);
+	UNUSED(ev);
+	UNUSED(p);
 
 	toolkit_widget_quit();
+
 	return TRUE;
 }
 
@@ -86,7 +92,6 @@ configure_evhandler(GtkWidget *w, GdkEve
 
 	gdk_draw_rectangle(w->window, w->style->black_gc, TRUE,
 	    0, 0, w->allocation.width, w->allocation.height);
-
 	return TRUE;
 }
 
@@ -118,9 +123,12 @@ key_press_evhandler(GtkWidget *w, GdkEve
 	UNUSED(w);
 	UNUSED(p);
 
-	if (ev->keyval == GDK_F11)
-		xmenu_select_screen(scrnmode ^ SCRNMODE_FULLSCREEN);
-	else if ((ev->keyval == GDK_F12) && (np2oscfg.F12KEY == 0))
+	if (ev->keyval == GDK_F11) {
+		if ((np2oscfg.F11KEY == 1) && (scrnmode & SCRNMODE_FULLSCREEN))
+			xmenu_toggle_menu();
+		else if (np2oscfg.F11KEY == 2)
+			xmenu_select_screen(scrnmode ^ SCRNMODE_FULLSCREEN);
+	} else if ((ev->keyval == GDK_F12) && (np2oscfg.F12KEY == 0))
 		xmenu_toggle_item(NULL, "mousemode", !np2oscfg.MOUSE_SW);
 	else
 		gtkkbd_keydown(ev->keyval);
@@ -196,10 +204,38 @@ button_release_evhandler(GtkWidget *w, G
 	return TRUE;
 }
 
+/*
+ - Signal: gboolean GtkWidget::motion_notify_event (GtkWidget *widget,
+          GdkEventMotion *event, gpointer user_data)
+*/
+static gboolean
+motion_notify_evhandler(GtkWidget *w, GdkEventMotion *ev, gpointer p)
+{
+
+	UNUSED(w);
+	UNUSED(p);
+
+	if ((scrnmode & SCRNMODE_FULLSCREEN) && (ev->y < 8.0))
+		xmenu_show();
+
+	return TRUE;
+}
+
 
 /*
  * misc
  */
+static gint
+main_loop_quit(gpointer p)
+{
+
+	UNUSED(p);
+
+	scrnmng_fullscreen(0);
+
+	return 0;
+}
+
 static void
 set_icon_bitmap(GtkWidget *w)
 {
@@ -215,7 +251,7 @@ set_icon_bitmap(GtkWidget *w)
 /*
  * idle process
  */
-static int install_count = 0;
+static volatile int install_count = 0;
 static guint idle_id;
 
 void
@@ -223,7 +259,7 @@ install_idle_process(void)
 {
 
 	if (install_count++ == 0) {
-		idle_id = g_idle_add((GSourceFunc)mainloop, 0);
+		idle_id = g_idle_add((GSourceFunc)mainloop, NULL);
 		soundmng_play();
 	}
 }
@@ -280,6 +316,7 @@ gui_gtk_widget_create(void)
 	gint root_x, root_y;
 
 	main_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+//	gtk_widget_set_double_buffered(GTK_WIDGET(main_window), FALSE);
 	gtk_window_set_resizable(GTK_WINDOW(main_window), FALSE);
 	gtk_window_set_title(GTK_WINDOW(main_window), np2oscfg.titles);
 	gtk_widget_add_events(main_window, EVENT_MASK);
@@ -293,6 +330,7 @@ gui_gtk_widget_create(void)
 	gtk_widget_show(menubar);
 
 	drawarea = gtk_drawing_area_new();
+//	gtk_widget_set_double_buffered(GTK_WIDGET(drawarea), FALSE);
 	gtk_widget_set_size_request(GTK_WIDGET(drawarea), 640, 400);
 	gtk_box_pack_end(GTK_BOX(main_vbox), drawarea, FALSE, TRUE, 0);
 	gtk_widget_show(drawarea);
@@ -320,6 +358,8 @@ gui_gtk_widget_create(void)
 	    GTK_SIGNAL_FUNC(button_press_evhandler), NULL);
 	g_signal_connect(GTK_OBJECT(main_window), "button_release_event",
 	    GTK_SIGNAL_FUNC(button_release_evhandler), NULL);
+	g_signal_connect(GTK_OBJECT(main_window), "motion_notify_event",
+	    GTK_SIGNAL_FUNC(motion_notify_evhandler), NULL);
 
 	g_signal_connect(GTK_OBJECT(drawarea), "configure_event",
 	    GTK_SIGNAL_FUNC(configure_evhandler), NULL);
@@ -346,6 +386,7 @@ gui_gtk_widget_mainloop(void)
 {
 
 	install_idle_process();
+	gtk_quit_add(1, main_loop_quit, NULL);
 	gtk_main();
 	uninstall_idle_process();
 }