--- np2/x11/gtk2/gtk_main.c 2007/01/23 15:48:20 1.7 +++ np2/x11/gtk2/gtk_main.c 2007/01/24 14:09:32 1.9 @@ -1,4 +1,4 @@ -/* $Id: gtk_main.c,v 1.7 2007/01/23 15:48:20 monaka Exp $ */ +/* $Id: gtk_main.c,v 1.9 2007/01/24 14:09:32 monaka Exp $ */ /* * Copyright (c) 2004 NONAKA Kimihiro @@ -74,7 +74,6 @@ destroy_evhandler(GtkWidget *w, GdkEvent UNUSED(ev); UNUSED(p); - taskmng_exit(); toolkit_widget_quit(); return TRUE; @@ -227,16 +226,12 @@ motion_notify_evhandler(GtkWidget *w, Gd * misc */ static gint -main_widget_quit(gpointer p) +main_loop_quit(gpointer p) { - BYTE orig_scrnmode; UNUSED(p); - /* change to window mode */ - orig_scrnmode = scrnmode; - xmenu_select_screen(scrnmode & ~SCRNMODE_FULLSCREEN); - scrnmode = orig_scrnmode; + scrnmng_fullscreen(0); return 0; } @@ -264,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(); } } @@ -321,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); @@ -334,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); @@ -389,7 +386,7 @@ gui_gtk_widget_mainloop(void) { install_idle_process(); - gtk_quit_add(1, main_widget_quit, NULL); + gtk_quit_add(1, main_loop_quit, NULL); gtk_main(); uninstall_idle_process(); }