unity-2d/keymonitor-shutdown-fixes.patch

   1 === modified file 'libunity-2d-private/src/keymonitor.cpp'
   2 --- libunity-2d-private/src/keymonitor.cpp      2011-09-23 12:45:33 +0000
   3 +++ libunity-2d-private/src/keymonitor.cpp      2011-10-28 22:18:46 +0000
   4 @@ -21,7 +21,7 @@
   5  #include "keymonitor.h"
   6
   7  // Qt
   8 -#include <QtConcurrentRun>
   9 +#include <QSocketNotifier>
  10  #include <QDebug>
  11
  12  // X11
  13 @@ -38,19 +38,17 @@
  14
  15
  16  KeyMonitor::KeyMonitor(QObject* parent)
  17 -: QObject(parent), m_stop(false)
  18 +: QObject(parent)
  19  {
  20      if (this->registerEvents()) {
  21          getModifiers();
  22 -        m_future = QtConcurrent::run(this, &KeyMonitor::run);
  23      }
  24  }
  25
  26  KeyMonitor::~KeyMonitor()
  27  {
  28 -    /* let the running thread know that it should stop */
  29 -    m_stop = true;
  30      m_eventList.clear();
  31 +    XCloseDisplay(m_display);
  32  }
  33
  34  KeyMonitor* KeyMonitor::instance()
  35 @@ -74,6 +72,8 @@
  36              m_modList.append(xmodmap->modifiermap[i]);
  37          }
  38      }
  39 +
  40 +    XFreeModifiermap(xmodmap);
  41  }
  42
  43  bool KeyMonitor::registerEvents()
  44 @@ -82,6 +82,7 @@
  45      Window window;
  46
  47      XDeviceInfo *devices;
  48 +    int x11FileDescriptor;
  49      int num_devices;
  50      int i, j;
  51
  52 @@ -116,8 +117,11 @@
  53                  }
  54              }
  55          }
  56 +        XCloseDevice(m_display, device);
  57      }
  58
  59 +    XFreeDeviceList(devices);
  60 +
  61      if (m_eventList.size() == 0) {
  62          UQ_WARNING << "No input devices found.";
  63          return false;
  64 @@ -128,15 +132,21 @@
  65          return false;
  66      }
  67
  68 +    /* Dispatch XEvents when there is activity on the X11 file descriptor */
  69 +    x11FileDescriptor = ConnectionNumber(m_display);
  70 +    QSocketNotifier* socketNotifier = new QSocketNotifier(x11FileDescriptor, QSocketNotifier::Read, this);
  71 +    connect(socketNotifier, SIGNAL(activated(int)), this, SLOT(x11EventDispatch()));
  72 +
  73      return true;
  74  }
  75
  76
  77 -void KeyMonitor::run()
  78 +void KeyMonitor::x11EventDispatch()
  79  {
  80      XEvent event;
  81
  82 -    while(!m_stop && !XNextEvent(m_display, &event)) {
  83 +    while (XPending(m_display) > 0) {
  84 +        XNextEvent(m_display, &event);
  85          if (event.type == key_press_type) {
  86              XDeviceKeyEvent *keyEvent = (XDeviceKeyEvent *) &event;
  87              if (!m_modList.contains((KeyCode) keyEvent->keycode)) {
  88
  89 === modified file 'libunity-2d-private/src/keymonitor.h'
  90 --- libunity-2d-private/src/keymonitor.h        2011-09-19 19:06:54 +0000
  91 +++ libunity-2d-private/src/keymonitor.h        2011-10-28 22:14:18 +0000
  92 @@ -51,11 +51,12 @@
  93
  94      void getModifiers();
  95      bool registerEvents();
  96 -    void run();
  97 -
  98 +
  99 +private Q_SLOTS:
 100 +    void x11EventDispatch();
 101 +
 102 +private:
 103      Display *m_display;
 104 -    QFuture<void> m_future;
 105 -    bool m_stop;
 106      QVector<XEventClass> m_eventList;
 107      QVector<KeyCode> m_modList;
 108  };
 109