From 95d32ad4ce8cf38a5662d2fca51b39feb3da7d2a Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sat, 21 Feb 2009 22:51:06 +0000 Subject: [PATCH] add log SVN revision: 39130 --- .../src/lib/ecore_evas/ecore_evas_win32.c | 71 ++++++++++++++----- 1 file changed, 52 insertions(+), 19 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c index 439f435263..abf9ba1051 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c @@ -254,6 +254,8 @@ _ecore_evas_win32_event_mouse_button_down(void *data __UNUSED__, int type __UNUS Ecore_Win32_Event_Mouse_Button_Down *e; Evas_Button_Flags flags = EVAS_BUTTON_NONE; + EINA_ERROR_PINFO("mouse button down (%f %dx%d)\n", e->time, e->x, e->y); + e = event; ee = _ecore_evas_win32_match(e->window); if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */ @@ -264,8 +266,6 @@ _ecore_evas_win32_event_mouse_button_down(void *data __UNUSED__, int type __UNUS if (e->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK; evas_event_feed_mouse_down(ee->evas, e->button, flags, e->time, NULL); - printf (" * ee event button down %f %d %d\n", e->time, e->x, e->y); - return 1; } @@ -276,7 +276,8 @@ _ecore_evas_win32_event_mouse_button_up(void *data __UNUSED__, int type __UNUSED Ecore_Win32_Event_Mouse_Button_Up *e; Evas_Button_Flags flags = EVAS_BUTTON_NONE; - printf (" * ee event button up 0 \n"); + EINA_ERROR_PINFO("mouse button up (%f %dx%d)\n", e->time, e->x, e->y); + e = event; ee = _ecore_evas_win32_match(e->window); if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */ @@ -287,8 +288,6 @@ _ecore_evas_win32_event_mouse_button_up(void *data __UNUSED__, int type __UNUSED if (e->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK; evas_event_feed_mouse_up(ee->evas, e->button, flags, e->time, NULL); - printf (" * ee event button up\n"); - return 1; } @@ -298,6 +297,8 @@ _ecore_evas_win32_event_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, Ecore_Evas *ee; Ecore_Win32_Event_Mouse_Wheel *e; + EINA_ERROR_PINFO("mouse wheel\n"); + e = event; ee = _ecore_evas_win32_match(e->window); if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */ @@ -350,6 +351,8 @@ _ecore_evas_win32_event_mouse_move(void *data __UNUSED__, int type __UNUSED__, v Ecore_Evas *ee; Ecore_Win32_Event_Mouse_Move *e; + EINA_ERROR_PINFO("mouse move\n"); + e = event; ee = _ecore_evas_win32_match(e->window); if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */ @@ -367,6 +370,8 @@ _ecore_evas_win32_event_mouse_in(void *data __UNUSED__, int type __UNUSED__, voi Ecore_Evas *ee; Ecore_Win32_Event_Mouse_In *e; + EINA_ERROR_PINFO("mouse in\n"); + e = event; ee = _ecore_evas_win32_match(e->window); if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */ @@ -387,6 +392,8 @@ _ecore_evas_win32_event_mouse_out(void *data __UNUSED__, int type __UNUSED__, vo Ecore_Evas *ee; Ecore_Win32_Event_Mouse_Out *e; + EINA_ERROR_PINFO("mouse out\n"); + e = event; ee = _ecore_evas_win32_match(e->window); if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */ @@ -409,6 +416,8 @@ _ecore_evas_win32_event_window_damage(void *data __UNUSED__, int type __UNUSED__ Ecore_Evas *ee; Ecore_Win32_Event_Window_Damage *e; + EINA_ERROR_PINFO("window damage\n"); + e = event; ee = _ecore_evas_win32_match(e->window); if (!ee) return 1; /* pass on event */ @@ -424,7 +433,6 @@ _ecore_evas_win32_event_window_damage(void *data __UNUSED__, int type __UNUSED__ } else { - printf (" * ee window event damage\n"); if (ee->rotation == 0) evas_damage_rectangle_add(ee->evas, e->x, @@ -460,6 +468,8 @@ _ecore_evas_win32_event_window_destroy(void *data __UNUSED__, int type __UNUSED_ Ecore_Evas *ee; Ecore_Win32_Event_Window_Destroy *e; + EINA_ERROR_PINFO("window destroy\n"); + e = event; ee = _ecore_evas_win32_match(e->window); if (!ee) return 1; /* pass on event */ @@ -467,7 +477,6 @@ _ecore_evas_win32_event_window_destroy(void *data __UNUSED__, int type __UNUSED_ if (ee->func.fn_destroy) ee->func.fn_destroy(ee); ecore_evas_free(ee); - printf (" * ee event destroy\n"); return 1; } @@ -477,7 +486,8 @@ _ecore_evas_win32_event_window_show(void *data __UNUSED__, int type __UNUSED__, Ecore_Evas *ee; Ecore_Win32_Event_Window_Show *e; - printf (" * ee window event show\n"); + EINA_ERROR_PINFO("window show\n"); + e = event; ee = _ecore_evas_win32_match(e->window); if (!ee) return 1; /* pass on event */ @@ -495,6 +505,8 @@ _ecore_evas_win32_event_window_hide(void *data __UNUSED__, int type __UNUSED__, Ecore_Evas *ee; Ecore_Win32_Event_Window_Hide *e; + EINA_ERROR_PINFO("window hide\n"); + e = event; ee = _ecore_evas_win32_match(e->window); if (!ee) return 1; /* pass on event */ @@ -512,6 +524,8 @@ _ecore_evas_win32_event_window_configure(void *data __UNUSED__, int type __UNUSE Ecore_Evas *ee; Ecore_Win32_Event_Window_Configure *e; + EINA_ERROR_PINFO("window configure\n"); + e = event; ee = _ecore_evas_win32_match(e->window); if (!ee) return 1; /* pass on event */ @@ -526,7 +540,6 @@ _ecore_evas_win32_event_window_configure(void *data __UNUSED__, int type __UNUSE if ((ee->w != e->width) || (ee->h != e->height)) { - printf (" * ee resize : 1\n"); ee->w = e->width; ee->h = e->height; if ((ee->rotation == 90) || (ee->rotation == 270)) @@ -536,7 +549,6 @@ _ecore_evas_win32_event_window_configure(void *data __UNUSED__, int type __UNUSE } else { - printf (" * ee resize : 2\n"); evas_output_size_set(ee->evas, ee->w, ee->h); evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); } @@ -551,7 +563,6 @@ _ecore_evas_win32_event_window_configure(void *data __UNUSED__, int type __UNUSE if ((ee->expecting_resize.w > 0) && (ee->expecting_resize.h > 0)) { - printf (" * ee resize : 3\n"); if ((ee->expecting_resize.w == ee->w) && (ee->expecting_resize.h == ee->h)) _ecore_evas_win32_mouse_move_process(ee, ee->mouse.x, ee->mouse.y, @@ -559,7 +570,6 @@ _ecore_evas_win32_event_window_configure(void *data __UNUSED__, int type __UNUSE ee->expecting_resize.w = 0; ee->expecting_resize.h = 0; } - printf (" * ee resize : 4\n"); if (ee->func.fn_resize) ee->func.fn_resize(ee); } @@ -572,6 +582,8 @@ _ecore_evas_win32_event_window_delete_request(void *data __UNUSED__, int type __ Ecore_Evas *ee; Ecore_Win32_Event_Window_Delete_Request *e; + EINA_ERROR_PINFO("window delete request\n"); + e = event; ee = _ecore_evas_win32_match(e->window); if (!ee) return 1; /* pass on event */ @@ -588,6 +600,8 @@ _ecore_evas_win32_event_window_delete_request(void *data __UNUSED__, int type __ static void _ecore_evas_win32_free(Ecore_Evas *ee) { + EINA_ERROR_PINFO("ecore evas free\n"); + ecore_win32_window_del(ee->engine.win32.window); eina_hash_del(ecore_evases_hash, _ecore_evas_win32_winid_str_get(ee->engine.win32.window), ee); ecore_evases = _ecore_list2_remove(ecore_evases, ee); @@ -605,6 +619,8 @@ _ecore_evas_win32_callback_delete_request_set(Ecore_Evas *ee, static void _ecore_evas_win32_move(Ecore_Evas *ee, int x, int y) { + EINA_ERROR_PINFO("ecore evas move (%dx%d)\n", x, y); + if ((x != ee->x) || (y != ee->y)) { ee->x = x; @@ -617,7 +633,8 @@ _ecore_evas_win32_move(Ecore_Evas *ee, int x, int y) static void _ecore_evas_win32_resize(Ecore_Evas *ee, int width, int height) { - printf (" * _ecore_evas_win32_resize %d %d\n", width, height); + EINA_ERROR_PINFO("ecore evas resize (%dx%d)\n", width, height); + if ((ee->w != width) || (ee->h != height)) { ee->w = width; @@ -642,7 +659,8 @@ _ecore_evas_win32_resize(Ecore_Evas *ee, int width, int height) static void _ecore_evas_win32_move_resize(Ecore_Evas *ee, int x, int y, int width, int height) { - printf (" * _ecore_evas_win32_resize\n"); + EINA_ERROR_PINFO("ecore evas resize (%dx%d %dx%d)\n", x, y, width, height); + if ((ee->w != width) || (ee->h != height) || (x != ee->x) || (y != ee->y)) { int change_size = 0; @@ -683,6 +701,8 @@ _ecore_evas_win32_rotation_set(Ecore_Evas *ee, int rotation) { int rot_dif; + EINA_ERROR_PINFO("ecore evas rotation: %s\n", rotation ? "yes" : "no"); + if (ee->rotation == rotation) return; rot_dif = ee->rotation - rotation; if (rot_dif < 0) rot_dif = -rot_dif; @@ -756,7 +776,8 @@ _ecore_evas_win32_rotation_set(Ecore_Evas *ee, int rotation) static void _ecore_evas_win32_show(Ecore_Evas *ee) { - printf (" * ee window show\n"); + EINA_ERROR_PINFO("ecore evas show\n"); + ee->should_be_visible = 1; if (ee->prop.avoid_damage) _ecore_evas_win32_render(ee); @@ -768,6 +789,8 @@ _ecore_evas_win32_show(Ecore_Evas *ee) static void _ecore_evas_win32_hide(Ecore_Evas *ee) { + EINA_ERROR_PINFO("ecore evas hide\n"); + ecore_win32_window_hide(ee->engine.win32.window); ee->should_be_visible = 0; } @@ -775,6 +798,8 @@ _ecore_evas_win32_hide(Ecore_Evas *ee) static void _ecore_evas_win32_raise(Ecore_Evas *ee) { + EINA_ERROR_PINFO("ecore evas raise\n"); + if (!ee->prop.fullscreen) ecore_win32_window_raise(ee->engine.win32.window); else @@ -784,6 +809,8 @@ _ecore_evas_win32_raise(Ecore_Evas *ee) static void _ecore_evas_win32_lower(Ecore_Evas *ee) { + EINA_ERROR_PINFO("ecore evas lower\n"); + if (!ee->prop.fullscreen) ecore_win32_window_lower(ee->engine.win32.window); else @@ -793,12 +820,16 @@ _ecore_evas_win32_lower(Ecore_Evas *ee) static void _ecore_evas_win32_activate(Ecore_Evas *ee) { + EINA_ERROR_PINFO("ecore evas activate\n"); + ecore_win32_window_focus_set(ee->engine.win32.window); } static void _ecore_evas_win32_title_set(Ecore_Evas *ee, const char *title) { + EINA_ERROR_PINFO("ecore evas title set\n"); + if (ee->prop.title) free(ee->prop.title); ee->prop.title = NULL; if (title) ee->prop.title = strdup(title); @@ -914,6 +945,8 @@ _ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, int on) { struct _Ecore_Win32_Window *window; + EINA_ERROR_PINFO("ecore evas fullscreen set\n"); + if ((ee->engine.win32.state.fullscreen && on) || (!ee->engine.win32.state.fullscreen && !on)) return; @@ -937,9 +970,9 @@ _ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, int on) window->shape.mask); } -#ifdef BUILD_ECORE_EVAS_DIRECT3D if (strcmp(ee->driver, "direct3d") == 0) { +#ifdef BUILD_ECORE_EVAS_DIRECT3D Evas_Engine_Info_Direct3D *einfo; einfo = (Evas_Engine_Info_Direct3D *)evas_engine_info_get(ecore_evas_get(ee)); @@ -949,12 +982,12 @@ _ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, int on) einfo->info.layered = window->shape.layered; evas_engine_info_set(ecore_evas_get(ee), (Evas_Engine_Info *)einfo); } - } #endif /* BUILD_ECORE_EVAS_DIRECT3D */ + } -#ifdef BUILD_ECORE_EVAS_SOFTWRE_DDRAW if (strcmp(ee->driver, "software_ddraw") == 0) { +#ifdef BUILD_ECORE_EVAS_SOFTWRE_DDRAW Evas_Engine_Info_Software_DDraw *einfo; einfo = (Evas_Engine_Info_Direct3D *)evas_engine_info_get(ecore_evas_get(ee)); @@ -964,8 +997,8 @@ _ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, int on) /* einfo->info.layered = window->shape.layered; */ evas_engine_info_set(ecore_evas_get(ee), (Evas_Engine_Info *)einfo); } - } #endif /* BUILD_ECORE_EVAS_SOFTWARE_DDRAW */ + } }