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

diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas
index 1f68911..b7ad74b 100644
--- a/src/game/g_holmes.pas
+++ b/src/game/g_holmes.pas
@@ -1,9 +1,8 @@
-(* Copyright (C)  DooM 2D:Forever Developers
+(* 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.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,745 +17,537 @@ unit g_holmes;
 
 interface
 
-uses
-  e_log,
-  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;
-
-
-type
-  THMouseEvent = record
-  public
-    const
-      // both for but and for bstate
-      Left = $0001;
-      Right = $0002;
-      Middle = $0004;
-      WheelUp = $0008;
-      WheelDown = $0010;
-
-      // event types
-      Release = 0;
-      Press = 1;
-      Motion = 2;
-
-  public
-    kind: Byte; // motion, press, release
-    x, y: Integer;
-    dx, dy: Integer; // for wheel this is wheel motion, otherwise this is relative mouse motion
-    but: Word; // current pressed/released button, or 0 for motion
-    bstate: Word; // button state
-    kstate: Word; // keyboard state (see THKeyEvent);
-  end;
-
-  THKeyEvent = record
-  public
-    const
-      // modifiers
-      ModCtrl = $0001;
-      ModAlt = $0002;
-      ModShift = $0004;
-
-      // event types
-      Release = 0;
-      Press = 1;
-
-  public
-    kind: Byte;
-    scan: Word; // SDL_SCANCODE_XXX
-    sym: Word; // SDLK_XXX
-    bstate: Word; // button state
-    kstate: Word; // keyboard state
-  end;
-
-
-procedure g_Holmes_VidModeChanged ();
-procedure g_Holmes_WindowFocused ();
-procedure g_Holmes_WindowBlured ();
+  procedure holmesInitCommands ();
+  procedure holmesInitBinds ();
 
-procedure g_Holmes_Draw ();
-procedure g_Holmes_DrawUI ();
+  function monsTypeToString (mt: Byte): AnsiString;
+  function monsBehToString (bt: Byte): AnsiString;
+  function monsStateToString (st: Byte): AnsiString;
+  function trigType2Str (ttype: Integer): AnsiString;
 
-function g_Holmes_MouseEvent (var ev: THMouseEvent): Boolean; // returns `true` if event was eaten
-function g_Holmes_KeyEvent (var ev: THKeyEvent): Boolean; // returns `true` if event was eaten
-
-// hooks for player
-procedure g_Holmes_plrView (viewPortX, viewPortY, viewPortW, viewPortH: Integer);
-procedure g_Holmes_plrLaser (ax0, ay0, ax1, ay1: Integer);
+  var
+    g_holmes_imfunctional: Boolean = false;
+    g_holmes_enabled: Boolean = {$IF DEFINED(D2F_DEBUG)}true{$ELSE}false{$ENDIF};
 
+  var
+    msX: Integer = -666;
+    msY: Integer = -666;
+    showGrid: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF};
+    showMonsInfo: Boolean = false;
+    showMonsLOS2Plr: Boolean = false;
+    showAllMonsCells: Boolean = false;
+    showMapCurPos: Boolean = false;
+    showLayersWindow: Boolean = false;
+    showOutlineWindow: Boolean = false;
+    showTriggers: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF};
+    showTraceBox: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF};
 
-var
-  g_holmes_enabled: Boolean = {$IF DEFINED(D2F_DEBUG)}true{$ELSE}false{$ENDIF};
+  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;
+    g_ol_rlayer_door: Boolean = false;
+    g_ol_rlayer_acid1: Boolean = false;
+    g_ol_rlayer_acid2: Boolean = false;
+    g_ol_rlayer_water: Boolean = false;
+    g_ol_rlayer_fore: Boolean = false;
 
+  var
+    monMarkedUID: Integer = -1;
+    platMarkedGUID: Integer = -1;
 
 implementation
 
 uses
-  SysUtils, GL, SDL2,
-  MAPDEF, g_options;
+  {mempool,}
+  e_log, e_input,
+  g_player, g_monsters,
+  g_map, g_triggers, g_game, g_panel, g_console,
+  {xprofiler,}
+  fui_common, fui_events, fui_ctls,
+  {$IFDEF ENABLE_RENDER}
+    r_render,
+  {$ENDIF}
+  {rttiobj,} typinfo, e_res,
+  SysUtils, Classes,
+  {$IFDEF USE_SDL2}
+    SDL2,
+  {$ENDIF}
+  MAPDEF, g_options,
+  hashtable, xparser;
 
 
 var
   //globalInited: Boolean = false;
-  msX: Integer = -666;
-  msY: Integer = -666;
   msB: Word = 0; // button state
   kbS: Word = 0; // keyboard modifiers state
-  showGrid: Boolean = true;
-  showMonsInfo: Boolean = false;
-  showMonsLOS2Plr: Boolean = false;
-  showAllMonsCells: Boolean = false;
-  showMapCurPos: Boolean = false;
-  showLayersWindow: Boolean = false;
-  showOutlineWindow: Boolean = false;
-  oldShowLayersWindow: Boolean = false;
-  oldShowOutlineWindow: Boolean = false;
+
 
 // ////////////////////////////////////////////////////////////////////////// //
 {$INCLUDE g_holmes.inc}
-{$INCLUDE g_holmes_ui.inc}
 
 
 // ////////////////////////////////////////////////////////////////////////// //
-var
-  g_ol_nice: Boolean = false;
-  g_ol_rlayer_back: Boolean = false;
-  g_ol_rlayer_step: Boolean = false;
-  g_ol_rlayer_wall: Boolean = false;
-  g_ol_rlayer_door: Boolean = false;
-  g_ol_rlayer_acid1: Boolean = false;
-  g_ol_rlayer_acid2: Boolean = false;
-  g_ol_rlayer_water: Boolean = false;
-  g_ol_rlayer_fore: Boolean = false;
+{$INCLUDE g_holmes_cmd.inc}
 
 
 // ////////////////////////////////////////////////////////////////////////// //
-var
-  winOptions: THTopWindow = nil;
-  winLayers: THTopWindow = nil;
-  winOutlines: THTopWindow = nil;
-
 
-procedure createOptionsWindow ();
-var
-  llb: THCtlCBListBox;
+{$IF NOT DEFINED(ENABLE_RENDER)}
+function pmsCurMapX (): Integer; inline;
 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);
+  result := round(msX/g_dbg_scale)
 end;
 
-
-procedure createLayersWindow ();
-var
-  llb: THCtlCBListBox;
+function pmsCurMapY (): Integer; inline;
 begin
-  llb := THCtlCBListBox.Create(0, 0);
-  llb.appendItem('background', @g_rlayer_back);
-  llb.appendItem('steps', @g_rlayer_step);
-  llb.appendItem('walls', @g_rlayer_wall);
-  llb.appendItem('doors', @g_rlayer_door);
-  llb.appendItem('acid1', @g_rlayer_acid1);
-  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.escClose := true;
-  winLayers.appendChild(llb);
+  result := round(msY/g_dbg_scale)
 end;
 
-
-procedure createOutlinesWindow ();
-var
-  llb: THCtlCBListBox;
-begin
-  llb := THCtlCBListBox.Create(0, 0);
-  llb.appendItem('background', @g_ol_rlayer_back);
-  llb.appendItem('steps', @g_ol_rlayer_step);
-  llb.appendItem('walls', @g_ol_rlayer_wall);
-  llb.appendItem('doors', @g_ol_rlayer_door);
-  llb.appendItem('acid1', @g_ol_rlayer_acid1);
-  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);
-  winOutlines := THTopWindow.Create('outlines', 100, 10);
-  winOutlines.escClose := true;
-  winOutlines.appendChild(llb);
-end;
-
-
-// ////////////////////////////////////////////////////////////////////////// //
-procedure g_Holmes_VidModeChanged ();
-begin
-  e_WriteLog(Format('Holmes: videomode changed: %dx%d', [gScreenWidth, gScreenHeight]), MSG_NOTIFY);
-  // texture space is possibly lost here, idc
-  curtexid := 0;
-  font6texid := 0;
-  font8texid := 0;
-  prfont6texid := 0;
-  prfont8texid := 0;
-  //createCursorTexture();
-end;
-
-procedure g_Holmes_WindowFocused ();
-begin
-  msB := 0;
-  kbS := 0;
-end;
-
-procedure g_Holmes_WindowBlured ();
+function r_Render_HolmesViewIsSet (): Boolean;
 begin
+  result := false
 end;
+{$ENDIF}
 
 
 // ////////////////////////////////////////////////////////////////////////// //
 var
-  vpSet: Boolean = false;
-  vpx, vpy: Integer;
-  vpw, vph: Integer;
-  laserSet: Boolean = false;
-  laserX0, laserY0, laserX1, laserY1: Integer;
-  monMarkedUID: Integer = -1;
-
-
-procedure g_Holmes_plrView (viewPortX, viewPortY, viewPortW, viewPortH: Integer);
-begin
-  vpSet := true;
-  vpx := viewPortX;
-  vpy := viewPortY;
-  vpw := viewPortW;
-  vph := viewPortH;
-end;
-
-procedure g_Holmes_plrLaser (ax0, ay0, ax1, ay1: Integer);
-begin
-  laserSet := true;
-  laserX0 := ax0;
-  laserY0 := ay0;
-  laserX1 := ax1;
-  laserY1 := ay1;
-  laserSet := laserSet; // shut up, fpc!
-end;
-
+  winHelp: TUITopWindow = nil;
+  winOptions: TUITopWindow = nil;
+  winLayers: TUITopWindow = nil;
+  winOutlines: TUITopWindow = nil;
 
-function pmsCurMapX (): Integer; inline; begin result := msX+vpx; end;
-function pmsCurMapY (): Integer; inline; begin result := msY+vpy; end;
 
+procedure createHelpWindow (); forward;
+procedure createOptionsWindow (); forward;
+procedure createLayersWindow (); forward;
+procedure createOutlinesWindow (); forward;
 
-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;
+procedure toggleLayersWindowCB (me: TUIControl);
+begin
+  showLayersWindow := not showLayersWindow;
+  if showLayersWindow then
   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;
+    if (winLayers = nil) then createLayersWindow();
+    uiAddWindow(winLayers);
+  end
+  else
   begin
-    result := false; // don't stop
-    e_WriteLog(Format('monster #%d (UID:%u) (proxyid:%d)', [mon.arrIdx, mon.UID, mon.proxyId]), MSG_NOTIFY);
+    uiRemoveWindow(winLayers);
   end;
+end;
 
+procedure toggleOutlineWindowCB (me: TUIControl);
 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
+  showOutlineWindow := not showOutlineWindow;
+  if showOutlineWindow 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
+    if (winOutlines = nil) then createOutlinesWindow();
+    uiAddWindow(winOutlines);
+  end
+  else
   begin
-    monMarkedUID := -1;
-    e_WriteLog('===========================', MSG_NOTIFY);
-    monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, monsAtDump);
-    e_WriteLog('---------------------------', MSG_NOTIFY);
-    exit;
+    uiRemoveWindow(winOutlines);
   end;
 end;
 
 
-var
-  edgeBmp: array of Byte = nil;
-
-
-procedure drawOutlines ();
-  procedure clearEdgeBmp ();
-  begin
-    SetLength(edgeBmp, (gWinSizeX+4)*(gWinSizeY+4));
-    FillChar(edgeBmp[0], Length(edgeBmp)*sizeof(edgeBmp[0]), 0);
-  end;
-
-  procedure drawPanel (pan: TPanel);
+procedure createHelpWindow ();
+  procedure addHelpEmptyLine ();
   var
