blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 762 Projects 19 Wiki Activity

Fix T68073: Wacom Intuos 5S no pen pressure on Wayland 

The issue is that wayland seems to impose a generic device naming scheme
when using Xwayland For example any table stylus will show up with the
following naming convention: xwayland-stylus:33

For this to work in blender, I had to modify how the identifier string
is extracted. I also renamed the two char pointers in the search
algorithm to be more logical.

Reviewed By: Brecht

Differential Revision: http://developer.blender.org/D5401
This commit is contained in:
Sebastian Parborg 2019-08-02 16:40:04 +02:00
parent 455a1e210b
commit 369ffbd911
Notes: blender-bot 2023-02-14 08:47:25 +01:00 
Referenced by issue #68073, Wacom Intuos 5S no pen pressure on Fedora 30
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
intern/ghost/intern/GHOST_SystemX11.cpp
View File

@ -2194,23 +2194,28 @@ int GHOST_X11_ApplicationIOErrorHandler(Display * /*display*/)
#ifdef WITH_X11_XINPUT
static bool is_filler_char(char c)
{
return isspace(c) || c == '_' || c == '-' || c == ';' || c == ':';
}
/* These C functions are copied from Wine 3.12's wintab.c */
static bool match_token(const char *haystack, const char *needle)
{
const char *p, *q;
for (p = haystack; *p;) {
while (*p && isspace(*p))
p++;
if (!*p)
const char *h, *n;
for (h = haystack; *h;) {
while (*h && is_filler_char(*h))
h++;
if (!*h)
break;
for (q = needle; *q && *p && tolower(*p) == tolower(*q); q++)
p++;
if (!*q && (isspace(*p) || !*p))
for (n = needle; *n && *h && tolower(*h) == tolower(*n); n++)
h++;
if (!*n && (is_filler_char(*h) || !*h))
return true;
while (*p && !isspace(*p))
p++;
while (*h && !is_filler_char(*h))
h++;
}
return false;
}