X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_holmes.pas;h=dfa8a00c5bb6eb86df978e88a432af2ad1bd7628;hb=6d6df4e3427cd01e03e172984c9d0d391ff38032;hp=1f68911b260c4c44994f6b1b982779dcec03a057;hpb=2bdaa61ce43bde7d6b75f24f66f3d7d5ef54426b;p=d2df-sdl.git

diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas
index 1f68911..dfa8a00 100644
--- a/src/game/g_holmes.pas
+++ b/src/game/g_holmes.pas
@@ -19,7 +19,7 @@ unit g_holmes;
 interface
 
 uses
-  e_log,
+  e_log, e_input,
   g_textures, g_basic, e_graphics, g_phys, g_grid, g_player, g_monsters,
   g_window, g_map, g_triggers, g_items, g_game, g_panel, g_console,
   xprofiler;
@@ -68,8 +68,9 @@ type
     sym: Word; // SDLK_XXX
     bstate: Word; // button state
     kstate: Word; // keyboard state
-  end;
 
+  public
+  end;
 
 procedure g_Holmes_VidModeChanged ();
 procedure g_Holmes_WindowFocused ();
@@ -86,6 +87,13 @@ procedure g_Holmes_plrView (viewPortX, viewPortY, viewPortW, viewPortH: Integer)
 procedure g_Holmes_plrLaser (ax0, ay0, ax1, ay1: Integer);
 
 
+operator = (constref ev: THKeyEvent; const s: AnsiString): Boolean;
+operator = (const s: AnsiString; constref ev: THKeyEvent): Boolean;
+
+operator = (constref ev: THMouseEvent; const s: AnsiString): Boolean;
+operator = (const s: AnsiString; constref ev: THMouseEvent): Boolean;
+
+
 var
   g_holmes_enabled: Boolean = {$IF DEFINED(D2F_DEBUG)}true{$ELSE}false{$ENDIF};
 
@@ -93,8 +101,8 @@ var
 implementation
 
 uses
-  SysUtils, GL, SDL2,
-  MAPDEF, g_options;
+  SysUtils, Classes, GL, SDL2,
+  MAPDEF, g_main, g_options, utils, hashtable, xparser;
 
 
 var
@@ -110,17 +118,142 @@ var
   showMapCurPos: Boolean = false;
   showLayersWindow: Boolean = false;
   showOutlineWindow: Boolean = false;
-  oldShowLayersWindow: Boolean = false;
-  oldShowOutlineWindow: Boolean = false;
 
 // ////////////////////////////////////////////////////////////////////////// //
 {$INCLUDE g_holmes.inc}
 {$INCLUDE g_holmes_ui.inc}
 
 
+// ////////////////////////////////////////////////////////////////////////// //
+// any mods = 255: nothing was defined
+function parseModKeys (const s: AnsiString; out kmods: Byte; out mbuts: Byte): AnsiString;
+var
+  pos, epos: Integer;
+begin
+  kmods := 255;
+  mbuts := 255;
+  pos := 1;
+  //while (pos <= Length(s)) and (s[pos] <= ' ') do Inc(pos);
+  if (pos < Length(s)) and ((s[pos] = '+') or (s[pos] = '-') or (s[pos] = '*')) then Inc(pos);
+  while (pos < Length(s)) do
+  begin
+    if (Length(s)-pos >= 2) and (s[pos+1] = '-') then
+    begin
+      case s[pos] of
+        'C', 'c': begin if (kmods = 255) then kmods := 0; kmods := kmods or THKeyEvent.ModCtrl; Inc(pos, 2); continue; end;
+        'M', 'm': begin if (kmods = 255) then kmods := 0; kmods := kmods or THKeyEvent.ModAlt; Inc(pos, 2); continue; end;
+        'S', 's': begin if (kmods = 255) then kmods := 0; kmods := kmods or THKeyEvent.ModShift; Inc(pos, 2); continue; end;
+      end;
+      break;
+    end;
+    if (Length(s)-pos >= 4) and ((s[pos+1] = 'M') or (s[pos+1] = 'm')) and ((s[pos+2] = 'B') or (s[pos+1] = 'b')) and (s[pos+3] = '-') then
+    begin
+      case s[pos] of
+        'L', 'l': begin if (mbuts = 255) then mbuts := 0; mbuts := mbuts or THMouseEvent.Left; Inc(pos, 4); continue; end;
+        'R', 'r': begin if (mbuts = 255) then mbuts := 0; mbuts := mbuts or THMouseEvent.Right; Inc(pos, 4); continue; end;
+        'M', 'm': begin if (mbuts = 255) then mbuts := 0; mbuts := mbuts or THMouseEvent.Middle; Inc(pos, 4); continue; end;
+      end;
+      break;
+    end;
+    break;
+  end;
+  epos := Length(s)+1;
+  while (epos > pos) and (s[epos-1] <= ' ') do Dec(epos);
+  if (epos > pos) then result := Copy(s, pos, epos-pos) else result := '';
+end;
+
+
+operator = (constref ev: THKeyEvent; const s: AnsiString): Boolean;
+var
+  f: Integer;
+  kmods: Byte = 255;
+  mbuts: Byte = 255;
+  kname: AnsiString;
+begin
+  result := false;
+  if (Length(s) > 0) then
+  begin
+         if (s[1] = '+') then begin if (ev.kind <> ev.Press) then exit; end
+    else if (s[1] = '-') then begin if (ev.kind <> ev.Release) then exit; end
+    else if (s[1] = '*') then begin end
+    else if (ev.kind <> ev.Press) then exit;
+  end;
+  kname := parseModKeys(s, kmods, mbuts);
+  if (kmods = 255) then kmods := 0;
+  if (ev.kstate <> kmods) then exit;
+  if (mbuts <> 255) and (ev.bstate <> mbuts) then exit;
+  for f := 1 to High(e_KeyNames) do
+  begin
+    if (CompareText(kname, e_KeyNames[f]) = 0) then
+    begin
+      result := (ev.scan = f);
+      exit;
+    end;
+  end;
+end;
+
+
+operator = (const s: AnsiString; constref ev: THKeyEvent): Boolean;
+begin
+  result := (ev = s);
+end;
+
+
+operator = (constref ev: THMouseEvent; const s: AnsiString): Boolean;
+var
+  kmods: Byte = 255;
+  mbuts: Byte = 255;
+  kname: AnsiString;
+  but: Integer = -1;
+begin
+  result := false;
+
+  if (Length(s) > 0) then
+  begin
+         if (s[1] = '+') then begin if (ev.kind <> ev.Press) then exit; end
+    else if (s[1] = '-') then begin if (ev.kind <> ev.Release) then exit; end
+    else if (s[1] = '*') then begin if (ev.kind <> ev.Motion) then exit; end
+    else if (ev.kind <> ev.Press) then exit;
+  end;
+
+  kname := parseModKeys(s, kmods, mbuts);
+       if (CompareText(kname, 'LMB') = 0) then but := THMouseEvent.Left
+  else if (CompareText(kname, 'RMB') = 0) then but := THMouseEvent.Right
+  else if (CompareText(kname, 'MMB') = 0) then but := THMouseEvent.Middle
+  else if (CompareText(kname, 'None') = 0) then but := 0
+  else exit;
+
+  //conwritefln('s=[%s]; kname=[%s]; kmods=%s; mbuts=%s; but=%s', [s, kname, kmods, mbuts, but]);
+
+  if (mbuts = 255) then mbuts := 0;
+  if (kmods = 255) then kmods := 0;
+  if (ev.kstate <> kmods) then exit;
+
+       if (ev.kind = ev.Press) then mbuts := mbuts or but
+  else if (ev.kind = ev.Release) then mbuts := mbuts and (not but);
+
+  //conwritefln('  ev.bstate=%s; ev.but=%s; mbuts=%s', [ev.bstate, ev.but, mbuts]);
+
+  result := (ev.bstate = mbuts) and (ev.but = but);
+end;
+
+
+operator = (const s: AnsiString; constref ev: THMouseEvent): Boolean;
+begin
+  result := (ev = s);
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+{$INCLUDE g_holmes_cmd.inc}
+procedure holmesInitCommands (); forward;
+procedure holmesInitBinds (); forward;
+
+
 // ////////////////////////////////////////////////////////////////////////// //
 var
   g_ol_nice: Boolean = false;
+  g_ol_fill_walls: Boolean = false;
   g_ol_rlayer_back: Boolean = false;
   g_ol_rlayer_step: Boolean = false;
   g_ol_rlayer_wall: Boolean = false;
@@ -133,30 +266,148 @@ var
 
 // ////////////////////////////////////////////////////////////////////////// //
 var
+  winHelp: THTopWindow = nil;
   winOptions: THTopWindow = nil;
   winLayers: THTopWindow = nil;
   winOutlines: THTopWindow = nil;
 
 
-procedure createOptionsWindow ();
+procedure createHelpWindow (); forward;
+procedure createOptionsWindow (); forward;
+procedure createLayersWindow (); forward;
+procedure createOutlinesWindow (); forward;
+
+
+procedure toggleLayersWindowCB (me: THControl; checked: Integer);
+begin
+  if showLayersWindow then
+  begin
+    if (winLayers = nil) then createLayersWindow();
+    uiAddWindow(winLayers);
+  end
+  else
+  begin
+    uiRemoveWindow(winLayers);
+  end;
+end;
+
+
+procedure toggleOutlineWindowCB (me: THControl; checked: Integer);
+begin
+  if showOutlineWindow then
+  begin
+    if (winOutlines = nil) then createOutlinesWindow();
+    uiAddWindow(winOutlines);
+  end
+  else
+  begin
+    uiRemoveWindow(winOutlines);
+  end;
+end;
+
+
+procedure createHelpWindow ();
 var
-  llb: THCtlCBListBox;
+  llb: THCtlSimpleText;
+  slist: array of AnsiString = nil;
+  cmd: PHolmesCommand;
+  bind: THolmesBinding;
+  f, maxkeylen: Integer;
+  s: AnsiString;
 begin
