summaryrefslogtreecommitdiff
path: root/src/lib/ecore_win32
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 /src/lib/ecore_win32
parent46e9eed2c4d7cf100959dc5b9b747335a980cebe (diff)
Revert "ecore_win: fix the incorrect mouse cursor position."
This reverts commit 1f1542f82404fa2262526cc3eed7b2edc622c5ce. coordinate has been corrupted. need to investigate more.
Diffstat (limited to 'src/lib/ecore_win32')
-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,
1421 int button) 1421 int button)
1422{ 1422{
1423 Ecore_Win32_Window *window; 1423 Ecore_Win32_Window *window;
1424 RECT rect = { 0, 0, 0, 0 };
1425 1424
1426 INF("mouse button pressed"); 1425 INF("mouse button pressed");
1427 1426
1428 window = (Ecore_Win32_Window *)GetWindowLongPtr(msg->window, GWLP_USERDATA); 1427 window = (Ecore_Win32_Window *)GetWindowLongPtr(msg->window, GWLP_USERDATA);
1429 if (!GetWindowRect(window->window, &rect))
1430 ERR("GetWindowRect() failed!");
1431 1428
1432 if (button > 3) 1429 if (button > 3)
1433 { 1430 {
@@ -1441,10 +1438,8 @@ _ecore_win32_event_handle_button_press(Ecore_Win32_Callback_Data *msg,
1441 e->direction = 0; 1438 e->direction = 0;
1442 /* wheel delta is positive or negative, never 0 */ 1439 /* wheel delta is positive or negative, never 0 */
1443 e->z = GET_WHEEL_DELTA_WPARAM(msg->window_param) > 0 ? -1 : 1; 1440 e->z = GET_WHEEL_DELTA_WPARAM(msg->window_param) > 0 ? -1 : 1;
1444 e->x = GET_X_LPARAM(msg->data_param) - rect.left; 1441 e->x = GET_X_LPARAM(msg->data_param);
1445 e->y = GET_Y_LPARAM(msg->data_param) - rect.top; 1442 e->y = GET_Y_LPARAM(msg->data_param);
1446 e->root.x = rect.left;
1447 e->root.y = rect.top;
1448 e->timestamp = msg->timestamp; 1443 e->timestamp = msg->timestamp;
1449 e->modifiers = _ecore_win32_modifiers_get(); 1444 e->modifiers = _ecore_win32_modifiers_get();
1450 1445
@@ -1463,10 +1458,8 @@ _ecore_win32_event_handle_button_press(Ecore_Win32_Callback_Data *msg,
1463 1458
1464 e->window = (Ecore_Window)window; 1459 e->window = (Ecore_Window)window;
1465 e->event_window = e->window; 1460 e->event_window = e->window;
1466 e->x = GET_X_LPARAM(msg->data_param) - rect.left; 1461 e->x = GET_X_LPARAM(msg->data_param);
1467 e->y = GET_Y_LPARAM(msg->data_param) - rect.top; 1462 e->y = GET_Y_LPARAM(msg->data_param);
1468 e->root.x = rect.left;
1469 e->root.y = rect.top;
1470 e->timestamp = msg->timestamp; 1463 e->timestamp = msg->timestamp;
1471 e->modifiers = _ecore_win32_modifiers_get(); 1464 e->modifiers = _ecore_win32_modifiers_get();
1472 1465
@@ -1493,10 +1486,8 @@ _ecore_win32_event_handle_button_press(Ecore_Win32_Callback_Data *msg,
1493 e->window = (Ecore_Window)window; 1486 e->window = (Ecore_Window)window;
1494 e->event_window = e->window; 1487 e->event_window = e->window;
1495 e->buttons = button; 1488 e->buttons = button;
1496 e->x = GET_X_LPARAM(msg->data_param) - rect.left; 1489 e->x = GET_X_LPARAM(msg->data_param);
1497 e->y = GET_Y_LPARAM(msg->data_param) - rect.top; 1490 e->y = GET_Y_LPARAM(msg->data_param);
1498 e->root.x = rect.left;
1499 e->root.y = rect.top;
1500 e->timestamp = msg->timestamp; 1491 e->timestamp = msg->timestamp;
1501 e->modifiers = _ecore_win32_modifiers_get(); 1492 e->modifiers = _ecore_win32_modifiers_get();
1502 1493