author | zecke <zecke> | 2002-10-18 01:34:23 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-18 01:34:23 (UTC) |
commit | 0457c48c165abef8afa2ac73c8f66d20e289681a (patch) (unidiff) | |
tree | 2c6baf363487d474df6ceeaf2ea17a351b38aa05 /x11/libqpe-x11 | |
parent | e7e36afd3685c7fab146ebd0078d7f1a60f8c5e6 (diff) | |
download | opie-0457c48c165abef8afa2ac73c8f66d20e289681a.zip opie-0457c48c165abef8afa2ac73c8f66d20e289681a.tar.gz opie-0457c48c165abef8afa2ac73c8f66d20e289681a.tar.bz2 |
Fix OCOPServer bugs... when removing clients
Implement the Opie side for the OK button
now the awesome matchbox needs to get an update
I was too excited about X11 so i did not do any PIM work yet
-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 | |||
@@ -1,48 +1,59 @@ | |||
1 | #define QTOPIA_INTERNAL_LANGLIST | 1 | #define QTOPIA_INTERNAL_LANGLIST |
2 | 2 | ||
3 | #include <stdio.h> | 3 | #include <stdio.h> |
4 | #include <stdlib.h> | 4 | #include <stdlib.h> |
5 | #include <unistd.h> | 5 | #include <unistd.h> |
6 | #include <sys/file.h> | 6 | #include <sys/file.h> |
7 | 7 | ||
8 | |||
8 | #include <qdir.h> | 9 | #include <qdir.h> |
9 | #include <qdialog.h> | 10 | #include <qdialog.h> |
10 | #include <qdragobject.h> | 11 | #include <qdragobject.h> |
11 | #include <qevent.h> | 12 | #include <qevent.h> |
12 | #include <qlabel.h> | 13 | #include <qlabel.h> |
13 | #include <qlist.h> | 14 | #include <qlist.h> |
14 | #include <qtextstream.h> | 15 | #include <qtextstream.h> |
15 | #include <qtextcodec.h> | 16 | #include <qtextcodec.h> |
16 | #include <qpalette.h> | 17 | #include <qpalette.h> |
17 | #include <qptrdict.h> | 18 | #include <qptrdict.h> |
18 | #include <qregexp.h> | 19 | #include <qregexp.h> |
20 | #include <qtimer.h> | ||
19 | 21 | ||
20 | #include <qpe/alarmserver.h> | 22 | #include <qpe/alarmserver.h> |
21 | #include <qpe/applnk.h> | 23 | #include <qpe/applnk.h> |
22 | #include <qpe/qpemenubar.h> | 24 | #include <qpe/qpemenubar.h> |
23 | #include <qpe/textcodecinterface.h> | 25 | #include <qpe/textcodecinterface.h> |
24 | #include <qpe/imagecodecinterface.h> | 26 | #include <qpe/imagecodecinterface.h> |
25 | #include <qpe/qlibrary.h> | 27 | #include <qpe/qlibrary.h> |
26 | #include <qpe/qpestyle.h> | 28 | #include <qpe/qpestyle.h> |
27 | #include <qpe/styleinterface.h> | 29 | #include <qpe/styleinterface.h> |
28 | #include <qpe/global.h> | 30 | #include <qpe/global.h> |
29 | #include <qpe/resource.h> | 31 | #include <qpe/resource.h> |
30 | #include <qpe/config.h> | 32 | #include <qpe/config.h> |
31 | #include <qpe/network.h> | 33 | #include <qpe/network.h> |
32 | 34 | ||
33 | #include <qpe/qpeapplication.h> | 35 | #include <qpe/qpeapplication.h> |
34 | #include <qpe/timestring.h> | 36 | #include <qpe/timestring.h> |
35 | #include <qpe/qcopenvelope_qws.h> | 37 | #include <qpe/qcopenvelope_qws.h> |
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 { |
38 | struct QCopRec{ | 49 | struct QCopRec{ |
39 | QCopRec( const QCString& ch, const QCString& msg, const QByteArray& ar ) | 50 | QCopRec( const QCString& ch, const QCString& msg, const QByteArray& ar ) |
40 | : channel(ch), message(msg), data(ar) { | 51 | : channel(ch), message(msg), data(ar) { |
41 | 52 | ||
42 | } | 53 | } |
43 | QCString channel; | 54 | QCString channel; |
44 | QCString message; | 55 | QCString message; |
45 | QByteArray data; | 56 | QByteArray data; |
46 | }; | 57 | }; |
47 | }; | 58 | }; |
48 | 59 | ||
@@ -67,24 +78,29 @@ public: | |||
67 | bool notbusysent : 1; | 78 | bool notbusysent : 1; |
68 | bool preloaded : 1; | 79 | bool preloaded : 1; |
69 | bool forceshow : 1; | 80 | bool forceshow : 1; |
70 | bool nomaximize : 1; | 81 | bool nomaximize : 1; |
71 | bool keep_running : 1; | 82 | bool keep_running : 1; |
72 | 83 | ||
73 | QWidget* presswidget; | 84 | QWidget* presswidget; |
74 | QPoint presspos; | 85 | QPoint presspos; |
75 | QWidget* qpe_main_widget; | 86 | QWidget* qpe_main_widget; |
76 | QString appName; | 87 | QString appName; |
77 | QString styleName; | 88 | QString styleName; |
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 | ||
80 | private: | 96 | private: |
81 | QList<QCopRec> qcopq; | 97 | QList<QCopRec> qcopq; |
82 | }; | 98 | }; |
83 | QPEApplication::Private::~Private() { | 99 | QPEApplication::Private::~Private() { |
84 | } | 100 | } |
85 | QPEApplication::Private::Private() | 101 | QPEApplication::Private::Private() |
86 | : kbgrabber(0 ), presstimer(0 ), rightpressed( FALSE ), kbregrab( FALSE ), notbusysent( FALSE ), | 102 | : kbgrabber(0 ), presstimer(0 ), rightpressed( FALSE ), kbregrab( FALSE ), notbusysent( FALSE ), |
87 | preloaded( FALSE ), forceshow( FALSE ), nomaximize( FALSE ), keep_running( TRUE ), | 103 | preloaded( FALSE ), forceshow( FALSE ), nomaximize( FALSE ), keep_running( TRUE ), |
88 | presswidget( 0 ), qpe_main_widget(0 ) { | 104 | presswidget( 0 ), qpe_main_widget(0 ) { |
89 | 105 | ||
90 | qcopq.setAutoDelete( TRUE ); | 106 | qcopq.setAutoDelete( TRUE ); |
@@ -210,24 +226,50 @@ QPEApplication::~QPEApplication() { | |||
210 | 226 | ||
211 | // delete m_sys; | 227 | // delete m_sys; |
212 | // delete m_pid; | 228 | // delete m_pid; |
213 | 229 | ||
214 | delete d; | 230 | delete d; |
215 | } | 231 | } |
216 | QPEApplication::QPEApplication(int &arg, char** argv, Type t) | 232 | QPEApplication::QPEApplication(int &arg, char** argv, Type t) |
217 | : QApplication( arg, argv, t ) { | 233 | : QApplication( arg, argv, t ) { |
218 | d = new Private; | 234 | d = new Private; |
219 | d->loadTextCodecs(); | 235 | d->loadTextCodecs(); |
220 | d->loadImageCodecs(); | 236 | d->loadImageCodecs(); |
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(); |
223 | if ( dw < 200 ) { | 265 | if ( dw < 200 ) { |
224 | setFont( QFont( "helvetica", 8 ) ); | 266 | setFont( QFont( "helvetica", 8 ) ); |
225 | AppLnk::setSmallIconSize( 10 ); | 267 | AppLnk::setSmallIconSize( 10 ); |
226 | AppLnk::setBigIconSize( 28 ); | 268 | AppLnk::setBigIconSize( 28 ); |
227 | }else if ( dw > 600 ) { | 269 | }else if ( dw > 600 ) { |
228 | setFont( QFont( "helvetica", 12 ) ); | 270 | setFont( QFont( "helvetica", 12 ) ); |
229 | AppLnk::setSmallIconSize( 24 ); | 271 | AppLnk::setSmallIconSize( 24 ); |
230 | AppLnk::setBigIconSize( 48 ); | 272 | AppLnk::setBigIconSize( 48 ); |
231 | }else if ( dw > 200 ) { | 273 | }else if ( dw > 200 ) { |
232 | setFont( QFont( "helvetica", 10 ) ); | 274 | setFont( QFont( "helvetica", 10 ) ); |
233 | AppLnk::setSmallIconSize( 16 ); | 275 | AppLnk::setSmallIconSize( 16 ); |
@@ -521,24 +563,44 @@ void QPEApplication::setStylusOperation( QWidget* w, StylusMode mode) { | |||
521 | connect( w, SIGNAL( destroyed() ), qApp, SLOT( removeSenderFromStylusDict() ) ); | 563 | connect( w, SIGNAL( destroyed() ), qApp, SLOT( removeSenderFromStylusDict() ) ); |
522 | w->installEventFilter( qApp ); | 564 | w->installEventFilter( qApp ); |
523 | } | 565 | } |
524 | } | 566 | } |
525 | QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w) { | 567 | QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w) { |
526 | if ( stylusDict ) | 568 | if ( stylusDict ) |
527 | return ( StylusMode ) ( int ) stylusDict->find( w ); | 569 | return ( StylusMode ) ( int ) stylusDict->find( w ); |
528 | return LeftOnly; | 570 | return LeftOnly; |
529 | } | 571 | } |
530 | 572 | ||
531 | // eventFilter...... | 573 | // eventFilter...... |
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 ) { |
534 | QMouseEvent * me = ( QMouseEvent* ) e; | 596 | QMouseEvent * me = ( QMouseEvent* ) e; |
535 | StylusMode mode = (StylusMode)(int)stylusDict->find(o); | 597 | StylusMode mode = (StylusMode)(int)stylusDict->find(o); |
536 | switch (mode) { | 598 | switch (mode) { |
537 | case RightOnHold: | 599 | case RightOnHold: |
538 | switch ( me->type() ) { | 600 | switch ( me->type() ) { |
539 | case QEvent::MouseButtonPress: | 601 | case QEvent::MouseButtonPress: |
540 | if ( me->button() == LeftButton ) { | 602 | if ( me->button() == LeftButton ) { |
541 | d->presstimer = startTimer(500); // #### pref. | 603 | d->presstimer = startTimer(500); // #### pref. |
542 | d->presswidget = (QWidget*)o; | 604 | d->presswidget = (QWidget*)o; |
543 | d->presspos = me->pos(); | 605 | d->presspos = me->pos(); |
544 | d->rightpressed = FALSE; | 606 | d->rightpressed = FALSE; |
@@ -648,24 +710,52 @@ void QPEApplication::prepareForTermination( bool willrestart ) | |||
648 | lblWait->setPixmap( pix ); | 710 | lblWait->setPixmap( pix ); |
649 | lblWait->setAlignment( QWidget::AlignCenter ); | 711 | lblWait->setAlignment( QWidget::AlignCenter ); |
650 | lblWait->show(); | 712 | lblWait->show(); |
651 | lblWait->showMaximized(); | 713 | lblWait->showMaximized(); |
652 | } | 714 | } |
653 | #ifndef SINGLE_APP | 715 | #ifndef SINGLE_APP |
654 | { QCopEnvelope envelope( "QPE/System", "forceQuit()" ); | 716 | { QCopEnvelope envelope( "QPE/System", "forceQuit()" ); |
655 | } | 717 | } |
656 | processEvents(); // ensure the message goes out. | 718 | processEvents(); // ensure the message goes out. |
657 | sleep( 1 ); // You have 1 second to comply. | 719 | sleep( 1 ); // You have 1 second to comply. |
658 | #endif | 720 | #endif |
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 | ||
661 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) | 751 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) |
662 | 752 | ||
663 | // The libraries with the skiff package (and possibly others) have | 753 | // The libraries with the skiff package (and possibly others) have |
664 | // completely useless implementations of builtin new and delete that | 754 | // completely useless implementations of builtin new and delete that |
665 | // use about 50% of your CPU. Here we revert to the simple libc | 755 | // use about 50% of your CPU. Here we revert to the simple libc |
666 | // functions. | 756 | // functions. |
667 | 757 | ||
668 | void* operator new[]( size_t size ) | 758 | void* operator new[]( size_t size ) |
669 | { | 759 | { |
670 | return malloc( size ); | 760 | return malloc( size ); |
671 | } | 761 | } |
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 | |||
@@ -52,24 +52,26 @@ public: | |||
52 | bool keepRunning()const; | 52 | bool keepRunning()const; |
53 | 53 | ||
54 | bool keyboardGrabbed()const; | 54 | bool keyboardGrabbed()const; |
55 | int exec(); | 55 | int exec(); |
56 | 56 | ||
57 | // QWS bits | 57 | // QWS bits |
58 | enum screenSaverHint { | 58 | enum screenSaverHint { |
59 | Disable = 0, | 59 | Disable = 0, |
60 | DisableLightOff = 1, | 60 | DisableLightOff = 1, |
61 | DisableSuspend = 2, | 61 | DisableSuspend = 2, |
62 | Enable = 100 | 62 | Enable = 100 |
63 | }; | 63 | }; |
64 | /* reimplemented for internal purposes */ | ||
65 | int x11ClientMessage( QWidget*, XEvent*, bool ); | ||
64 | 66 | ||
65 | signals: | 67 | signals: |
66 | void clientMoused(); | 68 | void clientMoused(); |
67 | void timeChanged(); | 69 | void timeChanged(); |
68 | void clockChanged( bool pm ); | 70 | void clockChanged( bool pm ); |
69 | void micChanged( bool muted ); | 71 | void micChanged( bool muted ); |
70 | void volumeChanged( bool muted ); | 72 | void volumeChanged( bool muted ); |
71 | void appMessage( const QCString& msg, const QByteArray& data); | 73 | void appMessage( const QCString& msg, const QByteArray& data); |
72 | void weekChanged( bool startOnMonday ); | 74 | void weekChanged( bool startOnMonday ); |
73 | void dateFormatChanged( DateFormat ); | 75 | void dateFormatChanged( DateFormat ); |
74 | void flush(); | 76 | void flush(); |
75 | void reload(); | 77 | void reload(); |