From 36df86fcd2382ab14ba377a6220ab79769db0b4e Mon Sep 17 00:00:00 2001
From: 12pm <30786226+12pm@users.noreply.github.com>
Date: Sat, 5 Oct 2019 18:04:43 +0200
Subject: [PATCH] Add toggle keyboard shortcuts button to demo player

Demo shortcuts can be annoying if you have other binds on them.

Icons made by eNJi
---
 data/demo_buttons2.png                    | Bin 262 -> 1476 bytes
 datasrc/content.py                        |   4 +++-
 src/engine/shared/config_variables.h      |   1 +
 src/game/client/components/menus_demo.cpp |  12 +++++++++++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/data/demo_buttons2.png b/data/demo_buttons2.png
index 1f1b4fece6f645b6ad69c5c1422dde98dc1551d1..0fd3f244697604f5b5a1055192f8482e366a472f 100644
GIT binary patch
literal 1476
zcmV;#1v~nQP)<h;3K|Lk000e1NJLTq004jh001Be1^@s6+9Gfz00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1zAZ%K~#8N?V4YR
zR8<_u&#0}%u75I9vsrCXYb-Dg_d#-GeDS4+1o5FDdy}Z%!dRjn3g03K3b&}oNL!RJ
z3QA<v0$Cy=sE1rl*L7xR)BKl9<nG$-^PM?&cjnIBnLFc*UAp%JAI`bwo|)g7d(XeQ
zGYJz>9LKS_Xfw;EF%c#101+qd01+qd01>C|4#4K=Zkr7qVQ$-hN+PigkKtNdGDTe-
zfD3#V$*$s2DA{G(7~`UwZ_F{w;64?VQtu4#Du($2t8HpyjF`UpDf|_m!7>7O07ljl
zlD&AdP!LYkw!OBk^|Bma$07U&^`M~H>b>8<2hmG&<ByIyCY8#QPmvmv&!@PF102s3
zzdBsheiYB!qR^qX6`Sbv+oBnvj@S2b0$Yt@?8DZ@&*vQ{mEv7_TctXlrYwG-CxKK<
zlYCn|GS4OwiTySoDrl#sxKE2mW()27&gLu7hxagyoyDv<hd<zBcrX5lD^XMGPdE=(
z+q`%j&)^MQj~aOz$=!Gjf5DB|g(8Q^Vs?t=#2*=X!lct3=Iq(IX3d&O)8Bv2B$KLF
zE51Kms5y8UU3S`2p+jveHnD)(Jjb4@fOB5YqnN~Zu^nH+k8mNrfPMG~ZoscFY5fA%
zq0Sw^-8dih+Ly5d-$A{%xPZ-%-`o47lT2POjQm-%PC0{vpHN;kevm!D9$Zw+78ti_
z7%6R=+N`z*<(5q~D=x){@gaNwwTaS*QT|cXh`S#(s-*TD8&F@fR7ay#qgQ#2I*nG1
zUU$ZIW0i7y@dpMnrl;pKlg-XIOP5|Y2M@l&46u-MLE~3K4_Tt_;^8TKI&`RQ#U_^F
zyCJ09t2+Y4HT(^4;9q#omTCRW;vcBdq{a23%_|+T`71btH}NVCqF(P(Z3Yna#n0y_
z9j5!KH9wbA-9Yhc%>V~%TFQh?!-!wo{60f17NADl71XSv{GX`xT%%AU=pt%VX~%vE
zHRH_1EVkof)LuYkYf$eQl;H74M%e9aam?w{vl;QX%+aG+vwZnIoV%U)g%Pq@UB!p3
zwo2$w+lo!BV6&|<1!Z1KN1)h`T8Cf5&v7kkJ^co|aU*JEc3~R7#^-Ro&F?|I{$un~
zYX%Ut<7czOPFvfV!pL8-V$3;tQs?W6?>hr<LYt?<#iI%)Z5l>qYTIG^nX2Kv7T&K3
zrN@4GrLMx8)}p@neSP<tOlFxGA75qK+lS4G6W^Onn>0f-8h;utRu9g^CR;6ZsBOh2
z`qE>o72w#bMnx&t@f7OY#5fM4)^@GEqgIi_-%;hNt9r`o^;*YE*IpN`<BiA9<u0=3
zPjF|QLYm86DwH=6-`y3Kp&B;ZRQO)*8_&y~i0>0ZYq#GMGOfYaQLojDwC20BiS``s
zqjAkXvr+X_t~%O<`^`Ll-@}8&*P5TnEV66<q&a^425Y|B)KL7X3sOql0m}FiKfu3H
z7dQyoq-pcD8=qEzhk81|bo?Vn7MmSA-Zo=nou;GXf;n_(kJ+~EYN1v+jl_=@>Hr?S
zQ?Sc>xB&GqWnMs4R}X^pK*tX)8}-HCzI|2U;f|WFbmz|1l>5b&f#U}nk^e{Z;XUZ_
zs~)^~(a8K6^+QuVGe8@zL%)%B9=)+<jz2UsXwvC!lg-XEot<NB_)eOxu4+HZH4;Bs
zxFev%UexBP)!f1lF<AWSKkPI@S^UW2UVsui@lDk9*edkiZ{bR;9l!ZEzaoCT1ca5!
zKXYuQ(W9hICCHCKF?X6fbn`{r0m6y?Z_)CbFX9dmPF}?0*wULX;ypmbiD!U_6L)}!
e6L)|}W6Zzg%6*by=(o850000<MNUMnLSTa21>%PQ

literal 262
zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3HGX9;gigQfEC~978G?-(G7CJnA6gmMEj;
zp}S*u-vZ?w!3@`;t*T6ARPq*|xNH6Yx`W@f-zox1N=gT2-1^69z;j3H-EP)4TmJ*r
zA5wO_=dAc{^+T{T`*81d6{UV*fyoxecPiYJzM1_n7V+aLpBFIWqtOp%hyFv253ezE
z*(RJg%(5qFYx<7T{#D`n;`ukHJ-nwoONk%ITJ`W==&VNp?DezCxZ7rnXPC?WIvQ;z
zd?LFyK|kd|Yo2i1ZuJ-6E{Sv1b^d*y&2-1Fp#us|u&eh<p4-e8%?<PzgQu&X%Q~lo
FCIAgUYg7OL

diff --git a/datasrc/content.py b/datasrc/content.py
index c5c13d458..82e752ed5 100644
--- a/datasrc/content.py
+++ b/datasrc/content.py
@@ -270,7 +270,7 @@ set_demobuttons = SpriteSet("demobuttons", image_demobuttons, 5, 1)
 set_fileicons = SpriteSet("fileicons", image_fileicons, 8, 1)
 set_guibuttons = SpriteSet("guibuttons", image_guibuttons, 12, 4)
 set_guiicons = SpriteSet("guiicons", image_guiicons, 8, 2)
-set_demobuttons2 = SpriteSet("demobuttons2", image_demobuttons2, 3, 1)
+set_demobuttons2 = SpriteSet("demobuttons2", image_demobuttons2, 4, 1)
 set_audio_source = SpriteSet("audio_source", image_audio_source, 1, 1)
 
 container.spritesets.Add(set_particles)
@@ -408,6 +408,8 @@ container.sprites.Add(Sprite("demobutton_faster", set_demobuttons, 4,0,1,1))
 
 container.sprites.Add(Sprite("demobutton_slice_begin", set_demobuttons2, 0,0,1,1))
 container.sprites.Add(Sprite("demobutton_slice_end", set_demobuttons2, 1,0,1,1))
+container.sprites.Add(Sprite("demobutton_shortcuts_enabled", set_demobuttons2, 2,0,1,1))
+container.sprites.Add(Sprite("demobutton_shortcuts_disabled", set_demobuttons2, 3,0,1,1))
 
 container.sprites.Add(Sprite("file_demo1", set_fileicons, 0,0,1,1))
 container.sprites.Add(Sprite("file_demo2", set_fileicons, 1,0,1,1))
diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h
index 9d8e518ed..5bc7e527e 100644
--- a/src/engine/shared/config_variables.h
+++ b/src/engine/shared/config_variables.h
@@ -358,6 +358,7 @@ MACRO_CONFIG_INT(ClConfigVersion, cl_config_version, 0, 0, 0, CFGFLAG_CLIENT|CFG
 MACRO_CONFIG_INT(ClDemoSliceBegin, cl_demo_slice_begin, -1, 0, 0, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Begin marker for demo slice")
 MACRO_CONFIG_INT(ClDemoSliceEnd, cl_demo_slice_end, -1, 0, 0, CFGFLAG_SAVE|CFGFLAG_CLIENT, "End marker for demo slice")
 MACRO_CONFIG_INT(ClDemoShowSpeed, cl_demo_show_speed, 0, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Show speed meter on change")
+MACRO_CONFIG_INT(ClDemoKeyboardShortcuts, cl_demo_keyboard_shortcuts, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Enable keyboard shortcuts in demo player")
 
 //opengl
 MACRO_CONFIG_INT(GfxOpenGL3, gfx_opengl3, 0, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Use new OpenGL3 with shaders")
diff --git a/src/game/client/components/menus_demo.cpp b/src/game/client/components/menus_demo.cpp
index 49deac82c..1afa926e7 100644
--- a/src/game/client/components/menus_demo.cpp
+++ b/src/game/client/components/menus_demo.cpp
@@ -164,7 +164,7 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 	}
 
 	// handle keyboard shortcuts independent of active menu
-	if(m_pClient->m_pGameConsole->IsClosed() && m_DemoPlayerState == DEMOPLAYER_NONE)
+	if(m_pClient->m_pGameConsole->IsClosed() && m_DemoPlayerState == DEMOPLAYER_NONE && g_Config.m_ClDemoKeyboardShortcuts)
 	{
 		// increase/decrease speed
 		if(Input()->KeyPress(KEY_MOUSE_WHEEL_UP) || Input()->KeyPress(KEY_UP))
@@ -467,6 +467,16 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 		DemolistOnUpdate(false);
 	}
 
+	// toggle keyboard shortcuts button
+	ButtonBar.VSplitRight(Margins*3, &ButtonBar, 0);
+	ButtonBar.VSplitRight(ButtonbarHeight, &ButtonBar, &Button);
+	static int s_KeyboardShortcutsButton = 0;
+	int Sprite = g_Config.m_ClDemoKeyboardShortcuts ? SPRITE_DEMOBUTTON_SHORTCUTS_ENABLED : SPRITE_DEMOBUTTON_SHORTCUTS_DISABLED;
+	if(DoButton_Sprite(&s_KeyboardShortcutsButton, IMAGE_DEMOBUTTONS2, Sprite, 0, &Button, CUI::CORNER_ALL))
+	{
+		g_Config.m_ClDemoKeyboardShortcuts ^= 1;
+	}
+
 	// demo name
 	char aDemoName[64] = {0};
 	DemoPlayer()->GetDemoName(aDemoName, sizeof(aDemoName));