We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] riscos: Add support for additional mouse events

SDL-mouse-events.patch (text/plain), 3.89 KB, created by Cameron Cawley on 2020-09-21 22:20:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cameron Cawley

Created: 2020-09-21 22:20:52 UTC

Size: 3.89 KB

patch

obsolete

># HG changeset patch
># User Cameron Cawley <ccawley2011@gmail.com>
># Date 1600631279 -3600
>#      Sun Sep 20 20:47:59 2020 +0100
># Branch SDL-1.2
># Node ID 95be7982bc83cda83c2bb779e2033b977ab51640
># Parent  1bffae6992b0b3fb9075ce52d9a972ad853afe0a
>riscos: Add support for additional mouse events
>
>diff -r 1bffae6992b0 -r 95be7982bc83 src/video/riscos/SDL_riscosevents.c
>--- a/src/video/riscos/SDL_riscosevents.c	Sat Jul 18 23:05:02 2020 +0300
>+++ b/src/video/riscos/SDL_riscosevents.c	Sun Sep 20 20:47:59 2020 +0100
>@@ -262,6 +262,10 @@
> static Sint16 last_x = -1, last_y = -1;
> static int last_buttons = 0;
> 
>+static inline void HandleMouseButton(int changed, int last, int mask, int button) {
>+    if (changed & mask) SDL_PrivateMouseButton((last & mask) ? SDL_PRESSED : SDL_RELEASED, button, 0, 0);
>+}
>+
> /* Share routine between WIMP and FULLSCREEN for polling mouse and
>    passing on events */
> void RISCOS_PollMouseHelper(_THIS, int fullscreen)
>@@ -352,9 +356,14 @@
>           {
>              int changed = last_buttons ^ regs.r[2];
>              last_buttons = regs.r[2];
>-             if (changed & 4) SDL_PrivateMouseButton((last_buttons & 4) ? SDL_PRESSED : SDL_RELEASED, SDL_BUTTON_LEFT, 0, 0);
>-             if (changed & 2) SDL_PrivateMouseButton((last_buttons & 2) ? SDL_PRESSED : SDL_RELEASED, SDL_BUTTON_MIDDLE, 0, 0);
>-             if (changed & 1) SDL_PrivateMouseButton((last_buttons & 1) ? SDL_PRESSED : SDL_RELEASED, SDL_BUTTON_RIGHT, 0, 0);
>+             HandleMouseButton(changed, last_buttons, 1, SDL_BUTTON_RIGHT);
>+             HandleMouseButton(changed, last_buttons, 2, SDL_BUTTON_MIDDLE);
>+             HandleMouseButton(changed, last_buttons, 4, SDL_BUTTON_LEFT);
>+             HandleMouseButton(changed, last_buttons, 8, SDL_BUTTON_X1);
>+             HandleMouseButton(changed, last_buttons, 16, SDL_BUTTON_X2);
>+             HandleMouseButton(changed, last_buttons, 32, SDL_BUTTON_X2 + 1);
>+             HandleMouseButton(changed, last_buttons, 64, SDL_BUTTON_X2 + 2);
>+             HandleMouseButton(changed, last_buttons, 128, SDL_BUTTON_X2 + 3);
>           }
>        }
>     }
>diff -r 1bffae6992b0 -r 95be7982bc83 src/video/riscos/SDL_wimppoll.c
>--- a/src/video/riscos/SDL_wimppoll.c	Sat Jul 18 23:05:02 2020 +0300
>+++ b/src/video/riscos/SDL_wimppoll.c	Sun Sep 20 20:47:59 2020 +0100
>@@ -219,6 +219,20 @@
> 			*/
> 			break;
> 
>+		case 10: /* Window scroll */
>+			if (message[0] == sdlWindow)
>+			{
>+				if (message[9] < 0) {
>+					SDL_PrivateMouseButton(SDL_PRESSED, SDL_BUTTON_WHEELDOWN, 0, 0);
>+					SDL_PrivateMouseButton(SDL_RELEASED, SDL_BUTTON_WHEELDOWN, 0, 0);
>+				} else if (message[9] > 0) {
>+					SDL_PrivateMouseButton(SDL_PRESSED, SDL_BUTTON_WHEELUP, 0, 0);
>+					SDL_PrivateMouseButton(SDL_RELEASED, SDL_BUTTON_WHEELUP, 0, 0);
>+				}
>+			} else
>+				sysEvent = 1;
>+			break;
>+
> 		case 11: /* Lose Caret */
> 			 hasFocus = 0;
> 			 if (message[0] == sdlWindow) SDL_PrivateAppActive(0, SDL_APPINPUTFOCUS);
>diff -r 1bffae6992b0 -r 95be7982bc83 src/video/riscos/SDL_wimpvideo.c
>--- a/src/video/riscos/SDL_wimpvideo.c	Sat Jul 18 23:05:02 2020 +0300
>+++ b/src/video/riscos/SDL_wimpvideo.c	Sun Sep 20 20:47:59 2020 +0100
>@@ -231,7 +231,7 @@
>    window_block[5] = 0;
>    window_block[6] = -1;			  /* Open on top of window stack */
> 
>-   window_block[7] = 0x80040042;      /* Window flags */
>+   window_block[7] = 0x80040242;      /* Window flags */
>    if (!(surface->flags & SDL_NOFRAME)) {
>       window_block[7] |= 0x5000000;
>       if (riscos_closeaction != 0) window_block[7] |= 0x2000000;
>@@ -239,8 +239,8 @@
> 
>    /* TODO: Take into account surface->flags */
> 
>-   window_block[8] = 0xff070207;      /* Window colours */
>-   window_block[9] = 0x000c0103;
>+   window_block[8] = 0xff070207;      /* Window colours and extra flags */
>+   window_block[9] = 0x020c0103;
>    window_block[10] = 0;                    /* Work area minimum */
>    window_block[11] = -surface->h << 1;
>    window_block[12] = surface->w << 1;   /* Work area maximum */

Actions: View | Diff

Attachments on bug 5293: 4465

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.