zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GTK: make spacenavd work through its socket, too 

E.g. for when you have more than one user logged in, in which case
spacenavd works only for the first of those X11 displays.

We try to do it the old way first, so there should be no regressions.

Also fixes storing non-booleans in bool variables.
pull/1116/head
Přemysl Eric Janouch 2021-03-28 19:05:03 +02:00 committed by phkahler
parent d8816863d0
commit 5c3ce9bfc2
1 changed files with 56 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/platform/guigtk.cpp
View File

@ -34,6 +34,11 @@
#if defined(HAVE_SPACEWARE) #if defined(HAVE_SPACEWARE)
# include <spnav.h> # include <spnav.h>
# include <gdk/gdkx.h> # include <gdk/gdkx.h>
# if GTK_CHECK_VERSION(3, 20, 0)
# include <gdkmm/seat.h>
# else
# include <gdkmm/devicemanager.h>
# endif
#endif #endif
#include "solvespace.h" #include "solvespace.h"
@ -1039,15 +1044,7 @@ void Open3DConnexion() {}
void Close3DConnexion() {} void Close3DConnexion() {}
#if defined(HAVE_SPACEWARE) && defined(GDK_WINDOWING_X11) #if defined(HAVE_SPACEWARE) && defined(GDK_WINDOWING_X11)
static GdkFilterReturn GdkSpnavFilter(GdkXEvent *gdkXEvent, GdkEvent *gdkEvent, gpointer data) { static void ProcessSpnavEvent(WindowImplGtk *window, const spnav_event &spnavEvent, bool shiftDown, bool controlDown) {
XEvent *xEvent = (XEvent *)gdkXEvent;
WindowImplGtk *window = (WindowImplGtk *)data;
spnav_event spnavEvent;
if(!spnav_x11_event(xEvent, &spnavEvent)) {
return GDK_FILTER_CONTINUE;
}
switch(spnavEvent.type) { switch(spnavEvent.type) {
case SPNAV_EVENT_MOTION: { case SPNAV_EVENT_MOTION: {
SixDofEvent event = {}; SixDofEvent event = {};
@ -1058,8 +1055,8 @@ static GdkFilterReturn GdkSpnavFilter(GdkXEvent *gdkXEvent, GdkEvent *gdkEvent,
event.rotationX = (double)spnavEvent.motion.rx * 0.001; event.rotationX = (double)spnavEvent.motion.rx * 0.001;
event.rotationY = (double)spnavEvent.motion.ry * 0.001; event.rotationY = (double)spnavEvent.motion.ry * 0.001;
event.rotationZ = (double)spnavEvent.motion.rz * -0.001; event.rotationZ = (double)spnavEvent.motion.rz * -0.001;
event.shiftDown = xEvent->xmotion.state & ShiftMask; event.shiftDown = shiftDown;
event.controlDown = xEvent->xmotion.state & ControlMask; event.controlDown = controlDown;
if(window->onSixDofEvent) { if(window->onSixDofEvent) {
window->onSixDofEvent(event); window->onSixDofEvent(event);
} }
@ -1075,17 +1072,52 @@ static GdkFilterReturn GdkSpnavFilter(GdkXEvent *gdkXEvent, GdkEvent *gdkEvent,
} }
switch(spnavEvent.button.bnum) { switch(spnavEvent.button.bnum) {
case 0: event.button = SixDofEvent::Button::FIT; break; case 0: event.button = SixDofEvent::Button::FIT; break;
default: return GDK_FILTER_REMOVE; default: return;
} }
event.shiftDown = xEvent->xmotion.state & ShiftMask; event.shiftDown = shiftDown;
event.controlDown = xEvent->xmotion.state & ControlMask; event.controlDown = controlDown;
if(window->onSixDofEvent) { if(window->onSixDofEvent) {
window->onSixDofEvent(event); window->onSixDofEvent(event);
} }
break; break;
} }
}
return GDK_FILTER_REMOVE; static GdkFilterReturn GdkSpnavFilter(GdkXEvent *gdkXEvent, GdkEvent *gdkEvent, gpointer data) {
XEvent *xEvent = (XEvent *)gdkXEvent;
WindowImplGtk *window = (WindowImplGtk *)data;
bool shiftDown = (xEvent->xmotion.state & ShiftMask) != 0;
bool controlDown = (xEvent->xmotion.state & ControlMask) != 0;
spnav_event spnavEvent;
if(spnav_x11_event(xEvent, &spnavEvent)) {
ProcessSpnavEvent(window, spnavEvent, shiftDown, controlDown);
return GDK_FILTER_REMOVE;
}
return GDK_FILTER_CONTINUE;
}
static gboolean ConsumeSpnavQueue(GIOChannel *, GIOCondition, gpointer data) {
WindowImplGtk *window = (WindowImplGtk *)data;
Glib::RefPtr<Gdk::Window> gdkWindow = window->gtkWindow.get_window();
// We don't get modifier state through the socket.
int x, y;
Gdk::ModifierType mask{};
#if GTK_CHECK_VERSION(3, 20, 0)
Glib::RefPtr<Gdk::Device> device = gdkWindow->get_display()->get_default_seat()->get_pointer();
#else
Glib::RefPtr<Gdk::Device> device = gdkWindow->get_display()->get_device_manager()->get_client_pointer();
#endif
gdkWindow->get_device_position(device, x, y, mask);
bool shiftDown = (mask & Gdk::SHIFT_MASK) != 0;
bool controlDown = (mask & Gdk::CONTROL_MASK) != 0;
spnav_event spnavEvent;
while(spnav_poll_event(&spnavEvent)) {
ProcessSpnavEvent(window, spnavEvent, shiftDown, controlDown);
}
return TRUE;
} }
void Request3DConnexionEventsForWindow(WindowRef window) { void Request3DConnexionEventsForWindow(WindowRef window) {
@ -1093,10 +1125,16 @@ void Request3DConnexionEventsForWindow(WindowRef window) {
std::static_pointer_cast<WindowImplGtk>(window); std::static_pointer_cast<WindowImplGtk>(window);
Glib::RefPtr<Gdk::Window> gdkWindow = windowImpl->gtkWindow.get_window(); Glib::RefPtr<Gdk::Window> gdkWindow = windowImpl->gtkWindow.get_window();
if(GDK_IS_X11_DISPLAY(gdkWindow->get_display()->gobj())) { if(!GDK_IS_X11_DISPLAY(gdkWindow->get_display()->gobj())) {
return;
}
if(spnav_x11_open(gdk_x11_get_default_xdisplay(),
gdk_x11_window_get_xid(gdkWindow->gobj())) != -1) {
gdkWindow->add_filter(GdkSpnavFilter, windowImpl.get()); gdkWindow->add_filter(GdkSpnavFilter, windowImpl.get());
spnav_x11_open(gdk_x11_get_default_xdisplay(), } else if(spnav_open() != -1) {
gdk_x11_window_get_xid(gdkWindow->gobj())); g_io_add_watch(g_io_channel_unix_new(spnav_fd()), G_IO_IN,
ConsumeSpnavQueue, windowImpl.get());
} }
} }
#else #else