frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config/wscons: Fix build and add support for NetBSD 

Signed-off-by: Nia Alarie <nia@NetBSD.org>
This commit is contained in:
nia 2021-12-07 11:15:50 +01:00 committed by Povilas Kanapickas
parent 4c03b67d33
commit bcee84c3e4
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/meson.build
View File

@ -19,7 +19,7 @@ if build_udev
config_dep += udev_dep config_dep += udev_dep
endif endif
if host_machine.system() == 'openbsd' if host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd'
srcs_config += 'wscons.c' srcs_config += 'wscons.c'
endif endif

14
config/wscons.c
View File

@ -30,6 +30,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
@ -54,7 +55,10 @@ struct nameint {
char *name; char *name;
} kbdenc[] = { } kbdenc[] = {
KB_OVRENC, KB_OVRENC,
KB_ENCTAB, KB_ENCTAB
#ifndef __NetBSD__
,
#endif
{0} {0}
}; };
@ -220,7 +224,11 @@ wscons_add_pointers(void)
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
snprintf(devname, sizeof(devname), "%s%d", WSCONS_MOUSE_PREFIX, i); snprintf(devname, sizeof(devname), "%s%d", WSCONS_MOUSE_PREFIX, i);
LogMessageVerb(X_INFO, 10, "wsmouse: checking %s\n", devname); LogMessageVerb(X_INFO, 10, "wsmouse: checking %s\n", devname);
fd = open_device(devnamem O_RDWR | O_NONBLOCK | O_EXCL); #ifdef HAVE_OPEN_DEVICE
fd = open_device(devname, O_RDWR | O_NONBLOCK | O_EXCL);
#else
fd = open(devname, O_RDWR | O_NONBLOCK | O_EXCL);
#endif
if (fd == -1) { if (fd == -1) {
LogMessageVerb(X_WARNING, 10, "%s: %s\n", devname, strerror(errno)); LogMessageVerb(X_WARNING, 10, "%s: %s\n", devname, strerror(errno));
continue; continue;
@ -233,9 +241,11 @@ wscons_add_pointers(void)
} }
close(fd); close(fd);
switch (wsmouse_type) { switch (wsmouse_type) {
#ifdef WSMOUSE_TYPE_SYNAPTICS
case WSMOUSE_TYPE_SYNAPTICS: case WSMOUSE_TYPE_SYNAPTICS:
wscons_add_pointer(devname, "synaptics", ATTR_TOUCHPAD); wscons_add_pointer(devname, "synaptics", ATTR_TOUCHPAD);
break; break;
#endif
case WSMOUSE_TYPE_TPANEL: case WSMOUSE_TYPE_TPANEL:
wscons_add_pointer(devname, "ws", ATTR_TOUCHSCREEN); wscons_add_pointer(devname, "ws", ATTR_TOUCHSCREEN);
break; break;

1
include/meson.build
View File

@ -157,6 +157,7 @@ conf_data.set('HAVE_GETZONEID', cc.has_function('getzoneid') ? '1' : false)
conf_data.set('HAVE_MEMFD_CREATE', cc.has_function('memfd_create') ? '1' : false) conf_data.set('HAVE_MEMFD_CREATE', cc.has_function('memfd_create') ? '1' : false)
conf_data.set('HAVE_MKOSTEMP', cc.has_function('mkostemp') ? '1' : false) conf_data.set('HAVE_MKOSTEMP', cc.has_function('mkostemp') ? '1' : false)
conf_data.set('HAVE_MMAP', cc.has_function('mmap') ? '1' : false) conf_data.set('HAVE_MMAP', cc.has_function('mmap') ? '1' : false)
conf_data.set('HAVE_OPEN_DEVICE', cc.has_function('open_device') ? '1' : false)
conf_data.set('HAVE_POLL', cc.has_function('poll') ? '1' : false) conf_data.set('HAVE_POLL', cc.has_function('poll') ? '1' : false)
conf_data.set('HAVE_POLLSET_CREATE', cc.has_function('pollset_create') ? '1' : false) conf_data.set('HAVE_POLLSET_CREATE', cc.has_function('pollset_create') ? '1' : false)
conf_data.set('HAVE_POSIX_FALLOCATE', cc.has_function('posix_fallocate') ? '1' : false) conf_data.set('HAVE_POSIX_FALLOCATE', cc.has_function('posix_fallocate') ? '1' : false)