Commit 37a4dabe authored by Eli Zaretskii's avatar Eli Zaretskii

More than one watch is now supported.

Need to fix the issue with descriptor, now a pointer converted to Lisp integer.
parent dd8c2f5a
......@@ -1279,6 +1279,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
#ifdef WINDOWSNT
globals_of_w32 ();
globals_of_w32notify ();
/* Initialize environment from registry settings. */
init_environment (argv);
init_ntproc (dumping); /* must precede init_editfns. */
......
......@@ -599,7 +599,7 @@ handle_file_notifications (struct input_event *hold_quit)
{
DWORD info_size = notifications_size;
Lisp_Object cs = intern ("utf-16le");
Lisp_Object obj = get_watch_object (make_number (notifications_desc));
Lisp_Object obj = w32_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
......
This diff is collapsed.
......@@ -3282,7 +3282,7 @@ queue_notifications (struct input_event *event, W32Msg *msg, struct frame *f,
{
DWORD info_size = notifications_size;
Lisp_Object cs = intern ("utf-16le");
Lisp_Object obj = get_watch_object (make_number (notifications_desc));
Lisp_Object obj = w32_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
......
......@@ -685,8 +685,8 @@ extern void x_delete_display (struct w32_display_info *dpyinfo);
extern int notification_buffer_in_use;
extern BYTE file_notifications[16384];
extern DWORD notifications_size;
extern HANDLE notifications_desc;
extern Lisp_Object get_watch_object (Lisp_Object);
extern void *notifications_desc;
extern Lisp_Object w32_get_watch_object (Lisp_Object);
extern Lisp_Object lispy_file_action (DWORD);
/* Keypad command key support. W32 doesn't have virtual keys defined
......@@ -767,6 +767,7 @@ extern void syms_of_w32fns (void);
extern void globals_of_w32menu (void);
extern void globals_of_w32fns (void);
extern void globals_of_w32notify (void);
#ifdef CYGWIN
extern int w32_message_fd;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment