callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whitespace cleanup. (synthesize_crossing_events): Add comments and prevent

Browse Source 
2006-08-08  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkevents-quartz.c: (poll_func): Whitespace cleanup.
	(synthesize_crossing_events): Add comments and prevent a crash.
This commit is contained in:
Richard Hult
2006-08-08 21:06:03 +00:00
committed by Richard Hult
parent d451252f73
commit 230fcecae8
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-08-08 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkevents-quartz.c: (poll_func): Whitespace cleanup.
(synthesize_crossing_events): Add comments and prevent a crash.
2006-08-08 Michael Natterer <mitch@imendio.com> 2006-08-08 Michael Natterer <mitch@imendio.com>
* gdk/quartz/gdkwindow-quartz.c * gdk/quartz/gdkwindow-quartz.c

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2006-08-08 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkevents-quartz.c: (poll_func): Whitespace cleanup.
(synthesize_crossing_events): Add comments and prevent a crash.
2006-08-08 Michael Natterer <mitch@imendio.com> 2006-08-08 Michael Natterer <mitch@imendio.com>
* gdk/quartz/gdkwindow-quartz.c * gdk/quartz/gdkwindow-quartz.c

17
gdk/quartz/gdkevents-quartz.c
View File

@ -250,7 +250,6 @@ poll_func (GPollFD *ufds, guint nfds, gint timeout_)
{ {
if ([event type] == NSApplicationDefined) if ([event type] == NSApplicationDefined)
{ {
pthread_mutex_lock (&pollfd_mutex); pthread_mutex_lock (&pollfd_mutex);
for (i = 0; i < n_pollfds; i++) for (i = 0; i < n_pollfds; i++)
@ -282,6 +281,7 @@ poll_func (GPollFD *ufds, guint nfds, gint timeout_)
if (n_active == 0 && wakeup_pipe[1]) if (n_active == 0 && wakeup_pipe[1])
{ {
char c = 'A'; char c = 'A';
write (wakeup_pipe[1], &c, 1); write (wakeup_pipe[1], &c, 1);
} }
@ -289,8 +289,8 @@ poll_func (GPollFD *ufds, guint nfds, gint timeout_)
{ {
ufds[0].revents = G_IO_IN; ufds[0].revents = G_IO_IN;
/* FIXME: We can't assert here, what we need to to is to have a queue /* FIXME: We can't assert here, but we might need to have a
* for events instead. * queue for events instead.
*/ */
/*g_assert (current_event == NULL);*/ /*g_assert (current_event == NULL);*/
@ -955,8 +955,15 @@ synthesize_crossing_events (GdkWindow *window,
} }
else else
{ {
/* Dunno where we are coming from */ /* This means we have not current_mouse_window. FIXME: Should
synthesize_enter_event (window, nsevent, mode, GDK_NOTIFY_UNKNOWN); * we make sure to always set the root window instead of NULL?
*/
/* FIXME: Figure out why this is being called with window being
* NULL. The check works around a crash for now.
*/
if (window)
synthesize_enter_event (window, nsevent, mode, GDK_NOTIFY_UNKNOWN);
} }
_gdk_quartz_update_mouse_window (window); _gdk_quartz_update_mouse_window (window);