forked from enlightenment/efl
parent
33b8560d38
commit
1e7698357d
|
@ -1932,11 +1932,11 @@ _ecore_main_win32_select(int nfds __UNUSED__,
|
||||||
/* The result tells us the type of event we have. */
|
/* The result tells us the type of event we have. */
|
||||||
if (result == WAIT_FAILED)
|
if (result == WAIT_FAILED)
|
||||||
{
|
{
|
||||||
char *msg;
|
char *m;
|
||||||
|
|
||||||
msg = evil_last_error_get();
|
m = evil_last_error_get();
|
||||||
ERR(" * %s\n", msg);
|
ERR(" * %s\n", m);
|
||||||
free(msg);
|
free(m);
|
||||||
res = -1;
|
res = -1;
|
||||||
}
|
}
|
||||||
else if (result == WAIT_TIMEOUT)
|
else if (result == WAIT_TIMEOUT)
|
||||||
|
|
|
@ -39,6 +39,12 @@
|
||||||
#include "Ecore.h"
|
#include "Ecore.h"
|
||||||
#include "ecore_private.h"
|
#include "ecore_private.h"
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
# define FMT_SSIZE_T "%Id"
|
||||||
|
#else
|
||||||
|
# define FMT_SSIZE_T "%zd"
|
||||||
|
#endif
|
||||||
|
|
||||||
/* How of then we should retry to write to the pipe */
|
/* How of then we should retry to write to the pipe */
|
||||||
#define ECORE_PIPE_WRITE_RETRY 6
|
#define ECORE_PIPE_WRITE_RETRY 6
|
||||||
|
|
||||||
|
@ -407,7 +413,7 @@ ecore_pipe_write(Ecore_Pipe *p,
|
||||||
;
|
;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ERR("An unhandled error (ret: %zd errno: %d)"
|
ERR("An unhandled error (ret: " FMT_SSIZE_T " errno: %d)"
|
||||||
"occurred while writing to the pipe the length",
|
"occurred while writing to the pipe the length",
|
||||||
ret, errno);
|
ret, errno);
|
||||||
}
|
}
|
||||||
|
@ -441,7 +447,7 @@ ecore_pipe_write(Ecore_Pipe *p,
|
||||||
;
|
;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ERR("An unhandled error (ret: %zd errno: %d)"
|
ERR("An unhandled error (ret: " FMT_SSIZE_T " errno: %d)"
|
||||||
"occurred while writing to the pipe the length",
|
"occurred while writing to the pipe the length",
|
||||||
ret, errno);
|
ret, errno);
|
||||||
}
|
}
|
||||||
|
|
|
@ -185,9 +185,9 @@ _ecore_evas_win32_event_window_focus_in(void *data __UNUSED__, int type __UNUSED
|
||||||
Ecore_Win32_Event_Window_Focus_In *e;
|
Ecore_Win32_Event_Window_Focus_In *e;
|
||||||
|
|
||||||
e = event;
|
e = event;
|
||||||
ee = ecore_event_window_match(e->window);
|
ee = ecore_event_window_match((Ecore_Window)e->window);
|
||||||
if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
|
if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
|
||||||
if (e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
if ((Ecore_Window)e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
||||||
|
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = 1;
|
||||||
evas_focus_in(ee->evas);
|
evas_focus_in(ee->evas);
|
||||||
|
@ -202,9 +202,9 @@ _ecore_evas_win32_event_window_focus_out(void *data __UNUSED__, int type __UNUSE
|
||||||
Ecore_Win32_Event_Window_Focus_Out *e;
|
Ecore_Win32_Event_Window_Focus_Out *e;
|
||||||
|
|
||||||
e = event;
|
e = event;
|
||||||
ee = ecore_event_window_match(e->window);
|
ee = ecore_event_window_match((Ecore_Window)e->window);
|
||||||
if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
|
if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
|
||||||
if (e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
if ((Ecore_Window)e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
||||||
|
|
||||||
evas_focus_out(ee->evas);
|
evas_focus_out(ee->evas);
|
||||||
ee->prop.focused = 0;
|
ee->prop.focused = 0;
|
||||||
|
|
|
@ -10,6 +10,10 @@
|
||||||
# include <libgen.h>
|
# include <libgen.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
# include <direct.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_FEATURES_H
|
#ifdef HAVE_FEATURES_H
|
||||||
# include <features.h>
|
# include <features.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue