-rw-r--r-- | x11/ipc/client/ocopclient.cpp | 21 | ||||
-rw-r--r-- | x11/ipc/client/ocopclient.h | 4 | ||||
-rw-r--r-- | x11/libqpe-x11/qpe/qpeapplication.cpp | 207 | ||||
-rw-r--r-- | x11/libqpe-x11/qpe/qpeapplication.h | 23 |
4 files changed, 241 insertions, 14 deletions
diff --git a/x11/ipc/client/ocopclient.cpp b/x11/ipc/client/ocopclient.cpp index 43e426c..ac6e4a3 100644 --- a/x11/ipc/client/ocopclient.cpp +++ b/x11/ipc/client/ocopclient.cpp | |||
@@ -4,4 +4,5 @@ | |||
4 | #include <unistd.h> | 4 | #include <unistd.h> |
5 | #include <sys/socket.h> | 5 | #include <sys/socket.h> |
6 | #include <sys/types.h> | ||
6 | #include <sys/un.h> | 7 | #include <sys/un.h> |
7 | 8 | ||
@@ -17,13 +18,23 @@ OCOPClient::OCOPClient( const QString& path, QObject* obj ) | |||
17 | : QObject( obj ) | 18 | : QObject( obj ) |
18 | { | 19 | { |
20 | m_tries = 0; | ||
19 | init(QFile::encodeName(path) ); | 21 | init(QFile::encodeName(path) ); |
20 | } | 22 | } |
21 | OCOPClient::~OCOPClient() { | 23 | OCOPClient::~OCOPClient() { |
24 | delete m_notify; | ||
22 | close( m_socket ); | 25 | close( m_socket ); |
23 | } | 26 | } |
27 | void OCOPClient::init() { | ||
28 | // failed start ther server NOW!!! | ||
29 | startUP(); | ||
30 | QCString str; | ||
31 | init(str ); | ||
32 | } | ||
24 | void OCOPClient::init( const QCString& ) { | 33 | void OCOPClient::init( const QCString& ) { |
34 | m_tries++; | ||
25 | struct sockaddr_un unix_adr; | 35 | struct sockaddr_un unix_adr; |
26 | if ( (m_socket = socket(PF_UNIX, SOCK_STREAM, 0) ) < 0 ) { | 36 | if ( (m_socket = socket(PF_UNIX, SOCK_STREAM, 0) ) < 0 ) { |
27 | qWarning("could not socket"); | 37 | qWarning("could not socket"); |
38 | if ( m_tries < 8 ) | ||
28 | QTimer::singleShot(400, this,SLOT(init() ) ); | 39 | QTimer::singleShot(400, this,SLOT(init() ) ); |
29 | return; | 40 | return; |
@@ -37,4 +48,5 @@ void OCOPClient::init( const QCString& ) { | |||
37 | qWarning("could not connect %d", errno ); | 48 | qWarning("could not connect %d", errno ); |
38 | close( m_socket ); | 49 | close( m_socket ); |
50 | if ( m_tries < 8 ) | ||
39 | QTimer::singleShot(400, this, SLOT(init() ) ); | 51 | QTimer::singleShot(400, this, SLOT(init() ) ); |
40 | return; | 52 | return; |
@@ -128,2 +140,11 @@ void OCOPClient::call( const OCOPPacket& pack ) { | |||
128 | write(m_socket, pack.content().data(), pack.content().size() ); | 140 | write(m_socket, pack.content().data(), pack.content().size() ); |
129 | } | 141 | } |
142 | void OCOPClient::startUP() { | ||
143 | qWarning("Start me up"); | ||
144 | pid_t pi = fork(); | ||
145 | if ( pi == 0 ) { | ||
146 | setsid(); | ||
147 | execlp("opie-ipc", "opie-ipc", NULL ); | ||
148 | _exit(1); | ||
149 | } | ||
150 | } | ||
diff --git a/x11/ipc/client/ocopclient.h b/x11/ipc/client/ocopclient.h index e9544b9..53018a5 100644 --- a/x11/ipc/client/ocopclient.h +++ b/x11/ipc/client/ocopclient.h | |||
@@ -45,7 +45,9 @@ signals: | |||
45 | void called(const QCString&, const QCString&, const QByteArray& ); | 45 | void called(const QCString&, const QCString&, const QByteArray& ); |
46 | private slots: | 46 | private slots: |
47 | void init(); | ||
47 | void init(const QCString& pa); | 48 | void init(const QCString& pa); |
48 | void newData(); | 49 | void newData(); |
49 | private: | 50 | private: |
51 | void startUP(); | ||
50 | OCOPPacket packet()const; | 52 | OCOPPacket packet()const; |
51 | void call( const OCOPPacket& ); | 53 | void call( const OCOPPacket& ); |
@@ -53,5 +55,5 @@ private: | |||
53 | QSocketNotifier* m_notify; | 55 | QSocketNotifier* m_notify; |
54 | int m_socket; | 56 | int m_socket; |
55 | private slots: | 57 | int m_tries; |
56 | 58 | ||
57 | }; | 59 | }; |
diff --git a/x11/libqpe-x11/qpe/qpeapplication.cpp b/x11/libqpe-x11/qpe/qpeapplication.cpp index 891e132..6e4a96c 100644 --- a/x11/libqpe-x11/qpe/qpeapplication.cpp +++ b/x11/libqpe-x11/qpe/qpeapplication.cpp | |||
@@ -204,4 +204,14 @@ namespace { | |||
204 | }; | 204 | }; |
205 | // QPEApplication | 205 | // QPEApplication |
206 | QPEApplication::~QPEApplication() { | ||
207 | qWarning("~QPEApplication"); | ||
208 | ungrabKeyboard(); | ||
209 | qWarning("UngrabKeyboard"); | ||
210 | |||
211 | // delete m_sys; | ||
212 | // delete m_pid; | ||
213 | |||
214 | delete d; | ||
215 | } | ||
206 | QPEApplication::QPEApplication(int &arg, char** argv, Type t) | 216 | QPEApplication::QPEApplication(int &arg, char** argv, Type t) |
207 | : QApplication( arg, argv, t ) { | 217 | : QApplication( arg, argv, t ) { |
@@ -235,5 +245,8 @@ QPEApplication::QPEApplication(int &arg, char** argv, Type t) | |||
235 | } | 245 | } |
236 | 246 | ||
237 | m_sys = new QCopChannel( "QPE/System", this ); | 247 | /* Hmmm damn we need to make the parent 0l otherwise it get's deleted |
248 | * past the QApplication | ||
249 | */ | ||
250 | m_sys = new QCopChannel( "QPE/System", 0l); | ||
238 | connect(m_sys, SIGNAL( received( const QCString&, const QByteArray& ) ), | 251 | connect(m_sys, SIGNAL( received( const QCString&, const QByteArray& ) ), |
239 | this, SLOT(systemMessage( const QCString&, const QByteArray& ) ) ); | 252 | this, SLOT(systemMessage( const QCString&, const QByteArray& ) ) ); |
@@ -244,5 +257,5 @@ QPEApplication::QPEApplication(int &arg, char** argv, Type t) | |||
244 | d->appName = channel; | 257 | d->appName = channel; |
245 | channel = "QPE/Application/"+ channel; | 258 | channel = "QPE/Application/"+ channel; |
246 | m_pid = new QCopChannel( channel, this ); | 259 | m_pid = new QCopChannel( channel, 0l ); |
247 | connect(m_pid, SIGNAL( received( const QCString&, const QByteArray& ) ), | 260 | connect(m_pid, SIGNAL( received( const QCString&, const QByteArray& ) ), |
248 | this, SLOT( pidMessage( const QCString&, const QByteArray& ) ) ); | 261 | this, SLOT( pidMessage( const QCString&, const QByteArray& ) ) ); |
@@ -307,7 +320,4 @@ void QPEApplication::initTranslations() { | |||
307 | } | 320 | } |
308 | } | 321 | } |
309 | QPEApplication::~QPEApplication() { | ||
310 | delete d; | ||
311 | } | ||
312 | QString QPEApplication::qpeDir() { | 322 | QString QPEApplication::qpeDir() { |
313 | const char * base = getenv( "OPIEDIR" ); | 323 | const char * base = getenv( "OPIEDIR" ); |
@@ -387,10 +397,4 @@ void QPEApplication::ungrabKeyboard() { | |||
387 | } | 397 | } |
388 | } | 398 | } |
389 | void QPEApplication::setStylusOperation( QWidget*, StylusMode ) { | ||
390 | |||
391 | } | ||
392 | QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* ) { | ||
393 | |||
394 | } | ||
395 | void QPEApplication::showMainWidget( QWidget* wid, bool b) { | 399 | void QPEApplication::showMainWidget( QWidget* wid, bool b) { |
396 | d->show(wid, b ); | 400 | d->show(wid, b ); |
@@ -436,6 +440,10 @@ int QPEApplication::exec() { | |||
436 | d->sendQCopQ(); | 440 | d->sendQCopQ(); |
437 | 441 | ||
438 | if ( d->keep_running ) | 442 | if ( d->keep_running ) { |
439 | return QApplication::exec(); | 443 | qWarning("going to exec"); |
444 | int a = QApplication::exec(); | ||
445 | qWarning("left"); | ||
446 | return a; | ||
447 | } | ||
440 | 448 | ||
441 | { | 449 | { |
@@ -443,4 +451,5 @@ int QPEApplication::exec() { | |||
443 | e << d->appName; | 451 | e << d->appName; |
444 | } | 452 | } |
453 | qWarning("processing events!"); | ||
445 | processEvents(); | 454 | processEvents(); |
446 | return 0; | 455 | return 0; |
@@ -449,6 +458,178 @@ void QPEApplication::internalSetStyle( const QString& ) { | |||
449 | 458 | ||
450 | } | 459 | } |
460 | void QPEApplication::systemMessage( const QCString&, const QByteArray& ) { | ||
461 | |||
462 | } | ||
463 | void QPEApplication::pidMessage( const QCString&, const QByteArray& ) { | ||
464 | |||
465 | } | ||
466 | void QPEApplication::timerEvent( QTimerEvent* e ) { | ||
467 | if ( e->timerId() == d->presstimer && d->presswidget ) { | ||
468 | // Right pressed | ||
469 | postEvent( d->presswidget, | ||
470 | new QMouseEvent( QEvent::MouseButtonPress, d->presspos, | ||
471 | RightButton, LeftButton ) ); | ||
472 | killTimer( d->presstimer ); | ||
473 | d->presstimer = 0; | ||
474 | } | ||
475 | } | ||
476 | |||
477 | // InputMethods Hints | ||
478 | namespace { | ||
479 | static QPtrDict<void>* inputMethodDict = 0; | ||
480 | static void createInputMethodDict(){ | ||
481 | if ( !inputMethodDict ) | ||
482 | inputMethodDict = new QPtrDict<void>; | ||
483 | } | ||
484 | |||
485 | static QPtrDict<void>* stylusDict = 0; | ||
486 | static void createDict() { | ||
487 | if ( !stylusDict ) | ||
488 | stylusDict = new QPtrDict<void>; | ||
489 | } | ||
490 | }; | ||
491 | |||
492 | void QPEApplication::setInputMethodHint( QWidget* w, InputMethodHint mode ) { | ||
493 | createInputMethodDict(); | ||
494 | if ( mode == Normal ) { | ||
495 | inputMethodDict->remove | ||
496 | ( w ); | ||
497 | }else { | ||
498 | inputMethodDict->insert( w, ( void* ) mode ); | ||
499 | } | ||
500 | } | ||
501 | QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget* w) { | ||
502 | if ( inputMethodDict && w ) | ||
503 | return ( InputMethodHint ) ( int ) inputMethodDict->find( w ); | ||
504 | return Normal; | ||
505 | } | ||
451 | 506 | ||
452 | 507 | ||
508 | void QPEApplication::removeSenderFromStylusDict() { | ||
509 | stylusDict->remove( ( void* ) sender() ); | ||
510 | if ( d->presswidget == sender() ) | ||
511 | d->presswidget = 0; | ||
512 | } | ||
513 | void QPEApplication::setStylusOperation( QWidget* w, StylusMode mode) { | ||
514 | createDict(); | ||
515 | if ( mode == LeftOnly ) { | ||
516 | stylusDict->remove | ||
517 | ( w ); | ||
518 | w->removeEventFilter( qApp ); | ||
519 | }else { | ||
520 | stylusDict->insert( w, ( void* ) mode ); | ||
521 | connect( w, SIGNAL( destroyed() ), qApp, SLOT( removeSenderFromStylusDict() ) ); | ||
522 | w->installEventFilter( qApp ); | ||
523 | } | ||
524 | } | ||
525 | QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w) { | ||
526 | if ( stylusDict ) | ||
527 | return ( StylusMode ) ( int ) stylusDict->find( w ); | ||
528 | return LeftOnly; | ||
529 | } | ||
530 | |||
531 | // eventFilter...... | ||
532 | bool QPEApplication::eventFilter( QObject* o, QEvent* e ) { | ||
533 | if ( stylusDict && e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove ) { | ||
534 | QMouseEvent * me = ( QMouseEvent* ) e; | ||
535 | StylusMode mode = (StylusMode)(int)stylusDict->find(o); | ||
536 | switch (mode) { | ||
537 | case RightOnHold: | ||
538 | switch ( me->type() ) { | ||
539 | case QEvent::MouseButtonPress: | ||
540 | if ( me->button() == LeftButton ) { | ||
541 | d->presstimer = startTimer(500); // #### pref. | ||
542 | d->presswidget = (QWidget*)o; | ||
543 | d->presspos = me->pos(); | ||
544 | d->rightpressed = FALSE; | ||
545 | } | ||
546 | break; | ||
547 | case QEvent::MouseMove: | ||
548 | if (d->presstimer && (me->pos() - d->presspos).manhattanLength() > 8) { | ||
549 | killTimer(d->presstimer); | ||
550 | d->presstimer = 0; | ||
551 | } | ||
552 | break; | ||
553 | case QEvent::MouseButtonRelease: | ||
554 | if ( me->button() == LeftButton ) { | ||
555 | if ( d->presstimer ) { | ||
556 | killTimer(d->presstimer); | ||
557 | d->presstimer = 0; | ||
558 | } | ||
559 | if ( d->rightpressed && d->presswidget ) { | ||
560 | // Right released | ||
561 | postEvent( d->presswidget, | ||
562 | new QMouseEvent( QEvent::MouseButtonRelease, me->pos(), | ||
563 | RightButton, LeftButton + RightButton ) ); | ||
564 | // Left released, off-widget | ||
565 | postEvent( d->presswidget, | ||
566 | new QMouseEvent( QEvent::MouseMove, QPoint( -1, -1), | ||
567 | LeftButton, LeftButton ) ); | ||
568 | postEvent( d->presswidget, | ||
569 | new QMouseEvent( QEvent::MouseButtonRelease, QPoint( -1, -1), | ||
570 | LeftButton, LeftButton ) ); | ||
571 | d->rightpressed = FALSE; | ||
572 | return TRUE; // don't send the real Left release | ||
573 | } | ||
574 | } | ||
575 | break; | ||
576 | default: | ||
577 | break; | ||
578 | } | ||
579 | break; | ||
580 | default: | ||
581 | ; | ||
582 | } | ||
583 | } | ||
584 | else if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) { | ||
585 | QKeyEvent *ke = (QKeyEvent *)e; | ||
586 | if ( ke->key() == Key_Enter ) { | ||
587 | if ( o->isA( "QRadioButton" ) || o->isA( "QCheckBox" ) ) { | ||
588 | postEvent( o, new QKeyEvent( e->type(), Key_Space, ' ', | ||
589 | ke->state(), " ", ke->isAutoRepeat(), ke->count() ) ); | ||
590 | return TRUE; | ||
591 | } | ||
592 | } | ||
593 | } | ||
594 | return FALSE; | ||
595 | } | ||
596 | |||
597 | // Quit stuff | ||
598 | void QPEApplication::restart() { | ||
599 | |||
600 | } | ||
601 | void QPEApplication::shutdown() { | ||
602 | |||
603 | } | ||
604 | void QPEApplication::tryQuit() { | ||
605 | qWarning("TryQuit!!"); | ||
606 | if ( activeModalWidget() || strcmp( argv() [ 0 ], "embeddedkonsole" ) == 0 ) | ||
607 | return ; // Inside modal loop or konsole. Too hard to save state. | ||
608 | { | ||
609 | QCopEnvelope e( "QPE/System", "closing(QString)" ); | ||
610 | e << d->appName; | ||
611 | } | ||
612 | processEvents(); | ||
613 | |||
614 | quit(); | ||
615 | } | ||
616 | void QPEApplication::hideOrQuit() { | ||
617 | qWarning("hide or close"); | ||
618 | processEvents(); | ||
619 | qWarning("past processing"); | ||
620 | |||
621 | // If we are a preloaded application we don't actually quit, so emit | ||
622 | // a System message indicating we're quasi-closing. | ||
623 | if ( d->preloaded && d->qpe_main_widget ) | ||
624 | |||
625 | { | ||
626 | qWarning("hiding"); | ||
627 | QCopEnvelope e("QPE/System", "fastAppHiding(QString)" ); | ||
628 | e << d->appName; | ||
629 | d->qpe_main_widget->hide(); | ||
630 | } | ||
631 | else | ||
632 | quit(); | ||
633 | } | ||
453 | 634 | ||
454 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) | 635 | #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 cd385db..2af1c66 100644 --- a/x11/libqpe-x11/qpe/qpeapplication.h +++ b/x11/libqpe-x11/qpe/qpeapplication.h | |||
@@ -7,4 +7,5 @@ | |||
7 | 7 | ||
8 | #include <qapplication.h> | 8 | #include <qapplication.h> |
9 | #include <qevent.h> | ||
9 | 10 | ||
10 | #include <qpe/timestring.h> | 11 | #include <qpe/timestring.h> |
@@ -17,4 +18,5 @@ public: | |||
17 | ~QPEApplication(); | 18 | ~QPEApplication(); |
18 | 19 | ||
20 | |||
19 | static QString qpeDir(); | 21 | static QString qpeDir(); |
20 | static QString documentDir(); | 22 | static QString documentDir(); |
@@ -33,4 +35,12 @@ public: | |||
33 | static StylusMode stylusOperation( QWidget* ); | 35 | static StylusMode stylusOperation( QWidget* ); |
34 | 36 | ||
37 | enum InputMethodHint { | ||
38 | Normal, | ||
39 | AlwaysOff, | ||
40 | AlwaysOn | ||
41 | }; | ||
42 | static void setInputMethodHint( QWidget*, InputMethodHint ); | ||
43 | static InputMethodHint inputMethodHint( QWidget* ); | ||
44 | |||
35 | void showMainWidget( QWidget*, bool nomax = FALSE ); | 45 | void showMainWidget( QWidget*, bool nomax = FALSE ); |
36 | void showMainDocumentWidget( QWidget*, bool nomax = FALSE ); | 46 | void showMainDocumentWidget( QWidget*, bool nomax = FALSE ); |
@@ -61,4 +71,17 @@ private: | |||
61 | void internalSetStyle(const QString&); | 71 | void internalSetStyle(const QString&); |
62 | 72 | ||
73 | private slots: | ||
74 | void hideOrQuit(); | ||
75 | void systemMessage( const QCString&, const QByteArray& ); | ||
76 | void pidMessage( const QCString&, const QByteArray& ); | ||
77 | void removeSenderFromStylusDict(); | ||
78 | protected: | ||
79 | virtual void restart(); | ||
80 | virtual void shutdown(); | ||
81 | bool eventFilter( QObject*, QEvent* ); | ||
82 | void timerEvent( QTimerEvent* ); | ||
83 | void raiseAppropriateWindow(); | ||
84 | virtual void tryQuit(); | ||
85 | |||
63 | private: | 86 | private: |
64 | class Private; | 87 | class Private; |