-    sx, len, y0, y1: Integer;
+    stx: TUIStaticText;
   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
-    begin
-      sx := pan.X-(vpx-1);
-      len := pan.Width;
-      if (len > vpw+2) then len := vpw+2;
-      if (sx < 0) then begin len += sx; sx := 0; end;
-      if (sx+len > vpw+2) then len := vpw+2-sx;
-      if (len < 1) then exit;
-      assert(sx >= 0);
-      assert(sx+len <= vpw+2);
-      y0 := pan.Y-(vpy-1);
-      y1 := y0+pan.Height;
-      if (y0 < 0) then y0 := 0;
-      if (y1 > vph+2) then y1 := vph+2;
-      while (y0 < y1) do
-      begin
-        FillChar(edgeBmp[y0*(gWinSizeX+4)+sx], len*sizeof(edgeBmp[0]), 1);
-        Inc(y0);
-      end;
-    end
-    else
-    begin
-      drawRect(pan.X, pan.Y, pan.Width, pan.Height, 255, 255, 255);
-    end;
+    stx := TUIStaticText.Create();
+    stx.flExpand := true;
+    stx.halign := 0; // center
+    stx.text := '';
+    stx.header := false;
+    stx.line := false;
+    winHelp.appendChild(stx);
   end;
 
-  procedure drawEdges ();
+  procedure addHelpCaptionLine (const txt: AnsiString);
   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(1.0, 1.0, 1.0, 1.0);
-    glBegin(GL_POINTS);
-    for y := 1 to vph do
-    begin
-      a := @edgeBmp[y*(gWinSizeX+4)+1];
-      for x := 1 to vpw do
-      begin
-        if (a[0] <> 0) then
-        begin
-          if (a[-1] = 0) or (a[1] = 0) or (a[-(gWinSizeX+4)] = 0) or (a[gWinSizeX+4] = 0) or
-             (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);
-          end;
-        end;
-        Inc(a);
-      end;
-    end;
-    glEnd();
+    stx: TUIStaticText;
+  begin
+    stx := TUIStaticText.Create();
+    stx.flExpand := true;
+    stx.halign := 0; // center
+    stx.text := txt;
+    stx.header := true;
+    stx.line := true;
+    winHelp.appendChild(stx);
   end;
 
-  procedure doWallsOld (parr: array of TPanel; ptype: Word);
+  procedure addHelpCaption (const txt: AnsiString);
   var
-    f: Integer;
-    pan: TPanel;
+    stx: TUIStaticText;
   begin
-    if g_ol_nice then clearEdgeBmp();
-    for f := 0 to High(parr) do
-    begin
-      pan := parr[f];
-      if (pan = nil) or not pan.Enabled or (pan.Width < 1) or (pan.Height < 1) then continue;
-      if ((pan.PanelType and ptype) = 0) then continue;
-      drawPanel(pan);
-    end;
-    if g_ol_nice then drawEdges();
+    stx := TUIStaticText.Create();
+    stx.flExpand := true;
+    stx.halign := 0; // center
+    stx.text := txt;
+    stx.header := true;
+    stx.line := false;
+    winHelp.appendChild(stx);
   end;
 
-  function doWallCB (pan: TPanel; tag: Integer): Boolean;
+  procedure addHelpKeyMouse (const key, txt, grp: AnsiString);
+  var
+    box: TUIHBox;
+    span: TUISpan;
+    stx: TUIStaticText;
   begin
-    result := false; // don't stop
-    //if (pan = nil) or not pan.Enabled or (pan.Width < 1) or (pan.Height < 1) then exit;
-    drawPanel(pan);
+    box := TUIHBox.Create();
+    box.flExpand := true;
+      // key
+      stx := TUIStaticText.Create();
+      stx.flExpand := true;
+      stx.halign := 1; // right
+      stx.valign := 0; // center
+      stx.text := key;
+      stx.header := true;
+      stx.line := false;
+      stx.flHGroup := grp;
+      box.appendChild(stx);
+      // span
+      span := TUISpan.Create();
+      span.flDefaultSize := TLaySize.Create(12, 1);
+      span.flExpand := true;
+      box.appendChild(span);
+      // text
+      stx := TUIStaticText.Create();
+      stx.flExpand := true;
+      stx.halign := -1; // left
+      stx.valign := 0; // center
+      stx.text := txt;
+      stx.header := false;
+      stx.line := false;
+      box.appendChild(stx);
+    winHelp.appendChild(box);
   end;
 
-  procedure doWalls (parr: array of TPanel; ptype: Word);
-  begin
-    if g_ol_nice then clearEdgeBmp();
-    mapGrid.forEachInAABB(vpx-1, vpy-1, vpw+2, vph+2, doWallCB, panelTypeToTag(ptype));
-    if g_ol_nice then drawEdges();
-  end;
+  procedure addHelpKey (const key, txt: AnsiString); begin addHelpKeyMouse(key, txt, 'help-keys'); end;
+  procedure addHelpMouse (const key, txt: AnsiString); begin addHelpKeyMouse(key, txt, 'help-mouse'); end;
 
+var
+  slist: array of AnsiString = nil;
+  cmd: PHolmesCommand;
+  bind: THolmesBinding;
+  f: Integer;
+  {
+  llb: TUISimpleText;
+  maxkeylen: Integer;
+  s: AnsiString;
+  }
 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);
-end;
+  winHelp := TUITopWindow.Create('Holmes Help');
+  winHelp.escClose := true;
+  winHelp.flHoriz := false;
 
+  // keyboard
+  for cmd in cmdlist do cmd.helpmark := false;
 
-procedure plrDebugDraw ();
-
-  procedure drawTileGrid ();
-  var
-    x, y: Integer;
+  //maxkeylen := 0;
+  for bind in keybinds do
   begin
