*/
void NotifyLanguageChanged();
+ /**
+ * Gets AppId of current application
+ */
+ void GetAppId( std::string& appId );
+
public: //AdaptorInternalServices
/**
#include <physical-keyboard-impl.h>
#include <style-monitor-impl.h>
#include <base/core-event-interface.h>
+#include <virtual-keyboard.h>
namespace Dali
{
// Register Mouse wheel events
mEcoreEventHandler.push_back( ecore_event_handler_add( ECORE_EVENT_MOUSE_WHEEL, EcoreEventMouseWheel, handler ) );
+ // Register Focus events
+ mEcoreEventHandler.push_back( ecore_event_handler_add( ECORE_WL_EVENT_FOCUS_IN, EcoreEventWindowFocusIn, handler ) );
+ mEcoreEventHandler.push_back( ecore_event_handler_add( ECORE_WL_EVENT_FOCUS_OUT, EcoreEventWindowFocusOut, handler ) );
+
// Register Key events
mEcoreEventHandler.push_back( ecore_event_handler_add( ECORE_EVENT_KEY_DOWN, EcoreEventKeyDown, handler ) );
mEcoreEventHandler.push_back( ecore_event_handler_add( ECORE_EVENT_KEY_UP, EcoreEventKeyUp, handler ) );
{
std::string keyName( keyEvent->keyname );
std::string keyString( "" );
- int keyCode = 0/*ecore_x_keysym_keycode_get(keyEvent->keyname)*/;
+ int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname);
+ keyCode = (keyCode == -1) ? 0 : keyCode;
int modifier( keyEvent->modifiers );
unsigned long time = keyEvent->timestamp;
-
if (!strncmp(keyEvent->keyname, "Keycode-", 8))
keyCode = atoi(keyEvent->keyname + 8);
{
std::string keyName( keyEvent->keyname );
std::string keyString( "" );
- int keyCode = 0/*ecore_x_keysym_keycode_get(keyEvent->keyname)*/;
+ int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname);
+ keyCode = (keyCode == -1) ? 0 : keyCode;
int modifier( keyEvent->modifiers );
- unsigned long time( keyEvent->timestamp );
-
+ unsigned long time = keyEvent->timestamp;
if (!strncmp(keyEvent->keyname, "Keycode-", 8))
keyCode = atoi(keyEvent->keyname + 8);
#include <ecore-indicator-impl.h>
#include <window-visibility-observer.h>
#include <orientation-impl.h>
-
namespace
{
const float INDICATOR_ANIMATION_DURATION( 0.18f ); // 180 milli seconds
DALI_LOG_TRACE_METHOD_FMT( gWindowLogFilter, "visible : %d\n", visibleMode );
DALI_ASSERT_DEBUG(mOverlay);
+ ECore::WindowRenderSurface* wlSurface( dynamic_cast< ECore::WindowRenderSurface * >( mSurface ) );
+ DALI_ASSERT_DEBUG(wlSurface);
+ Ecore_Wl_Window* wlWindow = wlSurface->GetWlWindow();
+
+ mIndicatorVisible = visibleMode;
+
+ if ( mIndicatorVisible == Dali::Window::VISIBLE )
+ {
+ // when the indicator is visible, set proper mode for indicator server according to bg mode
+ if ( mIndicatorOpacityMode == Dali::Window::OPAQUE )
+ {
+ ecore_wl_window_indicator_opacity_set(wlWindow, ECORE_WL_INDICATOR_OPAQUE);
+ }
+ else if ( mIndicatorOpacityMode == Dali::Window::TRANSLUCENT )
+ {
+ ecore_wl_window_indicator_opacity_set(wlWindow, ECORE_WL_INDICATOR_TRANSLUCENT);
+ }
+ else if ( mIndicatorOpacityMode == Dali::Window::TRANSPARENT )
+ {
+ ecore_wl_window_indicator_opacity_set(wlWindow, ECORE_WL_INDICATOR_OPAQUE);
+ }
+ }
+ else
+ {
+ // when the indicator is not visible, set TRANSPARENT mode for indicator server
+ ecore_wl_window_indicator_opacity_set(wlWindow, ECORE_WL_INDICATOR_TRANSPARENT); // it means hidden indicator
+ }
+
DoShowIndicator( mIndicatorOrientation );
}
mSurface = windowSurface;
+ std::string appId;
+ mAdaptor->GetAppId( appId );
+ Ecore_Wl_Window* wlWindow = windowSurface ->GetWlWindow();
+ ecore_wl_window_class_name_set(wlWindow, appId.c_str());
+
mOrientation = Orientation::New(this);
// create event handler for Wayland window
{
DALI_ASSERT_ALWAYS(0 && "Failed to create X window");
}
-
- //FIXME
}
void WindowRenderSurface::UseExistingRenderable( unsigned int surfaceId )
*
* @return the Ecore X window handle
*/
- Ecore_Wl_Window* GetWlWindow();
+ virtual Ecore_Wl_Window* GetWlWindow();
/**
* Get the surface as an Ecore_Wl_Window
}
+void Adaptor::GetAppId( std::string& appId )
+{
+#ifdef USE_APPFW
+ char *id;
+ app_get_id(&id);
+ if ( id )
+ {
+ appId = id;
+ }
+ else
+ {
+ appId = "";
+ }
+#endif
+}
+
} // namespace Adaptor
} // namespace Internal
path = DALI_SHADERBIN_DIR;
}
+void Adaptor::GetAppId( std::string& appId )
+{
+ appId = "";
+}
+
} // namespace Adaptor
} // namespace Internal