Removed default display env detection - #39

juliagoda · Oct 29, 2018 · 7fc55fb · 7fc55fb
1 parent cd5c906
commit 7fc55fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,7 @@ if(POLICY CMP0071)
   cmake_policy(SET CMP0071 NEW)
 endif()
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" "${CMAKE_ROOT}/Modules")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" "${CMAKE_ROOT}/Modules" "/usr/local")
 
 
 if (NOT WIN32)

diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp
@@ -22,6 +22,7 @@
 #include "eventhandlerfactory.h"
 
 #include <SDL2/SDL_version.h>
+#include <SDL2/SDL_gamecontroller.h>
 
 #include <QtGlobal>
 #include <QResource>
@@ -37,6 +38,8 @@ AboutDialog::AboutDialog(QWidget *parent) :
 {
     ui->setupUi(this);
 
+
+
     qInstallMessageHandler(MessageHandler::myMessageOutput);
 
     ui->versionLabel->setText(PadderCommon::programVersion);

diff --git a/src/keyboard/virtualkeyboardmousewidget.cpp b/src/keyboard/virtualkeyboardmousewidget.cpp
@@ -127,8 +127,7 @@ bool VirtualKeyboardMouseWidget::is_numlock_activated()
 #endif
 
 #ifdef Q_OS_UNIX
-    Display *dpy = XOpenDisplay(":0");
-    if (dpy == nullptr) dpy = XOpenDisplay(X11Extras::getInstance()->getEnvVariable("DISPLAY"));
+    Display *dpy = XOpenDisplay(X11Extras::getInstance()->getEnvVariable("DISPLAY"));
     XKeyboardState x;
     XGetKeyboardControl(dpy, &x);
     XCloseDisplay(dpy);