-    for y := 0 to (mapGrid.gridHeight div mapGrid.tileSize) do
+    if (Length(bind.key) = 0) then continue;
+    if cmdlist.get(bind.cmdName, cmd) then
     begin
-      drawLine(mapGrid.gridX0, mapGrid.gridY0+y*mapGrid.tileSize, mapGrid.gridX0+mapGrid.gridWidth, mapGrid.gridY0+y*mapGrid.tileSize, 96, 96, 96, 255);
-    end;
-
-    for x := 0 to (mapGrid.gridWidth div mapGrid.tileSize) do
-    begin
-      drawLine(mapGrid.gridX0+x*mapGrid.tileSize, mapGrid.gridY0, mapGrid.gridX0+x*mapGrid.tileSize, mapGrid.gridY0+y*mapGrid.gridHeight, 96, 96, 96, 255);
+      if (Length(cmd.help) > 0) then
+      begin
+        cmd.helpmark := true;
+        //if (maxkeylen < Length(bind.key)) then maxkeylen := Length(bind.key);
+      end;
     end;
   end;
 
-  procedure hilightCell (cx, cy: Integer);
+  for cmd in cmdlist do
   begin
-    fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize, 0, 128, 0, 64);
-  end;
-
-  procedure hilightCell1 (cx, cy: Integer);
-  begin
-    //e_WriteLog(Format('h1: (%d,%d)', [cx, cy]), MSG_NOTIFY);
-    fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize, 255, 255, 0, 92);
-  end;
-
-  function hilightWallTrc (pan: TPanel; tag: Integer; x, y, prevx, prevy: Integer): Boolean;
-  begin
-    result := false; // don't stop
-    if (pan = nil) then exit; // cell completion, ignore
-    //e_WriteLog(Format('h1: (%d,%d)', [cx, cy]), MSG_NOTIFY);
-    fillRect(pan.X, pan.Y, pan.Width, pan.Height, 0, 128, 128, 64);
+    if not cmd.helpmark then continue;
+    if (Length(cmd.help) = 0) then begin cmd.helpmark := false; continue; end;
+    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;
 
-  function monsCollector (mon: TMonster; tag: Integer): Boolean;
-  var
-    ex, ey: Integer;
-    mx, my, mw, mh: Integer;
+  addHelpCaptionLine('KEYBOARD');
+  //llb := TUISimpleText.Create(0, 0);
+  for f := 0 to High(slist) do
   begin
-    result := false;
-    mon.getMapBox(mx, my, mw, mh);
-    e_DrawQuad(mx, my, mx+mw-1, my+mh-1, 255, 255, 0, 96);
-    if lineAABBIntersects(laserX0, laserY0, laserX1, laserY1, mx, my, mw, mh, ex, ey) then
+    //if (f > 0) then llb.appendItem('');
+    if (f > 0) then addHelpEmptyLine();
+    //llb.appendItem(slist[f], true, true);
+    addHelpCaption(slist[f]);
+    for cmd in cmdlist do
     begin
-      e_DrawPoint(8, ex, ey, 0, 255, 0);
+      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);
+          addHelpMouse(bind.key, cmd.help);
+        end;
+      end;
     end;
   end;
 
-  procedure drawMonsterInfo (mon: TMonster);
-  var
-    mx, my, mw, mh: Integer;
-
-    procedure drawMonsterTargetLine ();
-    var
-      emx, emy, emw, emh: Integer;
-      enemy: TMonster;
-      eplr: TPlayer;
-      ex, ey: Integer;
+  // mouse
+  for cmd in cmdlist do cmd.helpmark := false;
+
+  //maxkeylen := 0;
+  for bind in msbinds do
+  begin
+    if (Length(bind.key) = 0) then continue;
+    if cmdlist.get(bind.cmdName, cmd) then
     begin
-      if (g_GetUIDType(mon.MonsterTargetUID) = UID_PLAYER) then
+      if (Length(cmd.help) > 0) then
       begin
-        eplr := g_Player_Get(mon.MonsterTargetUID);
-        if (eplr <> nil) then eplr.getMapBox(emx, emy, emw, emh) else exit;
-      end
-      else if (g_GetUIDType(mon.MonsterTargetUID) = UID_MONSTER) then
-      begin
-        enemy := g_Monsters_ByUID(mon.MonsterTargetUID);
-        if (enemy <> nil) then enemy.getMapBox(emx, emy, emw, emh) else exit;
-      end
-      else
-      begin
-        exit;
-      end;
-      mon.getMapBox(mx, my, mw, mh);
-      drawLine(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, 255, 0, 0, 255);
-      if (g_Map_traceToNearestWall(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, @ex, @ey) <> nil) then
-      begin
-        drawLine(mx+mw div 2, my+mh div 2, ex, ey, 0, 255, 0, 255);
+        cmd.helpmark := true;
+        //if (maxkeylen < Length(bind.key)) then maxkeylen := Length(bind.key);
       end;
     end;
+  end;
 
-    procedure drawLOS2Plr ();
-    var
-      emx, emy, emw, emh: Integer;
-      eplr: TPlayer;
-      ex, ey: Integer;
+  //llb.appendItem('');
+  //llb.appendItem('mouse', true, true);
+  if (f > 0) then addHelpEmptyLine();
+  addHelpCaptionLine('MOUSE');
+  for bind in msbinds do
+  begin
+    if (Length(bind.key) = 0) then continue;
+    if cmdlist.get(bind.cmdName, cmd) then
     begin
