aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2015-08-25 18:12:40 +0900
committerChunEon Park <hermet@hermet.pe.kr>2015-08-25 18:13:14 +0900
commit3ce8860dab29ba6d0849ed1ecbbc72bbe0e11773 (patch)
treedcd70473b2d21fb0d488d2e8e9f4e59b8e0470e4
parentbuild: replace libsystemd-{daemon, journal} with libsystemd (diff)
downloadefl-3ce8860dab29ba6d0849ed1ecbbc72bbe0e11773.tar.gz
Revert "ecore_win: fix the incorrect mouse cursor position."
This reverts commit 1f1542f82404fa2262526cc3eed7b2edc622c5ce. coordinate has been corrupted. need to investigate more.
-rw-r--r--src/lib/ecore_win32/ecore_win32_event.c21
1 files changed, 6 insertions, 15 deletions
diff --git a/src/lib/ecore_win32/ecore_win32_event.c b/src/lib/ecore_win32/ecore_win32_event.c
index 3b5100dced..f9d29a1a6f 100644
--- a/src/lib/ecore_win32/ecore_win32_event.c
+++ b/src/lib/ecore_win32/ecore_win32_event.c
@@ -1421,13 +1421,10 @@ _ecore_win32_event_handle_button_press(Ecore_Win32_Callback_Data *msg,
int button)
{
Ecore_Win32_Window *window;
- RECT rect = { 0, 0, 0, 0 };
INF("mouse button pressed");
window = (Ecore_Win32_Window *)GetWindowLongPtr(msg->window, GWLP_USERDATA);
- if (!GetWindowRect(window->window, &rect))
- ERR("GetWindowRect() failed!");
if (button > 3)
{
@@ -1441,10 +1438,8 @@ _ecore_win32_event_handle_button_press(Ecore_Win32_Callback_Data *msg,
e->direction = 0;
/* wheel delta is positive or negative, never 0 */
e->z = GET_WHEEL_DELTA_WPARAM(msg->window_param) > 0 ? -1 : 1;
- e->x = GET_X_LPARAM(msg->data_param) - rect.left;
- e->y = GET_Y_LPARAM(msg->data_param) - rect.top;
- e->root.x = rect.left;
- e->root.y = rect.top;
+ e->x = GET_X_LPARAM(msg->data_param);
+ e->y = GET_Y_LPARAM(msg->data_param);
e->timestamp = msg->timestamp;
e->modifiers = _ecore_win32_modifiers_get();
@@ -1463,10 +1458,8 @@ _ecore_win32_event_handle_button_press(Ecore_Win32_Callback_Data *msg,
e->window = (Ecore_Window)window;
e->event_window = e->window;
- e->x = GET_X_LPARAM(msg->data_param) - rect.left;
- e->y = GET_Y_LPARAM(msg->data_param) - rect.top;
- e->root.x = rect.left;
- e->root.y = rect.top;
+ e->x = GET_X_LPARAM(msg->data_param);
+ e->y = GET_Y_LPARAM(msg->data_param);
e->timestamp = msg->timestamp;
e->modifiers = _ecore_win32_modifiers_get();
@@ -1493,10 +1486,8 @@ _ecore_win32_event_handle_button_press(Ecore_Win32_Callback_Data *msg,
e->window = (Ecore_Window)window;
e->event_window = e->window;
e->buttons = button;
- e->x = GET_X_LPARAM(msg->data_param) - rect.left;
- e->y = GET_Y_LPARAM(msg->data_param) - rect.top;
- e->root.x = rect.left;
- e->root.y = rect.top;
+ e->x = GET_X_LPARAM(msg->data_param);
+ e->y = GET_Y_LPARAM(msg->data_param);
e->timestamp = msg->timestamp;
e->modifiers = _ecore_win32_modifiers_get();