_con_chat_maximized ;)

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 68c356b2b85041d83d213e698d0528dfd7a32075..d42b8649c1b225d1900787c35856dadce2d943b7 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1413,15 +1413,27 @@ alias reducematchtime "sv_cmd rpn /timelimit timelimit timelimit_decrement sub t
 alias endmatch "timelimit -1"
 
 // useful keybind to maximize the chat area temporarily
+// HUD code takes care of many of these now...
+//set _backup_con_chatvars_set 0
+//alias _restore_con_chatvars_0 ""
+//alias _restore_con_chatvars_1 "set _backup_con_chatvars_set 0; con_chatpos $_backup_con_chatpos; con_chat $_backup_con_chat; con_notify $_backup_con_notify; con_chattime $_backup_con_chattime; cl_deathscoreboard $_backup_cl_deathscoreboard; scr_centertime $_backup_scr_centertime;r_track_sprites $_backup_r_track_sprites"
+//alias _restore_con_chatvars "_restore_con_chatvars_$_backup_con_chatvars_set"
+//alias _backup_con_chatvars_0 "set _backup_con_chatvars_set 1; set _backup_con_chatpos $con_chatpos; set _backup_con_chat $con_chat; set _backup_con_notify $con_notify; set _backup_con_chattime $con_chattime; set _backup_cl_deathscoreboard $cl_deathscoreboard; set _backup_scr_centertime $scr_centertime;set _backup_r_track_sprites $r_track_sprites"
+//alias _backup_con_chatvars_1 ""
+//alias _backup_con_chatvars "_backup_con_chatvars_$_backup_con_chatvars_set"
+//alias +con_chat_maximize "_backup_con_chatvars; con_chatpos -9; con_chat 100; con_notify 0; con_chattime 3600; cl_deathscoreboard 0; scr_centertime 0; r_track_sprites 0"
+//alias -con_chat_maximize "_restore_con_chatvars"
+
+set _con_chat_maximized 0
 set _backup_con_chatvars_set 0
 alias _restore_con_chatvars_0 ""
-alias _restore_con_chatvars_1 "set _backup_con_chatvars_set 0; con_chatpos $_backup_con_chatpos; con_chat $_backup_con_chat; con_notify $_backup_con_notify; con_chattime $_backup_con_chattime; cl_deathscoreboard $_backup_cl_deathscoreboard; scr_centertime $_backup_scr_centertime;r_track_sprites $_backup_r_track_sprites"
+alias _restore_con_chatvars_1 "set _backup_con_chatvars_set 0; con_notify $_backup_con_notify; con_chattime $_backup_con_chattime; cl_deathscoreboard $_backup_cl_deathscoreboard; scr_centertime $_backup_scr_centertime;r_track_sprites $_backup_r_track_sprites"
 alias _restore_con_chatvars "_restore_con_chatvars_$_backup_con_chatvars_set"
-alias _backup_con_chatvars_0 "set _backup_con_chatvars_set 1; set _backup_con_chatpos $con_chatpos; set _backup_con_chat $con_chat; set _backup_con_notify $con_notify; set _backup_con_chattime $con_chattime; set _backup_cl_deathscoreboard $cl_deathscoreboard; set _backup_scr_centertime $scr_centertime;set _backup_r_track_sprites $r_track_sprites"
+alias _backup_con_chatvars_0 "set _backup_con_chatvars_set 1; set _backup_con_notify $con_notify; set _backup_con_chattime $con_chattime; set _backup_cl_deathscoreboard $cl_deathscoreboard; set _backup_scr_centertime $scr_centertime;set _backup_r_track_sprites $r_track_sprites"
 alias _backup_con_chatvars_1 ""
 alias _backup_con_chatvars "_backup_con_chatvars_$_backup_con_chatvars_set"
-alias +con_chat_maximize "_backup_con_chatvars; con_chatpos -9; con_chat 100; con_notify 0; con_chattime 3600; cl_deathscoreboard 0; scr_centertime 0; r_track_sprites 0"
-alias -con_chat_maximize "_restore_con_chatvars"
+alias +con_chat_maximize "_con_chat_maximized 1; _backup_con_chatvars; con_notify 0; con_chattime 3600; cl_deathscoreboard 0; scr_centertime 0; r_track_sprites 0"
+alias -con_chat_maximize "_con_chat_maximized 0; _restore_con_chatvars"
 
 // tab completion
 set con_completion_playdemo    *.dem

diff --git a/hud_default.cfg b/hud_default.cfg
index 731a187416d5c349eb7547be6c4fdb5c320239ea..8c7abe41349b173d16363265545df6fe415df95d 100644 (file)
--- a/hud_default.cfg
+++ b/hud_default.cfg
@@ -198,5 +198,3 @@ seta hud_panel_infomessages_bg_color_team ""
 seta hud_panel_infomessages_bg_alpha "0"
 seta hud_panel_infomessages_bg_border ""
 seta hud_panel_infomessages_bg_padding ""
-
-menu_restart

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index bfb60251ddac0e99d234e7ffb9d54e48f1c34ab4..0c2df0e636257816fd717d9965883a9a323fd56a 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -23,6 +23,7 @@ var float autocvar_hud_configure_grid_xsize;
 var float autocvar_hud_configure_grid_ysize;
 var float autocvar_hud_configure_grid_alpha;
 
+var float autocvar__con_chat_maximized;
 var string autocvar__hud_panelorder;
 
 var string autocvar_hud_skin;

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 6c05c0167f6a1c63349ec7f9af3b4be56246d355..8b1d5b450a172ad410d74d3a3828d208a92e5f8f 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4229,11 +4229,22 @@ void HUD_Chat(void)
 
        active_panel = HUD_PANEL_CHAT;
        HUD_Panel_UpdateCvars(chat);
+
+       if(autocvar__con_chat_maximized && !autocvar__hud_configure) // draw at full screen height if maximized
+       {
+               panel_pos_y = panel_bg_border;
+               panel_size_y = vid_conheight - panel_bg_border * 2;
+               if(panel_bg == "0")
+                       panel_bg = "border"; // force a border when maximized
+               panel_bg_alpha = max(0.75, panel_bg_alpha); // force an alpha of at least 0.75
+       }
+
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;
 
        HUD_Panel_DrawBg(1);
+
        if(panel_bg_padding)
        {
                pos += '1 1 0' * panel_bg_padding;
@@ -4763,9 +4774,14 @@ void HUD_Main (void)
        }
        // draw panels in order specified by panel_order array
        for(i = HUD_PANEL_NUM - 1; i >= 0; --i) {
-               HUD_DrawPanel(panel_order[i]);
+               if(i != HUD_PANEL_CHAT || !autocvar__con_chat_maximized) // don't draw maximized chat panel twice!
+                       HUD_DrawPanel(panel_order[i]);
        }
 
+       // draw chat panel on top if it is maximized
+       if(autocvar__con_chat_maximized)
+               HUD_DrawPanel(HUD_PANEL_CHAT);
+
        // TODO hud_'ify these
        if (cvar("cl_showspeed"))
                HUD_ShowSpeed();