# Process this file with autoconf to produce a configure script
#AC_INIT(scim, 1.4.7, suzhe@tsinghua.org.cn)
-AC_INIT(isf, 2.4.6306, isf@samsung.com)
+AC_INIT(isf, 2.4.6307, isf@samsung.com)
AC_CONFIG_SRCDIR([ism/src/scim.h])
m4_pattern_allow([^AS_])
# ISF version
ISF_MAJOR_VERSION=2
ISF_MINOR_VERSION=4
-ISF_MICRO_VERSION=6306
+ISF_MICRO_VERSION=6307
ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION
static Eina_Bool panel_agent_handler (void *data, Ecore_Fd_Handler *fd_handler);
-static void efl_create_control_window (void);
+static Eina_Bool efl_create_control_window (void);
static Ecore_X_Window efl_get_app_window (void);
/////////////////////////////////////////////////////////////////////////////
/**
* @brief Create elementary control window.
*
- * @return The window pointer
+ * @return EINA_TRUE if successful, otherwise return EINA_FALSE
*/
-static void efl_create_control_window (void)
+static Eina_Bool efl_create_control_window (void)
{
/* WMSYNC, #1 Creating and registering control window */
+ if (ecore_x_display_get () == NULL)
+ return EINA_FALSE;
+
Ecore_X_Window root = ecore_x_window_root_first_get ();
_control_window = ecore_x_window_input_new (root, -100, -100, 1, 1);
ecore_x_e_virtual_keyboard_control_window_set (root, _control_window, 0, EINA_TRUE);
+
+ return EINA_TRUE;
}
/**
/* Connect the configuration reload signal. */
_config->signal_connect_reload (slot (config_reload_cb));
- if (!check_system_ready ())
- {
+ if (!check_system_ready ()) {
std::cerr << "[ISF-PANEL-EFL] Timeout. cannot check the state of system....\n";
}
elm_init (argc, argv);
check_time ("elm_init");
- efl_create_control_window();
+ if (!efl_create_control_window ())
+ goto cleanup;
efl_get_screen_resolution (_screen_width, _screen_height);