-  llb := THCtlCBListBox.Create(0, 0);
-  llb.appendItem('map grid', @showGrid);
-  llb.appendItem('cursor position on map', @showMapCurPos);
-  llb.appendItem('monster info', @showMonsInfo);
-  llb.appendItem('monster LOS to player', @showMonsLOS2Plr);
-  llb.appendItem('monster cells (SLOW!)', @showAllMonsCells);
-  llb.appendItem('', nil);
-  llb.appendItem('layers window', @showLayersWindow);
-  llb.appendItem('outline window', @showOutlineWindow);
-  winOptions := THTopWindow.Create('Holmes Options', 100, 100);
-  winOptions.escClose := true;
-  winOptions.appendChild(llb);
+  for cmd in cmdlist do cmd.helpmark := false;
+
+  maxkeylen := 0;
+  for bind in keybinds do
+  begin
+    if (Length(bind.key) = 0) then continue;
+    if cmdlist.get(bind.cmdName, cmd) then
+    begin
+      if (Length(cmd.help) > 0) then
+      begin
+        cmd.helpmark := true;
+        if (maxkeylen < Length(bind.key)) then maxkeylen := Length(bind.key);
+      end;
+    end;
+  end;
+
+  for cmd in cmdlist do
+  begin
+    if not cmd.helpmark then continue;
+    if (Length(cmd.help) = 0) then continue;
+    f := 0;
+    while (f < Length(slist)) and (CompareText(slist[f], cmd.section) <> 0) do Inc(f);
+    if (f = Length(slist)) then
+    begin
+      SetLength(slist, Length(slist)+1);
+      slist[High(slist)] := cmd.section;
+    end;
+  end;
+
+  llb := THCtlSimpleText.Create(0, 0);
+  for f := 0 to High(slist) do
+  begin
+    if (f > 0) then llb.appendItem('');
+    llb.appendItem(slist[f], true, true);
+    for cmd in cmdlist do
+    begin
+      if not cmd.helpmark then continue;
+      if (CompareText(cmd.section, slist[f]) <> 0) then continue;
+      for bind in keybinds do
+      begin
+        if (Length(bind.key) = 0) then continue;
+        if (cmd.name = bind.cmdName) then
+        begin
+          s := bind.key;
+          while (Length(s) < maxkeylen) do s += ' ';
+          s := '  '+s+' -- '+cmd.help;
+          llb.appendItem(s);
+        end;
+      end;
+    end;
+  end;
+
+  maxkeylen := 0;
+  for bind in msbinds do
+  begin
+    if (Length(bind.key) = 0) then continue;
+    if cmdlist.get(bind.cmdName, cmd) then
+    begin
+      if (Length(cmd.help) > 0) then
+      begin
+        cmd.helpmark := true;
+        if (maxkeylen < Length(bind.key)) then maxkeylen := Length(bind.key);
+      end;
+    end;
+  end;
+
+  llb.appendItem('');
+  llb.appendItem('mouse', true, true);
+  for bind in msbinds do
+  begin
+    if (Length(bind.key) = 0) then continue;
+    if cmdlist.get(bind.cmdName, cmd) then
+    begin
+      if (Length(cmd.help) > 0) then
+      begin
+        s := bind.key;
+        while (Length(s) < maxkeylen) do s += ' ';
+        s := '  '+s+' -- '+cmd.help;
+        llb.appendItem(s);
+      end;
+    end;
+  end;
+
+  winHelp := THTopWindow.Create('Holmes Help', 10, 10);
+  winHelp.escClose := true;
+  winHelp.appendChild(llb);
+  winHelp.centerInScreen();
 end;
 
 
+procedure winLayersClosed (me: THControl; dummy: Integer); begin showLayersWindow := false; end;
+procedure winOutlinesClosed (me: THControl; dummy: Integer); begin showOutlineWindow := false; end;
+
 procedure createLayersWindow ();
 var
   llb: THCtlCBListBox;
@@ -170,9 +421,10 @@ begin
   llb.appendItem('acid2', @g_rlayer_acid2);
   llb.appendItem('water', @g_rlayer_water);
   llb.appendItem('foreground', @g_rlayer_fore);
-  winLayers := THTopWindow.Create('visible', 10, 10);
+  winLayers := THTopWindow.Create('layers', 10, 10);
   winLayers.escClose := true;
   winLayers.appendChild(llb);
+  winLayers.closeCB := winLayersClosed;
 end;
 
 
@@ -189,11 +441,58 @@ begin
   llb.appendItem('acid2', @g_ol_rlayer_acid2);
   llb.appendItem('water', @g_ol_rlayer_water);
   llb.appendItem('foreground', @g_ol_rlayer_fore);
-  llb.appendItem('', nil);
-  llb.appendItem('slow''n''nice', @g_ol_nice);
+  llb.appendItem('OPTIONS', nil);
+  llb.appendItem('fill walls', @g_ol_fill_walls);
+  llb.appendItem('contours', @g_ol_nice);
   winOutlines := THTopWindow.Create('outlines', 100, 10);
   winOutlines.escClose := true;
   winOutlines.appendChild(llb);
+  winOutlines.closeCB := winOutlinesClosed;
+end;
+
+
+procedure createOptionsWindow ();
+var
+  llb: THCtlCBListBox;
+begin
+  llb := THCtlCBListBox.Create(0, 0);
+  llb.appendItem('map grid', @showGrid);
+  llb.appendItem('cursor position on map', @showMapCurPos);
+  llb.appendItem('monster info', @showMonsInfo);
+  llb.appendItem('monster LOS to player', @showMonsLOS2Plr);
+  llb.appendItem('monster cells (SLOW!)', @showAllMonsCells);
+  llb.appendItem('WINDOWS', nil);
+  llb.appendItem('layers window', @showLayersWindow, toggleLayersWindowCB);
+  llb.appendItem('outline window', @showOutlineWindow, toggleOutlineWindowCB);
+  winOptions := THTopWindow.Create('Holmes Options', 100, 100);
+  winOptions.escClose := true;
+  winOptions.appendChild(llb);
+  winOptions.centerInScreen();
+end;
+
+
+procedure toggleLayersWindow (arg: Integer=-1);
+begin
+  showLayersWindow := not showLayersWindow;
+  toggleLayersWindowCB(nil, 0);
+end;
+
+procedure toggleOutlineWindow (arg: Integer=-1);
+begin
+  showOutlineWindow := not showOutlineWindow;
+  toggleOutlineWindowCB(nil, 0);
+end;
+
+procedure toggleHelpWindow (arg: Integer=-1);
+begin
+  if (winHelp = nil) then createHelpWindow();
+  if not uiVisibleWindow(winHelp) then uiAddWindow(winHelp) else uiRemoveWindow(winHelp);
+end;
+
+procedure toggleOptionsWindow (arg: Integer=-1);
+begin
+  if (winOptions = nil) then createOptionsWindow();
+  if not uiVisibleWindow(winOptions) then uiAddWindow(winOptions) else uiRemoveWindow(winOptions);
 end;
 
 
@@ -256,65 +555,12 @@ function pmsCurMapY (): Integer; inline; begin result := msY+vpy; end;
 
 
 procedure plrDebugMouse (var ev: THMouseEvent);
-
-  function wallToggle (pan: TPanel; tag: Integer): Boolean;
-  begin
-    result := false; // don't stop
-    e_WriteLog(Format('wall #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY);
-    if ((kbS and THKeyEvent.ModAlt) <> 0) then
-    begin
-      if pan.Enabled then g_Map_DisableWall(pan.arrIdx) else g_Map_EnableWall(pan.arrIdx);
-    end;
-  end;
-
-  function monsAtDump (mon: TMonster; tag: Integer): Boolean;
-  begin
-    result := false; // don't stop
-    e_WriteLog(Format('monster #%d; UID=%d', [mon.arrIdx, mon.UID]), MSG_NOTIFY);
-    monMarkedUID := mon.UID;
-    //if pan.Enabled then g_Map_DisableWall(pan.arrIdx) else g_Map_EnableWall(pan.arrIdx);
-  end;
-
-  function monsInCell (mon: TMonster; tag: Integer): Boolean;
-  begin
-    result := false; // don't stop
-    e_WriteLog(Format('monster #%d (UID:%u) (proxyid:%d)', [mon.arrIdx, mon.UID, mon.proxyId]), MSG_NOTIFY);
-  end;
-
 begin
   //e_WriteLog(Format('mouse: x=%d; y=%d; but=%d; bstate=%d', [msx, msy, but, bstate]), MSG_NOTIFY);
   if (gPlayer1 = nil) or not vpSet then exit;
-  if (ev.kind <> THMouseEvent.Press) then exit;
-
-  e_WriteLog(Format('mev: %d', [Integer(ev.kind)]), MSG_NOTIFY);
-
-  if (ev.but = THMouseEvent.Left) then
-  begin
-    if ((kbS and THKeyEvent.ModShift) <> 0) then
-    begin
-      // dump monsters in cell
-      e_WriteLog('===========================', MSG_NOTIFY);
-      monsGrid.forEachInCell(pmsCurMapX, pmsCurMapY, monsInCell);
-      e_WriteLog('---------------------------', MSG_NOTIFY);
-    end
-    else
-    begin
-      // toggle wall
-      e_WriteLog('=== TOGGLE WALL ===', MSG_NOTIFY);
-      mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, wallToggle, (GridTagWall or GridTagDoor));
-      e_WriteLog('--- toggle wall ---', MSG_NOTIFY);
-    end;
-    exit;
-  end;
-
-  if (ev.but = THMouseEvent.Right) then
-  begin
-    monMarkedUID := -1;
-    e_WriteLog('===========================', MSG_NOTIFY);
-    monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, monsAtDump);
-    e_WriteLog('---------------------------', MSG_NOTIFY);
-    exit;
-  end;
+  //if (ev.kind <> THMouseEvent.Press) then exit;
+  //e_WriteLog(Format('mev: %d', [Integer(ev.kind)]), MSG_NOTIFY);
+  msbindExecute(ev);
 end;
 
 
@@ -323,6 +569,9 @@ var
 
 
 procedure drawOutlines ();
+var
+  r, g, b: Integer;
+
   procedure clearEdgeBmp ();
   begin
     SetLength(edgeBmp, (gWinSizeX+4)*(gWinSizeY+4));
@@ -334,21 +583,22 @@ procedure drawOutlines ();
     sx, len, y0, y1: Integer;
   begin
     if (pan = nil) or (pan.Width < 1) or (pan.Height < 1) then exit;
-    if (pan.X+pan.Width <= vpx-1) or (pan.Y+pan.Height <= vpy-1) or (pan.X >= vpx+vpw+1) or (pan.Y >= vpy+vph+1) then exit;
-    if g_ol_nice then
+    if (pan.X+pan.Width <= vpx-1) or (pan.Y+pan.Height <= vpy-1) then exit;
+    if (pan.X >= vpx+vpw+1) or (pan.Y >= vpy+vph+1) then exit;
+    if g_ol_nice or g_ol_fill_walls then
     begin
       sx := pan.X-(vpx-1);
       len := pan.Width;
-      if (len > vpw+2) then len := vpw+2;
+      if (len > gWinSizeX+4) then len := gWinSizeX+4;
       if (sx < 0) then begin len += sx; sx := 0; end;
-      if (sx+len > vpw+2) then len := vpw+2-sx;
+      if (sx+len > gWinSizeX+4) then len := gWinSizeX+4-sx;
       if (len < 1) then exit;
       assert(sx >= 0);
-      assert(sx+len <= vpw+2);
+      assert(sx+len <= gWinSizeX+4);
       y0 := pan.Y-(vpy-1);
       y1 := y0+pan.Height;
       if (y0 < 0) then y0 := 0;
-      if (y1 > vph+2) then y1 := vph+2;
+      if (y1 > gWinSizeY+4) then y1 := gWinSizeY+4;
       while (y0 < y1) do
       begin
         FillChar(edgeBmp[y0*(gWinSizeX+4)+sx], len*sizeof(edgeBmp[0]), 1);
@@ -357,8 +607,49 @@ procedure drawOutlines ();
     end
     else
     begin
-      drawRect(pan.X, pan.Y, pan.Width, pan.Height, 255, 255, 255);
+      drawRect(pan.X, pan.Y, pan.Width, pan.Height, r, g, b);
+    end;
+  end;
+
+var
+  lsx: Integer = -1;
+  lex: Integer = -1;
+  lsy: Integer = -1;
+
+  procedure flushLine ();
+  begin
+    if (lsy > 0) and (lsx > 0) then
+    begin
+      if (lex = lsx) then
+      begin
+        glBegin(GL_POINTS);
+          glVertex2f(lsx-1+vpx+0.37, lsy-1+vpy+0.37);
+        glEnd();
+      end
+      else
+      begin
+        glBegin(GL_LINES);
+          glVertex2f(lsx-1+vpx+0.37, lsy-1+vpy+0.37);
+          glVertex2f(lex-0+vpx+0.37, lsy-1+vpy+0.37);
+        glEnd();
+      end;
     end;
+    lsx := -1;
+    lex := -1;
+  end;
+
+  procedure startLine (y: Integer);
+  begin
+    flushLine();
+    lsy := y;
+  end;
+
+  procedure putPixel (x: Integer);
+  begin
+    if (x < 1) then exit;
+    if (lex+1 <> x) then flushLine();
+    if (lsx < 0) then lsx := x;
+    lex := x;
   end;
 
   procedure drawEdges ();
@@ -372,11 +663,11 @@ procedure drawOutlines ();
     glPointSize(1);
     glDisable(GL_LINE_SMOOTH);
     glDisable(GL_POLYGON_SMOOTH);
-    glColor4f(1.0, 1.0, 1.0, 1.0);
-    glBegin(GL_POINTS);
+    glColor4f(r/255.0, g/255.0, b/255.0, 1.0);
     for y := 1 to vph do
     begin
       a := @edgeBmp[y*(gWinSizeX+4)+1];
+      startLine(y);
       for x := 1 to vpw do
       begin
         if (a[0] <> 0) then
@@ -385,21 +676,49 @@ procedure drawOutlines ();
              (a[-(gWinSizeX+4)-1] = 0) or (a[-(gWinSizeX+4)+1] = 0) or
              (a[gWinSizeX+4-1] = 0) or (a[gWinSizeX+4+1] = 0) then
           begin
-            glVertex2f(x-1+vpx+0.37, y-1+vpy+0.37);
+            putPixel(x);
           end;
         end;
         Inc(a);
       end;
+      flushLine();
     end;
-    glEnd();
   end;
 
-  procedure doWallsOld (parr: array of TPanel; ptype: Word);
+  procedure drawFilledWalls ();
+  var
+    x, y: Integer;
+    a: PByte;
+  begin
+    glDisable(GL_BLEND);
+    glDisable(GL_TEXTURE_2D);
+    glLineWidth(1);
+    glPointSize(1);
+    glDisable(GL_LINE_SMOOTH);
+    glDisable(GL_POLYGON_SMOOTH);
+    glColor4f(r/255.0, g/255.0, b/255.0, 1.0);
+    for y := 1 to vph do
+    begin
+      a := @edgeBmp[y*(gWinSizeX+4)+1];
+      startLine(y);
+      for x := 1 to vpw do
+      begin
+        if (a[0] <> 0) then putPixel(x);
+        Inc(a);
+      end;
+      flushLine();
+    end;
+  end;
+
+  procedure doWallsOld (parr: array of TPanel; ptype: Word; ar, ag, ab: Integer);
   var
     f: Integer;
     pan: TPanel;
   begin
-    if g_ol_nice then clearEdgeBmp();
+    r := ar;
+    g := ag;
+    b := ab;
+    if g_ol_nice or g_ol_fill_walls then clearEdgeBmp();
     for f := 0 to High(parr) do
     begin
       pan := parr[f];
@@ -408,36 +727,47 @@ procedure drawOutlines ();
       drawPanel(pan);
     end;
     if g_ol_nice then drawEdges();
+    if g_ol_fill_walls then drawFilledWalls();
   end;
 
+var
+  xptag: Word;
+
   function doWallCB (pan: TPanel; tag: Integer): Boolean;
   begin
     result := false; // don't stop
     //if (pan = nil) or not pan.Enabled or (pan.Width < 1) or (pan.Height < 1) then exit;
+    if ((pan.PanelType and xptag) = 0) then exit;
     drawPanel(pan);
   end;
 
-  procedure doWalls (parr: array of TPanel; ptype: Word);
+  procedure doWalls (parr: array of TPanel; ptype: Word; ar, ag, ab: Integer);
   begin
-    if g_ol_nice then clearEdgeBmp();
-    mapGrid.forEachInAABB(vpx-1, vpy-1, vpw+2, vph+2, doWallCB, panelTypeToTag(ptype));
+    r := ar;
+    g := ag;
+    b := ab;
+    xptag := ptype;
+    if ((ptype and (PANEL_WALL or PANEL_OPENDOOR or PANEL_CLOSEDOOR)) <> 0) then ptype := GridTagWall or GridTagDoor
+    else panelTypeToTag(ptype);
+    if g_ol_nice or g_ol_fill_walls then clearEdgeBmp();
+    mapGrid.forEachInAABB(vpx-1, vpy-1, vpw+2, vph+2, doWallCB, ptype);
     if g_ol_nice then drawEdges();
+    if g_ol_fill_walls then drawFilledWalls();
   end;
 
 begin
