rewrite settemp system to handle "quit" right

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / menu.qc

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 4ae22cd08d14e9328f6272b08bf0874d9f8a355c..640581b9a49f348fb5594efb74a032a7477b3b42 100644 (file)
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -16,9 +16,17 @@ float menuInitialized;
 float menuNotTheFirstFrame;
 float menuMouseMode;
 
-void SUB_Null() { };
+void SUB_Null() { }
 
-void() m_init =
+void m_sync()
+{
+       updateCompression();
+       updateConwidths();
+
+       loadAllCvars(main);
+}
+
+void m_init()
 {
        cvar_set("_menu_alpha", "0");
        prvm_language = strzone(cvar_string("prvm_language"));
@@ -26,7 +34,7 @@ void() m_init =
        check_unacceptable_compiler_bugs();
 
 #ifdef WATERMARK
-       print(sprintf(_("^4MQC Build information: %s\n"), WATERMARK()));
+       print(sprintf(_("^4MQC Build information: ^1%s\n"), WATERMARK()));
 #endif
 
        // list all game dirs (TEST)
@@ -95,7 +103,7 @@ void UpdateConWidthHeight()
        }
 }
 
-void() m_init_delayed =
+void m_init_delayed()
 {
        float fh, glob, n, i;
        string s;
@@ -121,7 +129,8 @@ void() m_init_delayed =
        if(fh < 0)
        if(cvar_defstring("menu_skin") != "")
        {
-               draw_currentSkin = strcat("gfx/menu/", cvar_defstring("menu_skin"));
+               cvar_set("menu_skin", cvar_defstring("menu_skin"));
+               draw_currentSkin = strcat("gfx/menu/", cvar_string("menu_skin"));
                fh = fopen(language_filename(strcat(draw_currentSkin, "/skinvalues.txt")), FILE_READ);
        }
        if(fh < 0)
@@ -129,6 +138,10 @@ void() m_init_delayed =
                draw_currentSkin = "gfx/menu/default";
                fh = fopen(language_filename(strcat(draw_currentSkin, "/skinvalues.txt")), FILE_READ);
        }
+       if(fh < 0)
+       {
+               error("cannot load any menu skin\n");
+       }
        draw_currentSkin = strzone(draw_currentSkin);
        while((s = fgets(fh)))
        {
@@ -164,11 +177,13 @@ void() m_init_delayed =
        menuShiftState = 0;
        menuMousePos = '0.5 0.5 0';
 
+       m_sync();
+
        if(Menu_Active)
                m_display(); // delayed menu display
-};
+}
 
-void(float key, float ascii) m_keyup =
+void m_keyup (float key, float ascii)
 {
        if(!menuInitialized)
                return;
@@ -190,9 +205,9 @@ void(float key, float ascii) m_keyup =
        if(key == K_ALT) menuShiftState -= (menuShiftState & S_ALT);
        if(key == K_CTRL) menuShiftState -= (menuShiftState & S_CTRL);
        if(key == K_SHIFT) menuShiftState -= (menuShiftState & S_SHIFT);
-};
+}
 
-void(float key, float ascii) m_keydown =
+void m_keydown(float key, float ascii)
 {
        if(!menuInitialized)
                return;
@@ -228,7 +243,7 @@ void(float key, float ascii) m_keydown =
        if(key == K_ALT) menuShiftState |= S_ALT;
        if(key == K_CTRL) menuShiftState |= S_CTRL;
        if(key == K_SHIFT) menuShiftState |= S_SHIFT;
-};
+}
 
 float SCALEMODE_CROP = 0;
 float SCALEMODE_LETTERBOX = 1;
@@ -269,7 +284,7 @@ void draw_Picture_Aligned(vector algn, float scalemode, string img, float a)
        draw_Picture(org, img, isz, '1 1 1', a);
 }
 
-void(string img, float a, string algn, float force1) drawBackground =
+void drawBackground(string img, float a, string algn, float force1)
 {
        if(main.mainNexposee.ModalController_state == 0)
                return;
@@ -328,10 +343,10 @@ vector menuTooltipSize;
 float menuTooltipAlpha;
 string menuTooltipText;
 float menuTooltipState; // 0: static, 1: fading in, 2: fading out
-float m_testmousetooltipbox()
+float m_testmousetooltipbox(vector pos)
 {
-       if(menuMousePos_x >= menuTooltipOrigin_x && menuMousePos_x < menuTooltipOrigin_x + menuTooltipSize_x)
-       if(menuMousePos_y >= menuTooltipOrigin_y && menuMousePos_y < menuTooltipOrigin_y + menuTooltipSize_y)
+       if(pos_x >= menuTooltipOrigin_x && pos_x < menuTooltipOrigin_x + menuTooltipSize_x)
+       if(pos_y >= menuTooltipOrigin_y && pos_y < menuTooltipOrigin_y + menuTooltipSize_y)
                return FALSE;
        return TRUE;
 }
@@ -454,7 +469,7 @@ string gettooltip()
        }
        return menuTooltipItem.tooltip;
 }
-void m_tooltip()
+void m_tooltip(vector pos)
 {
        float f, i, w;
        entity it;
@@ -473,10 +488,10 @@ void m_tooltip()
        else
        {
                f = bound(0, frametime * 2, 1);
-               menuTooltipAveragedMousePos = menuTooltipAveragedMousePos * (1 - f) + menuMousePos * f;
-               f = vlen(menuMousePos - menuTooltipAveragedMousePos);
+               menuTooltipAveragedMousePos = menuTooltipAveragedMousePos * (1 - f) + pos * f;
+               f = vlen(pos - menuTooltipAveragedMousePos);
                if(f < 0.01)
-                       it = m_findtooltipitem(main, menuMousePos);
+                       it = m_findtooltipitem(main, pos);
                else
                        it = world;
        }
@@ -501,7 +516,10 @@ void m_tooltip()
 
                                        menuTooltipOrigin_x = -1; // unallocated
 
+                                       if (menuTooltipText)
+                                               strunzone(menuTooltipText);
                                        menuTooltipText = strzone(gettooltip());
+
                                        i = 0;
                                        w = 0;
                                        getWrappedLine_remaining = menuTooltipText;
@@ -531,7 +549,7 @@ void m_tooltip()
                menuTooltipState = 1;
 
        if(menuTooltipItem)
-               if(!m_testmousetooltipbox())
+               if(!m_testmousetooltipbox(pos))
                        menuTooltipState = 2; // fade out if mouse touches it
 
        switch(menuTooltipState)
@@ -551,7 +569,16 @@ void m_tooltip()
                        break;
        }
 
-       if(menuTooltipItem)
+       if(menuTooltipItem == world)
+       {
+               if (menuTooltipText)
+               {
+                       strunzone(menuTooltipText);
+                       menuTooltipText = string_null;
+               }
+               return;
+       }
+       else
        {
                if(menu_tooltips != menu_tooltips_old)
                {
@@ -560,7 +587,7 @@ void m_tooltip()
                        menu_tooltips_old = menu_tooltips;
                }
                else if(menuTooltipOrigin_x < 0) // unallocated?
-                       m_allocatetooltipbox(menuMousePos);
+                       m_allocatetooltipbox(pos);
 
                if(menuTooltipOrigin_x >= 0)
                {
@@ -583,7 +610,7 @@ void m_tooltip()
        }
 }
 
-void() m_draw =
+void m_draw()
 {
        float t;
        float realFrametime;
@@ -750,7 +777,7 @@ void() m_draw =
        }
        main.draw(main);
 
-       m_tooltip();
+       m_tooltip(menuMousePos);
 
        draw_alpha = max(draw_alpha, SKINALPHA_CURSOR_INTRO * bound(0, menuLogoAlpha, 1));
 
@@ -760,9 +787,9 @@ void() m_draw =
        postMenuDraw();
 
        frametime = 0;
-};
+}
 
-void() m_display =
+void m_display()
 {
        Menu_Active = true;
        setkeydest(KEY_MENU);
@@ -777,9 +804,9 @@ void() m_display =
 
        main.focusEnter(main);
        main.showNotify(main);
-};
+}
 
-void() m_hide =
+void m_hide()
 {
        Menu_Active = false;
        setkeydest(KEY_GAME);
@@ -790,17 +817,25 @@ void() m_hide =
 
        main.focusLeave(main);
        main.hideNotify(main);
-};
+}
 
-void() m_toggle =
+void m_toggle(float mode)
 {
        if(Menu_Active)
+       {
+               if (mode == 1)
+                       return;
                m_hide();
+       }
        else
+       {
+               if (mode == 0)
+                       return;
                m_display();
-};
+       }
+}
 
-void() m_shutdown =
+void Shutdown()
 {
        entity e;
 
@@ -811,7 +846,7 @@ void() m_shutdown =
                        if(e.destroy)
                                e.destroy(e);
        }
-};
+}
 
 void m_focus_item_chain(entity outermost, entity innermost)
 {
@@ -867,7 +902,7 @@ void m_setpointerfocus(entity wnd)
        }
 }
 
-void(string itemname) m_goto =
+void m_goto(string itemname)
 {
        entity e;
        if(!menuInitialized)
@@ -884,7 +919,7 @@ void(string itemname) m_goto =
        }
        else
        {
-               for(e = NULL; (e = findstring(e, name, itemname)); )
+               for(e = NULL; (e = find(e, name, itemname)); )
                        if(e.classname != "vtbl")
                                break;
                if(e)
@@ -897,7 +932,7 @@ void(string itemname) m_goto =
        }
 }
 
-void() m_goto_skin_selector =
+void m_goto_skin_selector()
 {
        if(!menuInitialized)
                return;
@@ -905,7 +940,7 @@ void() m_goto_skin_selector =
        m_goto("skinselector");
 }
 
-void() m_goto_language_selector =
+void m_goto_language_selector()
 {
        if(!menuInitialized)
                return;
@@ -913,7 +948,7 @@ void() m_goto_language_selector =
        m_goto("languageselector");
 }
 
-void() m_goto_video_settings =
+void m_goto_video_settings()
 {
        if(!menuInitialized)
                return;