#include <stdlib.h>
#include <unistd.h>
-#include <sensor.h>
+#include <sensor_internal.h>
#include <vconf.h>
-
+#include <Ecore.h>
#include "appcore-internal.h"
-#define LCD_TYPE_KEY "memory/sensor/lcd_type"
+#ifdef X11
+#include <Ecore_X.h>
+#include <X11/Xlib.h>
+
+/* Fixme: to be added for wayland works */
+#define _MAKE_ATOM(a, s) \
+ do { \
+ a = ecore_x_atom_get(s); \
+ if (!a) \
+ _ERR("##s creation failed.\n"); \
+ } while (0)
+
+#define STR_ATOM_ROTATION_LOCK "_E_ROTATION_LOCK"
+
+static Ecore_X_Atom ATOM_ROTATION_LOCK = 0;
+static Ecore_X_Window root;
+#endif
struct rot_s {
int handle;
- int (*callback) (enum appcore_rm, void *);
+ int (*callback) (void *event_info, enum appcore_rm, void *);
enum appcore_rm mode;
int lock;
void *cbdata;
int cb_set;
- int sf_started;
+ int sensord_started;
+
+ struct ui_wm_rotate* wm_rotate;
};
static struct rot_s rot;
struct rot_evt {
- enum accelerometer_rotate_state re;
+ enum auto_rotation_state re;
enum appcore_rm rm;
};
static struct rot_evt re_to_rm[] = {
{
- ROTATION_EVENT_0,
- APPCORE_RM_PORTRAIT_NORMAL,
+ AUTO_ROTATION_DEGREE_0,
+ APPCORE_RM_PORTRAIT_NORMAL,
},
{
- ROTATION_EVENT_90,
- APPCORE_RM_LANDSCAPE_NORMAL,
+ AUTO_ROTATION_DEGREE_90,
+ APPCORE_RM_LANDSCAPE_NORMAL,
},
{
- ROTATION_EVENT_180,
- APPCORE_RM_PORTRAIT_REVERSE,
+ AUTO_ROTATION_DEGREE_180,
+ APPCORE_RM_PORTRAIT_REVERSE,
},
{
- ROTATION_EVENT_270,
- APPCORE_RM_LANDSCAPE_REVERSE,
+ AUTO_ROTATION_DEGREE_270,
+ APPCORE_RM_LANDSCAPE_REVERSE,
},
};
-static enum appcore_rm __get_mode(int event_data)
+static enum appcore_rm __get_mode(sensor_data_t data)
{
int i;
+ int event;
enum appcore_rm m;
m = APPCORE_RM_UNKNOWN;
+ if (data.value_count > 0) {
+ event = (int)data.values[0];
+ } else {
+ _ERR("Failed to get sensor data");
+ return -1;
+ }
for (i = 0; i < sizeof(re_to_rm) / sizeof(re_to_rm[0]); i++) {
- if (re_to_rm[i].re == event_data) {
+ if (re_to_rm[i].re == event) {
m = re_to_rm[i].rm;
break;
}
return m;
}
-static void __changed_cb(unsigned int event_type, sensor_event_data_t *event,
- void *data)
+static void __changed_cb(sensor_t sensor, unsigned int event_type,
+ sensor_data_t *data, void *user_data)
{
- int *cb_event_data;
enum appcore_rm m;
if (rot.lock)
return;
- if (event_type != ACCELEROMETER_EVENT_ROTATION_CHECK) {
+ if (event_type != AUTO_ROTATION_CHANGE_STATE_EVENT) {
errno = EINVAL;
return;
}
- cb_event_data = (int *)(event->event_data);
-
- m = __get_mode(*cb_event_data);
+ m = __get_mode(*data);
_DBG("[APP %d] Rotation: %d -> %d", getpid(), rot.mode, m);
if (rot.callback) {
if (rot.cb_set && rot.mode != m) {
- rot.callback(m, data);
+ _DBG("[APP %d] Rotation: %d -> %d", getpid(), rot.mode, m);
+ rot.callback((void *)&m, m, user_data);
rot.mode = m;
}
}
int r;
enum appcore_rm m;
- rot.lock = vconf_keynode_get_bool(node);
+ rot.lock = !vconf_keynode_get_bool(node);
if (rot.lock) {
+ m = APPCORE_RM_PORTRAIT_NORMAL;
+ if (rot.mode != m) {
+ rot.callback((void *)&m, m, data);
+ rot.mode = m;
+ }
_DBG("[APP %d] Rotation locked", getpid());
return;
}
_DBG("[APP %d] Rotmode prev %d -> curr %d", getpid(),
rot.mode, m);
if (!r && rot.mode != m) {
- rot.callback(m, data);
+ rot.callback((void *)&m, m, data);
rot.mode = m;
}
}
int lock;
lock = 0;
- r = vconf_get_bool(VCONFKEY_SETAPPL_ROTATE_LOCK_BOOL, &lock);
- if (r) {
+ r = vconf_get_bool(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, &lock);
+ if (r)
_DBG("[APP %d] Rotation vconf get bool failed", getpid());
- }
- rot.lock = lock;
+ rot.lock = !lock;
- vconf_notify_key_changed(VCONFKEY_SETAPPL_ROTATE_LOCK_BOOL, __lock_cb,
+ vconf_notify_key_changed(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, __lock_cb,
data);
}
static void __del_rotlock(void)
{
- vconf_ignore_key_changed(VCONFKEY_SETAPPL_ROTATE_LOCK_BOOL, __lock_cb);
+ vconf_ignore_key_changed(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, __lock_cb);
rot.lock = 0;
}
-EXPORT_API int appcore_set_rotation_cb(int (*cb) (enum appcore_rm, void *),
+EXPORT_API int appcore_set_rotation_cb(int (*cb) (void *evnet_info, enum appcore_rm, void *),
void *data)
{
- int r;
- int handle;
+ if (rot.wm_rotate)
+ return rot.wm_rotate->set_rotation_cb(cb, data);
+ else {
+ bool r;
+ int handle;
+ sensor_t sensor = sensord_get_sensor(AUTO_ROTATION_SENSOR);
+
+ if (cb == NULL) {
+ errno = EINVAL;
+ return -1;
+ }
- if (cb == NULL) {
- errno = EINVAL;
- return -1;
- }
+ if (rot.callback != NULL) {
+ errno = EALREADY;
+ return -1;
+ }
- if (rot.callback != NULL) {
- errno = EALREADY;
- return -1;
- }
+ handle = sensord_connect(sensor);
+ if (handle < 0) {
+ _ERR("sensord_connect failed: %d", handle);
+ return -1;
+ }
- handle = sf_connect(ACCELEROMETER_SENSOR);
- if (handle < 0) {
- _ERR("sf_connect failed: %d", handle);
- return -1;
- }
+ r = sensord_register_event(handle, AUTO_ROTATION_CHANGE_STATE_EVENT,
+ SENSOR_INTERVAL_NORMAL, 0, __changed_cb, data);
+ if (!r) {
+ _ERR("sensord_register_event failed");
+ sensord_disconnect(handle);
+ return -1;
+ }
- r = sf_register_event(handle, ACCELEROMETER_EVENT_ROTATION_CHECK,
- NULL, __changed_cb, data);
- if (r < 0) {
- _ERR("sf_register_event failed: %d", r);
- sf_disconnect(handle);
- return -1;
- }
+ rot.cb_set = 1;
+ rot.callback = cb;
+ rot.cbdata = data;
+
+ r = sensord_start(handle, 0);
+ if (!r) {
+ _ERR("sensord_start failed");
+ r = sensord_unregister_event(handle, AUTO_ROTATION_CHANGE_STATE_EVENT);
+ if (!r)
+ _ERR("sensord_unregister_event failed");
+
+ rot.callback = NULL;
+ rot.cbdata = NULL;
+ rot.cb_set = 0;
+ rot.sensord_started = 0;
+ sensord_disconnect(handle);
+ return -1;
+ }
+ rot.sensord_started = 1;
- rot.cb_set = 1;
- rot.callback = cb;
- rot.cbdata = data;
+ rot.handle = handle;
+ __add_rotlock(data);
- r = sf_start(handle, 0);
- if (r < 0) {
- _ERR("sf_start failed: %d", r);
- sf_unregister_event(handle, ACCELEROMETER_EVENT_ROTATION_CHECK);
- rot.callback = NULL;
- rot.cbdata = NULL;
- rot.cb_set = 0;
- rot.sf_started = 0;
- sf_disconnect(handle);
- return -1;
+#ifdef X11
+ _MAKE_ATOM(ATOM_ROTATION_LOCK, STR_ATOM_ROTATION_LOCK);
+ root = ecore_x_window_root_first_get();
+ XSelectInput(ecore_x_display_get(), root, PropertyChangeMask);
+#endif
}
- rot.sf_started = 1;
-
- rot.handle = handle;
- __add_rotlock(data);
-
return 0;
}
EXPORT_API int appcore_unset_rotation_cb(void)
{
- int r;
+ if (rot.wm_rotate)
+ return rot.wm_rotate->unset_rotation_cb();
+ else {
+ bool r;
- _retv_if(rot.callback == NULL, 0);
+ _retv_if(rot.callback == NULL, 0);
- __del_rotlock();
+ __del_rotlock();
- if (rot.cb_set) {
- r = sf_unregister_event(rot.handle,
- ACCELEROMETER_EVENT_ROTATION_CHECK);
- if (r < 0) {
- _ERR("sf_unregister_event failed: %d", r);
- return -1;
+ if (rot.cb_set) {
+ r = sensord_unregister_event(rot.handle,
+ AUTO_ROTATION_CHANGE_STATE_EVENT);
+ if (!r) {
+ _ERR("sensord_unregister_event failed");
+ return -1;
+ }
+ rot.cb_set = 0;
}
- rot.cb_set = 0;
- }
- rot.callback = NULL;
- rot.cbdata = NULL;
+ rot.callback = NULL;
+ rot.cbdata = NULL;
- if (rot.sf_started == 1) {
- r = sf_stop(rot.handle);
- if (r < 0) {
- _ERR("sf_stop failed: %d", r);
- return -1;
+ if (rot.sensord_started == 1) {
+ r = sensord_stop(rot.handle);
+ if (!r) {
+ _ERR("sensord_stop failed");
+ return -1;
+ }
+ rot.sensord_started = 0;
}
- rot.sf_started = 0;
- }
- r = sf_disconnect(rot.handle);
- if (r < 0) {
- _ERR("sf_disconnect failed: %d", r);
- return -1;
+ r = sensord_disconnect(rot.handle);
+ if (!r) {
+ _ERR("sensord_disconnect failed");
+ return -1;
+ }
+ rot.handle = -1;
}
- rot.handle = -1;
-
return 0;
}
EXPORT_API int appcore_get_rotation_state(enum appcore_rm *curr)
{
- int r;
- unsigned long event;
+ if (rot.wm_rotate)
+ return rot.wm_rotate->get_rotation_state(curr);
+ else {
+ bool r;
+ sensor_data_t data;
+
+ if (curr == NULL) {
+ errno = EINVAL;
+ return -1;
+ }
- if (curr == NULL) {
- errno = EINVAL;
- return -1;
- }
+ r = sensord_get_data(rot.handle, AUTO_ROTATION_SENSOR, &data);
+ if (!r) {
+ _ERR("sensord_get_data failed");
+ *curr = APPCORE_RM_UNKNOWN;
+ return -1;
+ }
- r = sf_check_rotation(&event);
- if (r < 0) {
- _ERR("sf_check_rotation failed: %d", r);
- *curr = APPCORE_RM_UNKNOWN;
- return -1;
+ *curr = __get_mode(data);
}
-
- *curr = __get_mode(event);
-
return 0;
}
EXPORT_API int appcore_pause_rotation_cb(void)
{
- int r;
+ if (rot.wm_rotate)
+ return rot.wm_rotate->pause_rotation_cb();
+ else {
+ bool r;
- _retv_if(rot.callback == NULL, 0);
- _DBG("[APP %d] appcore_pause_rotation_cb is called", getpid());
+ _retv_if(rot.callback == NULL, 0);
+ _DBG("[APP %d] appcore_pause_rotation_cb is called", getpid());
- __del_rotlock();
+ __del_rotlock();
- if (rot.cb_set) {
- r = sf_unregister_event(rot.handle,
- ACCELEROMETER_EVENT_ROTATION_CHECK);
- if (r < 0) {
- _ERR("sf_unregister_event in appcore_internal_sf_stop failed: %d", r);
- return -1;
+ if (rot.cb_set) {
+ r = sensord_unregister_event(rot.handle,
+ AUTO_ROTATION_CHANGE_STATE_EVENT);
+ if (!r) {
+ _ERR("sensord_unregister_event failed");
+ return -1;
+ }
+ rot.cb_set = 0;
}
- rot.cb_set = 0;
- }
- if (rot.sf_started == 1) {
- r = sf_stop(rot.handle);
- if (r < 0) {
- _ERR("sf_stop in appcore_internal_sf_stop failed: %d",
- r);
- return -1;
+ if (rot.sensord_started == 1) {
+ r = sensord_stop(rot.handle);
+ if (!r) {
+ _ERR("sensord_stop failed");
+ return -1;
+ }
+ rot.sensord_started = 0;
}
- rot.sf_started = 0;
}
return 0;
EXPORT_API int appcore_resume_rotation_cb(void)
{
- int r;
- enum appcore_rm m;
-
- _retv_if(rot.callback == NULL, 0);
- _DBG("[APP %d] appcore_resume_rotation_cb is called", getpid());
+ if (rot.wm_rotate)
+ return rot.wm_rotate->resume_rotation_cb();
+ else {
+ bool r;
+ enum appcore_rm m;
+
+ _retv_if(rot.callback == NULL, 0);
+ _DBG("[APP %d] appcore_resume_rotation_cb is called", getpid());
+
+ if (rot.cb_set == 0) {
+ r = sensord_register_event(rot.handle,
+ AUTO_ROTATION_CHANGE_STATE_EVENT,
+ SENSOR_INTERVAL_NORMAL, 0, __changed_cb, rot.cbdata);
+ if (!r) {
+ _ERR("sensord_register_event failed");
+ return -1;
+ }
+ rot.cb_set = 1;
+ }
- if (rot.cb_set == 0) {
- r = sf_register_event(rot.handle,
- ACCELEROMETER_EVENT_ROTATION_CHECK, NULL,
- __changed_cb, rot.cbdata);
- if (r < 0) {
- _ERR("sf_register_event in appcore_internal_sf_start failed: %d", r);
- return -1;
+ if (rot.sensord_started == 0) {
+ r = sensord_start(rot.handle, 0);
+ if (!r) {
+ _ERR("sensord_start failed");
+ r = sensord_unregister_event(rot.handle,
+ AUTO_ROTATION_CHANGE_STATE_EVENT);
+ if (!r)
+ _ERR("sensord_unregister_event failed");
+ rot.cb_set = 0;
+ return -1;
+ }
+ rot.sensord_started = 1;
}
- rot.cb_set = 1;
- }
- if (rot.sf_started == 0) {
- r = sf_start(rot.handle, 0);
- if (r < 0) {
- _ERR("sf_start in appcore_internal_sf_start failed: %d",
- r);
- sf_unregister_event(rot.handle,
- ACCELEROMETER_EVENT_ROTATION_CHECK);
- rot.cb_set = 0;
- return -1;
+ __add_rotlock(rot.cbdata);
+
+ r = appcore_get_rotation_state(&m);
+ _DBG("[APP %d] Rotmode prev %d -> curr %d", getpid(), rot.mode, m);
+ if (!r && rot.mode != m && rot.lock == 0) {
+ rot.callback((void *)&m, m, rot.cbdata);
+ rot.mode = m;
}
- rot.sf_started = 1;
}
+ return 0;
+}
- __add_rotlock(rot.cbdata);
+EXPORT_API int appcore_set_wm_rotation(struct ui_wm_rotate* wm_rotate)
+{
+ if (!wm_rotate) return -1;
- r = appcore_get_rotation_state(&m);
- _DBG("[APP %d] Rotmode prev %d -> curr %d", getpid(), rot.mode, m);
- if (!r && rot.mode != m && rot.lock == 0) {
- rot.callback(m, rot.cbdata);
- rot.mode = m;
+ if (rot.callback) {
+ wm_rotate->set_rotation_cb(rot.callback, rot.cbdata);
+ appcore_unset_rotation_cb();
}
-
+ rot.wm_rotate = wm_rotate;
+ _DBG("[APP %d] Support wm rotate:%p", getpid(), wm_rotate);
return 0;
}
projects / platform / core / appfw / app-core.git / blobdiff