Map vote: capture and ignore right mouse click; it prevents zooming while holding...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / mapvoting.qc

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 61ba69b6a277c03eacab792d0feade3bc69f9970..d6ee23046cdcf74c1044ef24a376999691aa6e98 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -1,13 +1,18 @@
 #include "mapvoting.qh"
 
-#include "autocvars.qh"
-#include "miscfunctions.qh"
-#include "defs.qh"
-#include "hud/_mod.qh"
-#include "hud/panel/scoreboard.qh"
-
+#include <client/draw.qh>
+#include <client/hud/_mod.qh>
+#include <client/hud/panel/scoreboard.qh>
 #include <common/mapinfo.qh>
+#include <common/util.qh>
 
+// MapVote (#21)
+
+void MapVote_Draw_Export(int fh)
+{
+       // allow saving cvars that aesthetically change the panel into hud skin files
+       HUD_Write_Cvar("hud_panel_mapvote_highlight_border");
+}
 
 int mv_num_maps;
 
@@ -41,6 +46,19 @@ const int NUM_SSDIRS = 4;
 string ssdirs[NUM_SSDIRS];
 int n_ssdirs;
 
+bool PreviewExists(string name)
+{
+       if(autocvar_cl_readpicture_force)
+               return false;
+
+       if (fexists(strcat(name, ".tga"))) return true;
+       if (fexists(strcat(name, ".png"))) return true;
+       if (fexists(strcat(name, ".jpg"))) return true;
+       if (fexists(strcat(name, ".pcx"))) return true;
+
+       return false;
+}
+
 string MapVote_FormatMapItem(int id, string map, float _count, float maxwidth, vector fontsize)
 {
        TC(int, id);
@@ -629,7 +647,7 @@ void GameTypeVote_ReadOption(int i)
        }
        else
        {
-               Gametype type = MapInfo_Type_FromString(gt);
+               Gametype type = MapInfo_Type_FromString(gt, false);
                mv_pk3[i] = strzone(MapInfo_Type_ToText(type));
                mv_desc[i] = MapInfo_Type_Description(type);
        }
@@ -781,8 +799,8 @@ int MapVote_MoveDown(int pos)
 float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
 {
        TC(int, bInputType);
-       float imp;
 
+       static int first_digit = 0;
        if (!mv_active)
                return false;
 
@@ -794,63 +812,103 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
                return true;
        }
 
-       if (bInputType != 0)
+       if (bInputType == 2)
                return false;
 
-       if ('0' <= nPrimary && nPrimary <= '9')
+       // at this point bInputType can be 0 or 1 (key pressed or released)
+       bool key_pressed = (bInputType == 0);
+
+       if (key_pressed)
        {
-               imp = nPrimary - '0';
-               if (imp == 0) imp = 10;
-               localcmd(strcat("\nimpulse ", ftos(imp), "\n"));
-               return true;
+               if (nPrimary == K_ALT) hudShiftState |= S_ALT;
+               if (nPrimary == K_CTRL) hudShiftState |= S_CTRL;
+               if (nPrimary == K_SHIFT) hudShiftState |= S_SHIFT;
        }
-       switch(nPrimary)
+       else
        {
-               case K_KP_1: localcmd("\nimpulse 1\n"); return true;
-               case K_KP_2: localcmd("\nimpulse 2\n"); return true;
-               case K_KP_3: localcmd("\nimpulse 3\n"); return true;
-               case K_KP_4: localcmd("\nimpulse 4\n"); return true;
-               case K_KP_5: localcmd("\nimpulse 5\n"); return true;
-               case K_KP_6: localcmd("\nimpulse 6\n"); return true;
-               case K_KP_7: localcmd("\nimpulse 7\n"); return true;
-               case K_KP_8: localcmd("\nimpulse 8\n"); return true;
-               case K_KP_9: localcmd("\nimpulse 9\n"); return true;
-               case K_KP_0: localcmd("\nimpulse 10\n"); return true;
+               if (nPrimary == K_ALT) hudShiftState -= (hudShiftState & S_ALT);
+               if (nPrimary == K_CTRL) hudShiftState -= (hudShiftState & S_CTRL);
+               if (nPrimary == K_SHIFT) hudShiftState -= (hudShiftState & S_SHIFT);
+
+               if (nPrimary == K_CTRL)
+                       first_digit = 0;
+       }
 
+       int imp = 0;
+       switch(nPrimary)
+       {
                case K_RIGHTARROW:
+                       if (!key_pressed) return true;
                        mv_selection_keyboard = 1;
                        mv_selection = MapVote_MoveRight(mv_selection);
                        return true;
                case K_LEFTARROW:
+                       if (!key_pressed) return true;
                        mv_selection_keyboard = 1;
                        mv_selection = MapVote_MoveLeft(mv_selection);
                        return true;
                case K_DOWNARROW:
+                       if (!key_pressed) return true;
                        mv_selection_keyboard = 1;
                        mv_selection = MapVote_MoveDown(mv_selection);
                        return true;
                case K_UPARROW:
+                       if (!key_pressed) return true;
                        mv_selection_keyboard = 1;
                        mv_selection = MapVote_MoveUp(mv_selection);
                        return true;
                case K_KP_ENTER:
                case K_ENTER:
                case K_SPACE:
+                       if (!key_pressed) return true;
                        if ( mv_selection_keyboard )
                                MapVote_SendChoice(mv_selection);
                        return true;
+               case '1': case K_KP_1: imp = 1; break;
+               case '2': case K_KP_2: imp = 2; break;
+               case '3': case K_KP_3: imp = 3; break;
+               case '4': case K_KP_4: imp = 4; break;
+               case '5': case K_KP_5: imp = 5; break;
+               case '6': case K_KP_6: imp = 6; break;
+               case '7': case K_KP_7: imp = 7; break;
+               case '8': case K_KP_8: imp = 8; break;
+               case '9': case K_KP_9: imp = 9; break;
+               case '0': case K_KP_0: imp = 10; break;
+       }
+
+       if (imp && hudShiftState & S_CTRL)
+       {
+               if (!first_digit)
+               {
+                       if (!key_pressed)
+                               return true;
+                       first_digit = imp % 10;
+                       return true;
+               }
+               else
+                       imp = first_digit * 10 + (imp % 10);
        }
 
        if (nPrimary == K_MOUSE1)
        {
+               if (!key_pressed)
+                       return true;
                mv_selection_keyboard = 0;
                mv_selection = mv_mouse_selection;
                if (mv_selection >= 0)
-               {
                        imp = min(mv_selection + 1, mv_num_maps);
-                       localcmd(strcat("\nimpulse ", ftos(imp), "\n"));
+       }
+
+       if (nPrimary == K_MOUSE2)
+               return true; // do nothing
+
+       if (imp)
+       {
+               if (!key_pressed)
                        return true;
-               }
+               if (imp <= mv_num_maps)
+                       localcmd(strcat("\nimpulse ", ftos(imp), "\n"));
+               return true;
        }
 
        return false;