TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation of raw mouse support in Linux

Browse Source
This commit is contained in:
rdb 2013-12-25 13:59:08 +00:00
parent ea22e87f79
commit eeb2c4211f
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
panda/src/x11display/x11GraphicsWindow.cxx
View File

@ -32,7 +32,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/time.h> #include <sys/time.h>
#ifdef HAVE_LINUX_INPUT_H #ifdef PHAVE_LINUX_INPUT_H
#include <linux/input.h> #include <linux/input.h>
#endif #endif
@ -1202,7 +1202,7 @@ setup_colormap(XVisualInfo *visual) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void x11GraphicsWindow:: void x11GraphicsWindow::
open_raw_mice() { open_raw_mice() {
#ifdef HAVE_LINUX_INPUT_H #ifdef PHAVE_LINUX_INPUT_H
bool any_present = false; bool any_present = false;
bool any_mice = false; bool any_mice = false;
@ -1282,11 +1282,10 @@ open_raw_mice() {
// Description: Reads events from the raw mouse device files. // Description: Reads events from the raw mouse device files.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void x11GraphicsWindow:: void x11GraphicsWindow::
poll_raw_mice() poll_raw_mice() {
{ #ifdef PHAVE_LINUX_INPUT_H
#ifdef HAVE_LINUX_INPUT_H for (int di = 0; di < _mouse_device_info.size(); ++di) {
for (int dev=0; dev<_mouse_device_info.size(); dev++) { MouseDeviceInfo &inf = _mouse_device_info[di];
MouseDeviceInfo &inf = _mouse_device_info[dev];
// Read all bytes into buffer. // Read all bytes into buffer.
if (inf._fd >= 0) { if (inf._fd >= 0) {
@ -1296,7 +1295,7 @@ poll_raw_mice()
if (nread > 0) { if (nread > 0) {
inf._io_buffer += string(tbuf, nread); inf._io_buffer += string(tbuf, nread);
} else { } else {
if ((nread < 0)&&((errno == EWOULDBLOCK) || (errno==EAGAIN))) { if ((nread < 0) && ((errno == EWOULDBLOCK) || (errno==EAGAIN))) {
break; break;
} }
close(inf._fd); close(inf._fd);
@ -1315,7 +1314,7 @@ poll_raw_mice()
GraphicsWindowInputDevice &dev = _input_devices[inf._input_device_index]; GraphicsWindowInputDevice &dev = _input_devices[inf._input_device_index];
int x = dev.get_raw_pointer().get_x(); int x = dev.get_raw_pointer().get_x();
int y = dev.get_raw_pointer().get_y(); int y = dev.get_raw_pointer().get_y();
for (int i=0; i<nevents; i++) { for (int i = 0; i < nevents; i++) {
if (events[i].type == EV_REL) { if (events[i].type == EV_REL) {
if (events[i].code == REL_X) x += events[i].value; if (events[i].code == REL_X) x += events[i].value;
if (events[i].code == REL_Y) y += events[i].value; if (events[i].code == REL_Y) y += events[i].value;
@ -1323,9 +1322,9 @@ poll_raw_mice()
if (events[i].code == ABS_X) x = events[i].value; if (events[i].code == ABS_X) x = events[i].value;
if (events[i].code == ABS_Y) y = events[i].value; if (events[i].code == ABS_Y) y = events[i].value;
} else if (events[i].type == EV_KEY) { } else if (events[i].type == EV_KEY) {
if ((events[i].code >= BTN_MOUSE)&&(events[i].code < BTN_MOUSE+8)) { if ((events[i].code >= BTN_MOUSE) && (events[i].code < BTN_MOUSE + 8)) {
int btn = events[i].code - BTN_MOUSE; int btn = events[i].code - BTN_MOUSE;
dev.set_pointer_in_window(x,y); dev.set_pointer_in_window(x, y);
if (events[i].value) { if (events[i].value) {
dev.button_down(MouseButton::button(btn)); dev.button_down(MouseButton::button(btn));
} else { } else {
@ -1334,8 +1333,8 @@ poll_raw_mice()
} }
} }
} }
inf._io_buffer.erase(0,nevents*sizeof(struct input_event)); inf._io_buffer.erase(0, nevents * sizeof(struct input_event));
dev.set_pointer_in_window(x,y); dev.set_pointer_in_window(x, y);
} }
#endif #endif
} }