added SUPPORTIPV6 define checks - not defined by default, this should

[xonotic/darkplaces.git] / keys.c

diff --git a/keys.c b/keys.c
index ce220b42fe7d2e79370e081d9f6f6b6a7872f239..b4a40ed8a3d8d45b45f593780e336104e5738841 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -38,8 +38,6 @@ char          *keybindings[MAX_BINDMAPS][MAX_KEYS];
 int         history_line;
 char           history_savedline[MAX_INPUTLINE];
 conbuffer_t history;
-#define HIST_TEXTSIZE 262144
-#define HIST_MAXLINES 4096
 
 extern cvar_t  con_textsize;
 
@@ -321,6 +319,135 @@ static const keyname_t   keynames[] = {
        {"APOSTROPHE", '\''},
        {"BACKSLASH", '\\'},            // because a raw backslash is used for special characters
 
+       {"MIDINOTE0", K_MIDINOTE0},
+       {"MIDINOTE1", K_MIDINOTE1},
+       {"MIDINOTE2", K_MIDINOTE2},
+       {"MIDINOTE3", K_MIDINOTE3},
+       {"MIDINOTE4", K_MIDINOTE4},
+       {"MIDINOTE5", K_MIDINOTE5},
+       {"MIDINOTE6", K_MIDINOTE6},
+       {"MIDINOTE7", K_MIDINOTE7},
+       {"MIDINOTE8", K_MIDINOTE8},
+       {"MIDINOTE9", K_MIDINOTE9},
+       {"MIDINOTE10", K_MIDINOTE10},
+       {"MIDINOTE11", K_MIDINOTE11},
+       {"MIDINOTE12", K_MIDINOTE12},
+       {"MIDINOTE13", K_MIDINOTE13},
+       {"MIDINOTE14", K_MIDINOTE14},
+       {"MIDINOTE15", K_MIDINOTE15},
+       {"MIDINOTE16", K_MIDINOTE16},
+       {"MIDINOTE17", K_MIDINOTE17},
+       {"MIDINOTE18", K_MIDINOTE18},
+       {"MIDINOTE19", K_MIDINOTE19},
+       {"MIDINOTE20", K_MIDINOTE20},
+       {"MIDINOTE21", K_MIDINOTE21},
+       {"MIDINOTE22", K_MIDINOTE22},
+       {"MIDINOTE23", K_MIDINOTE23},
+       {"MIDINOTE24", K_MIDINOTE24},
+       {"MIDINOTE25", K_MIDINOTE25},
+       {"MIDINOTE26", K_MIDINOTE26},
+       {"MIDINOTE27", K_MIDINOTE27},
+       {"MIDINOTE28", K_MIDINOTE28},
+       {"MIDINOTE29", K_MIDINOTE29},
+       {"MIDINOTE30", K_MIDINOTE30},
+       {"MIDINOTE31", K_MIDINOTE31},
+       {"MIDINOTE32", K_MIDINOTE32},
+       {"MIDINOTE33", K_MIDINOTE33},
+       {"MIDINOTE34", K_MIDINOTE34},
+       {"MIDINOTE35", K_MIDINOTE35},
+       {"MIDINOTE36", K_MIDINOTE36},
+       {"MIDINOTE37", K_MIDINOTE37},
+       {"MIDINOTE38", K_MIDINOTE38},
+       {"MIDINOTE39", K_MIDINOTE39},
+       {"MIDINOTE40", K_MIDINOTE40},
+       {"MIDINOTE41", K_MIDINOTE41},
+       {"MIDINOTE42", K_MIDINOTE42},
+       {"MIDINOTE43", K_MIDINOTE43},
+       {"MIDINOTE44", K_MIDINOTE44},
+       {"MIDINOTE45", K_MIDINOTE45},
+       {"MIDINOTE46", K_MIDINOTE46},
+       {"MIDINOTE47", K_MIDINOTE47},
+       {"MIDINOTE48", K_MIDINOTE48},
+       {"MIDINOTE49", K_MIDINOTE49},
+       {"MIDINOTE50", K_MIDINOTE50},
+       {"MIDINOTE51", K_MIDINOTE51},
+       {"MIDINOTE52", K_MIDINOTE52},
+       {"MIDINOTE53", K_MIDINOTE53},
+       {"MIDINOTE54", K_MIDINOTE54},
+       {"MIDINOTE55", K_MIDINOTE55},
+       {"MIDINOTE56", K_MIDINOTE56},
+       {"MIDINOTE57", K_MIDINOTE57},
+       {"MIDINOTE58", K_MIDINOTE58},
+       {"MIDINOTE59", K_MIDINOTE59},
+       {"MIDINOTE60", K_MIDINOTE60},
+       {"MIDINOTE61", K_MIDINOTE61},
+       {"MIDINOTE62", K_MIDINOTE62},
+       {"MIDINOTE63", K_MIDINOTE63},
+       {"MIDINOTE64", K_MIDINOTE64},
+       {"MIDINOTE65", K_MIDINOTE65},
+       {"MIDINOTE66", K_MIDINOTE66},
+       {"MIDINOTE67", K_MIDINOTE67},
+       {"MIDINOTE68", K_MIDINOTE68},
+       {"MIDINOTE69", K_MIDINOTE69},
+       {"MIDINOTE70", K_MIDINOTE70},
+       {"MIDINOTE71", K_MIDINOTE71},
+       {"MIDINOTE72", K_MIDINOTE72},
+       {"MIDINOTE73", K_MIDINOTE73},
+       {"MIDINOTE74", K_MIDINOTE74},
+       {"MIDINOTE75", K_MIDINOTE75},
+       {"MIDINOTE76", K_MIDINOTE76},
+       {"MIDINOTE77", K_MIDINOTE77},
+       {"MIDINOTE78", K_MIDINOTE78},
+       {"MIDINOTE79", K_MIDINOTE79},
+       {"MIDINOTE80", K_MIDINOTE80},
+       {"MIDINOTE81", K_MIDINOTE81},
+       {"MIDINOTE82", K_MIDINOTE82},
+       {"MIDINOTE83", K_MIDINOTE83},
+       {"MIDINOTE84", K_MIDINOTE84},
+       {"MIDINOTE85", K_MIDINOTE85},
+       {"MIDINOTE86", K_MIDINOTE86},
+       {"MIDINOTE87", K_MIDINOTE87},
+       {"MIDINOTE88", K_MIDINOTE88},
+       {"MIDINOTE89", K_MIDINOTE89},
+       {"MIDINOTE90", K_MIDINOTE90},
+       {"MIDINOTE91", K_MIDINOTE91},
+       {"MIDINOTE92", K_MIDINOTE92},
+       {"MIDINOTE93", K_MIDINOTE93},
+       {"MIDINOTE94", K_MIDINOTE94},
+       {"MIDINOTE95", K_MIDINOTE95},
+       {"MIDINOTE96", K_MIDINOTE96},
+       {"MIDINOTE97", K_MIDINOTE97},
+       {"MIDINOTE98", K_MIDINOTE98},
+       {"MIDINOTE99", K_MIDINOTE99},
+       {"MIDINOTE100", K_MIDINOTE100},
+       {"MIDINOTE101", K_MIDINOTE101},
+       {"MIDINOTE102", K_MIDINOTE102},
+       {"MIDINOTE103", K_MIDINOTE103},
+       {"MIDINOTE104", K_MIDINOTE104},
+       {"MIDINOTE105", K_MIDINOTE105},
+       {"MIDINOTE106", K_MIDINOTE106},
+       {"MIDINOTE107", K_MIDINOTE107},
+       {"MIDINOTE108", K_MIDINOTE108},
+       {"MIDINOTE109", K_MIDINOTE109},
+       {"MIDINOTE110", K_MIDINOTE110},
+       {"MIDINOTE111", K_MIDINOTE111},
+       {"MIDINOTE112", K_MIDINOTE112},
+       {"MIDINOTE113", K_MIDINOTE113},
+       {"MIDINOTE114", K_MIDINOTE114},
+       {"MIDINOTE115", K_MIDINOTE115},
+       {"MIDINOTE116", K_MIDINOTE116},
+       {"MIDINOTE117", K_MIDINOTE117},
+       {"MIDINOTE118", K_MIDINOTE118},
+       {"MIDINOTE119", K_MIDINOTE119},
+       {"MIDINOTE120", K_MIDINOTE120},
+       {"MIDINOTE121", K_MIDINOTE121},
+       {"MIDINOTE122", K_MIDINOTE122},
+       {"MIDINOTE123", K_MIDINOTE123},
+       {"MIDINOTE124", K_MIDINOTE124},
+       {"MIDINOTE125", K_MIDINOTE125},
+       {"MIDINOTE126", K_MIDINOTE126},
+       {"MIDINOTE127", K_MIDINOTE127},
+
        {NULL, 0}
 };
 
