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

sdl: reverse previous accidental commit of old broken gtk gui code

This commit is contained in:
punkrockguy318 2014-03-06 04:24:49 +00:00
parent 1c418d3d72
commit 6302ac7d26
1 changed files with 36 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,14 @@ bool checkGTKVersion(int major_required, int minor_required)
// This function configures a single hotkey // This function configures a single hotkey
int configHotkey(char* hotkeyString) int configHotkey(char* hotkeyString)
{ {
SDL_Surface *screen;
SDL_Event event; SDL_Event event;
KillVideo();
#if SDL_VERSION_ATLEAST(2, 0, 0)
return 0; // TODO - SDL 2.0
#else
screen = SDL_SetVideoMode(420, 200, 8, 0);
//SDL_WM_SetCaption("Press a key to bind...", 0);
int newkey = 0; int newkey = 0;
while(1) while(1)
@ -92,11 +99,14 @@ int configHotkey(char* hotkeyString)
case SDL_KEYDOWN: case SDL_KEYDOWN:
newkey = event.key.keysym.sym; newkey = event.key.keysym.sym;
g_config->setOption(hotkeyString, newkey); g_config->setOption(hotkeyString, newkey);
extern FCEUGI *GameInfo;
InitVideo(GameInfo);
return 0; return 0;
} }
} }
return 0; return 0;
#endif
} }
// This function configures a single button on a gamepad // This function configures a single button on a gamepad
int configGamepadButton(GtkButton* button, gpointer p) int configGamepadButton(GtkButton* button, gpointer p)
@ -448,49 +458,6 @@ void openNetworkConfig()
g_signal_connect(win, "response", G_CALLBACK(netResponse), NULL); g_signal_connect(win, "response", G_CALLBACK(netResponse), NULL);
} }
// This function configures a single button on a gamepad
int configHotkeyButton(GtkTreeSelection* w, gpointer p)
{
char buf[256];
std::string prefix;
// only configure when the "Change" button is pressed in, not when it is unpressed
// if(gtk_tree_selection_get_mode(w) != GTK_SELECTION_NONE)
// return 0;
// ButtonConfigBegin();
//snprintf(buf, sizeof(buf), "SDL.Input.GamePad.%d", padNo);
//prefix = buf;
ButtConfig* result;
//DWaitButton(NULL, &GamePadConfig[0][0], 1);
result = &GamePadConfig[0][0];
//g_config->setOption(prefix + GamePadNames[x], GamePadConfig[padNo][x].ButtonNum[configNo]);
if(result->ButtType[0] == BUTTC_KEYBOARD)
{
std::cout << "Keyboard event hotkey. woot\n";
//g_config->setOption(prefix + "DeviceType", "Keyboard");
} else if(result->ButtType[0] == BUTTC_JOYSTICK) {
//g_config->setOption(prefix + "DeviceType", "Joystick");
} else {
//g_config->setOption(prefix + "DeviceType", "Unknown");
}
//g_config->setOption(prefix + "DeviceNum", GamePadConfig[padNo][x].DeviceNum[configNo]);
//snprintf(buf, sizeof(buf), "<tt>%s</tt>", ButtonName(&GamePadConfig[padNo][x], configNo));
//gtk_label_set_markup(GTK_LABEL(buttonMappings[x]), buf);
ButtonConfigEnd();
//gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), FALSE);
return 0;
}
// handler prototype // handler prototype
static void tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data); static void tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data);
@ -504,23 +471,6 @@ void flushGtkEvents()
GtkWidget* HotkeyWin; GtkWidget* HotkeyWin;
static void queryHotkey (GtkTreeSelection *selection, gpointer data)
{
GtkTreeIter iter;
GtkTreeModel *model;
char* hotkey;
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
gtk_tree_model_get (model, &iter, 0, &hotkey, -1);
flushGtkEvents();
configHotkey(hotkey);
}
}
// creates and opens hotkey config window // creates and opens hotkey config window
void openHotkeyConfig() void openHotkeyConfig()
{ {
@ -594,11 +544,36 @@ void openHotkeyConfig()
select = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree)); select = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree));
gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE); gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE);
g_signal_connect ( G_OBJECT (select), "changed", G_CALLBACK (queryHotkey), g_signal_connect ( G_OBJECT (select), "changed", G_CALLBACK (tree_selection_changed_cb),
NULL); NULL);
gtk_tree_selection_unselect_all (select); gtk_tree_selection_unselect_all (select);
} }
static void tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data)
{
GtkTreeIter iter;
GtkTreeModel *model;
char* hotkey;
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
gtk_tree_model_get (model, &iter, 0, &hotkey, -1);
gtk_widget_hide(HotkeyWin);
flushGtkEvents();
configHotkey(hotkey);
g_signal_emit_by_name(HotkeyWin, "destroy-event");
openHotkeyConfig();
g_free (hotkey);
}
}
GtkWidget* typeCombo; GtkWidget* typeCombo;
// TODO: finish this // TODO: finish this