Mercurial > emacs
comparison src/process.c @ 105936:45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
* keyboard.h: Declare timer_check.
* keyboard.c (timer_check_2): New function that does what the old
timer_check did.
(timer_check): Call timer_check_2 until -1 or a non-zero time is
returned, i.e. don't return -1 with timers pending.
* process.c: Remove extern declaration of timer_check.
* xmenu.c (x_menu_wait_for_event): Remove code that did a timeout
even if timer_check returned -1.
* gtkutil.c (xg_dialog_response_cb): data is now a struct xg_dialog_data
(pop_down_dialog): Destroy widget (if any), cancel timer and unref
the event loop.
(xg_maybe_add_timer, xg_dialog_run): New functions (bug #4574).
(xg_get_file_name, xg_get_font_name): Call xg_dialog_run (bug #4574).
Destroy the dialog after xg_dialog_run.
| author | Jan Dj?rv <jan.h.d@swipnet.se> |
|---|---|
| date | Tue, 10 Nov 2009 19:06:40 +0000 |
| parents | 21bdda3ded62 |
| children | ba3ffbd9c422 |
comparison
equal
deleted
inserted
replaced
| 105935:228c9c492970 | 105936:45191c90be7e |
|---|---|
| 294 #endif | 294 #endif |
| 295 | 295 |
| 296 static Lisp_Object get_process (); | 296 static Lisp_Object get_process (); |
| 297 static void exec_sentinel (); | 297 static void exec_sentinel (); |
| 298 | 298 |
| 299 extern EMACS_TIME timer_check (); | |
| 300 extern int timers_run; | 299 extern int timers_run; |
| 301 | 300 |
| 302 /* Mask of bits indicating the descriptors that we wait for input on. */ | 301 /* Mask of bits indicating the descriptors that we wait for input on. */ |
| 303 | 302 |
| 304 static SELECT_TYPE input_wait_mask; | 303 static SELECT_TYPE input_wait_mask; |