-  if g_ol_rlayer_back then doWalls(gRenderBackgrounds, PANEL_BACK);
-  if g_ol_rlayer_step then doWalls(gSteps, PANEL_STEP);
-  if g_ol_rlayer_wall then doWalls(gWalls, PANEL_WALL);
-  if g_ol_rlayer_door then doWalls(gWalls, PANEL_OPENDOOR or PANEL_CLOSEDOOR);
-  if g_ol_rlayer_acid1 then doWalls(gAcid1, PANEL_ACID1);
-  if g_ol_rlayer_acid2 then doWalls(gAcid2, PANEL_ACID2);
-  if g_ol_rlayer_water then doWalls(gWater, PANEL_WATER);
-  if g_ol_rlayer_fore then doWalls(gRenderForegrounds, PANEL_FORE);
+  if g_ol_rlayer_back then doWallsOld(gRenderBackgrounds, PANEL_BACK, 255, 127, 0);
+  if g_ol_rlayer_step then doWallsOld(gSteps, PANEL_STEP, 192, 192, 192);
+  if g_ol_rlayer_wall then doWallsOld(gWalls, PANEL_WALL, 255, 255, 255);
+  if g_ol_rlayer_door then doWallsOld(gWalls, PANEL_OPENDOOR or PANEL_CLOSEDOOR, 0, 255, 0);
+  if g_ol_rlayer_acid1 then doWallsOld(gAcid1, PANEL_ACID1, 255, 0, 0);
+  if g_ol_rlayer_acid2 then doWallsOld(gAcid2, PANEL_ACID2, 198, 198, 0);
+  if g_ol_rlayer_water then doWallsOld(gWater, PANEL_WATER, 0, 255, 255);
+  if g_ol_rlayer_fore then doWallsOld(gRenderForegrounds, PANEL_FORE, 210, 210, 210);
 end;
 
 
 procedure plrDebugDraw ();
-
   procedure drawTileGrid ();
   var
     x, y: Integer;
@@ -628,6 +958,8 @@ end;
 // ////////////////////////////////////////////////////////////////////////// //
 function g_Holmes_MouseEvent (var ev: THMouseEvent): Boolean;
 begin
+  holmesInitCommands();
+  holmesInitBinds();
   result := true;
   msX := ev.x;
   msY := ev.y;
@@ -638,19 +970,22 @@ begin
 end;
 
 
+// ////////////////////////////////////////////////////////////////////////// //
 function g_Holmes_KeyEvent (var ev: THKeyEvent): Boolean;
+{$IF DEFINED(D2F_DEBUG)}
 var
-  mon: TMonster;
   pan: TPanel;
-  x, y, w, h: Integer;
   ex, ey: Integer;
   dx, dy: Integer;
+{$ENDIF}
 
   procedure dummyWallTrc (cx, cy: Integer);
   begin
   end;
 
 begin
+  holmesInitCommands();
+  holmesInitBinds();
   result := false;
   msB := ev.bstate;
   kbS := ev.kstate;
@@ -661,97 +996,11 @@ begin
       result := true;
   end;
   if uiKeyEvent(ev) then begin result := true; exit; end;
+  if keybindExecute(ev) then begin result := true; exit; end;
   // press
   if (ev.kind = THKeyEvent.Press) then
   begin
-    // M-M: one monster think step
-    if (ev.scan = SDL_SCANCODE_M) and ((ev.kstate and THKeyEvent.ModAlt) <> 0) then
-    begin
-      result := true;
-      gmon_debug_think := false;
-      gmon_debug_one_think_step := true; // do one step
-      exit;
-    end;
-    // M-I: toggle monster info
-    if (ev.scan = SDL_SCANCODE_I) and ((ev.kstate and THKeyEvent.ModAlt) <> 0) then
-    begin
-      result := true;
-      showMonsInfo := not showMonsInfo;
-      exit;
-    end;
-    // M-L: toggle monster LOS to player
-    if (ev.scan = SDL_SCANCODE_L) and ((ev.kstate and THKeyEvent.ModAlt) <> 0) then
-    begin
-      result := true;
-      showMonsLOS2Plr := not showMonsLOS2Plr;
-      exit;
-    end;
-    // M-G: toggle "show all cells occupied by monsters"
-    if (ev.scan = SDL_SCANCODE_G) and ((ev.kstate and THKeyEvent.ModAlt) <> 0) then
-    begin
-      result := true;
-      showAllMonsCells := not showAllMonsCells;
-      exit;
-    end;
-    // M-A: wake up monster
-    if (ev.scan = SDL_SCANCODE_A) and ((ev.kstate and THKeyEvent.ModAlt) <> 0) then
-    begin
-      result := true;
-      if (monMarkedUID <> -1) then
-      begin
-        mon := g_Monsters_ByUID(monMarkedUID);
-        if (mon <> nil) then mon.WakeUp();
-      end;
-      exit;
-    end;
-    // C-T: teleport player
-    if (ev.scan = SDL_SCANCODE_T) and ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
-    begin
-      result := true;
-      //e_WriteLog(Format('TELEPORT: (%d,%d)', [pmsCurMapX, pmsCurMapY]), MSG_NOTIFY);
-      if (gPlayers[0] <> nil) then
-      begin
-        gPlayers[0].getMapBox(x, y, w, h);
-        gPlayers[0].TeleportTo(pmsCurMapX-w div 2, pmsCurMapY-h div 2, true, 69); // 69: don't change dir
-      end;
-      exit;
-    end;
-    // C-P: show cursor position on the map
-    if (ev.scan = SDL_SCANCODE_P) and ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
-    begin
-      result := true;
-      showMapCurPos := not showMapCurPos;
-      exit;
-    end;
-    // C-G: toggle grid
-    if (ev.scan = SDL_SCANCODE_G) and ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
-    begin
-      result := true;
-      showGrid := not showGrid;
-      exit;
-    end;
-    // C-L: toggle layers window
-    if (ev.scan = SDL_SCANCODE_L) and ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
-    begin
-      result := true;
-      showLayersWindow := not showLayersWindow;
-      exit;
-    end;
-    // C-O: toggle outlines window
-    if (ev.scan = SDL_SCANCODE_O) and ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
-    begin
-      result := true;
-      showOutlineWindow := not showOutlineWindow;
-      exit;
-    end;
-    // F1: toggle options window
-    if (ev.scan = SDL_SCANCODE_F1) and (ev.kstate = 0) then
-    begin
-      result := true;
-      if (winOptions = nil) then createOptionsWindow();
-      if not uiVisibleWindow(winOptions) then uiAddWindow(winOptions) else uiRemoveWindow(winOptions);
-      exit;
-    end;
+    {$IF DEFINED(D2F_DEBUG)}
     // C-UP, C-DOWN, C-LEFT, C-RIGHT: trace 10 pixels from cursor in the respective direction
     if ((ev.scan = SDL_SCANCODE_UP) or (ev.scan = SDL_SCANCODE_DOWN) or (ev.scan = SDL_SCANCODE_LEFT) or (ev.scan = SDL_SCANCODE_RIGHT)) and
        ((ev.kstate and THKeyEvent.ModCtrl) <> 0) then
