fix image loading sRGB conversion

[xonotic/darkplaces.git] / keys.c

diff --git a/keys.c b/keys.c
index cbc05ed032900c19371062af3eea56a15352530d..28f74a42b0dfcbb343ba094af647fdf1c2d89761 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -24,7 +24,7 @@
 #include "cl_video.h"
 #include "utf8lib.h"
 
-cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","1", "allows toggleconsole binds to close the console as well"};
+cvar_t con_closeontoggleconsole = {CVAR_SAVE, "con_closeontoggleconsole","1", "allows toggleconsole binds to close the console as well; when set to 2, this even works when not at the start of the line in console input; when set to 3, this works even if the toggleconsole key is the color tag"};
 
 /*
 key up events are sent even if in console mode
@@ -473,6 +473,36 @@ static const keyname_t   keynames[] = {
        {"AUX31", K_AUX31},
        {"AUX32", K_AUX32},
 
+       {"X360_DPAD_UP", K_X360_DPAD_UP},
+       {"X360_DPAD_DOWN", K_X360_DPAD_DOWN},
+       {"X360_DPAD_LEFT", K_X360_DPAD_LEFT},
+       {"X360_DPAD_RIGHT", K_X360_DPAD_RIGHT},
+       {"X360_START", K_X360_START},
+       {"X360_BACK", K_X360_BACK},
+       {"X360_LEFT_THUMB", K_X360_LEFT_THUMB},
+       {"X360_RIGHT_THUMB", K_X360_RIGHT_THUMB},
+       {"X360_LEFT_SHOULDER", K_X360_LEFT_SHOULDER},
+       {"X360_RIGHT_SHOULDER", K_X360_RIGHT_SHOULDER},
+       {"X360_A", K_X360_A},
+       {"X360_B", K_X360_B},
+       {"X360_X", K_X360_X},
+       {"X360_Y", K_X360_Y},
+       {"X360_LEFT_TRIGGER", K_X360_LEFT_TRIGGER},
+       {"X360_RIGHT_TRIGGER", K_X360_RIGHT_TRIGGER},
+       {"X360_LEFT_THUMB_UP", K_X360_LEFT_THUMB_UP},
+       {"X360_LEFT_THUMB_DOWN", K_X360_LEFT_THUMB_DOWN},
+       {"X360_LEFT_THUMB_LEFT", K_X360_LEFT_THUMB_LEFT},
+       {"X360_LEFT_THUMB_RIGHT", K_X360_LEFT_THUMB_RIGHT},
+       {"X360_RIGHT_THUMB_UP", K_X360_RIGHT_THUMB_UP},
+       {"X360_RIGHT_THUMB_DOWN", K_X360_RIGHT_THUMB_DOWN},
+       {"X360_RIGHT_THUMB_LEFT", K_X360_RIGHT_THUMB_LEFT},
+       {"X360_RIGHT_THUMB_RIGHT", K_X360_RIGHT_THUMB_RIGHT},
+
+       {"JOY_UP", K_JOY_UP},
+       {"JOY_DOWN", K_JOY_DOWN},
+       {"JOY_LEFT", K_JOY_LEFT},
+       {"JOY_RIGHT", K_JOY_RIGHT},
+
        {"SEMICOLON", ';'},                     // because a raw semicolon separates commands
        {"TILDE", '~'},
        {"BACKQUOTE", '`'},
@@ -1170,7 +1200,7 @@ Key_Message (int key, int ascii)
        if (key == K_ENTER || ascii == 10 || ascii == 13)
        {
                if(chat_mode < 0)
-                       Cmd_ExecuteString(chat_buffer, src_command); // not Cbuf_AddText to allow semiclons in args; however, this allows no variables then. Use aliases!
+                       Cmd_ExecuteString(chat_buffer, src_command, true); // not Cbuf_AddText to allow semiclons in args; however, this allows no variables then. Use aliases!
                else
                        Cmd_ForwardStringToServer(va("%s %s", chat_mode ? "say_team" : "say ", chat_buffer));
 
@@ -1656,7 +1686,7 @@ void Key_FindKeysForCommand (const char *command, int *keys, int numkeys, int bi
        }
 }
 
-qboolean CL_VM_InputEvent (qboolean down, int key, int ascii);
+extern qboolean CL_VM_InputEvent (int eventtype, int x, int y);
 
 /*
 ===================
@@ -1822,7 +1852,7 @@ Key_Event (int key, int ascii, qboolean down)
 
                        case key_game:
                                // csqc has priority over toggle menu if it wants to (e.g. handling escape for UI stuff in-game.. :sick:)
-                               q = CL_VM_InputEvent(down, key, ascii);
+                               q = CL_VM_InputEvent(down ? 0 : 1, key, ascii);
                                if (!q && down)
                                        MR_ToggleMenu(1);
                                break;
@@ -1864,11 +1894,15 @@ Key_Event (int key, int ascii, qboolean down)
                // con_closeontoggleconsole enables toggleconsole keys to close the
                // console, as long as they are not the color prefix character
                // (special exemption for german keyboard layouts)
-               if (con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && (key_consoleactive & KEY_CONSOLEACTIVE_USER) && ascii != STRING_COLOR_TAG)
+               if (con_closeontoggleconsole.integer && bind && !strncmp(bind, "toggleconsole", strlen("toggleconsole")) && (key_consoleactive & KEY_CONSOLEACTIVE_USER) && (con_closeontoggleconsole.integer >= ((ascii != STRING_COLOR_TAG) ? 2 : 3) || key_linepos == 1))
                {
                        Con_ToggleConsole_f ();
                        return;
                }
+
+               if (COM_CheckParm ("-noconsole"))
+                       return; // only allow the key bind to turn off console
+
                Key_Console (key, ascii);
                return;
        }
@@ -1906,7 +1940,7 @@ Key_Event (int key, int ascii, qboolean down)
                        MR_KeyEvent (key, ascii, down);
                        break;
                case key_game:
-                       q = CL_VM_InputEvent(down, key, ascii);
+                       q = CL_VM_InputEvent(down ? 0 : 1, key, ascii);
                        // ignore key repeats on binds and only send the bind if the event hasnt been already processed by csqc
                        if (!q && bind)
                        {
@@ -1929,6 +1963,21 @@ Key_Event (int key, int ascii, qboolean down)
        }
 }
 
+// a helper to simulate release of ALL keys
+void
+Key_ReleaseAll (void)
+{
+       int key;
+       // clear the event queue first
+       eventqueue_idx = 0;
+       // then send all down events (possibly into the event queue)
+       for(key = 0; key < MAX_KEYS; ++key)
+               if(keydown[key])
+                       Key_Event(key, 0, false);
+       // now all keys are guaranteed down (once the event queue is unblocked)
+       // and only future events count
+}
+
 /*
 ===================
 Key_ClearStates