SynEdit: support horizontal mouse wheel

git-svn-id: trunk@60562 -

components/synedit/lazsyneditmousecmdstypes.pp

@@ -11,7 +11,7 @@ interface
 *)
 
 type
-  TSynMouseButton = (mbLeft, mbRight, mbMiddle, mbExtra1, mbExtra2, mbWheelUp, mbWheelDown);
+  TSynMouseButton = (mbLeft, mbRight, mbMiddle, mbExtra1, mbExtra2, mbWheelUp, mbWheelDown, mbWheelLeft, mbWheelRight);
 
 implementation
 

components/synedit/synedit.pp

@@ -488,6 +488,7 @@ type
     procedure WMKillFocus(var Msg: TWMKillFocus); message WM_KILLFOCUS;
     procedure WMExit(var Message: TLMExit); message LM_EXIT;
     procedure WMMouseWheel(var Message: TLMMouseEvent); message LM_MOUSEWHEEL;
+    procedure WMMouseHorizWheel(var Message: TLMMouseEvent); message LM_MOUSEHWHEEL;
     //procedure WMMouseWheel(var Msg: TMessage); message WM_MOUSEWHEEL;
     procedure WMSetFocus(var Msg: TLMSetFocus); message WM_SETFOCUS;
     procedure WMVScroll(var Msg: TLMScroll); message WM_VSCROLL;
@@ -566,7 +567,7 @@ type
     FConfirmMouseDownMatchAct: TSynEditMouseAction;
     FConfirmMouseDownMatchFound: Boolean;
     fBookMarkOpt: TSynBookMarkOpt;
-    FMouseWheelAccumulator, FMouseWheelLinesAccumulator: integer;
+    FMouseWheelAccumulator, FMouseWheelLinesAccumulator: Array [Boolean] of integer;
     fHideSelection: boolean;
     fOverwriteCaret: TSynEditCaretType;
     fInsertCaret: TSynEditCaretType;
@@ -1631,9 +1632,13 @@ end;
 
 procedure TSynEditMouseGlobalActions.InitForOptions(AnOptions: TSynEditorMouseOptions);
 begin
+  // Normal wheel: scroll dependent on visible scroll-bars
   AddCommand(emcWheelScrollDown,       False,  mbXWheelDown, ccAny, cdDown, [], []);
   AddCommand(emcWheelScrollUp,         False,  mbXWheelUp, ccAny, cdDown, [], []);
 
+  AddCommand(emcWheelHorizScrollDown,       False,  mbXWheelLeft, ccAny, cdDown, [], []);
+  AddCommand(emcWheelHorizScrollUp,         False,  mbXWheelRight, ccAny, cdDown, [], []);
+
   if emCtrlWheelZoom in AnOptions then begin
     AddCommand(emcWheelZoomOut,        False,  mbXWheelDown, ccAny, cdDown, [ssCtrl], [ssCtrl]);
     AddCommand(emcWheelZoomIn,         False,  mbXWheelUp,   ccAny, cdDown, [ssCtrl], [ssCtrl]);
@@ -3124,13 +3129,15 @@ var
     //WHEEL_PAGESCROLL = MAXDWORD;
   var
     WClicks, WLines: Integer;
+    IsHoriz: Boolean;
   begin
-    Inc(FMouseWheelAccumulator, AnInfo.WheelDelta);
+    IsHoriz := AnInfo.Button in [mbXWheelLeft, mbXWheelRight];
-    Inc(FMouseWheelLinesAccumulator, MinMax(Mouse.WheelScrollLines, 1, APageSize) * AnInfo.WheelDelta);
+    Inc(FMouseWheelAccumulator[IsHoriz], AnInfo.WheelDelta);
-    WClicks := FMouseWheelAccumulator div WHEEL_DELTA;
+    Inc(FMouseWheelLinesAccumulator[IsHoriz], MinMax(Mouse.WheelScrollLines, 1, APageSize) * AnInfo.WheelDelta);
-    WLines  := FMouseWheelLinesAccumulator div WHEEL_DELTA;
+    WClicks := FMouseWheelAccumulator[IsHoriz] div WHEEL_DELTA;
-    dec(FMouseWheelAccumulator, WClicks * WHEEL_DELTA);
+    WLines  := FMouseWheelLinesAccumulator[IsHoriz] div WHEEL_DELTA;
-    dec(FMouseWheelLinesAccumulator, WLines * WHEEL_DELTA);
+    dec(FMouseWheelAccumulator[IsHoriz], WClicks * WHEEL_DELTA);
+    dec(FMouseWheelLinesAccumulator[IsHoriz], WLines * WHEEL_DELTA);
 
     case AnAction.Option of
       emcoWheelScrollSystem:
@@ -7669,6 +7676,47 @@ begin
   Message.Result := 1 // handled, skip further handling by interface
 end;
 
+procedure TCustomSynEdit.WMMouseHorizWheel(var Message: TLMMouseEvent);
+var
+  lState: TShiftState;
+  MousePos: TPoint;
+  AnActionResult: TSynEditMouseActionResult;
+begin
+  if ((sfHorizScrollbarVisible in fStateFlags) and (Message.Y > ClientHeight)) or
+     ((sfVertScrollbarVisible in fStateFlags) and (Message.X > ClientWidth))
+   then begin
+     // mouse is over scrollbar
+     inherited; // include OnMouseWheel...;
+     exit;
+   end;
+
+  MousePos.X := Message.X;
+  MousePos.Y := Message.Y;
+  if DoMouseWheelHorz(Message.State, Message.WheelDelta, MousePos) then begin
+    Message.Result := 1; // handled
+    exit;
+  end;
+
+  lState := Message.State - [ssCaps, ssNum, ssScroll]; // Remove unreliable states, see http://bugs.freepascal.org/view.php?id=20065
+
+  IncPaintLock;
+  try
+    if Message.WheelDelta > 0 then begin
+      FindAndHandleMouseAction(mbXWheelLeft, lState, Message.X, Message.Y, ccSingle, cdDown, AnActionResult, Message.WheelDelta);
+    end
+    else begin
+      // send megative delta
+      FindAndHandleMouseAction(mbXWheelRight, lState, Message.X, Message.Y, ccSingle, cdDown, AnActionResult, Message.WheelDelta);
+    end;
+  finally
+    DecPaintLock;
+  end;
+
+  DoHandleMouseActionResult(AnActionResult);
+
+  Message.Result := 1 // handled, skip further handling by interface
+end;
+
 procedure TCustomSynEdit.SetWantTabs(const Value: boolean);
 begin
   fWantTabs := Value;

components/synedit/syneditmousecmds.pp

@@ -81,6 +81,8 @@ const
   mbXExtra2    =  LazSynEditMouseCmdsTypes.mbExtra2;
   mbXWheelUp   =  LazSynEditMouseCmdsTypes.mbWheelUp;
   mbXWheelDown =  LazSynEditMouseCmdsTypes.mbWheelDown;
+  mbXWheelLeft =  LazSynEditMouseCmdsTypes.mbWheelLeft;
+  mbXWheelRight=  LazSynEditMouseCmdsTypes.mbWheelRight;
 
   SynMouseButtonMap: Array [TMouseButton] of TSynMouseButton =
     (mbXLeft, mbXRight, mbXMiddle, mbXExtra1, mbXExtra2);
@@ -88,7 +90,7 @@ const
   SynMouseButtonBackMap: Array [TSynMouseButton] of TMouseButton =
     (Controls.mbLeft, Controls.mbRight, Controls.mbMiddle,
      Controls.mbExtra1, Controls.mbExtra2,
-     Controls.mbLeft, Controls.mbLeft);
+     Controls.mbLeft, Controls.mbLeft, Controls.mbLeft, Controls.mbLeft);
 
 type
 
@@ -502,7 +504,7 @@ begin
     emcCodeFoldCollaps:       Result := SYNS_emcCodeFoldCollaps_opt;
     emcCodeFoldExpand:        Result := SYNS_emcCodeFoldExpand_opt;
     emcContextMenu:           Result := SYNS_emcContextMenuCaretMove_opt;
-    emcWheelScrollDown..emcWheelVertScrollUp:
+    emcWheelScrollDown..emcWheelHorizScrollUp:
                               Result := SYNS_emcWheelScroll_opt;
     else begin
       Result := '';
@@ -666,7 +668,7 @@ begin
   if Collection <> nil then
     TSynEditMouseActions(Collection).AssertNoConflict(self);
 
-  if FButton in [mbXWheelUp, mbXWheelDown] then
+  if FButton in [mbXWheelUp, mbXWheelDown, mbXWheelLeft, mbXWheelRight] then
     ClickDir := cdDown;
 end;
 
@@ -688,7 +690,7 @@ end;
 
 procedure TSynEditMouseAction.SetClickDir(AValue: TSynMAClickDir);
 begin
-  if FButton in [mbXWheelUp, mbXWheelDown] then
+  if FButton in [mbXWheelUp, mbXWheelDown, mbXWheelLeft, mbXWheelRight] then
     AValue := cdDown;
   if FClickDir = AValue then exit;
   FClickDir := AValue;