-/*
- * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
- */
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdlib.h> /* for NULL */
-#include "Ecore.h"
+#include <Ecore.h>
#include "ecore_private.h"
#ifdef BUILD_ECORE_EVAS_WIN32
-# include "Ecore_Win32.h"
-# include "ecore_win32_private.h"
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+# undef WIN32_LEAN_AND_MEAN
+# include <Ecore_Win32.h>
+# include <ecore_win32_private.h>
#endif /* BUILD_ECORE_EVAS_WIN32 */
#include "ecore_evas_private.h"
#include "Ecore_Evas.h"
-
#ifdef BUILD_ECORE_EVAS_WIN32
-#define ECORE_EVAS_EVENT_COUNT 14
+#define ECORE_EVAS_EVENT_COUNT 10
static int _ecore_evas_init_count = 0;
-static int _ecore_evas_fps_debug = 0;
static Ecore_Event_Handler *ecore_evas_event_handlers[ECORE_EVAS_EVENT_COUNT];
-static Ecore_Idle_Enterer *ecore_evas_idle_enterer = NULL;
-static Ecore_Evas *ecore_evases = NULL;
-static Evas_Hash *ecore_evases_hash = NULL;
-
-static int _ecore_evas_win32_event_key_down(void *data __UNUSED__, int type __UNUSED__, void *event);
-
-static int _ecore_evas_win32_event_key_up(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _ecore_evas_win32_event_mouse_button_down(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _ecore_evas_win32_event_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _ecore_evas_win32_event_mouse_button_up(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _ecore_evas_win32_event_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _ecore_evas_win32_event_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _ecore_evas_win32_event_window_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _ecore_evas_win32_event_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _ecore_evas_win32_event_window_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _ecore_evas_win32_event_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _ecore_evas_win32_event_window_damage(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _ecore_evas_win32_event_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _ecore_evas_win32_event_window_destroy(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _ecore_evas_win32_event_window_damage(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _ecore_evas_win32_event_window_show(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _ecore_evas_win32_event_window_destroy(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _ecore_evas_win32_event_window_hide(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _ecore_evas_win32_event_window_show(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _ecore_evas_win32_event_window_configure(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _ecore_evas_win32_event_window_hide(void *data __UNUSED__, int type __UNUSED__, void *event);
-
-static int _ecore_evas_win32_event_window_configure(void *data __UNUSED__, int type __UNUSED__, void *event);
-
-static int _ecore_evas_win32_event_window_delete_request(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _ecore_evas_win32_event_window_delete_request(void *data __UNUSED__, int type __UNUSED__, void *event);
/* Private functions */
-static void
+static int
_ecore_evas_win32_render(Ecore_Evas *ee)
{
-#ifdef BUILD_ECORE_EVAS_BUFFER
- Evas_List *ll;
-#endif
+ int rend = 0;
+ Eina_List *updates = NULL;
+ Eina_List *ll;
+ Ecore_Evas *ee2;
-#ifdef BUILD_ECORE_EVAS_BUFFER
- for (ll = ee->sub_ecore_evas; ll; ll = ll->next)
+ EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
{
- Ecore_Evas *ee2;
-
- ee2 = ll->data;
- if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);
- _ecore_evas_buffer_render(ee2);
- if (ee2->func.fn_post_render) ee2->func.fn_post_render(ee2);
+ if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);
+ if (ee2->engine.func->fn_render)
+ rend |= ee2->engine.func->fn_render(ee2);
+ if (ee2->func.fn_post_render) ee2->func.fn_post_render(ee2);
}
-#endif
+
if (ee->func.fn_pre_render) ee->func.fn_pre_render(ee);
if (ee->prop.avoid_damage)
{
- Evas_List *updates;
-
updates = evas_render_updates(ee->evas);
if (updates) evas_render_updates_free(updates);
}
{
if (ee->shaped)
{
- Evas_List *updates;
-
updates = evas_render_updates(ee->evas);
if (updates) evas_render_updates_free(updates);
}
else
{
- Evas_List *updates;
-
updates = evas_render_updates(ee->evas);
if (updates) evas_render_updates_free(updates);
}
}
else
evas_norender(ee->evas);
+ if (updates) rend = 1;
if (ee->func.fn_post_render) ee->func.fn_post_render(ee);
-}
-
-static int
-_ecore_evas_win32_idle_enter(void *data __UNUSED__)
-{
- Ecore_List2 *l;
- double t1 = 0.0;
- double t2 = 0.0;
-
- if (_ecore_evas_fps_debug)
- {
- t1 = ecore_time_get();
- }
- for (l = (Ecore_List2 *)ecore_evases; l; l = l->next)
- {
- Ecore_Evas *ee;
-
- ee = (Ecore_Evas *)l;
- _ecore_evas_win32_render(ee);
- }
-/* ecore_x_flush(); */
- if (_ecore_evas_fps_debug)
- {
- t2 = ecore_time_get();
-/* _ecore_evas_fps_debug_rendertime_add(t2 - t1); */
- }
- return 1;
+ return rend;
}
static int
if (_ecore_evas_init_count > 1)
return _ecore_evas_init_count;
- if (getenv("ECORE_EVAS_FPS_DEBUG"))
- _ecore_evas_fps_debug = 1;
-
- ecore_evas_idle_enterer = ecore_idle_enterer_add(_ecore_evas_win32_idle_enter, NULL);
-
- ecore_evas_event_handlers[0] = ecore_event_handler_add(ECORE_WIN32_EVENT_KEY_DOWN, _ecore_evas_win32_event_key_down, NULL);
- ecore_evas_event_handlers[1] = ecore_event_handler_add(ECORE_WIN32_EVENT_KEY_UP, _ecore_evas_win32_event_key_up, NULL);
- ecore_evas_event_handlers[2] = ecore_event_handler_add(ECORE_WIN32_EVENT_MOUSE_BUTTON_DOWN, _ecore_evas_win32_event_mouse_button_down, NULL);
- ecore_evas_event_handlers[3] = ecore_event_handler_add(ECORE_WIN32_EVENT_MOUSE_BUTTON_UP, _ecore_evas_win32_event_mouse_button_up, NULL);
- ecore_evas_event_handlers[4] = ecore_event_handler_add(ECORE_WIN32_EVENT_MOUSE_WHEEL, _ecore_evas_win32_event_mouse_wheel, NULL);
- ecore_evas_event_handlers[5] = ecore_event_handler_add(ECORE_WIN32_EVENT_MOUSE_MOVE, _ecore_evas_win32_event_mouse_move, NULL);
- ecore_evas_event_handlers[6] = ecore_event_handler_add(ECORE_WIN32_EVENT_MOUSE_IN, _ecore_evas_win32_event_mouse_in, NULL);
- ecore_evas_event_handlers[7] = ecore_event_handler_add(ECORE_WIN32_EVENT_MOUSE_OUT, _ecore_evas_win32_event_mouse_out, NULL);
- ecore_evas_event_handlers[8] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_DAMAGE, _ecore_evas_win32_event_window_damage, NULL);
- ecore_evas_event_handlers[9] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_DESTROY, _ecore_evas_win32_event_window_destroy, NULL);
- ecore_evas_event_handlers[10] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_SHOW, _ecore_evas_win32_event_window_show, NULL);
- ecore_evas_event_handlers[11] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_HIDE, _ecore_evas_win32_event_window_hide, NULL);
- ecore_evas_event_handlers[12] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_CONFIGURE, _ecore_evas_win32_event_window_configure, NULL);
- ecore_evas_event_handlers[13] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_DELETE_REQUEST, _ecore_evas_win32_event_window_delete_request, NULL);
-
+ ecore_evas_event_handlers[0] = ecore_event_handler_add(ECORE_WIN32_EVENT_MOUSE_IN, _ecore_evas_win32_event_mouse_in, NULL);
+ ecore_evas_event_handlers[1] = ecore_event_handler_add(ECORE_WIN32_EVENT_MOUSE_OUT, _ecore_evas_win32_event_mouse_out, NULL);
+ ecore_evas_event_handlers[2] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_FOCUS_IN, _ecore_evas_win32_event_window_focus_in, NULL);
+ ecore_evas_event_handlers[3] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_FOCUS_OUT, _ecore_evas_win32_event_window_focus_out, NULL);
+ ecore_evas_event_handlers[4] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_DAMAGE, _ecore_evas_win32_event_window_damage, NULL);
+ ecore_evas_event_handlers[5] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_DESTROY, _ecore_evas_win32_event_window_destroy, NULL);
+ ecore_evas_event_handlers[6] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_SHOW, _ecore_evas_win32_event_window_show, NULL);
+ ecore_evas_event_handlers[7] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_HIDE, _ecore_evas_win32_event_window_hide, NULL);
+ ecore_evas_event_handlers[8] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_CONFIGURE, _ecore_evas_win32_event_window_configure, NULL);
+ ecore_evas_event_handlers[9] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_DELETE_REQUEST, _ecore_evas_win32_event_window_delete_request, NULL);
+
+ ecore_event_evas_init();
return _ecore_evas_init_count;
}
_ecore_evas_init_count--;
if (_ecore_evas_init_count == 0)
{
- int i;
+ int i;
- while (ecore_evases) _ecore_evas_free(ecore_evases);
- for (i = 0; i < ECORE_EVAS_EVENT_COUNT; i++)
- ecore_event_handler_del(ecore_evas_event_handlers[i]);
- ecore_idle_enterer_del(ecore_evas_idle_enterer);
- ecore_evas_idle_enterer = NULL;
+ for (i = 0; i < ECORE_EVAS_EVENT_COUNT; i++)
+ ecore_event_handler_del(ecore_evas_event_handlers[i]);
+ ecore_event_evas_shutdown();
}
if (_ecore_evas_init_count < 0) _ecore_evas_init_count = 0;
return _ecore_evas_init_count;
}
-static char *
-_ecore_evas_win32_winid_str_get(Ecore_Win32_Window *window)
-{
- static char id[9];
- const char *vals = "qWeRtYuIoP5-$&<~";
- unsigned int val;
-
- val = (unsigned int)window;
- id[0] = vals[(val >> 28) & 0xf];
- id[1] = vals[(val >> 24) & 0xf];
- id[2] = vals[(val >> 20) & 0xf];
- id[3] = vals[(val >> 16) & 0xf];
- id[4] = vals[(val >> 12) & 0xf];
- id[5] = vals[(val >> 8) & 0xf];
- id[6] = vals[(val >> 4) & 0xf];
- id[7] = vals[(val ) & 0xf];
- id[8] = 0;
-
- return id;
-}
-
-static Ecore_Evas *
-_ecore_evas_win32_match(Ecore_Win32_Window *window)
-{
- Ecore_Evas *ee;
-
- ee = evas_hash_find(ecore_evases_hash, _ecore_evas_win32_winid_str_get(window));
-
- return ee;
-}
-
-static int
-_ecore_evas_win32_event_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
+static Eina_Bool
+_ecore_evas_win32_event_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
- Ecore_Win32_Event_Key_Down *e;
-
- e = event;
- ee = _ecore_evas_win32_match(e->window);
- if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
- /* FIXME to do */
-/* _ecore_evas_x_modifier_locks_update(ee, e->modifiers); */
- evas_event_feed_key_down(ee->evas, e->keyname, e->keysymbol, e->keycompose, NULL, e->time, NULL);
-
- return 1;
-}
+ Ecore_Win32_Event_Mouse_In *e;
-static int
-_ecore_evas_win32_event_key_up(void *data __UNUSED__, int type __UNUSED__, void *event)
-{
- Ecore_Evas *ee;
- Ecore_Win32_Event_Key_Up *e;
+ INF("mouse in");
e = event;
- ee = _ecore_evas_win32_match(e->window);
+ ee = ecore_event_window_match((Ecore_Window)e->window);
if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
- /* FIXME to do */
-/* _ecore_evas_x_modifier_locks_update(ee, e->modifiers); */
- evas_event_feed_key_up(ee->evas, e->keyname, e->keysymbol, e->keycompose, NULL, e->time, NULL);
+ if ((Ecore_Window)e->window != ee->prop.window) return 1;
- return 1;
-}
-
-static int
-_ecore_evas_win32_event_mouse_button_down(void *data __UNUSED__, int type __UNUSED__, void *event)
-{
- Ecore_Evas *ee;
- Ecore_Win32_Event_Mouse_Button_Down *e;
- Evas_Button_Flags flags = EVAS_BUTTON_NONE;
-
- e = event;
- ee = _ecore_evas_win32_match(e->window);
- if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
- if (e->window != ee->engine.win32.window) return 1;
+ if (ee->func.fn_mouse_in) ee->func.fn_mouse_in(ee);
/* FIXME to do */
/* _ecore_evas_x_modifier_locks_update(ee, e->modifiers); */
- if (e->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
- 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);
+ evas_event_feed_mouse_in(ee->evas, e->timestamp, NULL);
+ evas_focus_in(ee->evas);
+ _ecore_evas_mouse_move_process(ee, e->x, e->y, e->timestamp);
return 1;
}
-static int
-_ecore_evas_win32_event_mouse_button_up(void *data __UNUSED__, int type __UNUSED__, void *event)
+static Eina_Bool
+_ecore_evas_win32_event_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *event)
{
- Ecore_Evas *ee;
- Ecore_Win32_Event_Mouse_Button_Up *e;
- Evas_Button_Flags flags = EVAS_BUTTON_NONE;
-
- printf (" * ee event button up 0 \n");
- e = event;
- ee = _ecore_evas_win32_match(e->window);
- if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
- if (e->window != ee->engine.win32.window) return 1;
- /* FIXME to do */
-/* _ecore_evas_x_modifier_locks_update(ee, e->modifiers); */
- if (e->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
- 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;
-}
+ Ecore_Evas *ee;
+ Ecore_Win32_Event_Mouse_Out *e;
-static int
-_ecore_evas_win32_event_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event)
-{
- Ecore_Evas *ee;
- Ecore_Win32_Event_Mouse_Wheel *e;
+ INF("mouse out");
e = event;
- ee = _ecore_evas_win32_match(e->window);
+ ee = ecore_event_window_match((Ecore_Window)e->window);
if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
- if (e->window != ee->engine.win32.window) return 1;
- /* FIXME to do */
-/* _ecore_evas_x_modifier_locks_update(ee, e->modifiers); */
- evas_event_feed_mouse_wheel(ee->evas, e->direction, e->z, e->time, NULL);
-
- return 1;
-}
-
-static void
-_ecore_evas_win32_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned int timestamp)
-{
- ee->mouse.x = x;
- ee->mouse.y = y;
- if (ee->prop.cursor.object)
- {
- evas_object_show(ee->prop.cursor.object);
- if (ee->rotation == 0)
- evas_object_move(ee->prop.cursor.object,
- x - ee->prop.cursor.hot.x,
- y - ee->prop.cursor.hot.y);
- else if (ee->rotation == 90)
- evas_object_move(ee->prop.cursor.object,
- ee->h - y - 1 - ee->prop.cursor.hot.x,
- x - ee->prop.cursor.hot.y);
- else if (ee->rotation == 180)
- evas_object_move(ee->prop.cursor.object,
- ee->w - x - 1 - ee->prop.cursor.hot.x,
- ee->h - y - 1 - ee->prop.cursor.hot.y);
- else if (ee->rotation == 270)
- evas_object_move(ee->prop.cursor.object,
- y - ee->prop.cursor.hot.x,
- ee->w - x - 1 - ee->prop.cursor.hot.y);
- }
- if (ee->rotation == 0)
- evas_event_feed_mouse_move(ee->evas, x, y, timestamp, NULL);
- else if (ee->rotation == 90)
- evas_event_feed_mouse_move(ee->evas, ee->h - y - 1, x, timestamp, NULL);
- else if (ee->rotation == 180)
- evas_event_feed_mouse_move(ee->evas, ee->w - x - 1, ee->h - y - 1, timestamp, NULL);
- else if (ee->rotation == 270)
- evas_event_feed_mouse_move(ee->evas, y, ee->w - x - 1, timestamp, NULL);
-}
-
-static int
-_ecore_evas_win32_event_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event)
-{
- Ecore_Evas *ee;
- Ecore_Win32_Event_Mouse_Move *e;
+ if ((Ecore_Window)e->window != ee->prop.window) return 1;
- e = event;
- ee = _ecore_evas_win32_match(e->window);
- if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
- if (e->window != ee->engine.win32.window) return 1;
/* FIXME to do */
/* _ecore_evas_x_modifier_locks_update(ee, e->modifiers); */
- _ecore_evas_win32_mouse_move_process(ee, e->x, e->y, e->time);
+ _ecore_evas_mouse_move_process(ee, e->x, e->y, e->timestamp);
+
+ evas_event_feed_mouse_out(ee->evas, e->timestamp, NULL);
+ if (ee->func.fn_mouse_out) ee->func.fn_mouse_out(ee);
+ if (ee->prop.cursor.object) evas_object_hide(ee->prop.cursor.object);
return 1;
}
-static int
-_ecore_evas_win32_event_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *event)
+static Eina_Bool
+_ecore_evas_win32_event_window_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event)
{
- Ecore_Evas *ee;
- Ecore_Win32_Event_Mouse_In *e;
+ Ecore_Evas *ee;
+ Ecore_Win32_Event_Window_Focus_In *e;
e = event;
- ee = _ecore_evas_win32_match(e->window);
- if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
- if (e->window != ee->engine.win32.window) return 1;
-
- if (ee->func.fn_mouse_in) ee->func.fn_mouse_in(ee);
- /* FIXME to do */
-/* _ecore_evas_x_modifier_locks_update(ee, e->modifiers); */
- evas_event_feed_mouse_in(ee->evas, e->time, NULL);
- _ecore_evas_win32_mouse_move_process(ee, e->x, e->y, e->time);
-
- return 1;
+ ee = ecore_event_window_match((Ecore_Window)e->window);
+ if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
+ if ((Ecore_Window)e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+
+ ee->prop.focused = 1;
+ evas_focus_in(ee->evas);
+ if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
+ return ECORE_CALLBACK_PASS_ON;
}
-static int
-_ecore_evas_win32_event_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *event)
+static Eina_Bool
+_ecore_evas_win32_event_window_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event)
{
- Ecore_Evas *ee;
- Ecore_Win32_Event_Mouse_Out *e;
+ Ecore_Evas *ee;
+ Ecore_Win32_Event_Window_Focus_Out *e;
e = event;
- ee = _ecore_evas_win32_match(e->window);
- if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
- if (e->window != ee->engine.win32.window) return 1;
-
- /* FIXME to do */
-/* _ecore_evas_x_modifier_locks_update(ee, e->modifiers); */
- _ecore_evas_win32_mouse_move_process(ee, e->x, e->y, e->time);
-
- evas_event_feed_mouse_out(ee->evas, e->time, NULL);
- if (ee->func.fn_mouse_out) ee->func.fn_mouse_out(ee);
- if (ee->prop.cursor.object) evas_object_hide(ee->prop.cursor.object);
-
- return 1;
+ ee = ecore_event_window_match((Ecore_Window)e->window);
+ if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
+ if ((Ecore_Window)e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+
+ evas_focus_out(ee->evas);
+ ee->prop.focused = 0;
+ if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
+ return ECORE_CALLBACK_PASS_ON;
}
-static int
+static Eina_Bool
_ecore_evas_win32_event_window_damage(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_Win32_Event_Window_Damage *e;
+ INF("window damage");
+
e = event;
- ee = _ecore_evas_win32_match(e->window);
+ ee = ecore_event_window_match((Ecore_Window)e->window);
if (!ee) return 1; /* pass on event */
- if (e->window != ee->engine.win32.window) return 1;
+ if ((Ecore_Window)e->window != ee->prop.window) return 1;
if (ee->prop.avoid_damage)
{
}
else
{
- printf (" * ee window event damage\n");
if (ee->rotation == 0)
evas_damage_rectangle_add(ee->evas,
e->x,
return 1;
}
-static int
+static Eina_Bool
_ecore_evas_win32_event_window_destroy(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_Win32_Event_Window_Destroy *e;
+ INF("window destroy");
+
e = event;
- ee = _ecore_evas_win32_match(e->window);
+ ee = ecore_event_window_match((Ecore_Window)e->window);
if (!ee) return 1; /* pass on event */
- if (e->window != ee->engine.win32.window) return 1;
+ if ((Ecore_Window)e->window != ee->prop.window) return 1;
if (ee->func.fn_destroy) ee->func.fn_destroy(ee);
ecore_evas_free(ee);
- printf (" * ee event destroy\n");
return 1;
}
-static int
+static Eina_Bool
_ecore_evas_win32_event_window_show(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_Win32_Event_Window_Show *e;
- printf (" * ee window event show\n");
+ INF("window show");
+
e = event;
- ee = _ecore_evas_win32_match(e->window);
+ ee = ecore_event_window_match((Ecore_Window)e->window);
if (!ee) return 1; /* pass on event */
- if (e->window != ee->engine.win32.window) return 1;
+ if ((Ecore_Window)e->window != ee->prop.window) return 1;
if (ee->visible) return 0; /* dont pass it on */
ee->visible = 1;
if (ee->func.fn_show) ee->func.fn_show(ee);
return 1;
}
-static int
+static Eina_Bool
_ecore_evas_win32_event_window_hide(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_Win32_Event_Window_Hide *e;
+ INF("window hide");
+
e = event;
- ee = _ecore_evas_win32_match(e->window);
+ ee = ecore_event_window_match((Ecore_Window)e->window);
if (!ee) return 1; /* pass on event */
- if (e->window != ee->engine.win32.window) return 1;
+ if ((Ecore_Window)e->window != ee->prop.window) return 1;
if (!ee->visible) return 0; /* dont pass it on */
ee->visible = 0;
if (ee->func.fn_hide) ee->func.fn_hide(ee);
return 1;
}
-static int
+static Eina_Bool
_ecore_evas_win32_event_window_configure(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_Win32_Event_Window_Configure *e;
+ INF("window configure");
+
e = event;
- ee = _ecore_evas_win32_match(e->window);
+ ee = ecore_event_window_match((Ecore_Window)e->window);
if (!ee) return 1; /* pass on event */
- if (e->window != ee->engine.win32.window) return 1;
+ if ((Ecore_Window)e->window != ee->prop.window) return 1;
- if ((ee->x != e->x) || (ee->y != e->y))
+ if (ee->prop.override)
{
- ee->x = e->x;
- ee->y = e->y;
- if (ee->func.fn_move) ee->func.fn_move(ee);
+ if ((ee->x != e->x) || (ee->y != e->y))
+ {
+ ee->x = e->x;
+ ee->y = e->y;
+ ee->req.x = ee->x;
+ ee->req.y = ee->y;
+
+ if (ee->func.fn_move) ee->func.fn_move(ee);
+ }
}
if ((ee->w != e->width) || (ee->h != e->height))
{
- printf (" * ee resize : 1\n");
ee->w = e->width;
ee->h = e->height;
+ ee->req.w = ee->w;
+ ee->req.h = ee->h;
+
if ((ee->rotation == 90) || (ee->rotation == 270))
{
evas_output_size_set(ee->evas, ee->h, ee->w);
}
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);
}
if (ee->prop.avoid_damage)
{
+ int pdam;
+
+ pdam = ecore_evas_avoid_damage_get(ee);
ecore_evas_avoid_damage_set(ee, 0);
- ecore_evas_avoid_damage_set(ee, 1);
+ ecore_evas_avoid_damage_set(ee, pdam);
}
- /* FIXME: to do... */
-/* if (ee->shaped) */
-/* _ecore_evas_x_resize_shape(ee); */
+/* if (ee->shaped) */
+/* _ecore_evas_win32_region_border_resize(ee); */
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,
- ecore_win32_current_time_get());
+ _ecore_evas_mouse_move_process(ee, ee->mouse.x, ee->mouse.y,
+ ecore_win32_current_time_get());
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);
}
return 1;
}
-static int
+static Eina_Bool
_ecore_evas_win32_event_window_delete_request(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Evas *ee;
Ecore_Win32_Event_Window_Delete_Request *e;
+ INF("window delete request");
+
e = event;
- ee = _ecore_evas_win32_match(e->window);
+ ee = ecore_event_window_match((Ecore_Window)e->window);
if (!ee) return 1; /* pass on event */
- if (e->window != ee->engine.win32.window) return 1;
+ if ((Ecore_Window)e->window != ee->prop.window) return 1;
if (ee->func.fn_delete_request) ee->func.fn_delete_request(ee);
- printf (" * ee event delete\n");
+ INF(" * ee event delete\n");
return 1;
}
static void
_ecore_evas_win32_free(Ecore_Evas *ee)
{
- ecore_win32_window_del(ee->engine.win32.window);
- ecore_evases_hash = evas_hash_del(ecore_evases_hash, _ecore_evas_win32_winid_str_get(ee->engine.win32.window), ee);
- ecore_evases = _ecore_list2_remove(ecore_evases, ee);
+ INF("ecore evas free");
+
+ ecore_win32_window_free((struct _Ecore_Win32_Window *)ee->prop.window);
+ ecore_event_window_unregister(ee->prop.window);
_ecore_evas_win32_shutdown();
ecore_win32_shutdown();
}
static void
_ecore_evas_win32_callback_delete_request_set(Ecore_Evas *ee,
- void (*func) (Ecore_Evas *ee))
+ Ecore_Evas_Event_Cb func)
{
ee->func.fn_delete_request = func;
}
static void
_ecore_evas_win32_move(Ecore_Evas *ee, int x, int y)
{
+ INF("ecore evas move (%dx%d)", x, y);
+ ee->req.x = x;
+ ee->req.y = y;
+
if ((x != ee->x) || (y != ee->y))
{
ee->x = x;
ee->y = y;
- ecore_win32_window_move(ee->engine.win32.window, x, y);
+ ecore_win32_window_move((struct _Ecore_Win32_Window *)ee->prop.window,
+ x, y);
if (ee->func.fn_move) ee->func.fn_move(ee);
}
}
static void
_ecore_evas_win32_resize(Ecore_Evas *ee, int width, int height)
{
- printf (" * _ecore_evas_win32_resize %d %d\n", width, height);
+ INF("ecore evas resize (%dx%d)", width, height);
+ ee->req.w = width;
+ ee->req.h = height;
+
if ((ee->w != width) || (ee->h != height))
{
ee->w = width;
ee->h = height;
- ecore_win32_window_resize(ee->engine.win32.window, width, height);
+ ecore_win32_window_resize((struct _Ecore_Win32_Window *)ee->prop.window,
+ width, height);
if ((ee->rotation == 90) || (ee->rotation == 270))
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
}
- /* FIXME: damage and shape */
+ if (ee->prop.avoid_damage)
+ {
+ int pdam;
+ pdam = ecore_evas_avoid_damage_get(ee);
+ ecore_evas_avoid_damage_set(ee, 0);
+ ecore_evas_avoid_damage_set(ee, pdam);
+ }
+/* if ((ee->shaped) || (ee->alpha)) */
+/* _ecore_evas_win32_region_border_resize(ee); */
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
}
static void
_ecore_evas_win32_move_resize(Ecore_Evas *ee, int x, int y, int width, int height)
{
- printf (" * _ecore_evas_win32_resize\n");
+ INF("ecore evas resize (%dx%d %dx%d)", x, y, width, height);
+ ee->req.x = x;
+ ee->req.y = y;
+ ee->req.w = width;
+ ee->req.h = height;
+
if ((ee->w != width) || (ee->h != height) || (x != ee->x) || (y != ee->y))
{
int change_size = 0;
ee->y = y;
ee->w = width;
ee->h = height;
- ecore_win32_window_move_resize(ee->engine.win32.window, x, y, width, height);
+ ecore_win32_window_move_resize((struct _Ecore_Win32_Window *)ee->prop.window,
+ x, y, width, height);
if ((ee->rotation == 90) || (ee->rotation == 270))
{
evas_output_size_set(ee->evas, ee->h, ee->w);
evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
}
- /* FIXME: damage and shape */
+ if (ee->prop.avoid_damage)
+ {
+ int pdam;
+
+ pdam = ecore_evas_avoid_damage_get(ee);
+ ecore_evas_avoid_damage_set(ee, 0);
+ ecore_evas_avoid_damage_set(ee, pdam);
+ }
+/* if ((ee->shaped) || (ee->alpha)) */
+/* _ecore_evas_win32_region_border_resize(ee); */
if (change_pos)
{
if (ee->func.fn_move) ee->func.fn_move(ee);
}
static void
-_ecore_evas_win32_rotation_set(Ecore_Evas *ee, int rotation)
+_ecore_evas_win32_rotation_set_internal(Ecore_Evas *ee, int rotation)
{
int rot_dif;
- if (ee->rotation == rotation) return;
rot_dif = ee->rotation - rotation;
if (rot_dif < 0) rot_dif = -rot_dif;
- if (!strcmp(ee->driver, "software_ddraw"))
+ if (rot_dif != 180)
+ {
+ int minw, minh, maxw, maxh, basew, baseh, stepw, steph;
+
+ if (!ee->prop.fullscreen)
+ {
+ ecore_win32_window_resize((struct _Ecore_Win32_Window *)ee->prop.window,
+ ee->h, ee->w);
+ ee->expecting_resize.w = ee->h;
+ ee->expecting_resize.h = ee->w;
+ }
+ else
+ {
+ int w, h;
+
+ ecore_win32_window_size_get((struct _Ecore_Win32_Window *)ee->prop.window,
+ &w, &h);
+ ecore_win32_window_resize((struct _Ecore_Win32_Window *)ee->prop.window,
+ h, w);
+ if ((rotation == 0) || (rotation == 180))
+ {
+ evas_output_size_set(ee->evas, ee->w, ee->h);
+ evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
+ }
+ else
+ {
+ evas_output_size_set(ee->evas, ee->h, ee->w);
+ evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
+ }
+ if (ee->func.fn_resize) ee->func.fn_resize(ee);
+ }
+ ecore_evas_size_min_get(ee, &minw, &minh);
+ ecore_evas_size_max_get(ee, &maxw, &maxh);
+ ecore_evas_size_base_get(ee, &basew, &baseh);
+ ecore_evas_size_step_get(ee, &stepw, &steph);
+ ee->rotation = rotation;
+ ecore_evas_size_min_set(ee, minh, minw);
+ ecore_evas_size_max_set(ee, maxh, maxw);
+ ecore_evas_size_base_set(ee, baseh, basew);
+ ecore_evas_size_step_set(ee, steph, stepw);
+ _ecore_evas_mouse_move_process(ee, ee->mouse.x, ee->mouse.y,
+ ecore_win32_current_time_get());
+ }
+ else
+ {
+ ee->rotation = rotation;
+ _ecore_evas_mouse_move_process(ee, ee->mouse.x, ee->mouse.y,
+ ecore_win32_current_time_get());
+ if (ee->func.fn_resize) ee->func.fn_resize(ee);
+ }
+
+ if ((ee->rotation == 90) || (ee->rotation == 270))
+ evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
+ else
+ evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
+}
+
+static void
+_ecore_evas_win32_rotation_set(Ecore_Evas *ee, int rotation, int resize)
+{
+ INF("ecore evas rotation: %s", rotation ? "yes" : "no");
+
+ if (ee->rotation == rotation) return;
+
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_GDI
+ if (!strcmp(ee->driver, "software_gdi"))
{
+ Evas_Engine_Info_Software_Gdi *einfo;
+
+ einfo = (Evas_Engine_Info_Software_Gdi *)evas_engine_info_get(ee->evas);
+ if (!einfo) return;
+ einfo->info.rotation = rotation;
+ if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+ {
+ ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
+ }
+ _ecore_evas_win32_rotation_set_internal(ee, rotation);
+ }
+#endif /* BUILD_ECORE_EVAS_SOFTWARE_GDI */
+
#ifdef BUILD_ECORE_EVAS_SOFTWARE_DDRAW
- Evas_Engine_Info_Software_DDraw *einfo;
-
- einfo = (Evas_Engine_Info_Software_DDraw *)evas_engine_info_get(ee->evas);
- if (!einfo) return;
- if (rot_dif != 180)
- {
- int minw, minh, maxw, maxh, basew, baseh, stepw, steph;
-
- einfo->info.rotation = rotation;
- evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
- if (!ee->prop.fullscreen)
- {
- ecore_win32_window_resize(ee->engine.win32.window, ee->h, ee->w);
- ee->expecting_resize.w = ee->h;
- ee->expecting_resize.h = ee->w;
- }
- else
- {
- int w, h;
-
- ecore_win32_window_size_get(ee->engine.win32.window, &w, &h);
- ecore_win32_window_resize(ee->engine.win32.window, h, w);
- if ((rotation == 0) || (rotation == 180))
- {
- evas_output_size_set(ee->evas, ee->w, ee->h);
- evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
- }
- else
- {
- evas_output_size_set(ee->evas, ee->h, ee->w);
- evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
- }
- if (ee->func.fn_resize) ee->func.fn_resize(ee);
- }
- ecore_evas_size_min_get(ee, &minw, &minh);
- ecore_evas_size_max_get(ee, &maxw, &maxh);
- ecore_evas_size_base_get(ee, &basew, &baseh);
- ecore_evas_size_step_get(ee, &stepw, &steph);
- ee->rotation = rotation;
- ecore_evas_size_min_set(ee, minh, minw);
- ecore_evas_size_max_set(ee, maxh, maxw);
- ecore_evas_size_base_set(ee, baseh, basew);
- ecore_evas_size_step_set(ee, steph, stepw);
- _ecore_evas_win32_mouse_move_process(ee, ee->mouse.x, ee->mouse.y,
- ecore_win32_current_time_get());
- }
- else
- {
- einfo->info.rotation = rotation;
- evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
- ee->rotation = rotation;
- _ecore_evas_win32_mouse_move_process(ee, ee->mouse.x, ee->mouse.y,
- ecore_win32_current_time_get());
- if (ee->func.fn_resize) ee->func.fn_resize(ee);
- }
- if ((ee->rotation == 90) || (ee->rotation == 270))
- evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
- else
- evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
+ if (!strcmp(ee->driver, "software_ddraw"))
+ {
+ Evas_Engine_Info_Software_DDraw *einfo;
+
+ einfo = (Evas_Engine_Info_Software_DDraw *)evas_engine_info_get(ee->evas);
+ if (!einfo) return;
+ einfo->info.rotation = rotation;
+ if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+ {
+ ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
+ }
+ _ecore_evas_win32_rotation_set_internal(ee, rotation);
+ }
#endif /* BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
+}
+
+static void
+_ecore_evas_win32_shaped_set(Ecore_Evas *ee, int shaped)
+{
+ if (((ee->shaped) && (shaped)) || ((!ee->shaped) && (!shaped)))
+ return;
+
+ if (!strcmp(ee->driver, "software_ddraw")) return;
+
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_GDI
+ if (!strcmp(ee->driver, "software_gdi"))
+ {
+ Evas_Engine_Info_Software_Gdi *einfo;
+
+ einfo = (Evas_Engine_Info_Software_Gdi *)evas_engine_info_get(ee->evas);
+ ee->shaped = shaped;
+ if (einfo)
+ {
+ ee->engine.win32.state.region = ee->shaped;
+ einfo->info.region = ee->engine.win32.state.region;
+ if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+ {
+ ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
+ }
+ if (ee->shaped)
+ evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
+ }
+#endif /* BUILD_ECORE_EVAS_SOFTWARE_GDI */
}
}
static void
_ecore_evas_win32_show(Ecore_Evas *ee)
{
- printf (" * ee window show\n");
+ INF("ecore evas show");
+
ee->should_be_visible = 1;
if (ee->prop.avoid_damage)
_ecore_evas_win32_render(ee);
- ecore_win32_window_show(ee->engine.win32.window);
+ ecore_win32_window_show((struct _Ecore_Win32_Window *)ee->prop.window);
/* if (ee->prop.fullscreen) */
-/* ecore_win32_window_focus(ee->engine.win32.window); */
+/* ecore_win32_window_focus(ee->prop.window); */
}
static void
_ecore_evas_win32_hide(Ecore_Evas *ee)
{
- ecore_win32_window_hide(ee->engine.win32.window);
+ INF("ecore evas hide");
+
+ ecore_win32_window_hide((struct _Ecore_Win32_Window *)ee->prop.window);
ee->should_be_visible = 0;
}
static void
_ecore_evas_win32_raise(Ecore_Evas *ee)
{
+ INF("ecore evas raise");
+
if (!ee->prop.fullscreen)
- ecore_win32_window_raise(ee->engine.win32.window);
+ ecore_win32_window_raise((struct _Ecore_Win32_Window *)ee->prop.window);
else
- ecore_win32_window_raise(ee->engine.win32.window);
+ ecore_win32_window_raise((struct _Ecore_Win32_Window *)ee->prop.window);
}
static void
_ecore_evas_win32_lower(Ecore_Evas *ee)
{
+ INF("ecore evas lower");
+
if (!ee->prop.fullscreen)
- ecore_win32_window_lower(ee->engine.win32.window);
+ ecore_win32_window_lower((struct _Ecore_Win32_Window *)ee->prop.window);
else
- ecore_win32_window_lower(ee->engine.win32.window);
+ ecore_win32_window_lower((struct _Ecore_Win32_Window *)ee->prop.window);
}
static void
_ecore_evas_win32_activate(Ecore_Evas *ee)
{
- ecore_win32_window_focus_set(ee->engine.win32.window);
+ INF("ecore evas activate");
+
+ ecore_win32_window_focus((struct _Ecore_Win32_Window *)ee->prop.window);
}
static void
_ecore_evas_win32_title_set(Ecore_Evas *ee, const char *title)
{
+ INF("ecore evas title set");
+
if (ee->prop.title) free(ee->prop.title);
ee->prop.title = NULL;
if (title) ee->prop.title = strdup(title);
- ecore_win32_window_title_set(ee->engine.win32.window, ee->prop.title);
+ ecore_win32_window_title_set((struct _Ecore_Win32_Window *)ee->prop.window,
+ ee->prop.title);
}
static void
if ((ee->prop.min.w == width) && (ee->prop.min.h == height)) return;
ee->prop.min.w = width;
ee->prop.min.h = height;
- ecore_win32_window_size_min_set(ee->engine.win32.window, width, height);
+ ecore_win32_window_size_min_set((struct _Ecore_Win32_Window *)ee->prop.window,
+ width, height);
}
static void
if ((ee->prop.max.w == width) && (ee->prop.max.h == height)) return;
ee->prop.max.w = width;
ee->prop.max.h = height;
- ecore_win32_window_size_max_set(ee->engine.win32.window, width, height);
+ ecore_win32_window_size_max_set((struct _Ecore_Win32_Window *)ee->prop.window,
+ width, height);
}
static void
if ((ee->prop.base.w == width) && (ee->prop.base.h == height)) return;
ee->prop.base.w = width;
ee->prop.base.h = height;
- ecore_win32_window_size_base_set(ee->engine.win32.window, width, height);
+ ecore_win32_window_size_base_set((struct _Ecore_Win32_Window *)ee->prop.window,
+ width, height);
}
static void
if ((ee->prop.step.w == width) && (ee->prop.step.h == height)) return;
ee->prop.step.w = width;
ee->prop.step.h = height;
- ecore_win32_window_size_step_set(ee->engine.win32.window, width, height);
+ ecore_win32_window_size_step_set((struct _Ecore_Win32_Window *)ee->prop.window,
+ width, height);
}
static void
if (obj == NULL)
{
- ee->prop.cursor.object = NULL;
- ee->prop.cursor.layer = 0;
- ee->prop.cursor.hot.x = 0;
- ee->prop.cursor.hot.y = 0;
- ecore_win32_window_cursor_show(ee->engine.win32.window, 1);
- return;
+ ee->prop.cursor.object = NULL;
+ ee->prop.cursor.layer = 0;
+ ee->prop.cursor.hot.x = 0;
+ ee->prop.cursor.hot.y = 0;
+ ecore_win32_window_cursor_show(ee->prop.window, 1);
+ return;
}
ee->prop.cursor.object = obj;
ee->prop.cursor.hot.x = hot_x;
ee->prop.cursor.hot.y = hot_y;
- ecore_win32_window_cursor_show(ee->engine.win32.window, 0);
+ ecore_win32_window_cursor_show(ee->prop.window, 0);
evas_pointer_output_xy_get(ee->evas, &x, &y);
evas_object_layer_set(ee->prop.cursor.object, ee->prop.cursor.layer);
evas_object_move(ee->prop.cursor.object,
- x - ee->prop.cursor.hot.x,
- y - ee->prop.cursor.hot.y);
+ x - ee->prop.cursor.hot.x,
+ y - ee->prop.cursor.hot.y);
evas_object_pass_events_set(ee->prop.cursor.object, 1);
if (evas_pointer_inside_get(ee->evas))
evas_object_show(ee->prop.cursor.object);
static void
_ecore_evas_win32_focus_set(Ecore_Evas *ee, int on __UNUSED__)
{
- ecore_win32_window_focus_set(ee->engine.win32.window);
+ ecore_win32_window_focus((struct _Ecore_Win32_Window *)ee->prop.window);
}
static void
/* if (((ee->prop.borderless) && (on)) || */
/* ((!ee->prop.borderless) && (!on))) return; */
ee->prop.iconified = on;
- ecore_win32_window_iconified_set(ee->engine.win32.window, ee->prop.iconified);
+ ecore_win32_window_iconified_set((struct _Ecore_Win32_Window *)ee->prop.window,
+ ee->prop.iconified);
}
static void
if (((ee->prop.borderless) && (on)) ||
((!ee->prop.borderless) && (!on))) return;
ee->prop.borderless = on;
- ecore_win32_window_borderless_set(ee->engine.win32.window, ee->prop.borderless);
+ ecore_win32_window_borderless_set((struct _Ecore_Win32_Window *)ee->prop.window,
+ ee->prop.borderless);
+
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_GDI
+ if (!strcmp(ee->driver, "software_gdi"))
+ {
+ Evas_Engine_Info_Software_Gdi *einfo;
+
+ einfo = (Evas_Engine_Info_Software_Gdi *)evas_engine_info_get(ee->evas);
+ if (einfo)
+ {
+ einfo->info.borderless = ee->prop.borderless;
+ if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+ {
+ ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
+ }
+ if (ee->prop.borderless)
+ evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
+ }
+ }
+#endif /* BUILD_ECORE_EVAS_SOFTWARE_GDI */
+}
+
+static void
+_ecore_evas_win32_override_set(Ecore_Evas *ee, int on)
+{
+ struct _Ecore_Win32_Window *window;
+
+ INF("ecore evas override set");
+
+ window = (struct _Ecore_Win32_Window *)ee->prop.window;
+
+ if (ee->prop.override == on) return;
+ if (ee->should_be_visible) ecore_win32_window_hide(window);
+ /* FIXME: use borderless_set for now */
+ ecore_win32_window_borderless_set(window, on);
+ if (ee->should_be_visible) ecore_win32_window_show(window);
+ if (ee->prop.focused) ecore_win32_window_focus(window);
+ ee->prop.override = on;
}
static void
_ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, int on)
{
- if ((ee->prop.fullscreen && on) ||
- (!ee->prop.fullscreen && !on)) return;
+ struct _Ecore_Win32_Window *window;
+
+ INF("ecore evas fullscreen set");
+
+ if ((ee->engine.win32.state.fullscreen && on) ||
+ (!ee->engine.win32.state.fullscreen && !on))
+ return;
ee->engine.win32.state.fullscreen = on;
- ecore_win32_window_fullscreen_set(ee->engine.win32.window, ee->prop.borderless);
- /* FIXME: what to do with that code ?? */
-/* if (ee->should_be_visible) */
-/* ecore_x_netwm_state_request_send(ee->engine.x.win, ee->engine.x.win_root, */
-/* ECORE_X_WINDOW_STATE_FULLSCREEN, -1, on); */
-/* else */
-/* _ecore_evas_win32_state_update(ee); */
+ ee->prop.fullscreen = on;
+
+ window = (struct _Ecore_Win32_Window *)ee->prop.window;
+
+ if (on != 0)
+ {
+ ecore_win32_window_fullscreen_set(window, on);
+ }
+ else
+ {
+ ecore_win32_window_fullscreen_set(window, on);
+ }
+
+ /* Nothing to be done for the GDI backend at the evas level */
+
+#ifdef BUILD_ECORE_EVAS_SOFTWRE_DDRAW
+ if (strcmp(ee->driver, "software_ddraw") == 0)
+ {
+ Evas_Engine_Info_Software_DDraw *einfo;
+
+ einfo = (Evas_Engine_Info_Software_DDraw *)evas_engine_info_get(ecore_evas_get(ee));
+ if (einfo)
+ {
+ einfo->info.fullscreen = !!on;
+/* einfo->info.layered = window->shape.layered; */
+ if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+ {
+ ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
+ }
+ }
+ }
+#endif /* BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
+
+#ifdef BUILD_ECORE_EVAS_DIRECT3D
+ if (strcmp(ee->driver, "direct3d") == 0)
+ {
+ Evas_Engine_Info_Direct3D *einfo;
+
+ einfo = (Evas_Engine_Info_Direct3D *)evas_engine_info_get(ecore_evas_get(ee));
+ if (einfo)
+ {
+ einfo->info.fullscreen = !!on;
+ einfo->info.layered = window->shape.layered;
+ if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+ {
+ ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
+ }
+ }
+ }
+#endif /* BUILD_ECORE_EVAS_DIRECT3D */
}
+static void
+_ecore_evas_win32_alpha_set(Ecore_Evas *ee, int alpha)
+{
+ alpha = !!alpha;
+ if ((ee->alpha == alpha)) return;
-#endif /* BUILD_ECORE_EVAS_WIN32 */
+ if (!strcmp(ee->driver, "software_gdi"))
+ {
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_GDI
+ Evas_Engine_Info_Software_Gdi *einfo;
+
+ einfo = (Evas_Engine_Info_Software_Gdi *)evas_engine_info_get(ee->evas);
+ if (!einfo) return;
+
+ ee->shaped = 0;
+ ee->alpha = alpha;
+ /* ecore_win32_window_free(ee->prop.window); */
+ /* ecore_event_window_unregister(ee->prop.window); */
+ /* if (ee->alpha) */
+ /* { */
+ /* if (ee->prop.override) */
+ /* ee->prop.window = ecore_x_window_override_argb_new(ee->engine.x.win_root, ee->req.x, ee->req.y, ee->req.w, ee->req.h); */
+ /* else */
+ /* ee->prop.window = ecore_x_window_argb_new(ee->engine.x.win_root, ee->req.x, ee->req.y, ee->req.w, ee->req.h); */
+ /* if (!ee->engine.x.mask) */
+ /* ee->engine.x.mask = ecore_x_pixmap_new(ee->prop.window, ee->req.w, ee->req.h, 1); */
+ /* } */
+ /* else */
+ /* { */
+ /* if (ee->prop.override) */
+ /* ee->prop.window = ecore_win32_window_override_new(ee->engine.win32.win_root, */
+ /* ee->req.x, */
+ /* ee->req.y, */
+ /* ee->req.w, */
+ /* ee->req.h); */
+ /* else */
+ /* ee->prop.window = ecore_win32_window_new(ee->engine.win32.win_root, */
+ /* ee->req.x, */
+ /* ee->req.y, */
+ /* ee->req.w, */
+ /* ee->req.h); */
+ /* if (ee->engine.win32.mask) ecore_x_pixmap_free(ee->engine.x.mask); */
+ /* ee->engine.win32.mask = 0; */
+ /* ecore_win32_window_shape_input_mask_set(ee->prop.window, 0); */
+ /* } */
+
+ /* einfo->info.destination_alpha = alpha; */
+ einfo->info.region = alpha;
+
+// if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
+// ee->engine.x.mask = 0;
+ /* einfo->info.mask = ee->engine.win32.mask; */
+ /* einfo->info.drawable = ee->prop.window; */
+ if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+ {
+ ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
+ }
+ evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.w, ee->req.h);
+ /* ecore_win32_window_shape_mask_set(ee->prop.window, 0); */
+ /* ecore_event_window_register(ee->prop.window, ee, ee->evas, */
+ /* (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process, */
+ /* (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process, */
+ /* (Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process, */
+ /* (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process); */
+ if (ee->prop.borderless)
+ ecore_win32_window_borderless_set((struct _Ecore_Win32_Window *)ee->prop.window, ee->prop.borderless);
+ if (ee->visible) ecore_win32_window_show((struct _Ecore_Win32_Window *)ee->prop.window);
+ if (ee->prop.focused) ecore_win32_window_focus((struct _Ecore_Win32_Window *)ee->prop.window);
+ if (ee->prop.title)
+ {
+ ecore_win32_window_title_set((struct _Ecore_Win32_Window *)ee->prop.window, ee->prop.title);
+ /* ecore_win32_name_set(ee->prop.window, ee->prop.title); */
+ }
+ ecore_win32_window_type_set((struct _Ecore_Win32_Window *)ee->prop.window, ECORE_WIN32_WINDOW_TYPE_NORMAL);
+#endif /* BUILD_ECORE_EVAS_SOFTWARE_GDI */
+ }
+}
-static void *
-_ecore_evas_win32_window_get(Ecore_Evas *ee)
+static void
+_ecore_evas_win32_screen_dpi_get(const Ecore_Evas *ee, int *xdpi, int *ydpi)
{
-#ifdef BUILD_ECORE_EVAS_WIN32
- return ee->engine.win32.window;
-#else
- return NULL;
-#endif /* BUILD_ECORE_EVAS_WIN32 */
+ HDC dc;
+
+ dc = GetDC(NULL);
+ if (!dc)
+ {
+ if (xdpi) *xdpi = 0;
+ if (ydpi) *ydpi = 0;
+ return;
+ }
+
+ if (xdpi) *xdpi = GetDeviceCaps(dc, LOGPIXELSX);
+ if (ydpi) *ydpi = GetDeviceCaps(dc, LOGPIXELSY);
+
+ /*
+ * Alternative (to test)
+ int width_mm;
+ int height_mm;
+ int width_px;
+ int height_px;
+
+ width_mm = GetDeviceCaps(dc, HORZSIZE);
+ height_mm = GetDeviceCaps(dc, VERTSIZE);
+ width_px = GetDeviceCaps(dc, HORZRES);
+ height_px = GetDeviceCaps(dc, VERTRES);
+
+ *xdpi = (width_px * 254) / (width_mm * 10);
+ *ydpi = (height_px * 254) / (height_mm * 10);
+
+ code with LOGPIXELS gives 96x96
+ code with the computation gives 101x77
+
+ */
+
+ ReleaseDC(NULL, dc);
}
-#ifdef BUILD_ECORE_EVAS_WIN32
-static const Ecore_Evas_Engine_Func _ecore_win32_engine_func =
+static Ecore_Evas_Engine_Func _ecore_win32_engine_func =
{
_ecore_evas_win32_free,
NULL,
_ecore_evas_win32_resize,
_ecore_evas_win32_move_resize,
_ecore_evas_win32_rotation_set,
- NULL, /* _ecore_evas_x_shaped_set */
+ _ecore_evas_win32_shaped_set,
_ecore_evas_win32_show,
_ecore_evas_win32_hide,
_ecore_evas_win32_raise,
_ecore_evas_win32_focus_set,
_ecore_evas_win32_iconified_set,
_ecore_evas_win32_borderless_set,
- NULL, /* _ecore_evas_x_override_set */
+ _ecore_evas_win32_override_set,
NULL,
_ecore_evas_win32_fullscreen_set,
NULL, /* _ecore_evas_x_avoid_damage_set */
NULL, /* _ecore_evas_x_withdrawn_set */
NULL, /* _ecore_evas_x_sticky_set */
NULL, /* _ecore_evas_x_ignore_events_set */
- NULL, /* _ecore_evas_x_alpha_set */
- _ecore_evas_win32_window_get
+ _ecore_evas_win32_alpha_set,
+ NULL, //transparent
+ NULL, // profiles_set
+
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+
+ NULL, // render
+ NULL, // screen_geometry_get
+ _ecore_evas_win32_screen_dpi_get
};
#endif /* BUILD_ECORE_EVAS_WIN32 */
/* API */
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_GDI
static int
-_ecore_evas_engine_software_ddraw_init(Ecore_Evas *ee)
+_ecore_evas_engine_software_gdi_init(Ecore_Evas *ee)
{
+ Evas_Engine_Info_Software_Gdi *einfo;
+ const char *driver;
+ int rmethod;
+
+ driver = "software_gdi";
+
+ rmethod = evas_render_method_lookup(driver);
+ if (!rmethod)
+ return 0;
+
+ ee->driver = driver;
+ evas_output_method_set(ee->evas, rmethod);
+
+ einfo = (Evas_Engine_Info_Software_Gdi *)evas_engine_info_get(ee->evas);
+ if (einfo)
+ {
+ /* FIXME: REDRAW_DEBUG missing for now */
+ einfo->info.window = ((struct _Ecore_Win32_Window *)ee->prop.window)->window;
+ einfo->info.depth = ecore_win32_screen_depth_get();
+ einfo->info.rotation = 0;
+ einfo->info.borderless = 0;
+ einfo->info.fullscreen = 0;
+ einfo->info.region = 0;
+ if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+ {
+ ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
+ return 0;
+ }
+ }
+ else
+ {
+ ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
+ return 0;
+ }
+
+ return 1;
+}
+#endif /* BUILD_ECORE_EVAS_SOFTWARE_GDI */
+
#ifdef BUILD_ECORE_EVAS_SOFTWARE_DDRAW
+static int
+_ecore_evas_engine_software_ddraw_init(Ecore_Evas *ee)
+{
Evas_Engine_Info_Software_DDraw *einfo;
const char *driver;
int rmethod;
if (einfo)
{
/* FIXME: REDRAW_DEBUG missing for now */
- einfo->info.window = ((struct _Ecore_Win32_Window *)ee->engine.win32.window)->window;
+ einfo->info.window = ((struct _Ecore_Win32_Window *)ee->prop.window)->window;
einfo->info.depth = ecore_win32_screen_depth_get();
einfo->info.rotation = 0;
- evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
+ if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+ {
+ ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
+ return 0;
+ }
+ }
+ else
+ {
+ ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
+ return 0;
}
return 1;
-#else
- return 0;
-#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
}
+#endif /* BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
+#ifdef BUILD_ECORE_EVAS_DIRECT3D
static int
_ecore_evas_engine_direct3d_init(Ecore_Evas *ee)
{
-#ifdef BUILD_ECORE_EVAS_DIRECT3D
Evas_Engine_Info_Direct3D *einfo;
const char *driver;
int rmethod;
if (einfo)
{
/* FIXME: REDRAW_DEBUG missing for now */
- einfo->info.window = ((struct _Ecore_Win32_Window *)ee->engine.win32.window)->window;
+ einfo->info.window = ((struct _Ecore_Win32_Window *)ee->prop.window)->window;
einfo->info.depth = ecore_win32_screen_depth_get();
einfo->info.rotation = 0;
- evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
+ if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+ {
+ ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
+ return 0;
+ }
+ }
+ else
+ {
+ ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
+ return 0;
}
return 1;
-#else
- return 0;
-#endif /* ! BUILD_ECORE_EVAS_DIRECT3D */
}
+#endif /* BUILD_ECORE_EVAS_DIRECT3D */
+#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW
static int
_ecore_evas_engine_opengl_glew_init(Ecore_Evas *ee)
{
-#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW
Evas_Engine_Info_GL_Glew *einfo;
const char *driver;
int rmethod;
if (einfo)
{
/* FIXME: REDRAW_DEBUG missing for now */
- einfo->info.window = ((struct _Ecore_Win32_Window *)ee->engine.win32.window)->window;
+ einfo->info.window = ((struct _Ecore_Win32_Window *)ee->prop.window)->window;
einfo->info.depth = ecore_win32_screen_depth_get();
- evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
+ if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+ {
+ ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
+ return 0;
+ }
+ }
+ else
+ {
+ ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
+ return 0;
}
return 1;
-#else
- return 0;
-#endif /* ! BUILD_ECORE_EVAS_OPENGL_GLEW */
}
+#endif /* BUILD_ECORE_EVAS_OPENGL_GLEW */
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW
static int
_ecore_evas_engine_software_16_ddraw_init(Ecore_Evas *ee)
{
-#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DIRECTDRAW
Evas_Engine_Info_Software_DDraw *einfo;
const char *driver;
int rmethod;
if (einfo)
{
/* FIXME: REDRAW_DEBUG missing for now */
- einfo->info.window = ((struct _Ecore_Win32_Window *)ee->engine.win32.window)->window;
+ einfo->info.window = ((struct _Ecore_Win32_Window *)ee->prop.window)->window;
einfo->info.depth = ecore_win32_screen_depth_get();
einfo->info.rotation = 0;
- evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
+ if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+ {
+ ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
+ return 0;
+ }
}
-#else
- return 0;
-#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_DIRECTDRAW */
+ else
+ {
+ ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
+ return 0;
+ }
+
+ return 1;
}
+#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW */
+#ifdef BUILD_ECORE_EVAS_WIN32
static Ecore_Evas *
_ecore_evas_win32_new_internal(int (*_ecore_evas_engine_init)(Ecore_Evas *ee),
Ecore_Win32_Window *parent,
int width,
int height)
{
-#ifdef BUILD_ECORE_EVAS_WIN32
Ecore_Evas *ee;
if (!ecore_win32_init())
ee->y = y;
ee->w = width;
ee->h = height;
+ ee->req.x = ee->x;
+ ee->req.y = ee->y;
+ ee->req.w = ee->w;
+ ee->req.h = ee->h;
ee->prop.max.w = 32767;
ee->prop.max.h = 32767;
ee->prop.request_pos = 0;
ee->prop.sticky = 0;
/* FIXME: sticky to add */
+ ee->prop.window = 0;
/* init evas here */
ee->evas = evas_new();
evas_output_viewport_set(ee->evas, 0, 0, width, height);
ee->engine.win32.parent = parent;
- ee->engine.win32.window = ecore_win32_window_new(parent, x, y, width, height);
- if (!ee->engine.win32.window)
+ ee->prop.window = (Ecore_Window)ecore_win32_window_new(parent, x, y, width, height);
+ if (!ee->prop.window)
{
_ecore_evas_win32_shutdown();
free(ee);
return NULL;
}
- evas_key_modifier_add(ee->evas, "Shift");
- evas_key_modifier_add(ee->evas, "Control");
- evas_key_modifier_add(ee->evas, "Alt");
- evas_key_modifier_add(ee->evas, "Meta");
- evas_key_modifier_add(ee->evas, "Hyper");
- evas_key_modifier_add(ee->evas, "Super");
- evas_key_lock_add(ee->evas, "Caps_Lock");
- evas_key_lock_add(ee->evas, "Num_Lock");
- evas_key_lock_add(ee->evas, "Scroll_Lock");
-
- ecore_evases = _ecore_list2_prepend(ecore_evases, ee);
- ecore_evases_hash = evas_hash_add(ecore_evases_hash, _ecore_evas_win32_winid_str_get(ee->engine.win32.window), ee);
+ ee->engine.func->fn_render = _ecore_evas_win32_render;
+ _ecore_evas_register(ee);
+ ecore_event_window_register(ee->prop.window, ee, ee->evas,
+ (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process,
+ (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process,
+ (Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process,
+ (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process);
return ee;
+}
+
+#endif /* BUILD_ECORE_EVAS_WIN32 */
+
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_GDI
+
+EAPI Ecore_Evas *
+ecore_evas_software_gdi_new(Ecore_Win32_Window *parent,
+ int x,
+ int y,
+ int width,
+ int height)
+{
+ return _ecore_evas_win32_new_internal(_ecore_evas_engine_software_gdi_init,
+ parent,
+ x,
+ y,
+ width,
+ height);
+}
+
#else
+
+EAPI Ecore_Evas *
+ecore_evas_software_gdi_new(Ecore_Win32_Window *parent __UNUSED__,
+ int x __UNUSED__,
+ int y __UNUSED__,
+ int width __UNUSED__,
+ int height __UNUSED__)
+{
return NULL;
- parent = NULL;
- x = 0;
- y = 0;
- width = 0;
- height = 0;
-#endif /* ! BUILD_ECORE_EVAS_WIN32 */
}
+#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_GDI */
+
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_DDRAW
+
EAPI Ecore_Evas *
ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent,
int x,
int width,
int height)
{
-#ifdef BUILD_ECORE_EVAS_SOFTWARE_DDRAW
return _ecore_evas_win32_new_internal(_ecore_evas_engine_software_ddraw_init,
parent,
x,
y,
width,
height);
+}
+
#else
+
+EAPI Ecore_Evas *
+ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent __UNUSED__,
+ int x __UNUSED__,
+ int y __UNUSED__,
+ int width __UNUSED__,
+ int height __UNUSED__)
+{
return NULL;
- parent = NULL;
- x = 0;
- y = 0;
- width = 0;
- height = 0;
-#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
}
+#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
+
+
+#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW
+
EAPI Ecore_Evas *
ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent,
int x,
int width,
int height)
{
-#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DIRECTDRAW
return _ecore_evas_win32_new_internal(_ecore_evas_engine_software_16_ddraw_init,
parent,
x,
y,
width,
height);
+}
+
#else
+
+EAPI Ecore_Evas *
+ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent __UNUSED__,
+ int x __UNUSED__,
+ int y __UNUSED__,
+ int width __UNUSED__,
+ int height __UNUSED__)
+{
return NULL;
- parent = NULL;
- x = 0;
- y = 0;
- width = 0;
- height = 0;
-#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_DIRECTDRAW */
}
+#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW */
+
+
+#ifdef BUILD_ECORE_EVAS_DIRECT3D
+
EAPI Ecore_Evas *
ecore_evas_direct3d_new(Ecore_Win32_Window *parent,
int x,
int width,
int height)
{
-#ifdef BUILD_ECORE_EVAS_DIRECT3D
return _ecore_evas_win32_new_internal(_ecore_evas_engine_direct3d_init,
parent,
x,
y,
width,
height);
+}
+
#else
+
+EAPI Ecore_Evas *
+ecore_evas_direct3d_new(Ecore_Win32_Window *parent __UNUSED__,
+ int x __UNUSED__,
+ int y __UNUSED__,
+ int width __UNUSED__,
+ int height __UNUSED__)
+{
return NULL;
- parent = NULL;
- x = 0;
- y = 0;
- width = 0;
- height = 0;
-#endif /* ! BUILD_ECORE_EVAS_DIRECT3D */
}
+#endif /* ! BUILD_ECORE_EVAS_DIRECT3D */
+
+
+#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW
+
EAPI Ecore_Evas *
ecore_evas_gl_glew_new(Ecore_Win32_Window *parent,
int x,
int width,
int height)
{
-#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW
return _ecore_evas_win32_new_internal(_ecore_evas_engine_opengl_glew_init,
parent,
x,
y,
width,
height);
+}
+
#else
+
+EAPI Ecore_Evas *
+ecore_evas_gl_glew_new(Ecore_Win32_Window *parent __UNUSED__,
+ int x __UNUSED__,
+ int y __UNUSED__,
+ int width __UNUSED__,
+ int height __UNUSED__)
+{
return NULL;
- parent = NULL;
- x = 0;
- y = 0;
- width = 0;
- height = 0;
-#endif /* BUILD_ECORE_EVAS_OPENGL_GLEW */
}
+#endif /* BUILD_ECORE_EVAS_OPENGL_GLEW */
+
+
+#ifdef BUILD_ECORE_EVAS_WIN32
+
EAPI Ecore_Win32_Window *
-ecore_evas_win32_window_get(Ecore_Evas *ee)
+ecore_evas_win32_window_get(const Ecore_Evas *ee)
{
-#ifdef BUILD_ECORE_EVAS_WIN32
- return (Ecore_Win32_Window *) _ecore_evas_win32_window_get(ee);
+ return (Ecore_Win32_Window *) ecore_evas_window_get(ee);
+}
+
#else
+
+EAPI Ecore_Win32_Window *
+ecore_evas_win32_window_get(const Ecore_Evas *ee __UNUSED__)
+{
return NULL;
- ee = NULL;
-#endif /* BUILD_ECORE_EVAS_WIN32 */
}
+
+#endif /* BUILD_ECORE_EVAS_WIN32 */
projects / profile / ivi / ecore.git / blobdiff