dont send keyRegister message if keycode is 0, or key is released

1 files changed, 3 insertions, 2 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index bca95b2..4640a12 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -236,388 +236,389 @@ public:
 
 		int v[ 4 ];
 		i1 = ssi( i1, config, "Dim", "Interval_Dim", 30 );
 		i2 = ssi( i2, config, "LightOff", "Interval_LightOff", 20 );
 		i3 = ssi( i3, config, "", "Interval", 60 );
 
 		//qDebug("screen saver intervals: %d %d %d", i1, i2, i3);
 
 		v [ 0 ] = QMAX( 1000 * i1, 100 );
 		v [ 1 ] = QMAX( 1000 * i2, 100 );
 		v [ 2 ] = QMAX( 1000 * i3, 100 );
 		v [ 3 ] = 0;
 		m_enable_dim = ( ( i1 != 0 ) ? config. readNumEntry ( "Dim", 1 ) : false );
 		m_enable_lightoff = ( ( i2 != 0 ) ? config. readNumEntry ( "LightOff", 1 ) : false );
 		m_enable_onlylcdoff = config. readNumEntry ( "LcdOffOnly", 0 );
 
 		if ( !i1 && !i2 && !i3 )
 			QWSServer::setScreenSaverInterval( 0 );
 		else
 			QWSServer::setScreenSaverIntervals( v );
 	}
 
 	void setInterval ( int interval )
 	{
 		setIntervals ( -1, -1, interval );
 	}
 
 	void setMode ( int mode )
 	{
 		if ( mode > m_disable_suspend )
 			setInterval( -1 );
 		m_disable_suspend = mode;
 	}
 
 	int backlight ( )
 	{
 		if ( m_backlight_bright == -1 ) {
 			// Read from config
 			Config config ( "qpe" );
 			config. setGroup ( "Screensaver" );
 			m_backlight_bright = config. readNumEntry ( "Brightness", 255 );
 		}
 		return m_backlight_bright;
 	}
 
 	void setBacklight ( int bright )
 	{
 		if ( bright == -3 ) {
 			// Forced on
 			m_backlight_forcedoff = false;
 			bright = -1;
 		}
 		if ( m_backlight_forcedoff && bright != -2 )
 			return ;
 		if ( bright == -2 ) {
 			// Toggle between off and on
 			bright = m_backlight_bright ? 0 : -1;
 			m_backlight_forcedoff = !bright;
 		}
 
 		m_backlight_bright = bright;
 
 		bright = backlight ( );
 		ODevice::inst ( ) -> setDisplayBrightness ( bright );
 
 		m_backlight_bright = bright;
 	}
 
 private:
 	int m_disable_suspend;
 	bool m_enable_dim;
 	bool m_enable_lightoff;
 	bool m_enable_onlylcdoff;
 
 	bool m_lcd_status;
 
 	int m_backlight_bright;
 	bool m_backlight_forcedoff;
 };
 
 
 void DesktopApplication::switchLCD ( bool on )
 {
 	if ( qApp ) {
 		DesktopApplication *dapp = (DesktopApplication *) qApp;
 
 		if ( dapp-> m_screensaver )
 			dapp-> m_screensaver-> setBacklight ( on ? -3 : -1 );
 	}
 }
 
 
 DesktopApplication::DesktopApplication( int& argc, char **argv, Type appType )
 		: QPEApplication( argc, argv, appType )
 {
 
 	QTimer * t = new QTimer( this );
 	connect( t, SIGNAL( timeout() ), this, SLOT( psTimeout() ) );
 	t->start( 10000 );
 	ps = new PowerStatus;
 	pa = new DesktopPowerAlerter( 0 );
 
 	channel = new QCopChannel( "QPE/Desktop", this );
 	connect( channel, SIGNAL( received( const QCString&, const QByteArray& ) ),
 	         this, SLOT( desktopMessage( const QCString&, const QByteArray& ) ) );
 
 	channel = new QCopChannel( "QPE/System", this );
 	connect( channel, SIGNAL( received( const QCString&, const QByteArray& ) ),
 	         this, SLOT( systemMessage( const QCString&, const QByteArray& ) ) );
 
 	m_screensaver = new QPEScreenSaver;
 
 	m_screensaver-> setInterval ( -1 );
 	QWSServer::setScreenSaver( m_screensaver );
 }
 
 
 DesktopApplication::~DesktopApplication()
 {
 	delete ps;
 	delete pa;
 }
 
 void DesktopApplication::desktopMessage( const QCString &msg, const QByteArray &data )
 {
 #ifdef Q_WS_QWS
 	QDataStream stream( data, IO_ReadOnly );
 	if ( msg == "keyRegister(int key, QString channel, QString message)" ) {
 		int k;
 		QString c, m;
 		stream >> k;
 		stream >> c;
 		stream >> m;
 
 		qWarning( "KeyRegisterReceived: %i, %s, %s", k, ( const char* ) c, ( const char * ) m );
 		keyRegisterList.append( QCopKeyRegister( k, c, m ) );
 	}
 	else if ( msg == "suspend()" ) {
 		emit power();
 	}
 #endif
 }
 
 
 void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & data )
 {
 #ifdef Q_WS_QWS
 	QDataStream stream ( data, IO_ReadOnly );
 
 	if ( msg == "setScreenSaverInterval(int)" ) {
 		int time;
 		stream >> time;
 		m_screensaver-> setInterval( time );
 	}
 	else if ( msg == "setScreenSaverIntervals(int,int,int)" ) {
 		int t1, t2, t3;
 		stream >> t1 >> t2 >> t3;
 		m_screensaver-> setIntervals( t1, t2, t3 );
 	}
 	else if ( msg == "setBacklight(int)" ) {
 		int bright;
 		stream >> bright;
 		m_screensaver-> setBacklight( bright );
 	}
 	else if ( msg == "setScreenSaverMode(int)" ) {
 		int mode;
 		stream >> mode;
 		m_screensaver-> setMode ( mode );
 	}
 #endif
 }
 
 enum MemState { Unknown, VeryLow, Low, Normal } memstate = Unknown;
 
 #ifdef Q_WS_QWS
 bool DesktopApplication::qwsEventFilter( QWSEvent *e )
 {
 	qpedesktop->checkMemory();
 
 	if ( e->type == QWSEvent::Key ) {
 		QWSKeyEvent * ke = ( QWSKeyEvent * ) e;
 		if ( !loggedin && ke->simpleData.keycode != Key_F34 )
 			return TRUE;
 		bool press = ke->simpleData.is_press;
 		bool autoRepeat = ke->simpleData.is_auto_repeat;
 
 		/*
 		  app that registers key/message to be sent back to the app, when it doesn't have focus,
 		  when user presses key, unless keyboard has been requested from app.
 		  will not send multiple repeats if user holds key
 		  i.e. one shot
 		 */
-		if ( !keyRegisterList.isEmpty() ) {
+    if ( !keyRegisterList.isEmpty() &&  ke->simpleData.keycode !=0 && press) {
+//        qDebug("<<<<<<<<<<<<<keycode %d", ke->simpleData.keycode);
 			KeyRegisterList::Iterator it;
 			for ( it = keyRegisterList.begin(); it != keyRegisterList.end(); ++it ) {
-				if ( ( *it ).getKeyCode() == ke->simpleData.keycode && !autoRepeat && !keyboardGrabbed() && press ) {
+        if ( ( *it ).getKeyCode() == ke->simpleData.keycode && !autoRepeat && !keyboardGrabbed() ) {
 					if ( press )
 						qDebug( "press" );
 					else
 						qDebug( "release" );
 					QCopEnvelope( ( *it ).getChannel().utf8(), ( *it ).getMessage().utf8() );
 				}
 			}
 		}
 
 		if ( !keyboardGrabbed() ) {
 			if ( ke->simpleData.keycode == Key_F9 ) {
 				if ( press )
 					emit datebook();
 				return TRUE;
 			}
 			if ( ke->simpleData.keycode == Key_F10 ) {
 				if ( !press && cardSendTimer ) {
 					emit contacts();
 					delete cardSendTimer;
 				}
 				else if ( press ) {
 					cardSendTimer = new QTimer();
 					cardSendTimer->start( 2000, TRUE );
 					connect( cardSendTimer, SIGNAL( timeout() ), this, SLOT( sendCard() ) );
 				}
 				return TRUE;
 			}
 			/* menu key now opens application menu/toolbar
 			 if ( ke->simpleData.keycode == Key_F11 ) {
 			 if ( press ) emit menu();
 			 return TRUE;
 			 }
 			*/
 			if ( ke->simpleData.keycode == Key_F12 ) {
 				while ( activePopupWidget() )
 					activePopupWidget() ->close();
 				if ( press )
 					emit launch();
 				return TRUE;
 			}
 			if ( ke->simpleData.keycode == Key_F13 ) {
 				if ( press )
 					emit email();
 				return TRUE;
 			}
 		}
 
 		if ( ke->simpleData.keycode == Key_F34 ) {
 			if ( press )
 				emit power();
 			return TRUE;
 		}
 		// This was used for the iPAQ PowerButton
 		// See main.cpp for new KeyboardFilter
 		//
 		//    if ( ke->simpleData.keycode == Key_SysReq ) {
 		//      if ( press ) emit power();
 		//      return TRUE;
 		//    }
 		if ( ke->simpleData.keycode == Key_F35 ) {
 			if ( press )
 				emit backlight();
 			return TRUE;
 		}
 		if ( ke->simpleData.keycode == Key_F32 ) {
 			if ( press )
 				QCopEnvelope e( "QPE/Desktop", "startSync()" );
 			return TRUE;
 		}
 		if ( ke->simpleData.keycode == Key_F31 && !ke->simpleData.modifiers ) {
 			if ( press )
 				emit symbol();
 			return TRUE;
 		}
 		if ( ke->simpleData.keycode == Key_NumLock ) {
 			if ( press )
 				emit numLockStateToggle();
 		}
 		if ( ke->simpleData.keycode == Key_CapsLock ) {
 			if ( press )
 				emit capsLockStateToggle();
 		}
 		if ( ( press && !autoRepeat ) || ( !press && autoRepeat ) )
 			qpedesktop->keyClick();
 	}
 	else {
 		if ( e->type == QWSEvent::Mouse ) {
 			QWSMouseEvent * me = ( QWSMouseEvent * ) e;
 			static bool up = TRUE;
 			if ( me->simpleData.state & LeftButton ) {
 				if ( up ) {
 					up = FALSE;
 					qpedesktop->screenClick();
 				}
 			}
 			else {
 				up = TRUE;
 			}
 		}
 	}
 
 	return QPEApplication::qwsEventFilter( e );
 }
 #endif
 
 void DesktopApplication::psTimeout()
 {
 	qpedesktop->checkMemory(); // in case no events are being generated
 
 	*ps = PowerStatusManager::readStatus();
 
 	if ( ( ps->batteryStatus() == PowerStatus::VeryLow ) ) {
 		pa->alert( tr( "Battery is running very low." ), 6 );
 	}
 
 	if ( ps->batteryStatus() == PowerStatus::Critical ) {
 		pa->alert( tr( "Battery level is critical!\n"
 		               "Keep power off until power restored!" ), 1 );
 	}
 
 	if ( ps->backupBatteryStatus() == PowerStatus::VeryLow ) {
 		pa->alert( tr( "The Back-up battery is very low.\nPlease charge the back-up battery." ), 3 );
 	}
 }
 
 
 void DesktopApplication::sendCard()
 {
 	delete cardSendTimer;
 	cardSendTimer = 0;
 	QString card = getenv( "HOME" );
 	card += "/Applications/addressbook/businesscard.vcf";
 
 	if ( QFile::exists( card ) ) {
 		QCopEnvelope e( "QPE/Obex", "send(QString,QString,QString)" );
 		QString mimetype = "text/x-vCard";
 		e << tr( "business card" ) << card << mimetype;
 	}
 }
 
 #if defined(QPE_HAVE_MEMALERTER)
 QPE_MEMALERTER_IMPL
 #endif
 
 //===========================================================================
 
 Desktop::Desktop() :
 		QWidget( 0, 0, WStyle_Tool | WStyle_Customize ),
 		qcopBridge( 0 ),
 		transferServer( 0 ),
 		packageSlave( 0 )
 {
 	qpedesktop = this;
 
 	//    bg = new Info( this );
 	tb = new TaskBar;
 
 	launcher = new Launcher( 0, 0, WStyle_Customize | QWidget::WGroupLeader );
 
 	connect( launcher, SIGNAL( busy() ), tb, SLOT( startWait() ) );
 	connect( launcher, SIGNAL( notBusy( const QString& ) ), tb, SLOT( stopWait( const QString& ) ) );
 
 	int displayw = qApp->desktop() ->width();
 	int displayh = qApp->desktop() ->height();
 
 
 	QSize sz = tb->sizeHint();
 
 	setGeometry( 0, displayh - sz.height(), displayw, sz.height() );
 	tb->setGeometry( 0, displayh - sz.height(), displayw, sz.height() );
 
 	tb->show();
 	launcher->showMaximized();
 	launcher->show();
 	launcher->raise();
 #if defined(QPE_HAVE_MEMALERTER)
 
 	initMemalerter();
 #endif
 	// start services
 	startTransferServer();
 	( void ) new IrServer( this );
 	rereadVolumes();
 
 	packageSlave = new PackageSlave( this );
 	connect( qApp, SIGNAL( volumeChanged( bool ) ), this, SLOT( rereadVolumes() ) );
 
 	qApp->installEventFilter( this );
 }
 
 void Desktop::show()
 {