Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
1dfc36c3
Commit
1dfc36c3
authored
Oct 21, 2019
by
Alistair Leslie-Hughes
Committed by
Alexandre Julliard
Oct 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dinput: Detect more buttons as non-joysticks.
Signed-off-by:
Alistair Leslie-Hughes
<
leslie_alistair@hotmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
524783df
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
joystick_linux.c
dlls/dinput/joystick_linux.c
+5
-4
No files found.
dlls/dinput/joystick_linux.c
View file @
1dfc36c3
...
...
@@ -168,7 +168,7 @@ static INT find_joystick_devices(void)
struct
JoyDev
joydev
,
*
new_joydevs
;
BYTE
axes_map
[
ABS_MAX
+
1
];
SHORT
btn_map
[
KEY_MAX
-
BTN_MISC
+
1
];
BOOL
is_stylu
s
=
FALSE
;
BOOL
non_j
s
=
FALSE
;
snprintf
(
joydev
.
device
,
sizeof
(
joydev
.
device
),
"%s%d"
,
JOYDEV_NEW
,
i
);
if
((
fd
=
open
(
joydev
.
device
,
O_RDONLY
))
==
-
1
)
...
...
@@ -242,8 +242,9 @@ static INT find_joystick_devices(void)
case
BTN_DEAD
:
joydev
.
is_joystick
=
TRUE
;
break
;
case
BTN_MOUSE
:
case
BTN_STYLUS
:
is_stylu
s
=
TRUE
;
non_j
s
=
TRUE
;
break
;
default:
break
;
...
...
@@ -251,9 +252,9 @@ static INT find_joystick_devices(void)
}
}
if
(
is_stylu
s
)
if
(
non_j
s
)
{
TRACE
(
"
Stylus
detected. Skipping
\n
"
);
TRACE
(
"
Non-joystick
detected. Skipping
\n
"
);
close
(
fd
);
continue
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment