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

GTK+: Add things to shader parameters dialog: 

Spin buttons next to sliders for precise control.
Save as box to save a new preset.
This commit is contained in:
Brandon Wright 2019-01-31 16:33:17 -06:00
parent c9f66cf910
commit 0cb166862f
3 changed files with 181 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/src/gtk_config.cpp
View File

@ -113,6 +113,8 @@ int Snes9xConfig::load_defaults ()
window_height = -1; window_height = -1;
preferences_width = -1; preferences_width = -1;
preferences_height = -1; preferences_height = -1;
shader_parameters_width = -1;
shader_parameters_height = -1;
sram_directory.clear (); sram_directory.clear ();
export_directory.clear (); export_directory.clear ();
savestate_directory.clear (); savestate_directory.clear ();
@ -305,6 +307,8 @@ int Snes9xConfig::save_config_file ()
cf.SetInt (z"MainHeight", window_height); cf.SetInt (z"MainHeight", window_height);
cf.SetInt (z"PreferencesWidth", preferences_width); cf.SetInt (z"PreferencesWidth", preferences_width);
cf.SetInt (z"PreferencesHeight", preferences_height); cf.SetInt (z"PreferencesHeight", preferences_height);
cf.SetInt (z"ShaderParametersWidth", shader_parameters_width);
cf.SetInt (z"ShaderParametersHeight", shader_parameters_height);
outbool (cf, z"UIVisible", ui_visible); outbool (cf, z"UIVisible", ui_visible);
outbool (cf, z"StatusBarVisible", statusbar_visible); outbool (cf, z"StatusBarVisible", statusbar_visible);
if (default_esc_behavior != ESC_TOGGLE_MENUBAR) if (default_esc_behavior != ESC_TOGGLE_MENUBAR)
@ -535,6 +539,8 @@ int Snes9xConfig::load_config_file ()
inint (z"MainHeight", window_height); inint (z"MainHeight", window_height);
inint (z"PreferencesWidth", preferences_width); inint (z"PreferencesWidth", preferences_width);
inint (z"PreferencesHeight", preferences_height); inint (z"PreferencesHeight", preferences_height);
inint (z"ShaderParametersWidth", shader_parameters_width);
inint (z"ShaderParametersHeight", shader_parameters_height);
inbool (z"UIVisible", ui_visible); inbool (z"UIVisible", ui_visible);
inbool (z"StatusBarVisible", statusbar_visible); inbool (z"StatusBarVisible", statusbar_visible);
inbool (z"Fullscreen", fullscreen); inbool (z"Fullscreen", fullscreen);

1
gtk/src/gtk_config.h
View File

@ -126,6 +126,7 @@ class Snes9xConfig
bool rom_loaded; bool rom_loaded;
int window_width, window_height; int window_width, window_height;
int preferences_width, preferences_height; int preferences_width, preferences_height;
int shader_parameters_width, shader_parameters_height;
bool pause_emulation_on_switch; bool pause_emulation_on_switch;
int num_threads; int num_threads;
bool screensaver_needs_reset; bool screensaver_needs_reset;

274
gtk/src/gtk_shader_parameters.cpp
View File

