forked from enlightenment/efl
Ecore_Evas: use window states and event property to fix ecore_evas_fullscreen_set()
This implies that elm_win_fullscreen_set() is also fixed @fix
This commit is contained in:
parent
3f389c6e1e
commit
540de0e254
|
@ -278,6 +278,7 @@ _ecore_win32_window_procedure(HWND window,
|
||||||
case WM_WINDOWPOSCHANGED:
|
case WM_WINDOWPOSCHANGED:
|
||||||
INF("position changed window message");
|
INF("position changed window message");
|
||||||
_ecore_win32_event_handle_configure_notify(data);
|
_ecore_win32_event_handle_configure_notify(data);
|
||||||
|
_ecore_win32_event_handle_property_notify(data);
|
||||||
_ecore_win32_event_handle_expose(data);
|
_ecore_win32_event_handle_expose(data);
|
||||||
return 0;
|
return 0;
|
||||||
case WM_ENTERSIZEMOVE:
|
case WM_ENTERSIZEMOVE:
|
||||||
|
|
|
@ -1893,6 +1893,22 @@ _ecore_win32_event_handle_resize(Ecore_Win32_Callback_Data *msg)
|
||||||
ecore_event_add(ECORE_WIN32_EVENT_WINDOW_RESIZE, e, NULL, NULL);
|
ecore_event_add(ECORE_WIN32_EVENT_WINDOW_RESIZE, e, NULL, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
_ecore_win32_event_handle_property_notify(Ecore_Win32_Callback_Data *msg)
|
||||||
|
{
|
||||||
|
Ecore_Win32_Event_Window_Property *e;
|
||||||
|
|
||||||
|
INF("window property");
|
||||||
|
|
||||||
|
e = calloc(1, sizeof(Ecore_Win32_Event_Window_Property));
|
||||||
|
if (!e) return;
|
||||||
|
|
||||||
|
e->window = (void *)GetWindowLongPtr(msg->window, GWLP_USERDATA);
|
||||||
|
e->timestamp = _ecore_win32_event_last_time;
|
||||||
|
|
||||||
|
ecore_event_add(ECORE_WIN32_EVENT_WINDOW_PROPERTY, e, NULL, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
_ecore_win32_event_handle_delete_request(Ecore_Win32_Callback_Data *msg)
|
_ecore_win32_event_handle_delete_request(Ecore_Win32_Callback_Data *msg)
|
||||||
{
|
{
|
||||||
|
|
|
@ -157,6 +157,7 @@ void _ecore_win32_event_handle_map_notify(Ecore_Win32_Callback_Data *msg);
|
||||||
void _ecore_win32_event_handle_unmap_notify(Ecore_Win32_Callback_Data *msg);
|
void _ecore_win32_event_handle_unmap_notify(Ecore_Win32_Callback_Data *msg);
|
||||||
void _ecore_win32_event_handle_configure_notify(Ecore_Win32_Callback_Data *msg);
|
void _ecore_win32_event_handle_configure_notify(Ecore_Win32_Callback_Data *msg);
|
||||||
void _ecore_win32_event_handle_resize(Ecore_Win32_Callback_Data *msg);
|
void _ecore_win32_event_handle_resize(Ecore_Win32_Callback_Data *msg);
|
||||||
|
void _ecore_win32_event_handle_property_notify(Ecore_Win32_Callback_Data *msg);
|
||||||
void _ecore_win32_event_handle_delete_request(Ecore_Win32_Callback_Data *msg);
|
void _ecore_win32_event_handle_delete_request(Ecore_Win32_Callback_Data *msg);
|
||||||
void _ecore_win32_event_handle_selection_notify(Ecore_Win32_Callback_Data *msg);
|
void _ecore_win32_event_handle_selection_notify(Ecore_Win32_Callback_Data *msg);
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
|
|
||||||
#ifdef BUILD_ECORE_EVAS_WIN32
|
#ifdef BUILD_ECORE_EVAS_WIN32
|
||||||
|
|
||||||
#define ECORE_EVAS_EVENT_COUNT 10
|
#define ECORE_EVAS_EVENT_COUNT 11
|
||||||
|
|
||||||
static int _ecore_evas_init_count = 0;
|
static int _ecore_evas_init_count = 0;
|
||||||
|
|
||||||
|
@ -91,6 +91,8 @@ static Eina_Bool _ecore_evas_win32_event_window_configure(void *data EINA_UNUSED
|
||||||
|
|
||||||
static Eina_Bool _ecore_evas_win32_event_window_delete_request(void *data EINA_UNUSED, int type EINA_UNUSED, void *event);
|
static Eina_Bool _ecore_evas_win32_event_window_delete_request(void *data EINA_UNUSED, int type EINA_UNUSED, void *event);
|
||||||
|
|
||||||
|
static Eina_Bool _ecore_evas_win32_event_window_property_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event);
|
||||||
|
|
||||||
/* Private functions */
|
/* Private functions */
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -154,6 +156,7 @@ _ecore_evas_win32_init(void)
|
||||||
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[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[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_evas_event_handlers[9] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_DELETE_REQUEST, _ecore_evas_win32_event_window_delete_request, NULL);
|
||||||
|
ecore_evas_event_handlers[10] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_PROPERTY, _ecore_evas_win32_event_window_property_change, NULL);
|
||||||
|
|
||||||
ecore_event_evas_init();
|
ecore_event_evas_init();
|
||||||
return _ecore_evas_init_count;
|
return _ecore_evas_init_count;
|
||||||
|
@ -460,6 +463,104 @@ _ecore_evas_win32_event_window_delete_request(void *data EINA_UNUSED, int type E
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Eina_Bool
|
||||||
|
_ecore_evas_win32_event_window_property_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
|
||||||
|
{
|
||||||
|
struct {
|
||||||
|
struct {
|
||||||
|
unsigned char fullscreen : 1;
|
||||||
|
} win32;
|
||||||
|
struct {
|
||||||
|
Eina_Bool fullscreen : 1;
|
||||||
|
} prop;
|
||||||
|
} prev;
|
||||||
|
Ecore_Evas *ee;
|
||||||
|
Ecore_Win32_Event_Window_Property *e;
|
||||||
|
Ecore_Evas_Engine_Data_Win32 *wdata;
|
||||||
|
Ecore_Win32_Window_State *state;
|
||||||
|
unsigned int num;
|
||||||
|
unsigned int i;
|
||||||
|
|
||||||
|
INF("window property");
|
||||||
|
|
||||||
|
e = event;
|
||||||
|
ee = ecore_event_window_match((Ecore_Window)e->window);
|
||||||
|
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
|
||||||
|
if ((Ecore_Window)e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
||||||
|
wdata = ee->engine.data;
|
||||||
|
|
||||||
|
prev.win32.fullscreen = wdata->state.fullscreen;
|
||||||
|
|
||||||
|
prev.prop.fullscreen = ee->prop.fullscreen;
|
||||||
|
|
||||||
|
wdata->state.fullscreen = 0;
|
||||||
|
|
||||||
|
ee->prop.fullscreen = EINA_FALSE;
|
||||||
|
|
||||||
|
/* we get the states status */
|
||||||
|
ecore_win32_window_state_get(e->window, &state, &num);
|
||||||
|
if (state)
|
||||||
|
{
|
||||||
|
for (i = 0; i < num; i++)
|
||||||
|
{
|
||||||
|
switch (state[i])
|
||||||
|
{
|
||||||
|
case ECORE_WIN32_WINDOW_STATE_FULLSCREEN:
|
||||||
|
ee->prop.fullscreen = 1;
|
||||||
|
wdata->state.fullscreen = 1;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((prev.win32.fullscreen != wdata->state.fullscreen) ||
|
||||||
|
(prev.prop.fullscreen != ee->prop.fullscreen))
|
||||||
|
{
|
||||||
|
if (ee->func.fn_state_change)
|
||||||
|
ee->func.fn_state_change(ee);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* FIXME, should be in idler */
|
||||||
|
static void
|
||||||
|
_ecore_evas_win32_state_update(Ecore_Evas *ee)
|
||||||
|
{
|
||||||
|
Ecore_Win32_Window_State state[10];
|
||||||
|
Ecore_Evas_Engine_Data_Win32 *edata = ee->engine.data;
|
||||||
|
int num = 0;
|
||||||
|
|
||||||
|
if (ee->prop.modal)
|
||||||
|
state[num++] = ECORE_WIN32_WINDOW_STATE_MODAL;
|
||||||
|
if (ee->prop.sticky)
|
||||||
|
state[num++] = ECORE_WIN32_WINDOW_STATE_STICKY;
|
||||||
|
if (ee->prop.maximized)
|
||||||
|
state[num++] = ECORE_WIN32_WINDOW_STATE_MAXIMIZED_VERT;
|
||||||
|
if (ee->prop.maximized)
|
||||||
|
state[num++] = ECORE_WIN32_WINDOW_STATE_MAXIMIZED_HORZ;
|
||||||
|
// if (bd->client.netwm.state.shaded)
|
||||||
|
// state[num++] = ECORE_WIN32_WINDOW_STATE_SHADED;
|
||||||
|
/* if (ee->prop.focus_skip) */
|
||||||
|
/* state[num++] = ECORE_WIN32_WINDOW_STATE_SKIP_TASKBAR; */
|
||||||
|
/* if (ee->prop.focus_skip) */
|
||||||
|
/* state[num++] = ECORE_WIN32_WINDOW_STATE_SKIP_PAGER; */
|
||||||
|
// if (bd->client.netwm.state.hidden)
|
||||||
|
// state[num++] = ECORE_WIN32_WINDOW_STATE_HIDDEN;
|
||||||
|
if (edata->state.fullscreen)
|
||||||
|
state[num++] = ECORE_WIN32_WINDOW_STATE_FULLSCREEN;
|
||||||
|
/* if (edata->state.above) */
|
||||||
|
/* state[num++] = ECORE_WIN32_WINDOW_STATE_ABOVE; */
|
||||||
|
/* if (edata->state.below) */
|
||||||
|
/* state[num++] = ECORE_WIN32_WINDOW_STATE_BELOW; */
|
||||||
|
/* if (ee->prop.demand_attention) */
|
||||||
|
/* state[num++] = ECORE_WIN32_WINDOW_STATE_DEMANDS_ATTENTION; */
|
||||||
|
|
||||||
|
ecore_win32_window_state_set((Ecore_Win32_Window *)ee->prop.window, state, num);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Ecore_Evas interface */
|
/* Ecore_Evas interface */
|
||||||
|
|
||||||
|
@ -911,26 +1012,22 @@ _ecore_evas_win32_override_set(Ecore_Evas *ee, Eina_Bool on)
|
||||||
static void
|
static void
|
||||||
_ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, Eina_Bool on)
|
_ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, Eina_Bool on)
|
||||||
{
|
{
|
||||||
Ecore_Win32_Window *window;
|
|
||||||
Ecore_Evas_Engine_Data_Win32 *wdata = ee->engine.data;
|
Ecore_Evas_Engine_Data_Win32 *wdata = ee->engine.data;
|
||||||
|
|
||||||
INF("ecore evas fullscreen set");
|
INF("ecore evas fullscreen set");
|
||||||
|
|
||||||
if (ee->prop.fullscreen == !!on) return;
|
if (ee->prop.fullscreen == !!on) return;
|
||||||
|
|
||||||
wdata->state.fullscreen = on;
|
wdata->state.fullscreen = !!on;
|
||||||
ee->prop.fullscreen = on;
|
if (ee->should_be_visible)
|
||||||
|
{
|
||||||
|
struct _Ecore_Win32_Window *window;
|
||||||
|
|
||||||
window = (Ecore_Win32_Window *)ee->prop.window;
|
window = (Ecore_Win32_Window *)ee->prop.window;
|
||||||
|
|
||||||
if (on != 0)
|
|
||||||
{
|
|
||||||
ecore_win32_window_fullscreen_set(window, on);
|
ecore_win32_window_fullscreen_set(window, on);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
_ecore_evas_win32_state_update(ee);
|
||||||
ecore_win32_window_fullscreen_set(window, on);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Nothing to be done for the GDI backend at the evas level */
|
/* Nothing to be done for the GDI backend at the evas level */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue