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

View File

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

View File

@ -229,13 +229,13 @@ ecore_event_loop(void)
if (tval.tv_usec <= 1000)
tval.tv_usec = 1000;
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);
}
/* no timers - just sit and block */
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);
}
for (pid_h = pid_handlers; pid_h; pid_h = pid_h->next)

View File

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