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

GTK: Add the hacks to UI.

This commit is contained in:
Brandon Wright 2019-04-13 15:25:55 -05:00
parent 79d9a2ee7e
commit e170bf66ca
2 changed files with 412 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/src/gtk_preferences.cpp
View File

@ -736,9 +736,13 @@ Snes9xPreferences::move_settings_to_dialog ()
gtk_widget_show (get_widget ("cpu_overclock"));
gtk_widget_show (get_widget ("remove_sprite_limit"));
gtk_widget_show (get_widget ("block_invalid_vram_access"));
gtk_widget_show (get_widget ("echo_buffer_hack"));
gtk_widget_show (get_widget ("soundfilterhbox"));
set_check ("cpu_overclock", Settings.OneClockCycle != 6);
set_check ("remove_sprite_limit", Settings.MaxSpriteTilesPerLine != 34);
set_check ("echo_buffer_hack", Settings.SeparateEchoBuffer);
set_combo ("sound_filter", Settings.InterpolationMethod);
#endif
}
@ -851,6 +855,9 @@ Snes9xPreferences::get_settings_from_dialog ()
{
Settings.MaxSpriteTilesPerLine = 34;
}
Settings.SeparateEchoBuffer = get_check ("echo_buffer_hack");
Settings.InterpolationMethod = get_check ("sound_filter");
#endif
config->joystick_threshold = get_spin ("joystick_threshold");

614
gtk/src/snes9x.ui
View File

@ -1061,7 +1061,7 @@
<col id="0" translatable="yes">Sound buffer synchronization</col>
</row>
<row>
<col id="0" translatable="yes">No throttling, but can use vsync to control speed</col>
<col id="0" translatable="yes">No throttling, use vsync to control speed</col>
</row>
</data>
</object>
@ -1117,6 +1117,29 @@
</row>
</data>
</object>
<object class="GtkListStore" id="liststoresoundfilter">
<columns>
<!-- column-name item -->
<column type="gchararray"/>
</columns>
<data>
<row>
<col id="0" translatable="yes">Nearest</col>
</row>
<row>
<col id="0" translatable="yes">Linear</col>
</row>
<row>
<col id="0" translatable="yes">Gaussian (correct)</col>
</row>
<row>
<col id="0" translatable="yes">Cubic</col>
</row>
<row>
<col id="0" translatable="yes">Sinc</col>
</row>
</data>
</object>
<object class="GtkListStore" id="liststore9">
<columns>
<!-- column-name item -->
@ -4442,7 +4465,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkFrame" id="frame5">
<object class="GtkFrame" id="basicsettingsframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
@ -4468,7 +4491,7 @@
<object class="GtkLabel" id="label45">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Speed throttle:</property>
<property name="label" translatable="yes">Throttling method:</property>
</object>
<packing>
<property name="expand">False</property>
@ -4502,17 +4525,176 @@
<property name="position">0</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label44">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Speed Control&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="rewindsettingsframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignmentrewindsettings">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vboxrewindsettings">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
<child>
<object class="GtkHBox" id="rewind_buffer_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
<object class="GtkLabel" id="rewind_buffer_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Rewind buffer size (MB):</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="rewind_buffer_size">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">rewind_buffer_adjustment</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="rewind_granularity_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
<object class="GtkLabel" id="rewind_granularity_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Number of frames between rewind snapshots:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="rewind_granularity">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">rewind_granularity_adjustment</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="labelrewindsettingsframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Rewind Settings&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="hacksettingsframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignmenthacksettings">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vboxhacksettings">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
<child>
<object class="GtkCheckButton" id="block_invalid_vram_access">
<property name="label" translatable="yes">Block invalid VRAM access</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<property name="tooltip_text" translatable="yes">Allows ROM hacks to write to screen at the wrong time. Only use if you know your ROM hack expects this</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -4527,16 +4709,31 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cpu_overclock">
<property name="label" translatable="yes">Overclock S-CPU hack (dangerous)</property>
<property name="label" translatable="yes">Overclock CPU</property>
<property name="visible">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Reduce slowdown at severe accuracy cost</property>
<property name="tooltip_text" translatable="yes">Reduces slowdown, but has potential to break games</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="remove_sprite_limit">
<property name="label" translatable="yes">Remove sprite limit</property>
<property name="visible">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Reduces flicker, but may cause graphical artifacts</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@ -4546,12 +4743,12 @@
</packing>
</child>
<child>
<object class="GtkCheckButton" id="remove_sprite_limit">
<property name="label" translatable="yes">Remove sprite limit hack (dangerous)</property>
<object class="GtkCheckButton" id="echo_buffer_hack">
<property name="label" translatable="yes">Redirect echo buffer overflow</property>
<property name="visible">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Will break games relying on proper behavior</property>
<property name="tooltip_text" translatable="yes">Allows old addmusic hacks to work</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@ -4603,150 +4800,18 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="rewind_buffer_hbox">
<property name="visible">True</property>
<object class="GtkHBox" id="soundfilterhbox">
<property name="visible">False</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip_text" translatable="yes">Gaussian is the correct behavior for SNES hardware</property>
<property name="spacing">10</property>
<child>
<object class="GtkLabel" id="rewind_buffer_label">
<object class="GtkLabel" id="labelsoundfilter">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Rewind buffer size (MB):</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="rewind_buffer_size">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">rewind_buffer_adjustment</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">6</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="rewind_granularity_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
<object class="GtkLabel" id="rewind_granularity_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Number of frames between rewind snapshots:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="rewind_granularity">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">rewind_granularity_adjustment</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">7</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label44">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Accuracy&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
<child>
<object class="GtkCheckButton" id="pause_emulation_on_switch">
<property name="label" translatable="yes">Pause emulation when switching away from Snes9x</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label128">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">The ESC key should:</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Sound filter:</property>
</object>
<packing>
<property name="expand">False</property>
@ -4755,12 +4820,13 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="default_esc_behavior">
<object class="GtkComboBox" id="sound_filter">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">liststore4</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="model">liststoresoundfilter</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext4"/>
<object class="GtkCellRendererText" id="cellrenderertextsoundfilter"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@ -4773,71 +4839,16 @@
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label123">
<object class="GtkLabel" id="labelhacksettingsframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Window Switching&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="screensaver_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox22">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<child>
<object class="GtkCheckButton" id="prevent_screensaver">
<property name="label" translatable="yes">Prevent the screensaver from activating</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label138">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Screensaver&lt;/b&gt;</property>
<property name="label" translatable="yes">&lt;b&gt;Hacks&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
</child>
@ -9003,6 +9014,191 @@
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vboxui">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
<child>
<object class="GtkCheckButton" id="pause_emulation_on_switch">
<property name="label" translatable="yes">Pause emulation when switching away from Snes9x</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label128">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">The ESC key should:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="default_esc_behavior">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">liststore4</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext4"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label123">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Window Switching&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="screensaver_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox22">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<child>
<object class="GtkCheckButton" id="prevent_screensaver">
<property name="label" translatable="yes">Prevent the screensaver from activating</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label138">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Screensaver&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<child type="tab">
<object class="GtkVBox" id="vboxuitab">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage" id="imageuitab">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">input-keyboard</property>
<property name="pixel_size">24</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labeluitab">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">UI</property>
<property name="wrap">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">6</property>
<property name="tab_fill">False</property>
</packing>
</child>
</object>
</child>
</object>