-      eplr := gPlayers[0];
-      if (eplr = nil) then exit;
-      eplr.getMapBox(emx, emy, emw, emh);
-      mon.getMapBox(mx, my, mw, mh);
-      drawLine(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, 255, 0, 0, 255);
-      {$IF DEFINED(D2F_DEBUG)}
-      //mapGrid.dbgRayTraceTileHitCB := hilightCell1;
-      {$ENDIF}
-      if (g_Map_traceToNearestWall(mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, @ex, @ey) <> nil) then
-      //if (mapGrid.traceRay(ex, ey, mx+mw div 2, my+mh div 2, emx+emw div 2, emy+emh div 2, hilightWallTrc, (GridTagWall or GridTagDoor)) <> nil) then
+      if (Length(cmd.help) > 0) then
       begin
-        drawLine(mx+mw div 2, my+mh div 2, ex, ey, 0, 255, 0, 255);
+        //s := bind.key;
+        //while (Length(s) < maxkeylen) do s += ' ';
+        //s := '  '+s+' -- '+cmd.help;
+        //llb.appendItem(s);
+        addHelpKey(bind.key, cmd.help);
       end;
-      {$IF DEFINED(D2F_DEBUG)}
-      //mapGrid.dbgRayTraceTileHitCB := nil;
-      {$ENDIF}
     end;
+  end;
 
-  begin
-    if (mon = nil) then exit;
-    mon.getMapBox(mx, my, mw, mh);
-    //mx += mw div 2;
+  //winHelp.appendChild(llb);
 
-    monsGrid.forEachBodyCell(mon.proxyId, hilightCell);
+  uiLayoutCtl(winHelp);
+  winHelp.escClose := true;
+  winHelp.centerInScreen();
+end;
 
-    if showMonsInfo then
-    begin
-      //fillRect(mx-4, my-7*8-6, 110, 7*8+6, 0, 0, 94, 250);
-      darkenRect(mx-4, my-7*8-6, 110, 7*8+6, 128);
-      my -= 8;
-      my -= 2;
-
-      // type
-      drawText6(mx, my, Format('%s(U:%u)', [monsTypeToString(mon.MonsterType), mon.UID]), 255, 127, 0); my -= 8;
-      // beh
-      drawText6(mx, my, Format('Beh: %s', [monsBehToString(mon.MonsterBehaviour)]), 255, 127, 0); my -= 8;
-      // state
-      drawText6(mx, my, Format('State:%s (%d)', [monsStateToString(mon.MonsterState), mon.MonsterSleep]), 255, 127, 0); my -= 8;
-      // health
-      drawText6(mx, my, Format('Health:%d', [mon.MonsterHealth]), 255, 127, 0); my -= 8;
-      // ammo
-      drawText6(mx, my, Format('Ammo:%d', [mon.MonsterAmmo]), 255, 127, 0); my -= 8;
-      // target
-      drawText6(mx, my, Format('TgtUID:%u', [mon.MonsterTargetUID]), 255, 127, 0); my -= 8;
-      drawText6(mx, my, Format('TgtTime:%d', [mon.MonsterTargetTime]), 255, 127, 0); my -= 8;
-    end;
 
-    drawMonsterTargetLine();
-    if showMonsLOS2Plr then drawLOS2Plr();
-    {
-    property MonsterRemoved: Boolean read FRemoved write FRemoved;
-    property MonsterPain: Integer read FPain write FPain;
-    property MonsterAnim: Byte read FCurAnim write FCurAnim;
-    }
-  end;
+procedure winLayersClosed (me: TUIControl); begin showLayersWindow := false; end;
+procedure winOutlinesClosed (me: TUIControl); begin showOutlineWindow := false; end;
 
-  function highlightAllMonsterCells (mon: TMonster): Boolean;
-  begin
-    result := false; // don't stop
-    monsGrid.forEachBodyCell(mon.proxyId, hilightCell);
-  end;
+procedure addCheckBox (parent: TUIControl; const text: AnsiString; pvar: PBoolean; const aid: AnsiString='');
+var
+  cb: TUICheckBox;
+begin
+  cb := TUICheckBox.Create();
+  cb.flExpand := true;
+  cb.setVar(pvar);
+  cb.text := text;
+  cb.id := aid;
+  parent.appendChild(cb);
+end;
 
+procedure addButton (parent: TUIControl; const text: AnsiString; cb: TUIControl.TActionCB);
 var
-  mon: TMonster;
-  mx, my, mw, mh: Integer;
+  but: TUIButton;
 begin
-  if (gPlayer1 = nil) then exit;
+  but := TUIButton.Create();
+  //but.flExpand := true;
+  but.actionCB := cb;
+  but.text := text;
+  parent.appendChild(but);
+end;
 
-  glEnable(GL_SCISSOR_TEST);
-  glScissor(0, gWinSizeY-gPlayerScreenSize.Y-1, vpw, vph);
 
-  glPushMatrix();
-  glTranslatef(-vpx, -vpy, 0);
+procedure actionFillWalls (cb: TUIControl);
+begin
+  TUICheckBox(cb).checked := not TUICheckBox(cb).checked;
+  TUICheckBox(cb.topLevel['cbcontour']).enabled := not TUICheckBox(cb).checked;
+end;
 
-  if (showGrid) then drawTileGrid();
-  drawOutlines();
+procedure createLayersWindow ();
+var
+  box: TUIVBox;
+begin
+  winLayers := TUITopWindow.Create('layers');
+  winLayers.flHoriz := false;
+  winLayers.x0 := 10;
+  winLayers.y0 := 10;
+  winLayers.flHoriz := false;
+  winLayers.escClose := true;
+  winLayers.closeCB := winLayersClosed;
+
+  box := TUIVBox.Create();
+    addCheckBox(box, '~background', @g_rlayer_back);
+    addCheckBox(box, '~steps', @g_rlayer_step);
+    addCheckBox(box, '~walls', @g_rlayer_wall);
+    addCheckBox(box, '~doors', @g_rlayer_door);
+    addCheckBox(box, 'acid~1', @g_rlayer_acid1);
+    addCheckBox(box, 'acid~2', @g_rlayer_acid2);
+    addCheckBox(box, 'wate~r', @g_rlayer_water);
+    addCheckBox(box, '~foreground', @g_rlayer_fore);
+  winLayers.appendChild(box);
+
+  uiLayoutCtl(winLayers);
+end;
 
