haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

libsdl: mouse wheel inverted (#3195)

Browse Source
This commit is contained in:
Peter Kosyh
2018-10-06 16:43:12 +03:00
committed by Gerasim Troeglazov
parent 50978de12f
commit 67d742b209
2 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-libs/libsdl/libsdl-1.2.15.recipe
View File

@@ -5,7 +5,7 @@ joystick, and graphics via OpenGL."
HOMEPAGE="http://www.libsdl.org/"
COPYRIGHT="1997-2012 Sam Lantinga"
LICENSE="GNU LGPL v2.1"
REVISION="14"
REVISION="15"
SOURCE_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz"
CHECKSUM_SHA256="d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00"
SOURCE_DIR="SDL-$portVersion"

53
media-libs/libsdl/patches/libsdl-1.2.15.patchset
View File

@@ -1,4 +1,4 @@
From 6e348a6871b1cd882b2310b6f6cdc92b348cef44 Mon Sep 17 00:00:00 2001
From 147b0abca9a052f6067473729c1698c1e9768f3b Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 22 Nov 2013 23:38:56 +0100
Subject: Remove Alsa and ESD detection
@@ -36,7 +36,7 @@ index 08c8e1e..84d9a55 100644
2.19.0
From 8f11ab4149c6a4e4be28d1c907955ff30c936552 Mon Sep 17 00:00:00 2001
From bbaeaaa75724b902268de2681591380d9e0d7dc9 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 22 Nov 2013 23:39:26 +0100
Subject: Fix samples vs bytes issues
@@ -67,7 +67,7 @@ index de635f8..7faf571 100644
2.19.0
From 05cbb8360ef0edd25c76ce0c52bdc5d4b878989d Mon Sep 17 00:00:00 2001
From 654866025eb475ce742f7c0cce9debe5cbb4d4a2 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 22 Nov 2013 23:40:12 +0100
Subject: Various fixes to the video code
@@ -147,7 +147,7 @@ index c32b661..a26f18b 100644
2.19.0
From 8e4ce42357ea8573f8fb8bfc1ab7bde4aa00c5c3 Mon Sep 17 00:00:00 2001
From 1bcb03eaf59ffc0ba2a81ad736e4afa55cb85ffb Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 23 Nov 2013 11:59:00 +0100
Subject: Actually fix the sample vs bytes problem in audio driver.
@@ -201,7 +201,7 @@ index 7faf571..300bf03 100644
2.19.0
From e80a2b0cbdc71878dad069ff5fa00e7808774670 Mon Sep 17 00:00:00 2001
From 84dd81f7569d40ff3352011f042469ca2766da8e Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Sun, 22 Dec 2013 18:37:30 -0700
Subject: Remove Haiku from specialized DECLSPEC definition
@@ -224,7 +224,7 @@ index 27e2f7b..d5e2f1f 100644
2.19.0
From d4881867266f9b5416eeec5ac9ed57a099a70120 Mon Sep 17 00:00:00 2001
From 325e27ac31b4247992e499034fffd0998a91623a Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 5 Jan 2014 17:22:10 +0100
Subject: Change prefix from "be" to "os" for OpenGL includes
@@ -248,7 +248,7 @@ index f2b19a2..2cb94ee 100644
2.19.0
From fe36b04a86bb540767c5a96b48c40526b51a1d12 Mon Sep 17 00:00:00 2001
From 5bd26a05fa2f260a67933eb32f00bd631bb3198a Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Fri, 28 Mar 2014 18:04:12 +0100
Subject: Fix compilation on x86_64
@@ -383,7 +383,7 @@ index 7c71b00..f2fef10 100644
2.19.0
From b4d5b080305fff28b87d542f4e6a336a02af2c4e Mon Sep 17 00:00:00 2001
From 7b2636d859f8c403b61403f67bc76bbea5e3dbd9 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Mon, 20 Oct 2014 13:33:55 +0200
Subject: Fix problem with GL viewport
@@ -411,7 +411,7 @@ index 5d4077f..7e1bd38 100644
2.19.0
From 75e7832f924f90dd4f5539c0ac118a46c20fe2bb Mon Sep 17 00:00:00 2001
From 83aeeb90994f48dfadb94d61e18cb36e4d505aef Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Tue, 27 Oct 2015 21:39:24 +0000
Subject: Avoid crashing on quit when SDL_Win was never initialized.
@@ -440,7 +440,7 @@ index 7e1bd38..818d1a0 100644
2.19.0
From 332d8be37c9b9c8c9d228812e22184cef7020458 Mon Sep 17 00:00:00 2001
From 78766f233fcf2f572e83d88f697c1c6a636c5242 Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Tue, 27 Oct 2015 21:40:36 +0000
Subject: Add 24 bit color spaces to ColorSpaceToBitsPerPixel().
@@ -467,7 +467,7 @@ index 818d1a0..0100f3b 100644
2.19.0
From 65f80fb80f326eda6eb75f276eb4f96b983995d0 Mon Sep 17 00:00:00 2001
From f28728f746a43489a297dee56c637118e5c60260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 11 Jul 2016 15:08:06 +0200
Subject: Try to find correct application signature from app resources
@@ -519,7 +519,7 @@ index 8b79377..65a6dbf 100644
2.19.0
From 82e9317f9fba83878a8d28d11c163fb22a7ecd9d Mon Sep 17 00:00:00 2001
From b35fcca512ede0bd470f93319a8d8309bc3ba006 Mon Sep 17 00:00:00 2001
From: Peter Kosyh <p.kosyh@gmail.com>
Date: Fri, 5 Oct 2018 17:39:06 +0300
Subject: fix black box in top-left corner while win lost mouse focus
@@ -552,3 +552,32 @@ index 9e12750..63afded 100644
--
2.19.0
From 9fa69e45f9b169e37897edfceaa852d6dd884cc0 Mon Sep 17 00:00:00 2001
From: Peter Kosyh <p.kosyh@gmail.com>
Date: Sat, 6 Oct 2018 14:17:22 +0300
Subject: libsdl: mouse wheel inverted
diff --git a/src/video/bwindow/SDL_sysevents.cc b/src/video/bwindow/SDL_sysevents.cc
index 63afded..225e882 100644
--- a/src/video/bwindow/SDL_sysevents.cc
+++ b/src/video/bwindow/SDL_sysevents.cc
@@ -307,11 +307,11 @@ void SDL_BWin::DispatchMessage(BMessage *msg, BHandler *target)
x = y = 0;
if (msg->FindFloat("be:wheel_delta_x", &x) == B_OK && msg->FindFloat("be:wheel_delta_y", &y) == B_OK) {
if (x < 0 || y < 0) {
- SDL_PrivateMouseButton(SDL_PRESSED, SDL_BUTTON_WHEELDOWN, 0, 0);
- SDL_PrivateMouseButton(SDL_RELEASED, SDL_BUTTON_WHEELDOWN, 0, 0);
- } else if (x > 0 || y > 0) {
SDL_PrivateMouseButton(SDL_PRESSED, SDL_BUTTON_WHEELUP, 0, 0);
SDL_PrivateMouseButton(SDL_RELEASED, SDL_BUTTON_WHEELUP, 0, 0);
+ } else if (x > 0 || y > 0) {
+ SDL_PrivateMouseButton(SDL_PRESSED, SDL_BUTTON_WHEELDOWN, 0, 0);
+ SDL_PrivateMouseButton(SDL_RELEASED, SDL_BUTTON_WHEELDOWN, 0, 0);
}
}
break;
--
2.19.0