[mednaffe] 77/99: Add support for key assignments to (some) mednafen functions
Stephen Kitt
skitt at moszumanska.debian.org
Tue Aug 2 21:00:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository mednaffe.
commit cade900dc9fc32eaadb859d6c0ee754e88a987fe
Author: AmatCoder <amatcoder at gmail.com>
Date: Tue Jul 21 10:19:00 2015 +0200
Add support for key assignments to (some) mednafen functions
---
src/common.h | 2 +-
src/input.c | 212 +++++++++++++++++++++++++------
src/input.h | 18 +--
src/mednaffe_glade.h | 344 ++++++++++++++++++++++++++++++++++++++++++++++-----
4 files changed, 495 insertions(+), 81 deletions(-)
diff --git a/src/common.h b/src/common.h
index e4f3f99..c807cab 100644
--- a/src/common.h
+++ b/src/common.h
@@ -93,6 +93,6 @@ typedef struct
gint state;
joydata joy[9];
gboolean inputedited;
+ gboolean inputkeys;
gboolean m_error;
-
}guidata;
diff --git a/src/input.c b/src/input.c
index 61ec629..e71cdd3 100644
--- a/src/input.c
+++ b/src/input.c
@@ -104,6 +104,34 @@ gchar* hash2joy(gchar *key ,gint i)
return joy_hash;
}
+gchar* modkeys(gchar *key, gchar *value)
+{
+ if (key[0] == '\0') return NULL;
+
+ gchar **items;
+ gchar *value2 = NULL;
+ guint num,i;
+
+ items = g_strsplit(key, "+", 4);
+ num = g_strv_length(items);
+
+ if (num>1)
+ {
+ for (i=(num-1);i>0;i--)
+ {
+ if (items[i][0]=='a') value2 = g_strconcat("Alt+", value, NULL);
+ else if (items[i][0]=='c') value2 = g_strconcat("Ctrl+", value, NULL);
+ else if (items[i][0]=='s') value2 = g_strconcat("Shift+", value, NULL);
+
+ g_free(value);
+ value = value2;
+ }
+ }
+ g_strfreev(items);
+
+ return value;
+}
+
gchar* sdl2gdk(gchar *key)
{
gchar **line;
@@ -208,13 +236,20 @@ gboolean joy_watch( GIOChannel *channel, GIOCondition cond, guidata *gui)
if ((gui->treepath != NULL) && (!gui->inputedited))
{
- GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtk_builder_get_object(gui->specific, "treeview_input")));
+ gchar *fullcommand;
+ GtkTreeModel *model;
+
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtk_builder_get_object(gui->specific, "treeview_input")));
gtk_tree_model_get_iter_from_string(model, &iter, gui->treepath);
gtk_list_store_set(GTK_LIST_STORE(model), &iter, 2, on, 3, gui->joy[a].name, -1);
gtk_tree_model_get(model, &iter, 1, &command, -1);
- gchar *fullcommand = g_strconcat(gui->system,".input.",gui->port, command, NULL);
+ if (gui->inputkeys)
+ fullcommand = g_strconcat("-command.", command, NULL);
+ else
+ fullcommand = g_strconcat(gui->system,".input.",gui->port, command, NULL);
+
g_free(command);
g_hash_table_replace(gui->clist, fullcommand, fullcommand);
@@ -266,10 +301,15 @@ void read_input(guidata *gui)
GtkTreeIter iter;
gui->system++;
-
- model = GTK_TREE_MODEL(gtk_builder_get_object(
+ if (gui->inputkeys)
+ {
+ model = GTK_TREE_MODEL(gtk_builder_get_object(gui->builder, "keys"));
+ }
+ else
+ {
+ model = GTK_TREE_MODEL(gtk_builder_get_object(
gui->specific, gui->system));
-
+ }
gtk_tree_view_set_model(GTK_TREE_VIEW(gtk_builder_get_object(
gui->specific, "treeview_input")), model);
@@ -282,8 +322,10 @@ void read_input(guidata *gui)
gchar *hashkey;
gtk_tree_model_get(model, &iter, 1, &action, -1);
- command = g_strconcat(gui->system, ".input.",
- gui->port, action, NULL);
+ if (gui->inputkeys) command = g_strconcat("command.", action, NULL);
+ else
+ command = g_strconcat(gui->system, ".input.",
+ gui->port, action, NULL);
g_free(action);
hashkey = g_hash_table_lookup(gui->hash, command);
g_free(command);
@@ -294,6 +336,8 @@ void read_input(guidata *gui)
{
gchar *value = sdl2gdk(hashkey);
+ if ((value != NULL) && (gui->inputkeys)) value = modkeys(hashkey, value);
+
if (value != NULL)
{
gtk_list_store_set(GTK_LIST_STORE(model), &iter, 2, value, 3, "Keyboard", -1);
@@ -471,7 +515,7 @@ DWORD WINAPI joy_thread(LPVOID lpParam)
if ((event.type == SDL_JOYBUTTONDOWN) ||
(event.type == SDL_JOYHATMOTION) ||
- ((event.type == SDL_JOYAXISMOTION) &&
+ ((event.type == SDL_JOYAXISMOTION) &&
((event.jaxis.value < -DEADZONE) || (event.jaxis.value > DEADZONE))))
{
unsigned int b;
@@ -604,41 +648,58 @@ void on_input_clicked (GtkButton *button, guidata *gui)
if (gui->executing) return;
- gchar *text = g_strconcat("<b>Controller Setup - ",
- gui->fullsystem, "</b>", NULL);
+ gui->inputkeys = (gtk_button_get_label(button)[0]=='K');
- gtk_label_set_markup(GTK_LABEL(gtk_builder_get_object(
+ GtkNotebook *notebook =
+ GTK_NOTEBOOK(gtk_builder_get_object(gui->specific, "notebook1"));
+
+ if (gui->inputkeys)
+ {
+ gtk_label_set_markup(GTK_LABEL(gtk_builder_get_object(
+ gui->specific, "label108")), "<b>Key Assignments</b>");
+
+ gtk_window_set_title (GTK_WINDOW(gui->inputwindow), "Key Assignments");
+
+ gtk_widget_hide(GTK_WIDGET(notebook));
+ }
+ else
+ {
+ gchar *text = g_strconcat("<b>Controller Setup - ",
+ gui->fullsystem, "</b>", NULL);
+
+ gtk_label_set_markup(GTK_LABEL(gtk_builder_get_object(
gui->specific, "label108")), text);
- g_free(text);
+ g_free(text);
- text = g_strconcat("Controller Setup - ", gui->fullsystem, NULL);
- gtk_window_set_title (GTK_WINDOW(gui->inputwindow), text);
- g_free(text);
+ text = g_strconcat("Controller Setup - ", gui->fullsystem, NULL);
+ gtk_window_set_title (GTK_WINDOW(gui->inputwindow), text);
- GtkNotebook *notebook = GTK_NOTEBOOK(gtk_builder_get_object(gui->specific, "notebook1"));
+ g_free(text);
+ g_free(gui->port);
- g_free(gui->port);
+ gtk_widget_show(GTK_WIDGET(notebook));
- switch (gui->pagesys)
- {
- case 0: set_builtin(notebook, gui); break;
- case 1: set_builtin(notebook, gui); break;
- case 2: set_builtin(notebook, gui); break;
- case 3: set_builtin(notebook, gui); break;
- case 4: set_ports(4, notebook, gui); break;
- case 5: set_ports(5, notebook, gui); break;
- case 6: set_ports(2, notebook, gui); break;
- case 7: set_builtin(notebook, gui); break;
- case 8: set_ports(2, notebook, gui); break;
- case 9: set_ports(2, notebook, gui); break;
- case 10: set_ports(8, notebook, gui); break;
- case 11: set_ports(2, notebook, gui); break;
- case 12: set_builtin(notebook, gui); break;
- case 13: set_builtin(notebook, gui); break;
- default : break;
- }
+ switch (gui->pagesys)
+ {
+ case 0: set_builtin(notebook, gui); break;
+ case 1: set_builtin(notebook, gui); break;
+ case 2: set_builtin(notebook, gui); break;
+ case 3: set_builtin(notebook, gui); break;
+ case 4: set_ports(4, notebook, gui); break;
+ case 5: set_ports(5, notebook, gui); break;
+ case 6: set_ports(2, notebook, gui); break;
+ case 7: set_builtin(notebook, gui); break;
+ case 8: set_ports(2, notebook, gui); break;
+ case 9: set_ports(2, notebook, gui); break;
+ case 10: set_ports(8, notebook, gui); break;
+ case 11: set_ports(2, notebook, gui); break;
+ case 12: set_builtin(notebook, gui); break;
+ case 13: set_builtin(notebook, gui); break;
+ default : break;
+ }
- gtk_notebook_set_current_page(notebook, 0);
+ gtk_notebook_set_current_page(notebook, 0);
+ }
if (gui->changed)
{
@@ -801,8 +862,24 @@ gboolean editable_key_cb(GtkWidget *ed, GdkEventKey *event, guidata *gui)
gchar *command;
gchar *fullcommand;
gchar *key = NULL;
+ gchar *key2;
guint nkey;
+ printf("%i\n",event->keyval);
+ if (gui->inputkeys)
+ {
+ if (
+ (event->keyval==65505) ||
+ (event->keyval==65506) ||
+ (event->keyval==65507) ||
+ (event->keyval==65508) ||
+ (event->keyval==65511) ||
+ (event->keyval==65512) ||
+ (event->keyval==65513) ||
+ (event->keyval==65514)
+ ) return FALSE;
+ }
+
#ifdef G_OS_WIN32
g_mutex_lock (&mutex);
if (bool==1) {
@@ -819,16 +896,68 @@ gboolean editable_key_cb(GtkWidget *ed, GdkEventKey *event, guidata *gui)
model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtk_builder_get_object(gui->specific, "treeview_input")));
gtk_tree_model_get_iter_from_string(model, &iter, gui->treepath);
+
+ if (gui->inputkeys)
+ {
+ key2 = key;
+
+ if (event->state & GDK_SHIFT_MASK)
+ {
+ key = g_strconcat("Shift+", key2, NULL);
+ g_free(key2);
+ key2 = key;
+ }
+ if (event->state & GDK_MOD1_MASK)
+ {
+ key = g_strconcat("Alt+", key2, NULL);
+ g_free(key2);
+ key2 = key;
+ }
+ if (event->state & GDK_CONTROL_MASK)
+ {
+ key = g_strconcat("Ctrl+", key2, NULL);
+ g_free(key2);
+ }
+
+ }
gtk_list_store_set(GTK_LIST_STORE(model), &iter, 2, key, 3, "Keyboard", -1);
g_free(key);
- gtk_tree_model_get(model, &iter,1 , &command, -1);
+ gtk_tree_model_get(model, &iter, 1, &command, -1);
+
+ if (gui->inputkeys)
+ fullcommand = g_strconcat("-command.", command, NULL);
+ else
+ fullcommand = g_strconcat(gui->system,".input.",gui->port, command, NULL);
- fullcommand = g_strconcat(gui->system,".input.",gui->port, command, NULL);
g_free(command);
g_hash_table_replace(gui->clist, fullcommand, fullcommand);
key = g_strdup_printf("%i",nkey);
+ if (gui->inputkeys)
+ {
+ key2 = key;
+
+ if (event->state & GDK_CONTROL_MASK)
+ {
+ key = g_strconcat(key2, "+ctrl", NULL);
+ g_free(key2);
+ key2 = key;
+ }
+ if (event->state & GDK_MOD1_MASK)
+ {
+ key = g_strconcat(key2, "+alt", NULL);
+ g_free(key2);
+ key2 = key;
+ }
+
+ if (event->state & GDK_SHIFT_MASK)
+ {
+ key = g_strconcat(key2, "+shift", NULL);
+ g_free(key2);
+ }
+ }
+
fullcommand++;
g_hash_table_insert(gui->hash, g_strdup(fullcommand), g_strconcat("keyboard ", key, NULL));
fullcommand--;
@@ -869,13 +998,18 @@ void thread_watch(GPid pid, gint status, guidata *gui)
{
GtkTreeIter iter;
gchar *command;
+ gchar* fullcommand;
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtk_builder_get_object(gui->specific, "treeview_input")));
gtk_tree_model_get_iter_from_string(model, &iter, gui->treepath);
gtk_list_store_set(GTK_LIST_STORE(model), &iter, 2, on, 3, gui->joy[which].name, -1);
gtk_tree_model_get(model, &iter, 1, &command, -1);
- gchar *fullcommand = g_strconcat(gui->system,".input.",gui->port, command, NULL);
+ if (gui->inputkeys)
+ fullcommand = g_strconcat("-command.", command, NULL);
+ else
+ fullcommand = g_strconcat(gui->system,".input.",gui->port, command, NULL);
+
g_free(command);
g_hash_table_replace(gui->clist, fullcommand, fullcommand);
fullcommand++;
diff --git a/src/input.h b/src/input.h
index d99ac22..ef8b586 100644
--- a/src/input.h
+++ b/src/input.h
@@ -1,25 +1,25 @@
/*
* input.h
- *
+ *
* Copyright 2013-2015 AmatCoder
- *
+ *
* This file is part of Mednaffe.
- *
+ *
* Mednaffe is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* Mednaffe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with Mednaffe; if not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
-
+
#ifndef INPUT_H
#define INPUT_H
@@ -40,7 +40,7 @@ static const guint const gdk_to_sdl[256] =
284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 304, 303, 306, 305, 301, 0, 310, 309, 308, 307, 311, 312, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127
};
static const char* const sdl_to_gdk[324] =
@@ -84,7 +84,7 @@ static const char* const sdl_to_gdk[324] =
"Numpad =", "Up", "Down", "Right", "Left", "Insert", "Home", "End",
"Page Up", "PageDown", "F1", "F2", "F3", "F4", "F5", "F6",
"F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14",
- "F15", NULL, NULL, NULL,
+ "F15", NULL, NULL, NULL,
"Num Lock", "Caps Lock", "Scroll Lock", "Right Shift",
"Left Shift", "Right Ctrl", "Left Ctrl", "Right Alt",
"Left Alt", "Right Meta", "Left Meta", "Left Super",
diff --git a/src/mednaffe_glade.h b/src/mednaffe_glade.h
index 8fb80ff..b477e91 100644
--- a/src/mednaffe_glade.h
+++ b/src/mednaffe_glade.h
@@ -28,17 +28,6 @@ static const char *mednaffe_glade =
"<interface>\n"
"<requires lib=\"gtk+\" version=\"2.18\"/>\n"
"<!-- interface-naming-policy toplevel-contextual -->\n"
-"<object class=\"GtkAdjustment\" id=\"adscanlines\">\n"
-"<property name=\"lower\">-100</property>\n"
-"<property name=\"upper\">100</property>\n"
-"<property name=\"step_increment\">1</property>\n"
-"<property name=\"page_increment\">10</property>\n"
-"</object>\n"
-"<object class=\"GtkAdjustment\" id=\"adyres\">\n"
-"<property name=\"upper\">65536</property>\n"
-"<property name=\"step_increment\">1</property>\n"
-"<property name=\"page_increment\">160</property>\n"
-"</object>\n"
"<object class=\"GtkImage\" id=\"add_image\">\n"
"<property name=\"visible\">True</property>\n"
"<property name=\"can_focus\">False</property>\n"
@@ -234,6 +223,17 @@ static const char *mednaffe_glade =
"<property name=\"step_increment\">0.01</property>\n"
"<property name=\"page_increment\">1</property>\n"
"</object>\n"
+"<object class=\"GtkAdjustment\" id=\"adscanlines\">\n"
+"<property name=\"lower\">-100</property>\n"
+"<property name=\"upper\">100</property>\n"
+"<property name=\"step_increment\">1</property>\n"
+"<property name=\"page_increment\">10</property>\n"
+"</object>\n"
+"<object class=\"GtkAdjustment\" id=\"adyres\">\n"
+"<property name=\"upper\">65536</property>\n"
+"<property name=\"step_increment\">1</property>\n"
+"<property name=\"page_increment\">160</property>\n"
+"</object>\n"
"<object class=\"GtkListStore\" id=\"cbpathstore\">\n"
"<columns>\n"
"<!-- column-name paths -->\n"
@@ -448,6 +448,16 @@ static const char *mednaffe_glade =
"<property name=\"can_focus\">False</property>\n"
"<property name=\"stock\">gtk-connect</property>\n"
"</object>\n"
+"<object class=\"GtkImage\" id=\"image22\">\n"
+"<property name=\"visible\">True</property>\n"
+"<property name=\"can_focus\">False</property>\n"
+"<property name=\"stock\">gtk-connect</property>\n"
+"</object>\n"
+"<object class=\"GtkImage\" id=\"image23\">\n"
+"<property name=\"visible\">True</property>\n"
+"<property name=\"can_focus\">False</property>\n"
+"<property name=\"stock\">gtk-connect</property>\n"
+"</object>\n"
"<object class=\"GtkImage\" id=\"image3\">\n"
"<property name=\"visible\">True</property>\n"
"<property name=\"can_focus\">False</property>\n"
@@ -485,6 +495,182 @@ static const char *mednaffe_glade =
"<property name=\"can_focus\">False</property>\n"
"<property name=\"stock\">gtk-connect</property>\n"
"</object>\n"
+"<object class=\"GtkListStore\" id=\"keys\">\n"
+"<columns>\n"
+"<!-- column-name key_label -->\n"
+"<column type=\"gchararray\"/>\n"
+"<!-- column-name key_command -->\n"
+"<column type=\"gchararray\"/>\n"
+"<!-- column-name key -->\n"
+"<column type=\"gchararray\"/>\n"
+"<!-- column-name device -->\n"
+"<column type=\"gchararray\"/>\n"
+"</columns>\n"
+"<data>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Toggle in-game quick help screen</col>\n"
+"<col id=\"1\">toggle_help</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Save state</col>\n"
+"<col id=\"1\">save_state</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Load state</col>\n"
+"<col id=\"1\">load_state</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Decrement selected save state slot</col>\n"
+"<col id=\"1\">state_slot_dec</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Increment selected save state slot</col>\n"
+"<col id=\"1\">state_slot_inc</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Toggle save-state rewinding functionality</col>\n"
+"<col id=\"1\">toggle_state_rewind</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Toggle cheat console</col>\n"
+"<col id=\"1\">togglecheatview</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Toggle cheats active</col>\n"
+"<col id=\"1\">togglecheatactive</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Enable network play console input</col>\n"
+"<col id=\"1\">togglenetview</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Toggle debugger</col>\n"
+"<col id=\"1\">toggle_debugger</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Enter frame advance mode</col>\n"
+"<col id=\"1\">advance_frame</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Exit frame advance mode</col>\n"
+"<col id=\"1\">run_normal</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Toggle frames-per-second display</col>\n"
+"<col id=\"1\">toggle_fps_view</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Rewind emulation</col>\n"
+"<col id=\"1\">state_rewind</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Save raw screen snapshot</col>\n"
+"<col id=\"1\">take_snapshot</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Save screen snapshot</col>\n"
+"<col id=\"1\">take_scaled_snapshot</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Rotate the screen</col>\n"
+"<col id=\"1\">rotate_screen</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Toggle fullscreen mode</col>\n"
+"<col id=\"1\">toggle_fs</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Fast-forward</col>\n"
+"<col id=\"1\">fast_forward</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Slow-forward</col>\n"
+"<col id=\"1\">slow_forward</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Detect analog buttons on physical joysticks/gamepads</col>\n"
+"<col id=\"1\">input_config_abd</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Configure buttons for emulated device on input port 1</col>\n"
+"<col id=\"1\">input_config1</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Configure buttons for emulated device on input port 2</col>\n"
+"<col id=\"1\">input_config2</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Activate in-game input configuration process for a command key</col>\n"
+"<col id=\"1\">input_configc</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Reset</col>\n"
+"<col id=\"1\">reset</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Hard reset</col>\n"
+"<col id=\"1\">power</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Exit the emulator (or netplay chat mode)</col>\n"
+"<col id=\"1\">exit</col>\n"
+"<col id=\"2\"> </col>\n"
+"<col id=\"3\" translatable=\"yes\"> </col>\n"
+"</row>\n"
+"</data>\n"
+"</object>\n"
"<object class=\"GtkListStore\" id=\"liststore1\"/>\n"
"<object class=\"GtkListStore\" id=\"liststore2\">\n"
"<columns>\n"
@@ -645,33 +831,37 @@ static const char *mednaffe_glade =
"<col id=\"1\">2</col>\n"
"</row>\n"
"<row>\n"
-"<col id=\"0\" translatable=\"yes\">Input</col>\n"
+"<col id=\"0\" translatable=\"yes\">Key Assignments</col>\n"
"<col id=\"1\">3</col>\n"
"</row>\n"
"<row>\n"
-"<col id=\"0\" translatable=\"yes\">Netplay</col>\n"
+"<col id=\"0\" translatable=\"yes\">Input</col>\n"
"<col id=\"1\">4</col>\n"
"</row>\n"
"<row>\n"
-"<col id=\"0\" translatable=\"yes\">State Rewinding</col>\n"
+"<col id=\"0\" translatable=\"yes\">Netplay</col>\n"
"<col id=\"1\">5</col>\n"
"</row>\n"
"<row>\n"
-"<col id=\"0\" translatable=\"yes\">Slow-Forwarding</col>\n"
+"<col id=\"0\" translatable=\"yes\">State Rewinding</col>\n"
"<col id=\"1\">6</col>\n"
"</row>\n"
"<row>\n"
-"<col id=\"0\" translatable=\"yes\">Fast-Forwarding</col>\n"
+"<col id=\"0\" translatable=\"yes\">Slow-Forwarding</col>\n"
"<col id=\"1\">7</col>\n"
"</row>\n"
"<row>\n"
-"<col id=\"0\" translatable=\"yes\">OSD</col>\n"
+"<col id=\"0\" translatable=\"yes\">Fast-Forwarding</col>\n"
"<col id=\"1\">8</col>\n"
"</row>\n"
"<row>\n"
-"<col id=\"0\" translatable=\"yes\">Paths</col>\n"
+"<col id=\"0\" translatable=\"yes\">OSD</col>\n"
"<col id=\"1\">9</col>\n"
"</row>\n"
+"<row>\n"
+"<col id=\"0\" translatable=\"yes\">Paths</col>\n"
+"<col id=\"1\">10</col>\n"
+"</row>\n"
"</data>\n"
"</object>\n"
"<object class=\"GtkListStore\" id=\"liststore6\">\n"
@@ -1816,6 +2006,78 @@ static const char *mednaffe_glade =
"</packing>\n"
"</child>\n"
"<child>\n"
+"<object class=\"GtkFrame\" id=\"frame16\">\n"
+"<property name=\"visible\">True</property>\n"
+"<property name=\"can_focus\">False</property>\n"
+"<property name=\"border_width\">4</property>\n"
+"<property name=\"label_xalign\">0</property>\n"
+"<property name=\"shadow_type\">none</property>\n"
+"<child>\n"
+"<object class=\"GtkAlignment\" id=\"alignment18\">\n"
+"<property name=\"visible\">True</property>\n"
+"<property name=\"can_focus\">False</property>\n"
+"<property name=\"left_padding\">12</property>\n"
+"<child>\n"
+"<object class=\"GtkVBox\" id=\"vbox27\">\n"
+"<property name=\"visible\">True</property>\n"
+"<property name=\"can_focus\">False</property>\n"
+"<property name=\"spacing\">12</property>\n"
+"<child>\n"
+"<object class=\"GtkHBox\" id=\"hbox49\">\n"
+"<property name=\"visible\">True</property>\n"
+"<property name=\"can_focus\">False</property>\n"
+"<child>\n"
+"<object class=\"GtkButton\" id=\"inputbutton1\">\n"
+"<property name=\"label\" translatable=\"yes\">Key Assignments</property>\n"
+"<property name=\"width_request\">300</property>\n"
+"<property name=\"visible\">True</property>\n"
+"<property name=\"can_focus\">True</property>\n"
+"<property name=\"receives_default\">True</property>\n"
+"<signal name=\"clicked\" handler=\"on_input_clicked\" swapped=\"no\"/>\n"
+"</object>\n"
+"<packing>\n"
+"<property name=\"expand\">False</property>\n"
+"<property name=\"fill\">False</property>\n"
+"<property name=\"position\">0</property>\n"
+"</packing>\n"
+"</child>\n"
+"</object>\n"
+"<packing>\n"
+"<property name=\"expand\">False</property>\n"
+"<property name=\"fill\">True</property>\n"
+"<property name=\"padding\">12</property>\n"
+"<property name=\"position\">0</property>\n"
+"</packing>\n"
+"</child>\n"
+"</object>\n"
+"</child>\n"
+"</object>\n"
+"</child>\n"
+"<child type=\"label\">\n"
+"<object class=\"GtkLabel\" id=\"label70\">\n"
+"<property name=\"visible\">True</property>\n"
+"<property name=\"can_focus\">False</property>\n"
+"<property name=\"label\" translatable=\"yes\"><b>Key Assignments</b></property>\n"
+"<property name=\"use_markup\">True</property>\n"
+"</object>\n"
+"</child>\n"
+"</object>\n"
+"<packing>\n"
+"<property name=\"position\">3</property>\n"
+"</packing>\n"
+"</child>\n"
+"<child type=\"tab\">\n"
+"<object class=\"GtkLabel\" id=\"label69\">\n"
+"<property name=\"visible\">True</property>\n"
+"<property name=\"can_focus\">False</property>\n"
+"<property name=\"label\" translatable=\"yes\">Key Assignments</property>\n"
+"</object>\n"
+"<packing>\n"
+"<property name=\"position\">3</property>\n"
+"<property name=\"tab_fill\">False</property>\n"
+"</packing>\n"
+"</child>\n"
+"<child>\n"
"<object class=\"GtkFrame\" id=\"frame9\">\n"
"<property name=\"visible\">True</property>\n"
"<property name=\"can_focus\">False</property>\n"
@@ -1995,7 +2257,7 @@ static const char *mednaffe_glade =
"</child>\n"
"</object>\n"
"<packing>\n"
-"<property name=\"position\">3</property>\n"
+"<property name=\"position\">4</property>\n"
"</packing>\n"
"</child>\n"
"<child type=\"tab\">\n"
@@ -2005,7 +2267,7 @@ static const char *mednaffe_glade =
"<property name=\"label\" translatable=\"yes\">Input</property>\n"
"</object>\n"
"<packing>\n"
-"<property name=\"position\">3</property>\n"
+"<property name=\"position\">4</property>\n"
"<property name=\"tab_fill\">False</property>\n"
"</packing>\n"
"</child>\n"
@@ -2292,7 +2554,7 @@ static const char *mednaffe_glade =
"</child>\n"
"</object>\n"
"<packing>\n"
-"<property name=\"position\">4</property>\n"
+"<property name=\"position\">5</property>\n"
"</packing>\n"
"</child>\n"
"<child type=\"tab\">\n"
@@ -2302,7 +2564,7 @@ static const char *mednaffe_glade =
"<property name=\"label\" translatable=\"yes\">Netplay</property>\n"
"</object>\n"
"<packing>\n"
-"<property name=\"position\">4</property>\n"
+"<property name=\"position\">5</property>\n"
"<property name=\"tab_fill\">False</property>\n"
"</packing>\n"
"</child>\n"
@@ -2383,7 +2645,7 @@ static const char *mednaffe_glade =
"</child>\n"
"</object>\n"
"<packing>\n"
-"<property name=\"position\">5</property>\n"
+"<property name=\"position\">6</property>\n"
"</packing>\n"
"</child>\n"
"<child type=\"tab\">\n"
@@ -2393,7 +2655,7 @@ static const char *mednaffe_glade =
"<property name=\"label\" translatable=\"yes\">State Rewinding</property>\n"
"</object>\n"
"<packing>\n"
-"<property name=\"position\">5</property>\n"
+"<property name=\"position\">6</property>\n"
"<property name=\"tab_fill\">False</property>\n"
"</packing>\n"
"</child>\n"
@@ -2485,7 +2747,7 @@ static const char *mednaffe_glade =
"</child>\n"
"</object>\n"
"<packing>\n"
-"<property name=\"position\">6</property>\n"
+"<property name=\"position\">7</property>\n"
"</packing>\n"
"</child>\n"
"<child type=\"tab\">\n"
@@ -2495,7 +2757,7 @@ static const char *mednaffe_glade =
"<property name=\"label\" translatable=\"yes\">Slow-Forwarding</property>\n"
"</object>\n"
"<packing>\n"
-"<property name=\"position\">6</property>\n"
+"<property name=\"position\">7</property>\n"
"<property name=\"tab_fill\">False</property>\n"
"</packing>\n"
"</child>\n"
@@ -2602,7 +2864,7 @@ static const char *mednaffe_glade =
"</child>\n"
"</object>\n"
"<packing>\n"
-"<property name=\"position\">7</property>\n"
+"<property name=\"position\">8</property>\n"
"</packing>\n"
"</child>\n"
"<child type=\"tab\">\n"
@@ -2612,7 +2874,7 @@ static const char *mednaffe_glade =
"<property name=\"label\" translatable=\"yes\">Fast-Forwarding</property>\n"
"</object>\n"
"<packing>\n"
-"<property name=\"position\">7</property>\n"
+"<property name=\"position\">8</property>\n"
"<property name=\"tab_fill\">False</property>\n"
"</packing>\n"
"</child>\n"
@@ -2708,7 +2970,7 @@ static const char *mednaffe_glade =
"</child>\n"
"</object>\n"
"<packing>\n"
-"<property name=\"position\">8</property>\n"
+"<property name=\"position\">9</property>\n"
"</packing>\n"
"</child>\n"
"<child type=\"tab\">\n"
@@ -2718,7 +2980,7 @@ static const char *mednaffe_glade =
"<property name=\"label\" translatable=\"yes\">OSD</property>\n"
"</object>\n"
"<packing>\n"
-"<property name=\"position\">8</property>\n"
+"<property name=\"position\">9</property>\n"
"<property name=\"tab_fill\">False</property>\n"
"</packing>\n"
"</child>\n"
@@ -3249,7 +3511,7 @@ static const char *mednaffe_glade =
"</child>\n"
"</object>\n"
"<packing>\n"
-"<property name=\"position\">9</property>\n"
+"<property name=\"position\">10</property>\n"
"</packing>\n"
"</child>\n"
"<child type=\"tab\">\n"
@@ -3259,7 +3521,7 @@ static const char *mednaffe_glade =
"<property name=\"label\" translatable=\"yes\">Paths</property>\n"
"</object>\n"
"<packing>\n"
-"<property name=\"position\">9</property>\n"
+"<property name=\"position\">10</property>\n"
"<property name=\"tab_fill\">False</property>\n"
"</packing>\n"
"</child>\n"
@@ -4104,6 +4366,15 @@ static const char *mednaffe_glade =
"<child>\n"
"<placeholder/>\n"
"</child>\n"
+"<child>\n"
+"<placeholder/>\n"
+"</child>\n"
+"<child>\n"
+"<placeholder/>\n"
+"</child>\n"
+"<child>\n"
+"<placeholder/>\n"
+"</child>\n"
"</object>\n"
"</child>\n"
"</object>\n"
@@ -4318,6 +4589,15 @@ static const char *mednaffe_glade =
"<child>\n"
"<placeholder/>\n"
"</child>\n"
+"<child>\n"
+"<placeholder/>\n"
+"</child>\n"
+"<child>\n"
+"<placeholder/>\n"
+"</child>\n"
+"<child>\n"
+"<placeholder/>\n"
+"</child>\n"
"</object>\n"
"</child>\n"
"</object>\n"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mednaffe.git
More information about the Pkg-games-commits
mailing list