-  if (laserSet) then g_Mons_AlongLine(laserX0, laserY0, laserX1, laserY1, monsCollector, true);
 
-  if (monMarkedUID <> -1) then
-  begin
-    mon := g_Monsters_ByUID(monMarkedUID);
-    if (mon <> nil) then
-    begin
-      mon.getMapBox(mx, my, mw, mh);
-      e_DrawQuad(mx, my, mx+mw-1, my+mh-1, 255, 0, 0, 30);
-      drawMonsterInfo(mon);
-    end;
-  end;
+procedure createOutlinesWindow ();
+var
+  box: TUIVBox;
+begin
+  winOutlines := TUITopWindow.Create('outlines');
+  winOutlines.flHoriz := false;
+  winOutlines.x0 := 100;
+  winOutlines.y0 := 30;
+  winOutlines.flHoriz := false;
+  winOutlines.escClose := true;
+  winOutlines.closeCB := winOutlinesClosed;
+
+  box := TUIVBox.Create();
+  box.hasFrame := true;
+  box.caption := 'layers';
+    addCheckBox(box, '~background', @g_ol_rlayer_back);
+    addCheckBox(box, '~steps', @g_ol_rlayer_step);
+    addCheckBox(box, '~walls', @g_ol_rlayer_wall);
+    addCheckBox(box, '~doors', @g_ol_rlayer_door);
+    addCheckBox(box, 'acid~1', @g_ol_rlayer_acid1);
+    addCheckBox(box, 'acid~2', @g_ol_rlayer_acid2);
+    addCheckBox(box, 'wate~r', @g_ol_rlayer_water);
+    addCheckBox(box, '~foreground', @g_ol_rlayer_fore);
+  winOutlines.appendChild(box);
+
+  box := TUIVBox.Create();
+  box.hasFrame := true;
+  box.caption := 'options';
+    addCheckBox(box, 'fi~ll walls', @g_ol_fill_walls, 'cbfill');
+    addCheckBox(box, 'con~tours', @g_ol_nice, 'cbcontour');
+  winOutlines.appendChild(box);
+
+  winOutlines.setActionCBFor('cbfill', actionFillWalls);
+
+  uiLayoutCtl(winOutlines);
+end;
 
-  if showAllMonsCells then g_Mons_ForEach(highlightAllMonsterCells);
 
-  glPopMatrix();
+procedure createOptionsWindow ();
+var
+  box: TUIBox;
+  span: TUISpan;
+begin
+  winOptions := TUITopWindow.Create('Holmes Options');
+  winOptions.flHoriz := false;
+  winOptions.flHoriz := false;
+  winOptions.escClose := true;
+
+  box := TUIVBox.Create();
+  box.hasFrame := true;
+  box.caption := 'visual';
+    addCheckBox(box, 'map ~grid', @showGrid);
+    addCheckBox(box, 'cursor ~position on map', @showMapCurPos);
+    addCheckBox(box, '~monster info', @showMonsInfo);
+    addCheckBox(box, 'monster LO~S to player', @showMonsLOS2Plr);
+    addCheckBox(box, 'monster ~cells (SLOW!)', @showAllMonsCells);
+    addCheckBox(box, 'draw ~triggers (SLOW!)', @showTriggers);
+  winOptions.appendChild(box);
+
+  box := TUIHBox.Create();
+  box.hasFrame := true;
+  box.caption := 'windows';
+  box.captionAlign := 0;
+  box.flAlign := 0;
+    addButton(box, '~layers', toggleLayersWindowCB);
+    span := TUISpan.Create();
+      span.flExpand := true;
+      span.flDefaultSize := TLaySize.Create(4, 1);
+      box.appendChild(span);
+    addButton(box, '~outline', toggleOutlineWindowCB);
+  winOptions.appendChild(box);
+
+  uiLayoutCtl(winOptions);
+  winOptions.centerInScreen();
+end;
 
-  glDisable(GL_SCISSOR_TEST);
 
-  if showMapCurPos then drawText8(4, gWinSizeY-10, Format('mappos:(%d,%d)', [pmsCurMapX, pmsCurMapY]), 255, 255, 0);
+procedure toggleLayersWindow (arg: Integer=-1);
+begin
+  if (arg < 0) then showLayersWindow := not showLayersWindow else showLayersWindow := (arg > 0);
+  showLayersWindow := not showLayersWindow; // hack for callback
+  toggleLayersWindowCB(nil);
 end;
 
+procedure toggleOutlineWindow (arg: Integer=-1);
+begin
+  if (arg < 0) then showOutlineWindow := not showOutlineWindow else showOutlineWindow := (arg > 0);
+  showOutlineWindow := not showOutlineWindow; // hack for callback
+  toggleOutlineWindowCB(nil);
+end;
 
-// ////////////////////////////////////////////////////////////////////////// //
-function g_Holmes_MouseEvent (var ev: THMouseEvent): Boolean;
+procedure toggleHelpWindow (arg: Integer=-1);
 begin
-  result := true;
-  msX := ev.x;
-  msY := ev.y;
-  msB := ev.bstate;
-  kbS := ev.kstate;
-  msB := msB;
-  if not uiMouseEvent(ev) then plrDebugMouse(ev);
+  if (winHelp = nil) then
+  begin
+    if (arg = 0) then exit;
+    createHelpWindow();
+  end;
+       if (arg < 0) then begin if not uiVisibleWindow(winHelp) then uiAddWindow(winHelp) else uiRemoveWindow(winHelp); end
+  else if (arg = 0) then begin if uiVisibleWindow(winHelp) then uiRemoveWindow(winHelp); end
+  else begin if (not uiVisibleWindow(winHelp)) then uiAddWindow(winHelp); end;
+  if (not uiVisibleWindow(winHelp)) then FreeAndNil(winHelp);
+end;
+
+procedure toggleOptionsWindow (arg: Integer=-1);
+begin
+  if (winOptions = nil) then createOptionsWindow();
+       if (arg < 0) then begin if not uiVisibleWindow(winOptions) then uiAddWindow(winOptions) else uiRemoveWindow(winOptions); end
+  else if (arg = 0) then begin if uiVisibleWindow(winOptions) then uiRemoveWindow(winOptions); end
+  else begin if not uiVisibleWindow(winOptions) then uiAddWindow(winOptions); end
 end;
 
 
