dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

First, fixed a couple of things that slipped through ... 

SVN revision: 5510
This commit is contained in:
cpk 2001-10-17 22:31:02 +00:00 committed by cpk
parent 57f30f0594
commit 317853525e
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
legacy/ecore/src/Ecore.h
View File

@ -137,7 +137,7 @@ extern "C"
void ecore_window_move_resize(Window win, int x, int y, int w, void ecore_window_move_resize(Window win, int x, int y, int w,
int h); int h);
int ecore_x_get_fd(void); int ecore_x_get_fd(void);
void ecore_set_error_handler(Ecore_Error_Function * func); void ecore_set_error_handler(Ecore_Error_Function func);
void ecore_reset_error_handler(void); void ecore_reset_error_handler(void);
int ecore_display_init(char *display); int ecore_display_init(char *display);
int ecore_events_pending(void); int ecore_events_pending(void);
@ -317,8 +317,8 @@ extern "C"
void ecore_keyboard_grab(Window win); void ecore_keyboard_grab(Window win);
void ecore_keyboard_ungrab(void); void ecore_keyboard_ungrab(void);
void ecore_ev_ipc_init(char *path); void ecore_event_ipc_init(char *path);
void ecore_ev_ipc_cleanup(void); void ecore_event_ipc_cleanup(void);
void ecore_add_ipc_service(int service, void (*func) (int fd)); void ecore_add_ipc_service(int service, void (*func) (int fd));
void ecore_del_ipc_service(int service); void ecore_del_ipc_service(int service);
@ -793,15 +793,13 @@ extern "C"
void ecore_event_filter_handler_add(Ecore_Event_Type type, void ecore_event_filter_handler_add(Ecore_Event_Type type,
void (*func) (Ecore_Event * void (*func) (Ecore_Event *
ev)); ev));
void void ecore_event_filter_idle_handler_add(void (*func) (void *data), void *data);
ecore_event_filter_idle_handler_add(void (*func) (void *data), void *data);
void ecore_ev_signal_init(void); void ecore_event_signal_init(void);
int ecore_ev_signal_events_pending(void); int ecore_event_signal_events_pending(void);
void ecore_ev_x_init(void); void ecore_event_x_init(void);
char char *ecore_keypress_translate_into_typeable(Ecore_Event_Key_Down * e);
*ecore_key_press_translate_into_typeable(Ecore_Event_Key_Down * e);
#define ECORE_ATOM(atom, name) \ #define ECORE_ATOM(atom, name) \
if (!atom) (atom) = ecore_atom_get(name); if (!atom) (atom) = ecore_atom_get(name);

4
legacy/ecore/src/e_events.c
View File

@ -229,13 +229,13 @@ ecore_event_loop(void)
if (tval.tv_usec <= 1000) if (tval.tv_usec <= 1000)
tval.tv_usec = 1000; tval.tv_usec = 1000;
ecore_handle_zero_event_timer(); ecore_handle_zero_event_timer();
if ((!ecore_events_pending()) && (!ecore_ev_signal_events_pending())) if ((!ecore_events_pending()) && (!ecore_event_signal_events_pending()))
fdcount = select(fdsize + 1, &fdset, NULL, NULL, &tval); fdcount = select(fdsize + 1, &fdset, NULL, NULL, &tval);
} }
/* no timers - just sit and block */ /* no timers - just sit and block */
else else
{ {
if ((!ecore_events_pending()) && (!ecore_ev_signal_events_pending())) if ((!ecore_events_pending()) && (!ecore_event_signal_events_pending()))
fdcount = select(fdsize + 1, &fdset, NULL, NULL, NULL); fdcount = select(fdsize + 1, &fdset, NULL, NULL, NULL);
} }
for (pid_h = pid_handlers; pid_h; pid_h = pid_h->next) for (pid_h = pid_handlers; pid_h; pid_h = pid_h->next)

2
legacy/ecore/src/e_x.c
View File

@ -766,7 +766,7 @@ ecore_x_get_fd(void)
} }
void void
ecore_set_error_handler(Ecore_Error_Function * func) ecore_set_error_handler(Ecore_Error_Function func)
{ {
XSetErrorHandler((XErrorHandler) func); XSetErrorHandler((XErrorHandler) func);
} }