@@ -777,6 +1026,7 @@ begin
       e_LogWritefln('v-trace: (%d,%d)-(%d,%d); end=(%d,%d); hit=%d', [pmsCurMapX, pmsCurMapY, dx, dy, ex, ey, (pan <> nil)]);
       exit;
     end;
+    {$ENDIF}
   end;
 end;
 
@@ -784,43 +1034,8 @@ end;
 // ////////////////////////////////////////////////////////////////////////// //
 procedure g_Holmes_Draw ();
 begin
-  if (oldShowLayersWindow <> showLayersWindow) then
-  begin
-    oldShowLayersWindow := showLayersWindow;
-    if showLayersWindow then
-    begin
-      if (winLayers = nil) then createLayersWindow();
-      uiAddWindow(winLayers);
-    end
-    else
-    begin
-      uiRemoveWindow(winLayers);
-    end;
-  end
-  else
-  begin
-    showLayersWindow := uiVisibleWindow(winLayers);
-    oldShowLayersWindow := showLayersWindow;
-  end;
-
-  if (oldShowOutlineWindow <> showOutlineWindow) then
-  begin
-    oldShowOutlineWindow := showOutlineWindow;
-    if showOutlineWindow then
-    begin
-      if (winOutlines = nil) then createOutlinesWindow();
-      uiAddWindow(winOutlines);
-    end
-    else
-    begin
-      uiRemoveWindow(winOutlines);
-    end;
-  end
-  else
-  begin
-    showOutlineWindow := uiVisibleWindow(winOutlines);
-    oldShowOutlineWindow := showOutlineWindow;
-  end;
+  holmesInitCommands();
+  holmesInitBinds();
 
   glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); // modify color buffer
   glDisable(GL_STENCIL_TEST);
@@ -844,4 +1059,189 @@ begin
 end;
 
 