-function g_Holmes_KeyEvent (var ev: THKeyEvent): Boolean;
+// ////////////////////////////////////////////////////////////////////////// //
+{$IFDEF USE_SDL2}
+procedure onKeyEvent (var ev: TFUIEvent);
+{$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
-  result := false;
-  msB := ev.bstate;
-  kbS := ev.kstate;
-  case ev.scan of
-    SDL_SCANCODE_LCTRL, SDL_SCANCODE_RCTRL,
-    SDL_SCANCODE_LALT, SDL_SCANCODE_RALT,
-    SDL_SCANCODE_LSHIFT, SDL_SCANCODE_RSHIFT:
-      result := true;
-  end;
-  if uiKeyEvent(ev) then begin result := true; exit; end;
   // press
-  if (ev.kind = THKeyEvent.Press) then
+  if (ev.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
+       ((ev.kstate and TFUIEvent.ModCtrl) <> 0) then
     begin
-      result := true;
+      ev.eat();
       dx := pmsCurMapX;
       dy := pmsCurMapY;
       case ev.scan of
@@ -777,71 +568,358 @@ 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;
+{$ELSE}
+procedure onKeyEvent (var ev: TFUIEvent);
+begin
+end;
+{$ENDIF}
 
 
 // ////////////////////////////////////////////////////////////////////////// //
-procedure g_Holmes_Draw ();
+procedure g_Holmes_OnEvent (var ev: TFUIEvent);
+  var doeat: Boolean = false;
 begin
-  if (oldShowLayersWindow <> showLayersWindow) then
+  if g_Game_IsNet then exit;
+  if not g_holmes_enabled then exit;
+  if g_holmes_imfunctional then exit;
+
+  holmesInitCommands();
+  holmesInitBinds();
+
+  msB := ev.bstate;
+  kbS := ev.kstate;
+
+  if (ev.key) then
   begin
-    oldShowLayersWindow := showLayersWindow;
-    if showLayersWindow then
-    begin
-      if (winLayers = nil) then createLayersWindow();
-      uiAddWindow(winLayers);
-    end
-    else
-    begin
-      uiRemoveWindow(winLayers);
+{$IFDEF USE_SDL2}
+    case ev.scan of
+      SDL_SCANCODE_LCTRL, SDL_SCANCODE_RCTRL,
+      SDL_SCANCODE_LALT, SDL_SCANCODE_RALT,
+      SDL_SCANCODE_LSHIFT, SDL_SCANCODE_RSHIFT:
+        doeat := true;
     end;
+{$ENDIF}
+  end
+  else if (ev.mouse) then
+  begin
+    msX := ev.x;
+    msY := ev.y;
+    msB := ev.bstate;
+    kbS := ev.kstate;
+    msB := msB;
+  end;
+
+  uiDispatchEvent(ev);
+  if (not ev.alive) then exit;
+
+  if (ev.mouse) then
+  begin
+    if (gPlayer1 <> nil) and r_Render_HolmesViewIsSet() then msbindExecute(ev);
+    ev.eat();
   end
   else
   begin
-    showLayersWindow := uiVisibleWindow(winLayers);
-    oldShowLayersWindow := showLayersWindow;
+    if keybindExecute(ev) then ev.eat();
+    if (ev.alive) then onKeyEvent(ev);
   end;
 
-  if (oldShowOutlineWindow <> showOutlineWindow) then
+  if (doeat) then ev.eat();
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+procedure bcOneMonsterThinkStep (); begin gmon_debug_think := false; gmon_debug_one_think_step := true; end;
+procedure bcOneMPlatThinkStep (); begin g_dbgpan_mplat_active := false; g_dbgpan_mplat_step := true; end;
+procedure bcMPlatToggle (); begin g_dbgpan_mplat_active := not g_dbgpan_mplat_active; 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 bcToggleDrawTriggers (arg: Integer=-1); begin if (arg < 0) then showTriggers := not showTriggers else showTriggers := (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 bcMonsterSpawn (s: AnsiString);
+var
+  mon: TMonster;
+begin
+  if not gGameOn or g_Game_IsClient then
   begin
-    oldShowOutlineWindow := showOutlineWindow;
-    if showOutlineWindow then
-    begin
-      if (winOutlines = nil) then createOutlinesWindow();
-      uiAddWindow(winOutlines);
-    end
-    else
+    conwriteln('cannot spawn monster in this mode');
+    exit;
+  end;
+  mon := g_Mons_SpawnAt(s, pmsCurMapX, pmsCurMapY);
+  if (mon = nil) then begin conwritefln('unknown monster id: ''%s''', [s]); exit; end;
+  monMarkedUID := mon.UID;
+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 dbgToggleTraceBox (arg: Integer=-1); begin if (arg < 0) then showTraceBox := not showTraceBox else showTraceBox := (arg > 0); end;
+
+procedure dbgToggleHolmesPause (arg: Integer=-1); begin if (arg < 0) then g_Game_HolmesPause(not gPauseHolmes) else g_Game_HolmesPause(arg > 0); 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]), TMsgType.Notify);
+    monMarkedUID := mon.UID;
+    dumpPublishedProperties(mon);
+  end;
+var
+  plr: TPlayer;
+  x, y, w, h: Integer;
+  mit: PMonster;
+  it: TMonsterGrid.Iter;
+begin
+  monMarkedUID := -1;
+  if (Length(gPlayers) > 0) then
+  begin
+    plr := gPlayers[0];
+    if (plr <> nil) then
     begin
