| -rw-r--r-- | x11/ipc/server/ocopserver.cpp | 59 | ||||
| -rw-r--r-- | x11/libqpe-x11/qpe/qpeapplication.cpp | 90 | ||||
| -rw-r--r-- | x11/libqpe-x11/qpe/qpeapplication.h | 2 |
3 files changed, 127 insertions, 24 deletions
diff --git a/x11/ipc/server/ocopserver.cpp b/x11/ipc/server/ocopserver.cpp index 4940cb8..0f818b7 100644 --- a/x11/ipc/server/ocopserver.cpp +++ b/x11/ipc/server/ocopserver.cpp @@ -165,5 +165,5 @@ void OCopServer::newOnClient( int fd ) { */ if (head.magic == 47 ) { - qWarning("magic match"); +// qWarning("magic match"); QCString channel( head.chlen+1 ); QCString func( head.funclen+1 ); @@ -173,13 +173,13 @@ void OCopServer::newOnClient( int fd ) { * we do not check for errors */ - qWarning("read "); +// qWarning("read "); int s = read(fd, channel.data(), head.chlen ); s = read(fd, func.data(), head.funclen ); s = read(fd, data.data(), head.datalen ); - qWarning("read"); +// qWarning("read"); /* debug output */ - qWarning("channel %s %d", channel.data(), head.chlen ); - qWarning("func %s %d", func.data(), head.funclen ); +// qWarning("channel %s %d", channel.data(), head.chlen ); +// qWarning("func %s %d", func.data(), head.funclen ); /* debug end */ @@ -215,8 +215,4 @@ void OCopServer::deregisterClient(int fd ) { QMap<int, OCOPClient>::Iterator it = m_clients.find( fd ); if (it != m_clients.end() ) { - OCOPClient client = it.data(); - delete client.notify; - m_clients.remove(fd ); - close(fd ); /* * TIME_ME @@ -234,5 +230,5 @@ void OCopServer::deregisterClient(int fd ) { * The channel contains this fd */ - qWarning("Channel %s", it2.key().data() ); + qWarning("Channel %s %d", it2.key().data(), it2.data().count() ); if ( it2.data().contains( fd ) ) { qWarning("contains"); @@ -242,5 +238,5 @@ void OCopServer::deregisterClient(int fd ) { * remove channel or just replace */ - if ( array.count() == 1 ) { + if ( array.count() == 1 || array.count() == 0) { qWarning("Invalidate!"); /* is the list now invalidatet? */ @@ -255,10 +251,16 @@ void OCopServer::deregisterClient(int fd ) { goto repeatIt; }else{ - qWarning("removing"); - array.remove( fd ); - it2 = m_channels.replace( it2.key(), array ); + qWarning("removing count %d %d",fd, array.count() ); + QValueList<int>::Iterator it3 = array.find( fd ); + it3 = array.remove( it3 ); + QCString key = it2.key().copy(); + it2 = m_channels.replace( key, array ); } } } // off all channels + OCOPClient client = it.data(); + delete client.notify; + m_clients.remove(fd ); + close(fd ); } qWarning("clients are now at %d", m_clients.count() ); @@ -328,12 +330,19 @@ void OCopServer::addChannel( const QCString& channel, QMap<QCString, QValueList<int> >::Iterator it; it = m_channels.find( channel ); - - /* could be empty */ - QValueList<int> list = it.data(); - list.append( fd ); - it = m_channels.replace( channel, list ); + if ( it != m_channels.end() ) { + /* could be empty */ + QValueList<int> list = it.data(); + list.append( fd ); + qWarning("count is now in addChannel %d %s", list.count(), channel.data() ); + it = m_channels.replace( channel, list ); + }else { + QValueList<int> ints; + ints.append( fd ); + m_channels.insert( channel, ints ); + } }; void OCopServer::delChannel( const QCString& channel, int fd ) { + qWarning("remove %s, %d", channel.data(), fd ); if (!m_channels.contains( channel ) ) return; @@ -343,17 +352,19 @@ void OCopServer::delChannel( const QCString& channel, if ( it.data().contains(fd) ) { - QValueList<int> ints = it.data(); if ( ints.count() == 1 ) - m_channels.remove( it ); + m_channels.remove( channel ); else{ QValueList<int> ints = it.data(); - ints.remove( fd ); - m_channels.replace( it.key(), ints ); + QValueList<int>::Iterator rem = ints.find( fd ); + rem = ints.remove( rem ); + QCString str = it.key().copy(); + m_channels.replace( str, ints ); } + qWarning(" channel count is now %d", ints.count() ); } } void OCopServer::isRegistered( const QCString& channel, int fd) { - qWarning("isRegistered"); +// qWarning("isRegistered"); OCOPHead head; QCString func(2); 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 @@ -6,4 +6,5 @@ #include <sys/file.h> + #include <qdir.h> #include <qdialog.h> @@ -17,4 +18,5 @@ #include <qptrdict.h> #include <qregexp.h> +#include <qtimer.h> #include <qpe/alarmserver.h> @@ -35,4 +37,13 @@ #include <qpe/qcopenvelope_qws.h> + +#include <X11/Xlib.h> +#include <X11/Xutil.h> + +const int XKeyPress = KeyPress; +const int XKeyRelease = KeyRelease; +#undef KeyPress +#undef KeyRelease + namespace { struct QCopRec{ @@ -77,4 +88,9 @@ public: QString styleName; QString decorationName; + Atom wm_delete_window; + Atom wm_take_focus; + Atom wm_context_help; + Atom wm_context_accept; + Atom wm_protocols; private: @@ -220,4 +236,30 @@ QPEApplication::QPEApplication(int &arg, char** argv, Type t) d->loadImageCodecs(); + // Init X-Atom + Atom *atoms[5]; + Atom atoms_re[5]; + char* names[5]; + int n = 0; + atoms[n] = &d->wm_delete_window; + names[n++] = "WM_DELETE_WINDOW"; + + atoms[n] = &d->wm_take_focus; + names[n++] = "WM_TAKE_FOCUS"; + + atoms[n] = &d->wm_context_help; + names[n++] = "_NET_WM_CONTEXT_HELP"; + + atoms[n] = &d->wm_context_accept; + names[n++] = "_NET_WM_CONTEXT_ACCEPT"; + + atoms[n] = &d->wm_protocols; + names[n++] = "WM_PROTOCOLS"; + + XInternAtoms( qt_xdisplay(), names, n, FALSE, atoms_re); + // now copy the values over to the properties + for (int i = 0; i < n; i++ ) + *atoms[i] = atoms_re[i]; + // done with X11 Stuff + int dw = desktop()->width(); if ( dw < 200 ) { @@ -531,4 +573,24 @@ QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w) { // eventFilter...... bool QPEApplication::eventFilter( QObject* o, QEvent* e ) { + /* + * We want our WM to show Ok and a X button + * on dialogs + * our part is to set the _NET_WM_CONTEXT_ACCEPT + * propery + * and then wait for a client message -zecke + * on show we will add the prop + */ + if (o->inherits("QDialog") && e->type() == QEvent::Show ) { + QDialog* dialog = (QDialog*)o; + Atom wm_prot[45]; + int n = 0; + wm_prot[n++] = d->wm_delete_window; + wm_prot[n++] = d->wm_take_focus; + wm_prot[n++] = d->wm_context_accept; + if ( dialog->testWFlags( WStyle_ContextHelp ) ) + wm_prot[n++] = d->wm_context_help; + XSetWMProtocols( qt_xdisplay(), dialog->winId(), wm_prot, n ); + return TRUE; // should be save + } if ( stylusDict && e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove ) { QMouseEvent * me = ( QMouseEvent* ) e; @@ -658,4 +720,32 @@ void QPEApplication::prepareForTermination( bool willrestart ) #endif } +int QPEApplication::x11ClientMessage(QWidget* w, XEvent* event, bool b ) { + qWarning("X11 ClientMessage %d %d", event->type, ClientMessage); + if ( event->type == ClientMessage ) { + if ( (event->xclient.message_type == d->wm_protocols) && + (event->xclient.data.l[0] == d->wm_context_accept ) ) { + qWarning("accepted!!!"); + /* + * I'm not sure if we should use activeWidget + * or activeModalWidget + * a QDialog could be not modal too + */ + if ( w->inherits("QDialog" ) ) { + qWarning("inherits QDialog!!!"); + QDialog* dia = (QDialog*)w; + /* + * call it directly or via QTimer::singleShot? + */ + QTimer::singleShot(0, dia, SLOT(reject() ) ); + return 0; + } + + } + } + return QApplication::x11ClientMessage(w, event, b ); +} + +#define KeyPress XKeyPress +#define KeyRelease XKeyRelease #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 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 @@ -62,4 +62,6 @@ public: Enable = 100 }; + /* reimplemented for internal purposes */ + int x11ClientMessage( QWidget*, XEvent*, bool ); signals: |