@ -17,46 +17,51 @@ static GtkWidget *dialog = NULL;
static std::vector<GLSLParam> *params = NULL; static std::vector<GLSLParam> *params = NULL;
static std::vector<GLSLParam> saved_params; static std::vector<GLSLParam> saved_params;
static inline double snap_to_interval (double value, double interval) static inline double snap_to_interval(double value, double interval)
{ {
return round (value / interval) * interval; return round(value / interval) * interval;
} }
static void value_changed (GtkRange *range, gpointer user_data) static void value_changed(GtkRange *range, gpointer user_data)
{ {
GLSLParam *p = (GLSLParam *) user_data; GLSLParam *p = (GLSLParam *)user_data;
GtkAdjustment *adj = gtk_range_get_adjustment (range); GtkAdjustment *adj = gtk_range_get_adjustment(range);
double interval = gtk_adjustment_get_step_increment (adj); double interval = gtk_adjustment_get_step_increment(adj);
double value = gtk_range_get_value (range); double value = gtk_range_get_value(range);
value = snap_to_interval (value, interval); value = snap_to_interval(value, interval);
gtk_range_set_value (range, value); gtk_range_set_value(range, value);
if (p->val != value) if (p->val != value)
{ {
p->val = value; p->val = value;
if (Settings.Paused) if (Settings.Paused)
S9xDeinitUpdate (top_level->last_width, top_level->last_height); S9xDeinitUpdate(top_level->last_width, top_level->last_height);
} }
} }
static void toggled (GtkToggleButton *togglebutton, gpointer user_data) static void toggled(GtkToggleButton *togglebutton, gpointer user_data)
{ {
GLSLParam *p = (GLSLParam *) user_data; GLSLParam *p = (GLSLParam *)user_data;
double value = (double) gtk_toggle_button_get_active (togglebutton); double value = (double)gtk_toggle_button_get_active(togglebutton);
if (p->val != value) if (p->val != value)
{ {
p->val = value; p->val = value;
if (Settings.Paused) if (Settings.Paused)
S9xDeinitUpdate (top_level->last_width, top_level->last_height); S9xDeinitUpdate(top_level->last_width, top_level->last_height);
} }
} }
static void dialog_response (GtkDialog *pdialog, gint response_id, gpointer user_data) static void dialog_response(GtkDialog *pdialog, gint response_id, gpointer user_data)
{ {
std::vector<GLSLParam> * params = (std::vector<GLSLParam> *) user_data; std::vector<GLSLParam> *params = (std::vector<GLSLParam> *)user_data;
int width, height;
gtk_window_get_size(GTK_WINDOW(pdialog), &width, &height);
gui_config->shader_parameters_width = width;
gui_config->shader_parameters_height = height;
switch (response_id) switch (response_id)
{ {
@ -68,12 +73,12 @@ static void dialog_response (GtkDialog *pdialog, gint response_id, gpointer user
config_file += "/snes9x.slangp"; config_file += "/snes9x.slangp";
else else
config_file = get_config_dir() + "/snes9x.glslp"; config_file = get_config_dir() + "/snes9x.glslp";
S9xDisplayGetDriver ()->save (config_file.c_str ()); S9xDisplayGetDriver()->save(config_file.c_str());
realpath (config_file.c_str (), path); realpath(config_file.c_str(), path);
gui_config->shader_filename = path; gui_config->shader_filename = path;
if (dialog) if (dialog)
gtk_widget_destroy (GTK_WIDGET (dialog)); gtk_widget_destroy(GTK_WIDGET(dialog));
dialog = NULL; dialog = NULL;
break; break;
} }
@ -82,154 +87,223 @@ static void dialog_response (GtkDialog *pdialog, gint response_id, gpointer user
case GTK_RESPONSE_DELETE_EVENT: case GTK_RESPONSE_DELETE_EVENT:
case GTK_RESPONSE_NONE: case GTK_RESPONSE_NONE:
if (dialog) if (dialog)
gtk_widget_destroy (GTK_WIDGET (dialog)); gtk_widget_destroy(GTK_WIDGET(dialog));
dialog = NULL; dialog = NULL;
*params = saved_params; *params = saved_params;
if (Settings.Paused) if (Settings.Paused)
S9xDeinitUpdate (top_level->last_width, top_level->last_height); S9xDeinitUpdate(top_level->last_width, top_level->last_height);
break; break;
case 15: // Save As
{
auto dialog = gtk_file_chooser_dialog_new(_("Export Shader Preset to:"),
top_level->get_window(),
GTK_FILE_CHOOSER_ACTION_SAVE,
"gtk-cancel", GTK_RESPONSE_CANCEL,
"gtk-save", GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
gui_config->last_shader_directory.c_str());
const char *name;
const char *extension;
if (gui_config->shader_filename.find(".slang") != std::string::npos)
{
name = "new.slangp";
extension = "*.slangp";
}
else
{
name = "new.glslp";
extension = "*.glslp";
}
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), name);
gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), true);
auto filter = gtk_file_filter_new();
gtk_file_filter_set_name(filter, _("Shader Preset"));
gtk_file_filter_add_pattern(filter, extension);
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
auto result = gtk_dialog_run(GTK_DIALOG(dialog));
if (result == GTK_RESPONSE_ACCEPT)
{
auto filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
S9xDisplayGetDriver()->save(filename);
g_free(filename);
}
gtk_widget_destroy(dialog);
break;
}
default: default:
break; break;
} }
} }
void gtk_shader_parameters_dialog_close () void gtk_shader_parameters_dialog_close()
{ {
if (dialog) if (dialog)
{ {
*params = saved_params; *params = saved_params;
gtk_widget_destroy (GTK_WIDGET (dialog)); gtk_widget_destroy(GTK_WIDGET(dialog));
dialog = NULL; dialog = NULL;
} }
} }
bool gtk_shader_parameters_dialog (GtkWindow *parent) bool gtk_shader_parameters_dialog(GtkWindow *parent)
{ {
if (dialog) if (dialog)
{ {
gtk_window_present (GTK_WINDOW (dialog)); gtk_window_present(GTK_WINDOW(dialog));
return false; return false;
} }
params = (std::vector<GLSLParam> *) S9xDisplayGetDriver()->get_parameters(); params = (std::vector<GLSLParam> *)S9xDisplayGetDriver()->get_parameters();
saved_params = *params; saved_params = *params;
if (!params || params->size() == 0) if (!params || params->size() == 0)
return false; return false;
dialog = gtk_dialog_new_with_buttons (_("GLSL Shader Parameters"), dialog = gtk_dialog_new_with_buttons(_("GLSL Shader Parameters"),
parent, parent,
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_DESTROY_WITH_PARENT,
"gtk-cancel", "gtk-cancel",
GTK_RESPONSE_CANCEL, GTK_RESPONSE_CANCEL,
"gtk-save", "gtk-save-as",
GTK_RESPONSE_OK, 15,
NULL); "gtk-save",
GTK_RESPONSE_OK,
NULL);
g_signal_connect_data (G_OBJECT (dialog), "response", G_CALLBACK (dialog_response), (gpointer) params, NULL, (GConnectFlags) 0); g_signal_connect_data(G_OBJECT(dialog), "response", G_CALLBACK(dialog_response), (gpointer)params, NULL, (GConnectFlags)0);
GtkWidget *scrolled_window; GtkWidget *scrolled_window;
gtk_widget_set_size_request(dialog, 640, 480); gtk_widget_set_size_request(dialog, 640, 480);
if (gui_config->shader_parameters_width > 0 && gui_config->shader_parameters_height > 0)
{
gtk_window_resize(GTK_WINDOW(dialog),
gui_config->shader_parameters_width,
gui_config->shader_parameters_height);
}
scrolled_window = gtk_scrolled_window_new (NULL, NULL); scrolled_window = gtk_scrolled_window_new(NULL, NULL);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG(dialog))), gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
scrolled_window); scrolled_window);
GtkSizeGroup *sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
#if GTK_MAJOR_VERSION >= 3 #if GTK_MAJOR_VERSION >= 3
gtk_widget_set_hexpand (scrolled_window, true); gtk_widget_set_hexpand(scrolled_window, true);
gtk_widget_set_vexpand (scrolled_window, true); gtk_widget_set_vexpand(scrolled_window, true);
gtk_widget_set_margin_start (scrolled_window, 5); gtk_widget_set_margin_start(scrolled_window, 5);
gtk_widget_set_margin_end (scrolled_window, 5); gtk_widget_set_margin_end(scrolled_window, 5);
gtk_widget_set_margin_top (scrolled_window, 5); gtk_widget_set_margin_top(scrolled_window, 5);
gtk_widget_set_margin_bottom (scrolled_window, 5); gtk_widget_set_margin_bottom(scrolled_window, 5);
GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
GtkWidget *grid = gtk_grid_new (); GtkWidget *grid = gtk_grid_new();
gtk_grid_set_row_homogeneous (GTK_GRID (grid), true); gtk_widget_set_margin_end(grid, 5);
gtk_grid_set_column_spacing (GTK_GRID (grid), 12); gtk_grid_set_row_homogeneous(GTK_GRID(grid), true);
gtk_container_add (GTK_CONTAINER (vbox), grid); gtk_grid_set_row_spacing(GTK_GRID(grid), 2);
gtk_container_add (GTK_CONTAINER (scrolled_window), vbox); gtk_grid_set_column_spacing(GTK_GRID(grid), 12);
gtk_container_add(GTK_CONTAINER(vbox), grid);
gtk_container_add(GTK_CONTAINER(scrolled_window), vbox);
for (unsigned int i = 0; i < params->size(); i++) for (unsigned int i = 0; i < params->size(); i++)
{ {
GLSLParam *p = &(*params)[i]; GLSLParam *p = &(*params)[i];
GtkWidget *label = gtk_label_new (p->name); GtkWidget *label = gtk_label_new(p->name);
gtk_label_set_xalign (GTK_LABEL (label), 0.0f); gtk_label_set_xalign(GTK_LABEL(label), 0.0f);
gtk_widget_show (label); gtk_widget_show(label);
gtk_grid_attach (GTK_GRID (grid), label, 0, i, 1, 1); gtk_grid_attach(GTK_GRID(grid), label, 0, i, 1, 1);
if (p->min == 0.0 && p->max == 1.0 && p->step == 1.0) if (p->min == 0.0 && p->max == 1.0 && p->step == 1.0)
{ {
GtkWidget *check = gtk_check_button_new (); GtkWidget *check = gtk_check_button_new();
gtk_grid_attach (GTK_GRID (grid), check, 1, i, 1, 1); gtk_grid_attach(GTK_GRID(grid), check, 1, i, 1, 1);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), (int) p->val); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), (int)p->val);
g_signal_connect_data (G_OBJECT (check), "toggled", G_CALLBACK (toggled), (gpointer) p, NULL, (GConnectFlags) 0); g_signal_connect_data(G_OBJECT(check), "toggled", G_CALLBACK(toggled), (gpointer)p, NULL, (GConnectFlags)0);
} }
else else
{ {
GtkWidget *scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, p->min, p->max, p->step); GtkWidget *spin = gtk_spin_button_new_with_range(p->min, p->max, p->step);
gtk_widget_set_hexpand (scale, true); gtk_grid_attach(GTK_GRID(grid), spin, 1, i, 1, 1);
gtk_grid_attach (GTK_GRID (grid), scale, 1, i, 1, 1); gtk_size_group_add_widget(sizegroup, spin);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_LEFT); int digits = gtk_spin_button_get_digits(GTK_SPIN_BUTTON(spin));
gtk_scale_set_draw_value (GTK_SCALE (scale), true); if (digits == 2)
gtk_scale_set_digits (GTK_SCALE (scale), 3); gtk_spin_button_set_digits(GTK_SPIN_BUTTON(spin), 3);
gtk_range_set_value (GTK_RANGE (scale), p->val);
g_signal_connect_data (G_OBJECT (scale), GtkAdjustment *adjustment = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(spin));
"value-changed",
G_CALLBACK (value_changed), GtkWidget *scale = gtk_scale_new(GTK_ORIENTATION_HORIZONTAL, adjustment);
(gpointer) p, gtk_widget_set_hexpand(scale, true);
NULL, gtk_grid_attach(GTK_GRID(grid), scale, 2, i, 1, 1);
(GConnectFlags) 0); gtk_scale_set_draw_value(GTK_SCALE(scale), false);
gtk_range_set_value(GTK_RANGE(scale), p->val);
g_signal_connect_data(G_OBJECT(scale),
"value-changed",
G_CALLBACK(value_changed),
(gpointer)p,
NULL,
(GConnectFlags)0);
} }
} }
#else #else
GtkWidget *vbox = gtk_vbox_new (false, 5); GtkWidget *vbox = gtk_vbox_new(false, 5);
GtkWidget *table = gtk_table_new (params->size (), 2, false); GtkWidget *table = gtk_table_new(params->size(), 3, false);
gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_row_spacings(GTK_TABLE(table), 5);
gtk_table_set_col_spacings (GTK_TABLE (table), 12); gtk_table_set_col_spacings(GTK_TABLE(table), 12);
gtk_container_add (GTK_CONTAINER (vbox), table); gtk_container_add(GTK_CONTAINER(vbox), table);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), vbox); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window), vbox);
gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 5); gtk_container_set_border_width(GTK_CONTAINER(scrolled_window), 5);
for (unsigned int i = 0; i < params->size(); i++) for (unsigned int i = 0; i < params->size(); i++)
{ {
GLSLParam *p = &(*params)[i]; GLSLParam *p = &(*params)[i];
GtkWidget *label = gtk_label_new (p->name); GtkWidget *label = gtk_label_new(p->name);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_widget_show (label); gtk_widget_show(label);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, i, i + 1, GTK_FILL, GTK_FILL, 0, 0); gtk_table_attach(GTK_TABLE(table), label, 0, 1, i, i + 1, GTK_FILL, GTK_FILL, 0, 0);
if (p->min == 0.0 && p->max == 1.0 && p->step == 1.0) if (p->min == 0.0 && p->max == 1.0 && p->step == 1.0)
{ {
GtkWidget *check = gtk_check_button_new (); GtkWidget *check = gtk_check_button_new();
gtk_table_attach (GTK_TABLE (table), check, 1, 2, i, i + 1, GTK_FILL, GTK_FILL, 0, 0); gtk_table_attach(GTK_TABLE(table), check, 1, 2, i, i + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), (int) p->val); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), (int)p->val);
g_signal_connect_data (G_OBJECT (check), "toggled", G_CALLBACK (toggled), (gpointer) p, NULL, (GConnectFlags) 0); g_signal_connect_data(G_OBJECT(check), "toggled", G_CALLBACK(toggled), (gpointer)p, NULL, (GConnectFlags)0);
} }
else else
{ {
GtkWidget *scale = gtk_hscale_new_with_range (p->min, p->max, p->step); GtkWidget *spin = gtk_spin_button_new_with_range(p->min, p->max, p->step);
gtk_table_attach (GTK_TABLE (table), scale, 1, 2, i, i + 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), GTK_FILL, 0, 0); gtk_table_attach(GTK_TABLE(table), spin, 1, 2, i, i + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_LEFT); gtk_size_group_add_widget(sizegroup, spin);
gtk_scale_set_draw_value (GTK_SCALE (scale), true); int digits = gtk_spin_button_get_digits(GTK_SPIN_BUTTON(spin));
gtk_scale_set_digits (GTK_SCALE (scale), 3); if (digits == 2)
gtk_range_set_value (GTK_RANGE (scale), p->val); gtk_spin_button_set_digits(GTK_SPIN_BUTTON(spin), 3);
g_signal_connect_data (G_OBJECT (scale),
"value-changed", GtkAdjustment *adjustment = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(spin));
G_CALLBACK (value_changed),
(gpointer) p, GtkWidget *scale = gtk_hscale_new(adjustment);
NULL, gtk_table_attach(GTK_TABLE(table), scale, 2, 3, i, i + 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), GTK_FILL, 0, 0);
(GConnectFlags) 0); gtk_scale_set_draw_value(GTK_SCALE(scale), false);
gtk_range_set_value(GTK_RANGE(scale), p->val);
g_signal_connect_data(G_OBJECT(scale),
"value-changed",
G_CALLBACK(value_changed),
(gpointer)p,
NULL,
(GConnectFlags)0);
} }
} }
#endif #endif
gtk_widget_show_all (dialog); gtk_widget_show_all(dialog);
return true; return true;
} }