projects
/
multypo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
there are players now :-) every game is better with players
[multypo.git]
/
qt
/
multypo.cpp
diff --git
a/qt/multypo.cpp
b/qt/multypo.cpp
index e7a188638008266ef5112d501bfd1d46024cdc27..0c5451ece7c8be2deed7c237b6407a6938b87cfd 100644
(file)
--- a/
qt/multypo.cpp
+++ b/
qt/multypo.cpp
@@
-9,13
+9,6
@@
#include <X11/extensions/XInput2.h>
#include <X11/Xutil.h>
#include <X11/extensions/XInput2.h>
#include <X11/Xutil.h>
-static QString colorToString(QColor col)
-{
- return QString("#%1%2%3").arg(col.red(), 2, 16, QChar('0'))
- .arg(col.green(), 2, 16, QChar('0'))
- .arg(col.blue(), 2, 16, QChar('0'));
-}
-
MultypoWindow::MultypoWindow(QWidget *parent) :
QWidget(parent),
xiInited(false)
MultypoWindow::MultypoWindow(QWidget *parent) :
QWidget(parent),
xiInited(false)
@@
-42,16
+35,15
@@
void MultypoWindow::handleKeyPress(int device, QString string)
{
qDebug() << "Device" << device << "String" << string;
{
qDebug() << "Device" << device << "String" << string;
- if (string == "Escape")
+ if (string == "Escape")
{
close();
close();
+ return;
+ }
if (!players.contains(device)) {
if (!players.contains(device)) {
- QLabel *label = new QLabel(this);
- layout()->addWidget(label);
- players[device] = label;
+ players[device] = new Player(this);
}
}
- QColor textColor = QColor(Qt::blue);
- players[device]->setText(players[device]->text() + "<span style='color:"+colorToString(textColor)+"'>"+string+"</span>");
+ players[device]->handleKey(string);
}
bool MultypoWindow::handleX11Event(XEvent *event)
}
bool MultypoWindow::handleX11Event(XEvent *event)
@@
-66,7
+58,7
@@
bool MultypoWindow::handleX11Event(XEvent *event)
}
/* Which version of XI2? We support 2.0 */
}
/* Which version of XI2? We support 2.0 */
- int major = 2, minor =
0
;
+ int major = 2, minor =
1
;
if (XIQueryVersion(dpy, &major, &minor) == BadRequest) {
qCritical() << "XI2 not available. Server supports" << major << "." <<
minor;
if (XIQueryVersion(dpy, &major, &minor) == BadRequest) {
qCritical() << "XI2 not available. Server supports" << major << "." <<
minor;
@@
-90,7
+82,7
@@
bool MultypoWindow::handleX11Event(XEvent *event)
for (int i = 0; i < ndevices; ++i) {
if (devices[i].use != XIMasterKeyboard) continue;
qDebug() << "Found master keyboard with ID" << devices[i].deviceid;
for (int i = 0; i < ndevices; ++i) {
if (devices[i].use != XIMasterKeyboard) continue;
qDebug() << "Found master keyboard with ID" << devices[i].deviceid;
- XISetFocus(dpy, devices[i].deviceid, winId(), CurrentTime);
+
//
XISetFocus(dpy, devices[i].deviceid, winId(), CurrentTime);
}
XIFreeDeviceInfo(devices);
}
XIFreeDeviceInfo(devices);
@@
-100,7
+92,13
@@
bool MultypoWindow::handleX11Event(XEvent *event)
}
else if (xiInited && event->type == GenericEvent
&& event->xcookie.type == GenericEvent && event->xcookie.extension == xiOpcode
}
else if (xiInited && event->type == GenericEvent
&& event->xcookie.type == GenericEvent && event->xcookie.extension == xiOpcode
- && event->xcookie.evtype == XI_KeyPress && XGetEventData(dpy, &event->xcookie)) {
+ && event->xcookie.evtype == XI_KeyPress) {
+
+ if (XGetEventData(dpy, &event->xcookie) != True) {
+ qCritical() << "Error getting event data";
+ // FIXME return true;
+ }
+
/* Handle XI event */
XIDeviceEvent *d_ev = (XIDeviceEvent*) event->xcookie.data;
KeyCode keycode = d_ev->detail;
/* Handle XI event */
XIDeviceEvent *d_ev = (XIDeviceEvent*) event->xcookie.data;
KeyCode keycode = d_ev->detail;