Fixed scrolling direction with mouse wheel for horizontal scrollers

WINGs/ChangeLog

@@ -51,6 +51,7 @@ Changes since wmaker 0.64.0:
 - fixed a bug that made the scroller knob jump backwards when dragged (this
   bug had no relation with the behavior that #define STRICT_NEXT_BEHAVIOUR
   attempts to accomplish).
+- fixed scrolling direction with mouse wheel for horizontal scroller.
 
 
 changes since wmaker 0.63.1:

WINGs/wscroller.c

@@ -798,6 +798,7 @@ static void
 handleActionEvents(XEvent *event, void *data)
 {
     Scroller *sPtr = (Scroller*)data;
+    int wheelDecrement, wheelIncrement;
     int id, dd;
 
 
@@ -809,11 +810,10 @@ handleActionEvents(XEvent *event, void *data)
     dd = sPtr->flags.decrDown;
 
     switch (event->type) {
-     case EnterNotify:
+    case EnterNotify:
+        break;
 
-	break;
-	
-     case LeaveNotify:
+    case LeaveNotify:
 	if (sPtr->timerID) {
 	    WMDeleteTimerHandler(sPtr->timerID);
 	    sPtr->timerID = NULL;
@@ -822,11 +822,20 @@ handleActionEvents(XEvent *event, void *data)
 	sPtr->flags.decrDown = 0;
 	break;
 
-     case ButtonPress:
+    case ButtonPress:
         /* FIXME: change Mod1Mask with something else */
         if (sPtr->flags.documentFullyVisible)
             break;
-	if (event->xbutton.button==WINGsConfiguration.mouseWheelUp) {
+
+        if (sPtr->flags.horizontal) {
+            wheelDecrement = WINGsConfiguration.mouseWheelDown;
+            wheelIncrement = WINGsConfiguration.mouseWheelUp;
+        } else {
+            wheelDecrement = WINGsConfiguration.mouseWheelUp;
+            wheelIncrement = WINGsConfiguration.mouseWheelDown;
+        }
+
+	if (event->xbutton.button == wheelDecrement) {
             if (event->xbutton.state & ControlMask) {
                 sPtr->flags.hitPart = WSDecrementPage;
             } else if (event->xbutton.state & ShiftMask) {
@@ -839,7 +848,7 @@ handleActionEvents(XEvent *event, void *data)
 		WMPostNotificationName(WMScrollerDidScrollNotification, sPtr,
 				       NULL);
 	    }
-	} else if (event->xbutton.button==WINGsConfiguration.mouseWheelDown) {
+	} else if (event->xbutton.button == wheelIncrement) {
             if (event->xbutton.state & ControlMask) {
                 sPtr->flags.hitPart = WSIncrementPage;
             } else if (event->xbutton.state & ShiftMask) {
@@ -865,7 +874,7 @@ handleActionEvents(XEvent *event, void *data)
 	}
 	break;
 
-     case ButtonRelease:
+    case ButtonRelease:
 	if (sPtr->flags.draggingKnob) {
 	    if (sPtr->action) {
 		(*sPtr->action)(sPtr, sPtr->clientData);
@@ -882,7 +891,7 @@ handleActionEvents(XEvent *event, void *data)
 	sPtr->flags.draggingKnob = 0;
 	break;
 
-     case MotionNotify:
+    case MotionNotify:
 	handleMotion(sPtr, event->xbutton.x, event->xbutton.y);
 	if (sPtr->timerID && sPtr->flags.hitPart != WSIncrementLine
 	    && sPtr->flags.hitPart != WSDecrementLine) {