+// ////////////////////////////////////////////////////////////////////////// //
+procedure bcOneMonsterThinkStep (); begin gmon_debug_think := false; gmon_debug_one_think_step := true; end;
+procedure bcToggleMonsterInfo (arg: Integer=-1); begin if (arg < 0) then showMonsInfo := not showMonsInfo else showMonsInfo := (arg > 0); end;
+procedure bcToggleMonsterLOSPlr (arg: Integer=-1); begin if (arg < 0) then showMonsLOS2Plr := not showMonsLOS2Plr else showMonsLOS2Plr := (arg > 0); end;
+procedure bcToggleMonsterCells (arg: Integer=-1); begin if (arg < 0) then showAllMonsCells := not showAllMonsCells else showAllMonsCells := (arg > 0); end;
+
+procedure bcToggleCurPos (arg: Integer=-1); begin if (arg < 0) then showMapCurPos := not showMapCurPos else showMapCurPos := (arg > 0); end;
+procedure bcToggleGrid (arg: Integer=-1); begin if (arg < 0) then showGrid := not showGrid else showGrid := (arg > 0); end;
+
+procedure bcMonsterWakeup ();
+var
+  mon: TMonster;
+begin
+  if (monMarkedUID <> -1) then
+  begin
+    mon := g_Monsters_ByUID(monMarkedUID);
+    if (mon <> nil) then mon.WakeUp();
+  end;
+end;
+
+procedure bcPlayerTeleport ();
+var
+  x, y, w, h: Integer;
+begin
+  //e_WriteLog(Format('TELEPORT: (%d,%d)', [pmsCurMapX, pmsCurMapY]), MSG_NOTIFY);
+  if (gPlayers[0] <> nil) then
+  begin
+    gPlayers[0].getMapBox(x, y, w, h);
+    gPlayers[0].TeleportTo(pmsCurMapX-w div 2, pmsCurMapY-h div 2, true, 69); // 69: don't change dir
+  end;
+end;
+
+procedure cbAtcurSelectMonster ();
+  function monsAtDump (mon: TMonster; tag: Integer): Boolean;
+  begin
+    result := true; // stop
+    e_WriteLog(Format('monster #%d (UID:%u) (proxyid:%d)', [mon.arrIdx, mon.UID, mon.proxyId]), MSG_NOTIFY);
+    monMarkedUID := mon.UID;
+  end;
+begin
+  monMarkedUID := -1;
+  //e_WriteLog('===========================', MSG_NOTIFY);
+  monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, monsAtDump);
+  //e_WriteLog('---------------------------', MSG_NOTIFY);
+end;
+
+procedure cbAtcurDumpMonsters ();
+  function monsAtDump (mon: TMonster; tag: Integer): Boolean;
+  begin
+    result := false; // don't stop
+    e_WriteLog(Format('monster #%d (UID:%u) (proxyid:%d)', [mon.arrIdx, mon.UID, mon.proxyId]), MSG_NOTIFY);
+  end;
+begin
+  e_WriteLog('===========================', MSG_NOTIFY);
+  monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, monsAtDump);
+  e_WriteLog('---------------------------', MSG_NOTIFY);
+end;
+
+procedure cbAtcurDumpWalls ();
+  function wallToggle (pan: TPanel; tag: Integer): Boolean;
+  begin
+    result := false; // don't stop
+    e_WriteLog(Format('wall #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY);
+  end;
+begin
+  e_WriteLog('=== TOGGLE WALL ===', MSG_NOTIFY);
+  mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, wallToggle, (GridTagWall or GridTagDoor));
+  e_WriteLog('--- toggle wall ---', MSG_NOTIFY);
+end;
+
+procedure cbAtcurToggleWalls ();
+  function wallToggle (pan: TPanel; tag: Integer): Boolean;
+  begin
+    result := false; // don't stop
+    //e_WriteLog(Format('wall #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY);
+    if pan.Enabled then g_Map_DisableWall(pan.arrIdx) else g_Map_EnableWall(pan.arrIdx);
+  end;
+begin
+  //e_WriteLog('=== TOGGLE WALL ===', MSG_NOTIFY);
+  mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, wallToggle, (GridTagWall or GridTagDoor));
+  //e_WriteLog('--- toggle wall ---', MSG_NOTIFY);
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+procedure holmesInitCommands ();
+begin
+  if (cmdlist <> nil) then exit;
+  cmdAdd('win_layers', toggleLayersWindow, 'toggle layers window', 'window control');
+  cmdAdd('win_outline', toggleOutlineWindow, 'toggle outline window', 'window control');
+  cmdAdd('win_help', toggleHelpWindow, 'toggle help window', 'window control');
+  cmdAdd('win_options', toggleOptionsWindow, 'toggle options window', 'window control');
+
+  cmdAdd('mon_think_step', bcOneMonsterThinkStep, 'one monster think step', 'monster control');
+  cmdAdd('mon_info', bcToggleMonsterInfo, 'toggle monster info', 'monster control');
+  cmdAdd('mon_los_plr', bcToggleMonsterLOSPlr, 'toggle monster LOS to player', 'monster control');
+  cmdAdd('mon_cells', bcToggleMonsterCells, 'toggle "show all cells occupied by monsters" (SLOW!)', 'monster control');
+  cmdAdd('mon_wakeup', bcMonsterWakeup, 'toggle "show all cells occupied by monsters" (SLOW!)', 'monster control');
+
+  cmdAdd('plr_teleport', bcPlayerTeleport, 'teleport player', 'player control');
+
+  cmdAdd('dbg_curpos', bcToggleCurPos, 'toggle "show cursor position on the map"', 'various');
+  cmdAdd('dbg_grid', bcToggleGrid, 'toggle grid', 'various');
+
+  cmdAdd('atcur_select_monster', cbAtcurSelectMonster, 'select monster to operate', 'monster control');
+  cmdAdd('atcur_dump_monsters', cbAtcurDumpMonsters, 'dump monsters in cell', 'monster control');
+  cmdAdd('atcur_dump_walls', cbAtcurDumpWalls, 'dump walls in cell', 'wall control');
+  cmdAdd('atcur_disable_walls', cbAtcurToggleWalls, 'disable walls', 'wall control');
+end;
+
+
+procedure holmesInitBinds ();
+var
+  st: TStream = nil;
+  pr: TTextParser = nil;
+  s, kn, v: AnsiString;
+  kmods: Byte;
+  mbuts: Byte;
+begin
+  kbS := kbS;
+  if not keybindsInited then
+  begin
+    // keyboard
+    keybindAdd('F1', 'win_help');
+    keybindAdd('M-F1', 'win_options');
+    keybindAdd('C-O', 'win_outline');
+    keybindAdd('C-L', 'win_layers');
+
+    keybindAdd('M-M', 'mon_think_step');
+    keybindAdd('M-I', 'mon_info');
+    keybindAdd('M-L', 'mon_los_plr');
+    keybindAdd('M-G', 'mon_cells');
+    keybindAdd('M-A', 'mon_wakeup');
+
+    keybindAdd('C-T', 'plr_teleport');
+
+    keybindAdd('C-P', 'dbg_curpos');
+    keybindAdd('C-G', 'dbg_grid');
+
+    // mouse
+    msbindAdd('LMB', 'atcur_select_monster');
+    msbindAdd('M-LMB', 'atcur_dump_monsters');
+    msbindAdd('RMB', 'atcur_dump_walls');
+    msbindAdd('M-RMB', 'atcur_disable_walls');
+
+    // load bindings from file
+    try
+      st := openDiskFileRO(GameDir+'holmes.rc');
+      pr := TFileTextParser.Create(st);
+      conwriteln('parsing "holmes.rc"...');
+      while (pr.tokType <> pr.TTEOF) do
+      begin
+        s := pr.expectId();
+             if (s = 'stop') then break
+        else if (s = 'unbind_keys') then keybinds := nil
+        else if (s = 'unbind_mouse') then msbinds := nil
+        else if (s = 'bind') then
+        begin
+               if (pr.tokType = pr.TTStr) then s := pr.expectStr(false)
+          else if (pr.tokType = pr.TTInt) then s := Format('%d', [pr.expectInt()])
+          else s := pr.expectId();
+
+               if (pr.tokType = pr.TTStr) then v := pr.expectStr(false)
+          else if (pr.tokType = pr.TTInt) then v := Format('%d', [pr.expectInt()])
+          else v := pr.expectId();
+
+          kn := parseModKeys(s, kmods, mbuts);
+          if (CompareText(kn, 'lmb') = 0) or (CompareText(kn, 'rmb') = 0) or (CompareText(kn, 'mmb') = 0) or (CompareText(kn, 'None') = 0) then
+          begin
+            msbindAdd(s, v);
+          end
+          else
+          begin
+            keybindAdd(s, v);
+          end;
+        end;
+      end;
+    except on e: Exception do // sorry
+      if (pr <> nil) then conwritefln('Holmes config parse error at (%s,%s): %s', [pr.tokLine, pr.tokCol, e.message]);
+    end;
+    if (pr <> nil) then pr.Free() else st.Free(); // ownership
+  end;
+end;
+
+
 end.