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

gtk: some more cleanup

This commit is contained in:
punkrockguy318 2016-04-23 00:58:59 +00:00
parent d9d6581e52
commit 10034b92b8
1 changed files with 29 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
trunk/src/drivers/sdl/gui.cpp
View File

@ -81,6 +81,13 @@ bool checkGTKVersion(int major_required, int minor_required)
} }
} }
void setCheckbox(GtkWidget* w, const char* configName)
{
int buf;
g_config->getOption(configName, &buf);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), buf);
}
// This function configures a single hotkey // This function configures a single hotkey
int configHotkey(char* hotkeyString) int configHotkey(char* hotkeyString)
{ {
@ -325,14 +332,7 @@ void openPaletteConfig()
ntscColorChk = gtk_check_button_new_with_label("Use NTSC palette"); ntscColorChk = gtk_check_button_new_with_label("Use NTSC palette");
g_signal_connect(ntscColorChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.NTSCpalette"); g_signal_connect(ntscColorChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.NTSCpalette");
setCheckbox(ntscColorChk, "SDL.NTSCpalette");
int b;
// sync with config
g_config->getOption("SDL.NTSCpalette", &b);
if(b)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ntscColorChk), 1);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ntscColorChk), 0);
// color / tint / hue sliders // color / tint / hue sliders
slidersFrame = gtk_frame_new("NTSC palette controls"); slidersFrame = gtk_frame_new("NTSC palette controls");
@ -926,16 +926,6 @@ void setDoubleBuffering(GtkWidget* w, gpointer p)
} }
#endif #endif
void setCheckboxFromConfig(GtkWidget* w, const char* configName)
{
int buf;
g_config->getOption(configName, &buf);
if(buf)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), 1);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), 0);
}
void openVideoConfig() void openVideoConfig()
{ {
GtkWidget* win; GtkWidget* win;
@ -1002,17 +992,17 @@ void openVideoConfig()
// openGL check // openGL check
glChk = gtk_check_button_new_with_label("Enable OpenGL"); glChk = gtk_check_button_new_with_label("Enable OpenGL");
g_signal_connect(glChk, "clicked", G_CALLBACK(setGl), NULL); g_signal_connect(glChk, "clicked", G_CALLBACK(setGl), NULL);
loadCheckboxFromConfig(glChk, "SDL.OpenGL"); setCheckbox(glChk, "SDL.OpenGL");
// openGL linear filter check // openGL linear filter check
linearChk = gtk_check_button_new_with_label("Enable OpenGL linear filter"); linearChk = gtk_check_button_new_with_label("Enable OpenGL linear filter");
g_signal_connect(linearChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.OpenGLip"); g_signal_connect(linearChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.OpenGLip");
loadCheckboxFromConfig(linearChk, "SDL.OpenGLip") setCheckbox(linearChk, "SDL.OpenGLip");
// DoubleBuffering check // DoubleBuffering check
dbChk = gtk_check_button_new_with_label("Enable double buffering"); dbChk = gtk_check_button_new_with_label("Enable double buffering");
g_signal_connect(dbChk, "clicked", G_CALLBACK(setDoubleBuffering), NULL); g_signal_connect(dbChk, "clicked", G_CALLBACK(setDoubleBuffering), NULL);
loadCheckboxFromConfig(dbChk, "SDL.DoubleBuffering"); setCheckbox(dbChk, "SDL.DoubleBuffering");
#endif #endif
// Region (NTSC/PAL/Dendy) // Region (NTSC/PAL/Dendy)
@ -1035,22 +1025,22 @@ void openVideoConfig()
// New PPU check // New PPU check
ppuChk = gtk_check_button_new_with_label("Enable new PPU"); ppuChk = gtk_check_button_new_with_label("Enable new PPU");
g_signal_connect(ppuChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.NewPPU"); g_signal_connect(ppuChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.NewPPU");
setCheckboxFromConfig(ppuChk, "SDL.NewPPU"); setCheckbox(ppuChk, "SDL.NewPPU");
// "disable 8 sprite limit" check // "disable 8 sprite limit" check
spriteLimitChk = gtk_check_button_new_with_label("Disable sprite limit"); spriteLimitChk = gtk_check_button_new_with_label("Disable sprite limit");
g_signal_connect(spriteLimitChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.DisableSpriteLimit"); g_signal_connect(spriteLimitChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.DisableSpriteLimit");
setCheckboxFromConfig(spriteLimitChk, "SDL.DisableSpriteLimit"); setCheckbox(spriteLimitChk, "SDL.DisableSpriteLimit");
// 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");
setCheckboxFromConfig(frameskipChk, "SDL.Frameskip"); setCheckbox(frameskipChk, "SDL.Frameskip");
// 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");
setCheckboxFromConfig(clipSidesChk, "SDL.ClipSides"); setCheckbox(clipSidesChk, "SDL.ClipSides");
// xscale / yscale // xscale / yscale
xscaleHbox = gtk_hbox_new(FALSE, 5); xscaleHbox = gtk_hbox_new(FALSE, 5);
@ -1078,7 +1068,7 @@ void openVideoConfig()
// show FPS check // show FPS check
showFpsChk = gtk_check_button_new_with_label("Show FPS"); showFpsChk = gtk_check_button_new_with_label("Show FPS");
g_signal_connect(showFpsChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.ShowFPS"); g_signal_connect(showFpsChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.ShowFPS");
setCheckboxFromConfig(showFpsChk, "SDL.ShowFPS"); setCheckbox(showFpsChk, "SDL.ShowFPS");
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);
@ -1179,28 +1169,13 @@ void openSoundConfig()
// sound enable check // sound enable check
soundChk = gtk_check_button_new_with_label("Enable sound"); soundChk = gtk_check_button_new_with_label("Enable sound");
// sync with cfg
int cfgBuf;
g_config->getOption("SDL.Sound", &cfgBuf);
if(cfgBuf)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(soundChk), TRUE);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(soundChk), FALSE);
g_signal_connect(soundChk, "clicked", G_CALLBACK(toggleSound), NULL); g_signal_connect(soundChk, "clicked", G_CALLBACK(toggleSound), NULL);
setCheckbox(soundChk,"SDL.Sound");
// low pass filter check // low pass filter check
lowpassChk = gtk_check_button_new_with_label("Enable low pass filter"); lowpassChk = gtk_check_button_new_with_label("Enable low pass filter");
// sync with cfg
g_config->getOption("SDL.Sound.LowPass", &cfgBuf);
if(cfgBuf)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lowpassChk), TRUE);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lowpassChk), FALSE);
g_signal_connect(lowpassChk, "clicked", G_CALLBACK(toggleLowPass), NULL); g_signal_connect(lowpassChk, "clicked", G_CALLBACK(toggleLowPass), NULL);
setCheckbox(lowpassChk, "SDL.Sound.LowPass");
// sound quality combo box // sound quality combo box
hbox1 = gtk_hbox_new(FALSE, 3); hbox1 = gtk_hbox_new(FALSE, 3);
@ -1210,13 +1185,9 @@ void openSoundConfig()
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(qualityCombo), "Very High"); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(qualityCombo), "Very High");
// sync widget with cfg // sync widget with cfg
g_config->getOption("SDL.Sound.Quality", &cfgBuf); int buf;
if(cfgBuf == 2) g_config->getOption("SDL.Sound.Quality", &buf);
gtk_combo_box_set_active(GTK_COMBO_BOX(qualityCombo), 2); gtk_combo_box_set_active(GTK_COMBO_BOX(qualityCombo), buf);
else if(cfgBuf == 1)
gtk_combo_box_set_active(GTK_COMBO_BOX(qualityCombo), 1);
else
gtk_combo_box_set_active(GTK_COMBO_BOX(qualityCombo), 0);
g_signal_connect(qualityCombo, "changed", G_CALLBACK(setQuality), NULL); g_signal_connect(qualityCombo, "changed", G_CALLBACK(setQuality), NULL);
@ -1231,17 +1202,17 @@ void openSoundConfig()
const int rates[5] = {11025, 22050, 44100, 48000, 96000}; const int rates[5] = {11025, 22050, 44100, 48000, 96000};
char buf[8]; char choices[8];
for(int i=0; i<5;i++) for(int i=0; i<5;i++)
{ {
sprintf(buf, "%d", rates[i]); sprintf(choices, "%d", rates[i]);
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(rateCombo), buf); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(rateCombo), choices);
} }
// sync widget with cfg // sync widget with cfg
g_config->getOption("SDL.Sound.Rate", &cfgBuf); g_config->getOption("SDL.Sound.Rate", &buf);
for(int i=0; i<5; i++) for(int i=0; i<5; i++)
if(cfgBuf == rates[i]) if(buf == rates[i])
gtk_combo_box_set_active(GTK_COMBO_BOX(rateCombo), i); gtk_combo_box_set_active(GTK_COMBO_BOX(rateCombo), i);
g_signal_connect(rateCombo, "changed", G_CALLBACK(setRate), NULL); g_signal_connect(rateCombo, "changed", G_CALLBACK(setRate), NULL);
@ -1256,22 +1227,15 @@ void openSoundConfig()
bufferLbl = gtk_label_new("Buffer size (in ms)"); bufferLbl = gtk_label_new("Buffer size (in ms)");
// sync widget with cfg // sync widget with cfg
g_config->getOption("SDL.Sound.BufSize", &cfgBuf); g_config->getOption("SDL.Sound.BufSize", &buf);
gtk_range_set_value(GTK_RANGE(bufferHscale), cfgBuf); gtk_range_set_value(GTK_RANGE(bufferHscale), buf);
g_signal_connect(bufferHscale, "button-release-event", G_CALLBACK(setBufSize), NULL); g_signal_connect(bufferHscale, "button-release-event", G_CALLBACK(setBufSize), NULL);
// Swap duty cycles // Swap duty cycles
swapDutyChk = gtk_check_button_new_with_label("Swap Duty Cycles"); swapDutyChk = gtk_check_button_new_with_label("Swap Duty Cycles");
// sync with cfg
g_config->getOption("SDL.SwapDuty", &cfgBuf);
if(cfgBuf)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(swapDutyChk), TRUE);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(swapDutyChk), FALSE);
g_signal_connect(swapDutyChk, "clicked", G_CALLBACK(toggleSwapDuty), NULL); g_signal_connect(swapDutyChk, "clicked", G_CALLBACK(toggleSwapDuty), NULL);
setCheckbox(swapDutyChk, "SDL.SwapDuty");
// mixer // mixer
mixerFrame = gtk_frame_new("Mixer:"); mixerFrame = gtk_frame_new("Mixer:");