ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gtk: reset video on video dialog close 

gtk: add gui option for showfps
This commit is contained in:
punkrockguy318 2012-08-11 03:49:27 +00:00
parent 28c348d9f9
commit b54b1bee43
2 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.txt
View File

@ -1,3 +1,5 @@
10-Aug-2012 - prg - gtk: reset video on video dialog close
10-Aug-2012 - prg - gtk: add gui option for showfps
10-Aug-2012 - prg - sdl: add runtime option for controling drawing fps (SDL.ShowFPS) 10-Aug-2012 - prg - sdl: add runtime option for controling drawing fps (SDL.ShowFPS)
10-Aug-2012 - prg - core: move showfps from build option to runtime option 10-Aug-2012 - prg - core: move showfps from build option to runtime option
10-Aug-2012 - prg - sdl: fix and enable SHOWFPS build option (TODO: make runtime option) 10-Aug-2012 - prg - sdl: fix and enable SHOWFPS build option (TODO: make runtime option)

49
src/drivers/sdl/gui.cpp
View File

@ -148,11 +148,22 @@ int configGamepadButton(GtkButton* button, gpointer p)
return 0; return 0;
} }
void resetVideo()
{
KillVideo();
InitVideo(GameInfo);
}
void closeVideoWin(GtkWidget* w, GdkEvent* e, gpointer p)
{
resetVideo();
gtk_widget_destroy(w);
}
void closeDialog(GtkWidget* w, GdkEvent* e, gpointer p) void closeDialog(GtkWidget* w, GdkEvent* e, gpointer p)
{ {
gtk_widget_destroy(w); gtk_widget_destroy(w);
} }
void toggleLowPass(GtkWidget* w, gpointer p) void toggleLowPass(GtkWidget* w, gpointer p)
{ {
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
@ -177,6 +188,7 @@ void toggleOption(GtkWidget* w, gpointer p)
g_config->setOption((char*)p, 1); g_config->setOption((char*)p, 1);
else else
g_config->setOption((char*)p, 0); g_config->setOption((char*)p, 0);
g_config->save(); g_config->save();
UpdateEMUCore(g_config); UpdateEMUCore(g_config);
} }
@ -876,14 +888,12 @@ void openVideoConfig()
GtkWidget* yscaleLbl; GtkWidget* yscaleLbl;
GtkWidget* xscaleHbox; GtkWidget* xscaleHbox;
GtkWidget* yscaleHbox; GtkWidget* yscaleHbox;
GtkWidget* showFpsChk;
win = gtk_dialog_new_with_buttons("Video Preferences", win = gtk_dialog_new_with_buttons("Video Preferences",
GTK_WINDOW(MainWindow), GTK_WINDOW(MainWindow),
(GtkDialogFlags)(GTK_DIALOG_DESTROY_WITH_PARENT), (GtkDialogFlags)(GTK_DIALOG_DESTROY_WITH_PARENT),
GTK_STOCK_CLOSE, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL);
GTK_RESPONSE_OK,
NULL);
gtk_window_set_icon_name(GTK_WINDOW(win), "video-display"); gtk_window_set_icon_name(GTK_WINDOW(win), "video-display");
//gtk_widget_set_size_request(win, 250, 250); //gtk_widget_set_size_request(win, 250, 250);
@ -986,7 +996,7 @@ void openVideoConfig()
else else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(spriteLimitChk), 0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(spriteLimitChk), 0);
// frameskip check // frameskip check
frameskipChk = gtk_check_button_new_with_label("Enable frameskip"); frameskipChk = gtk_check_button_new_with_label("Enable frameskip");
g_signal_connect(frameskipChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.Frameskip"); g_signal_connect(frameskipChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.Frameskip");
@ -999,7 +1009,7 @@ void openVideoConfig()
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(frameskipChk), 0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(frameskipChk), 0);
// clip sides check // clip sides check
clipSidesChk = gtk_check_button_new_with_label("Clip sides"); clipSidesChk = gtk_check_button_new_with_label("Clip sides");
g_signal_connect(clipSidesChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.ClipSides"); g_signal_connect(clipSidesChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.ClipSides");
@ -1033,8 +1043,20 @@ void openVideoConfig()
gtk_spin_button_set_value(GTK_SPIN_BUTTON(xscaleSpin), f); gtk_spin_button_set_value(GTK_SPIN_BUTTON(xscaleSpin), f);
g_config->getOption("SDL.YScale", &f); g_config->getOption("SDL.YScale", &f);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(yscaleSpin), f); gtk_spin_button_set_value(GTK_SPIN_BUTTON(yscaleSpin), f);
// show FPS check
showFpsChk = gtk_check_button_new_with_label("Show FPS");
g_signal_connect(showFpsChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.ShowFPS");
// sync with config
buf = 0;
g_config->getOption("SDL.ShowFPS", &buf);
if(buf)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(showFpsChk), 1);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(showFpsChk), 0);
gtk_box_pack_start(GTK_BOX(vbox), lbl, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(vbox), lbl, FALSE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), hbox1, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(vbox), hbox1, FALSE, FALSE, 5);
@ -1052,9 +1074,10 @@ void openVideoConfig()
gtk_box_pack_start(GTK_BOX(vbox), clipSidesChk, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(vbox), clipSidesChk, FALSE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), xscaleHbox, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(vbox), xscaleHbox, FALSE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), yscaleHbox, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(vbox), yscaleHbox, FALSE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), showFpsChk, FALSE, FALSE, 5);
g_signal_connect(win, "delete-event", G_CALLBACK(closeDialog), NULL); g_signal_connect(win, "delete-event", G_CALLBACK(closeVideoWin), NULL);
g_signal_connect(win, "response", G_CALLBACK(closeDialog), NULL); g_signal_connect(win, "response", G_CALLBACK(closeVideoWin), NULL);
gtk_widget_show_all(win); gtk_widget_show_all(win);