-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
// CLASS HEADER
#include <dali/integration-api/events/key-event-integ.h>
{
KeyEvent::KeyEvent()
-: Event(Key),
+: Event( Key ),
keyName(),
keyString(),
- keyCode(-1),
- keyModifier(0),
- time(0),
- state(KeyEvent::Down)
+ keyCode( -1 ),
+ keyModifier( 0 ),
+ time( 0 ),
+ state( KeyEvent::Down ),
+ deviceName( "" ),
+ deviceClass( DevelKeyEvent::DeviceClass::NONE )
{
}
-KeyEvent::KeyEvent(const std::string& keyName, const std::string& keyString, int keyCode, int keyModifier, unsigned long timeStamp, const State& keyState)
-: Event(Key),
- keyName(keyName),
- keyString(keyString),
- keyCode(keyCode),
- keyModifier(keyModifier),
- time(timeStamp),
- state(keyState)
+KeyEvent::KeyEvent( const std::string& keyName, const std::string& keyString, int keyCode, int keyModifier,
+ unsigned long timeStamp, const State& keyState, const std::string deviceName, const DevelKeyEvent::DeviceClass::Type deviceClass )
+: Event( Key ),
+ keyName( keyName ),
+ keyString( keyString ),
+ keyCode( keyCode ),
+ keyModifier( keyModifier ),
+ time( timeStamp ),
+ state( keyState ),
+ deviceName( deviceName ),
+ deviceClass( deviceClass )
+{
+}
+
+KeyEvent::KeyEvent( const Dali::KeyEvent& event )
+: Event( Key ),
+ keyName( event.keyPressedName ),
+ keyString( event.keyPressed ),
+ keyCode( event.keyCode ),
+ keyModifier( event.keyModifier ),
+ time( event.time ),
+ state( static_cast< Integration::KeyEvent::State >( event.state ) ),
+ deviceName( "" ),
+ deviceClass( DevelKeyEvent::DeviceClass::NONE )
{
}