0, 0, 0);
}
-static void
+static int
handle_file_notifications (struct input_event *hold_quit)
{
BYTE *p = file_notifications;
const DWORD min_size
= offsetof (FILE_NOTIFY_INFORMATION, FileName) + sizeof(wchar_t);
struct input_event inev;
+ int nevents = 0;
/* We cannot process notification before Emacs is fully initialized,
since we need the UTF-16LE coding-system to be set up. */
if (!initialized)
{
notification_buffer_in_use = 0;
- return;
+ return nevents;
}
enter_crit ();
if (notification_buffer_in_use)
{
DWORD info_size = notifications_size;
+ Lisp_Object cs = intern ("utf-16le");
+ Lisp_Object obj = get_watch_object (make_number (notifications_desc));
/* notifications_size could be zero when the buffer of
notifications overflowed on the OS level, or when the
directory being watched was itself deleted. Do nothing in
that case. */
- if (info_size)
+ if (info_size
+ && !NILP (obj) && CONSP (obj))
{
+ Lisp_Object callback = XCDR (obj);
+
EVENT_INIT (inev);
while (info_size >= min_size)
/* Note: mule-conf is preloaded, so utf-16le must
already be defined at this point. */
Lisp_Object fname
- = code_convert_string_norecord (utf_16_fn,
- intern ("utf-16le"), 0);
+ = code_convert_string_norecord (utf_16_fn, cs, 0);
Lisp_Object action = lispy_file_action (fni->Action);
- Lisp_Object obj;
- obj = get_watch_object (make_number (notifications_desc));
- if (!NILP (obj) && CONSP (obj))
- {
- inev.kind = FILE_NOTIFY_EVENT;
- inev.code = (ptrdiff_t)notifications_desc;
- inev.timestamp = GetTickCount ();
- inev.modifiers = 0;
- inev.frame_or_window = XCDR (obj);
- inev.arg = Fcons (action, fname);
- kbd_buffer_store_event_hold (&inev, hold_quit);
- }
+ inev.kind = FILE_NOTIFY_EVENT;
+ inev.code = (ptrdiff_t)notifications_desc;
+ inev.timestamp = GetTickCount ();
+ inev.modifiers = 0;
+ inev.frame_or_window = callback;
+ inev.arg = Fcons (action, fname);
+ kbd_buffer_store_event_hold (&inev, hold_quit);
if (!fni->NextEntryOffset)
break;
notification_buffer_in_use = 0;
}
leave_crit ();
+ return nevents;
}
int
for (;;)
{
- handle_file_notifications (hold_quit);
+ int nfnotify = handle_file_notifications (hold_quit);
+
nev = fill_queue (0);
if (nev <= 0)
{
/* If nev == -1, there was some kind of error
- If nev == 0 then waitp must be zero and no events were available
+ If nev == 0 then no events were available
so return. */
+ if (nfnotify)
+ nev = 0;
break;
}