-      uiRemoveWindow(winOutlines);
+      plr.getMapBox(x, y, w, h);
+      if (pmsCurMapX >= x) and (pmsCurMapY >= y) and (pmsCurMapX < x+w) and (pmsCurMapY < y+h) then
+      begin
+        dumpPublishedProperties(plr);
+      end;
     end;
-  end
-  else
+  end;
+  //e_WriteLog('===========================', MSG_NOTIFY);
+  it := monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY);
+  for mit in it do monsAtDump(mit^);
+  it.release();
+  //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]), TMsgType.Notify);
+  end;
+var
+  mit: PMonster;
+  it: TMonsterGrid.Iter;
+begin
+  it := monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY);
+  if (it.length > 0) then
   begin
-    showOutlineWindow := uiVisibleWindow(winOutlines);
-    oldShowOutlineWindow := showOutlineWindow;
+    e_WriteLog('===========================', TMsgType.Notify);
+    for mit in it do monsAtDump(mit^);
+    e_WriteLog('---------------------------', TMsgType.Notify);
   end;
+  it.release();
+end;
 
-  glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); // modify color buffer
-  glDisable(GL_STENCIL_TEST);
-  glDisable(GL_BLEND);
-  glDisable(GL_SCISSOR_TEST);
-  glDisable(GL_TEXTURE_2D);
+procedure cbAtcurDumpWalls ();
+  function wallToggle (pan: TPanel{; tag: Integer}): Boolean;
+  begin
+    result := false; // don't stop
+    if (platMarkedGUID = -1) then platMarkedGUID := pan.guid;
+    e_LogWritefln('wall ''%s'' #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.mapId, pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]);
+    dumpPublishedProperties(pan);
+  end;
+var
+  hasTrigs: Boolean = false;
+  f: Integer;
+  trig: PTrigger;
+  mwit: PPanel;
+  it: TPanelGrid.Iter;
+begin
+  platMarkedGUID := -1;
+  it := mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, (GridTagWall or GridTagDoor));
+  if (it.length > 0) then
+  begin
+    e_WriteLog('=== TOGGLE WALL ===', TMsgType.Notify);
+    for mwit in it do wallToggle(mwit^);
+    e_WriteLog('--- toggle wall ---', TMsgType.Notify);
+  end;
+  it.release();
+  if showTriggers then
+  begin
+    for f := 0 to High(gTriggers) do
+    begin
+      trig := @gTriggers[f];
+      if (pmsCurMapX >= trig.x) and (pmsCurMapY >= trig.y) and (pmsCurMapX < trig.x+trig.width) and (pmsCurMapY < trig.y+trig.height) then
+      begin
+        if not hasTrigs then begin writeln('=== TRIGGERS ==='); hasTrigs := true; end;
+        writeln('trigger ''', trig.mapId, ''' of type ''', trigType2Str(trig.TriggerType), '''');
+      end;
+    end;
+    if hasTrigs then writeln('--- triggers ---');
+  end;
+end;
 
-  if gGameOn then
+procedure cbAtcurToggleWalls ();
+  function wallToggle (pan: TPanel{; tag: Integer}): Boolean;
   begin
-    plrDebugDraw();
+    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_DisableWallGUID(pan.guid) else g_Map_EnableWallGUID(pan.guid);
   end;
+var
+  mwit: PPanel;
+  it: TPanelGrid.Iter;
+begin
+  //e_WriteLog('=== TOGGLE WALL ===', MSG_NOTIFY);
+  //e_WriteLog('--- toggle wall ---', MSG_NOTIFY);
+  it := mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, (GridTagWall or GridTagDoor));
+  for mwit in it do wallToggle(mwit^);
+  it.release();
+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, 'wake up selected monster', 'monster control');
+
+  cmdAdd('mon_spawn', bcMonsterSpawn, 'spawn monster', 'monster control');
 
-  laserSet := false;
+  cmdAdd('mplat_step', bcOneMPlatThinkStep, 'one mplat think step', 'mplat control');
+  cmdAdd('mplat_toggle', bcMPlatToggle, 'activate/deactivate moving platforms', 'mplat 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('dbg_triggers', bcToggleDrawTriggers, 'show/hide triggers (SLOW!)', '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');
+
+  cmdAdd('dbg_tracebox', dbgToggleTraceBox, 'test traceBox()', 'player control');
+
+  cmdAdd('hlm_pause', dbgToggleHolmesPause, '"Holmes" pause mode', 'game control');
 end;
 
 
-procedure g_Holmes_DrawUI ();
+procedure holmesInitBinds ();
+var
+  st: TStream = nil;
+  pr: TTextParser = nil;
+  s, kn, v: AnsiString;
+  kmods: Byte;
+  mbuts: Byte;
 begin
-  uiDraw();
-  drawCursor();
+  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('M-P', 'mplat_step');
+    keybindAdd('M-O', 'mplat_toggle');
+
+    keybindAdd('C-T', 'plr_teleport');
+    keybindAdd('M-T', 'dbg_tracebox');
+
+    keybindAdd('C-P', 'dbg_curpos');
+    keybindAdd('C-G', 'dbg_grid');
+    keybindAdd('C-X', 'dbg_triggers');
+
+    keybindAdd('C-1', 'mon_spawn zombie');
+
+    keybindAdd('C-S-P', 'hlm_pause');
+
+    // 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 := e_OpenResourceRO(ConfigDirs, '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;
 
 
+begin
+  // shut up, fpc!
+  msB := msB;
+
+  fuiEventCB := g_Holmes_OnEvent;
+  //uiContext.font := 'win14';
 end.