parent
a27c701f27
commit
78fdf79b00
|
@ -535,13 +535,10 @@ _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
|
||||||
p->fd_handler = NULL;
|
p->fd_handler = NULL;
|
||||||
return ECORE_CALLBACK_CANCEL;
|
return ECORE_CALLBACK_CANCEL;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
goto _win32_done;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
_win32_done:
|
|
||||||
if (!p->passed_data)
|
if (!p->passed_data)
|
||||||
p->passed_data = malloc(p->len);
|
p->passed_data = malloc(p->len);
|
||||||
|
|
||||||
|
|
|
@ -228,7 +228,7 @@ ecore_thread_run(void (*func_heavy)(void *data),
|
||||||
work = malloc(sizeof (Ecore_Pthread_Worker));
|
work = malloc(sizeof (Ecore_Pthread_Worker));
|
||||||
if (!work)
|
if (!work)
|
||||||
{
|
{
|
||||||
func_cancel(data);
|
func_cancel((void*) data);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -233,7 +233,7 @@ _ecore_key_press(int event,
|
||||||
XKeyEvent *xevent)
|
XKeyEvent *xevent)
|
||||||
{
|
{
|
||||||
Ecore_Event_Key *e;
|
Ecore_Event_Key *e;
|
||||||
const char *compose = NULL;
|
char *compose = NULL;
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
char *keyname;
|
char *keyname;
|
||||||
char *key;
|
char *key;
|
||||||
|
|
|
@ -30,6 +30,8 @@ ecore_x_gc_new(Ecore_X_Drawable draw, Ecore_X_GC_Value_Mask value_mask, const un
|
||||||
|
|
||||||
if (!draw) draw = DefaultRootWindow(_ecore_x_disp);
|
if (!draw) draw = DefaultRootWindow(_ecore_x_disp);
|
||||||
|
|
||||||
|
memset(&gcv, 0, sizeof (gcv));
|
||||||
|
|
||||||
for (i = 0, index = 0, mask = 1; i <= 22; i++, mask <<= 1)
|
for (i = 0, index = 0, mask = 1; i <= 22; i++, mask <<= 1)
|
||||||
{
|
{
|
||||||
switch (mask & value_mask)
|
switch (mask & value_mask)
|
||||||
|
|
|
@ -276,7 +276,6 @@ ecore_x_netwm_client_active_request(Ecore_X_Window root, Ecore_X_Window win, int
|
||||||
xev.xclient.data.l[2] = current_win;
|
xev.xclient.data.l[2] = current_win;
|
||||||
xev.xclient.data.l[3] = 0;
|
xev.xclient.data.l[3] = 0;
|
||||||
xev.xclient.data.l[4] = 0;
|
xev.xclient.data.l[4] = 0;
|
||||||
xev.xclient.data.l[5] = 0;
|
|
||||||
|
|
||||||
XSendEvent(_ecore_x_disp, root, False,
|
XSendEvent(_ecore_x_disp, root, False,
|
||||||
SubstructureRedirectMask | SubstructureNotifyMask, &xev);
|
SubstructureRedirectMask | SubstructureNotifyMask, &xev);
|
||||||
|
@ -1066,7 +1065,6 @@ ecore_x_netwm_ping_send(Ecore_X_Window win)
|
||||||
xev.xclient.data.l[2] = win;
|
xev.xclient.data.l[2] = win;
|
||||||
xev.xclient.data.l[3] = 0;
|
xev.xclient.data.l[3] = 0;
|
||||||
xev.xclient.data.l[4] = 0;
|
xev.xclient.data.l[4] = 0;
|
||||||
xev.xclient.data.l[5] = 0;
|
|
||||||
|
|
||||||
XSendEvent(_ecore_x_disp, win, False, NoEventMask, &xev);
|
XSendEvent(_ecore_x_disp, win, False, NoEventMask, &xev);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue