X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_gui.pas;h=22cb48d1e4317c46a4f39adcb2f98115741d8ded;hb=fa58c6452d91930e13453000a4b767a4e2447b88;hp=cd9d3b93244a371f0c89cc751575f78bb0106474;hpb=7908eab8a8bb5a2de31a03e588b2f12900c898c5;p=d2df-sdl.git

diff --git a/src/game/g_gui.pas b/src/game/g_gui.pas
index cd9d3b9..22cb48d 100644
--- a/src/game/g_gui.pas
+++ b/src/game/g_gui.pas
@@ -1,10 +1,25 @@
+(* Copyright (C)  DooM 2D:Forever Developers
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *)
 {$MODE DELPHI}
 unit g_gui;
 
 interface
 
 uses
-  e_graphics, e_input, g_playermodel, g_basic, MAPSTRUCT, wadreader;
+  e_graphics, e_input, e_log, g_playermodel, g_basic, MAPSTRUCT, wadreader;
 
 const
   MAINMENU_HEADER_COLOR: TRGB = (R:255; G:255; B:255);
@@ -105,6 +120,7 @@ type
     procedure OnMessage(var Msg: TMessage); virtual;
     procedure Update; virtual;
     procedure Draw; virtual;
+    function WantActivationKey (key: LongInt): Boolean; virtual;
     property X: Integer read FX write FX;
     property Y: Integer read FY write FY;
     property Enabled: Boolean read FEnabled write FEnabled;
@@ -274,6 +290,7 @@ type
     procedure OnMessage(var Msg: TMessage); override;
     procedure Draw; override;
     function GetWidth(): Word;
+    function WantActivationKey (key: LongInt): Boolean; override;
     property Key: Word read FKey write FKey;
     property Color: TRGB read FColor write FColor;
     property Font: TFont read FFont write FFont;
@@ -827,12 +844,15 @@ end;
 
 procedure TGUIControl.Update();
 begin
-
 end;
 
 procedure TGUIControl.Draw();
 begin
+end;
 
+function TGUIControl.WantActivationKey (key: LongInt): Boolean;
+begin
+  result := false;
 end;
 
 { TGUITextButton }
@@ -1429,6 +1449,14 @@ begin
 
   if not ok then Exit;
 
+  if (Msg.Msg = WM_KEYDOWN) and (FIndex <> -1) and (FItems[FIndex].Control <> nil) and
+     (FItems[FIndex].Control.WantActivationKey(Msg.wParam)) then
+  begin
+    FItems[FIndex].Control.OnMessage(Msg);
+    g_Sound_PlayEx(MENU_CLICKSOUND);
+    exit;
+  end;
+
   case Msg.Msg of
     WM_KEYDOWN:
     begin
@@ -2227,7 +2255,25 @@ begin
   if w > Result then Result := w;
 end;
 
+function TGUIKeyRead.WantActivationKey (key: LongInt): Boolean;
+begin
+  result :=
+    (key = IK_BACKSPACE) or
+    (key = IK_LEFT) or (key = IK_RIGHT) or
+    (key = IK_KPLEFT) or (key = IK_KPRIGHT) or
+    false; // oops
+end;
+
 procedure TGUIKeyRead.OnMessage(var Msg: TMessage);
+  procedure actDefCtl ();
+  begin
+    with FWindow do
+      if FDefControl <> '' then
+        SetActive(GetControl(FDefControl))
+      else
+        SetActive(nil);
+  end;
+
 begin
   inherited;
 
@@ -2240,13 +2286,7 @@ begin
         case wParam of
           IK_ESCAPE:
             begin
-              if FIsQuery then
-                with FWindow do
-                  if FDefControl <> '' then
-                    SetActive(GetControl(FDefControl))
-                  else
-                    SetActive(nil);
-
+              if FIsQuery then actDefCtl();
               FIsQuery := False;
             end;
           IK_RETURN, IK_KPRETURN:
@@ -2263,28 +2303,34 @@ begin
                 begin
                   FKey := IK_ENTER; // <Enter>
                   FIsQuery := False;
-
-                  with FWindow do
-                    if FDefControl <> '' then
-                      SetActive(GetControl(FDefControl))
-                    else
-                      SetActive(nil);
+                  actDefCtl();
                 end;
             end;
+          IK_BACKSPACE: // clear keybinding if we aren't waiting for a key
+            begin
+              if not FIsQuery then
+              begin
+                FKey := 0;
+                actDefCtl();
+              end;
+            end;
         end;
 
       MESSAGE_DIKEY:
-        if FIsQuery and (wParam <> IK_ENTER) and (wParam <> IK_KPRETURN) then // Not <Enter
         begin
-          if e_KeyNames[wParam] <> '' then
-            FKey := wParam;
-          FIsQuery := False;
-
-          with FWindow do
-            if FDefControl <> '' then
-              SetActive(GetControl(FDefControl))
-            else
-              SetActive(nil);
+          if not FIsQuery and (wParam = IK_BACKSPACE) then
+          begin
+            FKey := 0;
+            actDefCtl();
+          end
+          else if FIsQuery and (wParam <> IK_ENTER) and (wParam <> IK_KPRETURN) then // Not <Enter
+          begin
+            e_WriteLog(Format('HIT! %s', ['3']), MSG_WARNING);
+            if e_KeyNames[wParam] <> '' then
+              FKey := wParam;
+            FIsQuery := False;
+            actDefCtl();
+          end;
         end;
     end;
 end;