escape close

1 files changed, 3 insertions, 1 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index d0e9613..040b2fe 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -999,262 +999,264 @@ QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget * w )
 
 /*!
   \enum QPEApplication::InputMethodHint
 
   \value Normal the application sometimes needs text input (the default).
   \value AlwaysOff the application never needs text input.
   \value AlwaysOn the application always needs text input.
 */
 
 /*!
   Hints to the system that widget \a w has use for text input methods
   as specified by \a mode.
 
   \sa inputMethodHint() InputMethodHint
 */
 void QPEApplication::setInputMethodHint( QWidget * w, InputMethodHint mode )
 {
 	createInputMethodDict();
 	if ( mode == Normal ) {
 		inputMethodDict->remove
 		( w );
 	}
 	else {
 		inputMethodDict->insert( w, ( void* ) mode );
 	}
 }
 
 class HackDialog : public QDialog
 {
 public:
 	void acceptIt()
 	{
 		accept();
 	}
 	void rejectIt()
 	{
 		reject();
 	}
 };
 
 
 void QPEApplication::mapToDefaultAction( QWSKeyEvent * ke, int key )
 {
 	// specialised actions for certain widgets. May want to
 	// add more stuff here.
 	if ( activePopupWidget() && activePopupWidget() ->inherits( "QListBox" )
 	        && activePopupWidget() ->parentWidget()
 	        && activePopupWidget() ->parentWidget() ->inherits( "QComboBox" ) )
 		key = Qt::Key_Return;
 
 	if ( activePopupWidget() && activePopupWidget() ->inherits( "QPopupMenu" ) )
 		key = Qt::Key_Return;
 
 #ifdef QWS
 
 	ke->simpleData.keycode = key;
 #endif
 }
 
 
 /*!
   \internal
 */
 
 #ifdef QWS
 bool QPEApplication::qwsEventFilter( QWSEvent * e )
 {
 	if ( !d->notbusysent && e->type == QWSEvent::Focus ) {
 		if ( qApp->type() != QApplication::GuiServer ) {
 			QCopEnvelope e( "QPE/System", "notBusy(QString)" );
 			e << d->appName;
 		}
 		d->notbusysent = TRUE;
 	}
 	if ( type() == GuiServer ) {
 		switch ( e->type ) {
 			case QWSEvent::Mouse:
 				if ( e->asMouse() ->simpleData.state && !QWidget::find( e->window() ) )
 					emit clientMoused();
 				break;
 			default:
 				break;
 		}
 	}
 	if ( e->type == QWSEvent::Key ) {
 		QWSKeyEvent *ke = ( QWSKeyEvent * ) e;
 		if ( ke->simpleData.keycode == Qt::Key_F33 ) {
 			// Use special "OK" key to press "OK" on top level widgets
 			QWidget * active = activeWindow();
 			QWidget *popup = 0;
 			if ( active && active->isPopup() ) {
 				popup = active;
 				active = active->parentWidget();
 			}
 			if ( active && ( int ) active->winId() == ke->simpleData.window &&
 			        !active->testWFlags( WStyle_Customize | WType_Popup | WType_Desktop ) ) {
 				if ( ke->simpleData.is_press ) {
 					if ( popup )
 						popup->close();
 					if ( active->inherits( "QDialog" ) ) {
 						HackDialog * d = ( HackDialog * ) active;
 						d->acceptIt();
 						return TRUE;
 					}
 					else if ( ( ( HackWidget * ) active ) ->needsOk() ) {
 						QSignal s;
 						s.connect( active, SLOT( accept() ) );
 						s.activate();
 					}
 					else {
 						// do the same as with the select key: Map to the default action of the widget:
 						mapToDefaultAction( ke, Qt::Key_Return );
 					}
 				}
 			}
 		}
 		else if ( ke->simpleData.keycode == Qt::Key_F30 ) {
 			// Use special "select" key to do whatever default action a widget has
 			mapToDefaultAction( ke, Qt::Key_Space );
 		}
 		else if ( ke->simpleData.keycode == Qt::Key_Escape &&
 		          ke->simpleData.is_press ) {
 			// Escape key closes app if focus on toplevel
 			QWidget * active = activeWindow();
 			if ( active && active->testWFlags( WType_TopLevel ) &&
 			        ( int ) active->winId() == ke->simpleData.window &&
 			        !active->testWFlags( WStyle_Dialog | WStyle_Customize | WType_Popup | WType_Desktop ) ) {
 				if ( active->inherits( "QDialog" ) ) {
-					qDebug("dialog hack");
 					HackDialog * d = ( HackDialog * ) active;
 					d->rejectIt();
 					return TRUE;
+				} else /*if ( strcmp( argv() [ 0 ], "embeddedkonsole" ) != 0 )*/ {
+				active->close();
 				}
 			}
+
 		}
 		else if ( ke->simpleData.keycode >= Qt::Key_F1 && ke->simpleData.keycode <= Qt::Key_F29 ) {
 			// this should be if ( ODevice::inst ( )-> buttonForKeycode ( ... ))
 			// but we cannot access libopie function within libqpe :(
 
 			QWidget * active = activeWindow ( );
 			if ( active && ((int) active-> winId ( ) == ke-> simpleData.window )) {
 				if ( d-> kbgrabbed ) { // we grabbed the keyboard
 					QChar ch ( ke-> simpleData.unicode );
 					QKeyEvent qke ( ke-> simpleData. is_press ? QEvent::KeyPress : QEvent::KeyRelease,
 					                ke-> simpleData.keycode,
 					                ch. latin1 ( ),
 					                ke-> simpleData.modifiers,
 					                QString ( ch ),
 					                ke-> simpleData.is_auto_repeat, 1 );
 
 					QObject *which = QWidget::keyboardGrabber ( );
 					if ( !which )
 						which = QApplication::focusWidget ( );
 					if ( !which )
 						which = QApplication::activeWindow ( );
 					if ( !which )
 						which = qApp;
 
 					QApplication::sendEvent ( which, &qke );
 				}
 				else { // we didn't grab the keyboard, so send the event to the launcher
 					QCopEnvelope e ( "QPE/Launcher", "deviceButton(int,int,int)" );
 					e << int( ke-> simpleData.keycode ) << int( ke-> simpleData. is_press ) << int( ke-> simpleData.is_auto_repeat );
 				}
 			}
 			return true;
 		}
 	}
 	if ( e->type == QWSEvent::Focus ) {
 		QWSFocusEvent * fe = ( QWSFocusEvent* ) e;
 		if ( !fe->simpleData.get_focus ) {
 			QWidget * active = activeWindow();
 			while ( active && active->isPopup() ) {
 				active->close();
 				active = activeWindow();
 			}
 		}
 		else {
 			// make sure our modal widget is ALWAYS on top
 			QWidget *topm = activeModalWidget();
 			if ( topm && static_cast<int>( topm->winId() ) != fe->simpleData.window) {
 				topm->raise();
 			}
 		}
 		if ( fe->simpleData.get_focus && inputMethodDict ) {
 			InputMethodHint m = inputMethodHint( QWidget::find( e->window() ) );
 			if ( m == AlwaysOff )
 				Global::hideInputMethod();
 			if ( m == AlwaysOn )
 				Global::showInputMethod();
 		}
 	}
 
 
 	return QApplication::qwsEventFilter( e );
 }
 #endif
 
 /*!
   Destroys the QPEApplication.
 */
 QPEApplication::~QPEApplication()
 {
 	ungrabKeyboard();
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 	// Need to delete QCopChannels early, since the display will
 	// be gone by the time we get to ~QObject().
 	delete sysChannel;
 	delete pidChannel;
 #endif
 
 	delete d;
 }
 
 /*!
   Returns <tt>$OPIEDIR/</tt>.
 */
 QString QPEApplication::qpeDir()
 {
 	const char * base = getenv( "OPIEDIR" );
 	if ( base )
 		return QString( base ) + "/";
 
 	return QString( "../" );
 }
 
 /*!
   Returns the user's current Document directory. There is a trailing "/".
   .. well, it does now,, and there's no trailing '/'
 */
 QString QPEApplication::documentDir()
 {
 	const char* base = getenv( "HOME");
 	if ( base )
 		return QString( base ) + "/Documents";
 
 	return QString( "../Documents" );
 }
 
 static int deforient = -1;
 
 /*!
   \internal
 */
 int QPEApplication::defaultRotation()
 {
 	if ( deforient < 0 ) {
 		QString d = getenv( "QWS_DISPLAY" );
 		if ( d.contains( "Rot90" ) ) {
 			deforient = 90;
 		}
 		else if ( d.contains( "Rot180" ) ) {
 			deforient = 180;
 		}
 		else if ( d.contains( "Rot270" ) ) {
 			deforient = 270;
 		}
 		else {
 			deforient = 0;
 		}
 	}
 	return deforient;