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

GTK: make Space Navigator actually work. 

Before this commit, no events would actually be received.
pull/19/head
whitequark 2016-06-27 10:35:17 +00:00
parent a1589401b6
commit 21179c2e30
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -20,6 +20,7 @@ Bug fixes:
* Do not crash when changing autosave interval. * Do not crash when changing autosave interval.
* Three.js: correctly respond to controls when browser zoom is used. * Three.js: correctly respond to controls when browser zoom is used.
* OS X: do not completely hide main window when defocused. * OS X: do not completely hide main window when defocused.
* GTK: unbreak 3Dconnexion support.
2.1 2.1
--- ---

11
src/platform/gtkmain.cpp
View File

@ -1618,6 +1618,17 @@ int main(int argc, char** argv) {
TW->show_all(); TW->show_all();
GW->show_all(); GW->show_all();
#ifdef HAVE_SPACEWARE
#ifdef HAVE_GTK3
// We don't care if it can't be opened; just continue without.
spnav_x11_open(gdk_x11_get_default_xdisplay(),
gdk_x11_window_get_xid(GW->get_window()->gobj()));
#else
spnav_x11_open(gdk_x11_get_default_xdisplay(),
GDK_WINDOW_XWINDOW(GW->get_window()->gobj()));
#endif
#endif
SS.Init(); SS.Init();
if(argc >= 2) { if(argc >= 2) {