summaryrefslogtreecommitdiff
path: root/src/keyboard.h
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2009-11-10 19:06:40 +0000
committerJan Djärv <jan.h.d@swipnet.se>2009-11-10 19:06:40 +0000
commite90292a90cdb9a3b4d28b21db39f5f44ad3de805 (patch)
tree2bf6f977a64392335dd3365c845b6d589bfc6726 /src/keyboard.h
parent045b83c00aabaaaa5d4e363f848a1826f8f27338 (diff)
downloademacs-e90292a90cdb9a3b4d28b21db39f5f44ad3de805.tar.gz
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.
Diffstat (limited to 'src/keyboard.h')
-rw-r--r--src/keyboard.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/keyboard.h b/src/keyboard.h
index 5b32595fa63..b23cc13c64d 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -488,6 +488,7 @@ extern void add_user_signal P_ ((int, const char *));
extern int tty_read_avail_input P_ ((struct terminal *, int,
struct input_event *));
+extern EMACS_TIME timer_check P_ ((int));
/* arch-tag: 769cbade-1ba9-4950-b886-db265b061aa3
(do not change this comment) */