@@ -711,10 +838,10 @@ Key_Console (int key, int ascii)
        {
                if(keydown[K_CTRL])
                {
-                       con_backscroll += (int)floor((vid_conheight.integer >> 2) / con_textsize.integer)-1;
+                       con_backscroll += ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
                }
                else
-                       con_backscroll += (int)floor((vid_conheight.integer >> 1) / con_textsize.integer)-3;
+                       con_backscroll += ((vid_conheight.integer >> 1) / con_textsize.integer)-3;
                return;
        }
 
@@ -722,10 +849,10 @@ Key_Console (int key, int ascii)
        {
                if(keydown[K_CTRL])
                {
-                       con_backscroll -= (int)floor((vid_conheight.integer >> 2) / con_textsize.integer)-1;
+                       con_backscroll -= ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
                }
                else
-                       con_backscroll -= (int)floor((vid_conheight.integer >> 1) / con_textsize.integer)-3;
+                       con_backscroll -= ((vid_conheight.integer >> 1) / con_textsize.integer)-3;
                return;
        }
  
@@ -734,7 +861,7 @@ Key_Console (int key, int ascii)
                if(keydown[K_CTRL])
                        con_backscroll += 1;
                else if(keydown[K_SHIFT])
-                       con_backscroll += (int)floor((vid_conheight.integer >> 2) / con_textsize.integer)-1;
+                       con_backscroll += ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
                else
                        con_backscroll += 5;
                return;
@@ -745,7 +872,7 @@ Key_Console (int key, int ascii)
                if(keydown[K_CTRL])
                        con_backscroll -= 1;
                else if(keydown[K_SHIFT])
-                       con_backscroll -= (int)floor((vid_conheight.integer >> 2) / con_textsize.integer)-1;
+                       con_backscroll -= ((vid_conheight.integer >> 2) / con_textsize.integer)-1;
                else
                        con_backscroll -= 5;
                return;
@@ -1189,7 +1316,7 @@ Key_WriteBindings (qfile_t *f)
                        p = keybindings[j][i];
                        if (p)
                        {
-                               Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\");
+                               Cmd_QuoteString(bindbuf, sizeof(bindbuf), p, "\"\\"); // don't need to escape $ because cvars are not expanded inside bind
                                if (j == 0)
                                        FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString (i), bindbuf);
                                else