-rw-r--r-- | x11/libqpe-x11/qpe/qpeapplication.cpp | 90 | ||||
-rw-r--r-- | x11/libqpe-x11/qpe/qpeapplication.h | 2 |
2 files changed, 92 insertions, 0 deletions
diff --git a/x11/libqpe-x11/qpe/qpeapplication.cpp b/x11/libqpe-x11/qpe/qpeapplication.cpp index 8785c74..75a8189 100644 --- a/x11/libqpe-x11/qpe/qpeapplication.cpp +++ b/x11/libqpe-x11/qpe/qpeapplication.cpp | |||
@@ -7,2 +7,3 @@ | |||
7 | 7 | ||
8 | |||
8 | #include <qdir.h> | 9 | #include <qdir.h> |
@@ -18,2 +19,3 @@ | |||
18 | #include <qregexp.h> | 19 | #include <qregexp.h> |
20 | #include <qtimer.h> | ||
19 | 21 | ||
@@ -36,2 +38,11 @@ | |||
36 | 38 | ||
39 | |||
40 | #include <X11/Xlib.h> | ||
41 | #include <X11/Xutil.h> | ||
42 | |||
43 | const int XKeyPress = KeyPress; | ||
44 | const int XKeyRelease = KeyRelease; | ||
45 | #undef KeyPress | ||
46 | #undef KeyRelease | ||
47 | |||
37 | namespace { | 48 | namespace { |
@@ -78,2 +89,7 @@ public: | |||
78 | QString decorationName; | 89 | QString decorationName; |
90 | Atom wm_delete_window; | ||
91 | Atom wm_take_focus; | ||
92 | Atom wm_context_help; | ||
93 | Atom wm_context_accept; | ||
94 | Atom wm_protocols; | ||
79 | 95 | ||
@@ -221,2 +237,28 @@ QPEApplication::QPEApplication(int &arg, char** argv, Type t) | |||
221 | 237 | ||
238 | // Init X-Atom | ||
239 | Atom *atoms[5]; | ||
240 | Atom atoms_re[5]; | ||
241 | char* names[5]; | ||
242 | int n = 0; | ||
243 | atoms[n] = &d->wm_delete_window; | ||
244 | names[n++] = "WM_DELETE_WINDOW"; | ||
245 | |||
246 | atoms[n] = &d->wm_take_focus; | ||
247 | names[n++] = "WM_TAKE_FOCUS"; | ||
248 | |||
249 | atoms[n] = &d->wm_context_help; | ||
250 | names[n++] = "_NET_WM_CONTEXT_HELP"; | ||
251 | |||
252 | atoms[n] = &d->wm_context_accept; | ||
253 | names[n++] = "_NET_WM_CONTEXT_ACCEPT"; | ||
254 | |||
255 | atoms[n] = &d->wm_protocols; | ||
256 | names[n++] = "WM_PROTOCOLS"; | ||
257 | |||
258 | XInternAtoms( qt_xdisplay(), names, n, FALSE, atoms_re); | ||
259 | // now copy the values over to the properties | ||
260 | for (int i = 0; i < n; i++ ) | ||
261 | *atoms[i] = atoms_re[i]; | ||
262 | // done with X11 Stuff | ||
263 | |||
222 | int dw = desktop()->width(); | 264 | int dw = desktop()->width(); |
@@ -532,2 +574,22 @@ QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w) { | |||
532 | bool QPEApplication::eventFilter( QObject* o, QEvent* e ) { | 574 | bool QPEApplication::eventFilter( QObject* o, QEvent* e ) { |
575 | /* | ||
576 | * We want our WM to show Ok and a X button | ||
577 | * on dialogs | ||
578 | * our part is to set the _NET_WM_CONTEXT_ACCEPT | ||
579 | * propery | ||
580 | * and then wait for a client message -zecke | ||
581 | * on show we will add the prop | ||
582 | */ | ||
583 | if (o->inherits("QDialog") && e->type() == QEvent::Show ) { | ||
584 | QDialog* dialog = (QDialog*)o; | ||
585 | Atom wm_prot[45]; | ||
586 | int n = 0; | ||
587 | wm_prot[n++] = d->wm_delete_window; | ||
588 | wm_prot[n++] = d->wm_take_focus; | ||
589 | wm_prot[n++] = d->wm_context_accept; | ||
590 | if ( dialog->testWFlags( WStyle_ContextHelp ) ) | ||
591 | wm_prot[n++] = d->wm_context_help; | ||
592 | XSetWMProtocols( qt_xdisplay(), dialog->winId(), wm_prot, n ); | ||
593 | return TRUE; // should be save | ||
594 | } | ||
533 | if ( stylusDict && e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove ) { | 595 | if ( stylusDict && e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove ) { |
@@ -659,2 +721,30 @@ void QPEApplication::prepareForTermination( bool willrestart ) | |||
659 | } | 721 | } |
722 | int QPEApplication::x11ClientMessage(QWidget* w, XEvent* event, bool b ) { | ||
723 | qWarning("X11 ClientMessage %d %d", event->type, ClientMessage); | ||
724 | if ( event->type == ClientMessage ) { | ||
725 | if ( (event->xclient.message_type == d->wm_protocols) && | ||
726 | (event->xclient.data.l[0] == d->wm_context_accept ) ) { | ||
727 | qWarning("accepted!!!"); | ||
728 | /* | ||
729 | * I'm not sure if we should use activeWidget | ||
730 | * or activeModalWidget | ||
731 | * a QDialog could be not modal too | ||
732 | */ | ||
733 | if ( w->inherits("QDialog" ) ) { | ||
734 | qWarning("inherits QDialog!!!"); | ||
735 | QDialog* dia = (QDialog*)w; | ||
736 | /* | ||
737 | * call it directly or via QTimer::singleShot? | ||
738 | */ | ||
739 | QTimer::singleShot(0, dia, SLOT(reject() ) ); | ||
740 | return 0; | ||
741 | } | ||
742 | |||
743 | } | ||
744 | } | ||
745 | return QApplication::x11ClientMessage(w, event, b ); | ||
746 | } | ||
747 | |||
748 | #define KeyPress XKeyPress | ||
749 | #define KeyRelease XKeyRelease | ||
660 | 750 | ||
diff --git a/x11/libqpe-x11/qpe/qpeapplication.h b/x11/libqpe-x11/qpe/qpeapplication.h index 333f331..254fbfa 100644 --- a/x11/libqpe-x11/qpe/qpeapplication.h +++ b/x11/libqpe-x11/qpe/qpeapplication.h | |||
@@ -63,2 +63,4 @@ public: | |||
63 | }; | 63 | }; |
64 | /* reimplemented for internal purposes */ | ||
65 | int x11ClientMessage( QWidget*, XEvent*, bool ); | ||
64 | 66 | ||