Clean up some more leftovers from before Owen's reorganization: Don't have

2000-01-02  Tor Lillqvist  <tml@iki.fi>

* gdk/win32/gdkevents-win32.c: Clean up some more leftovers from
before Owen's reorganization: Don't have queued_events and
queued_tail statics in this file, but use gdk_queued_events and
gdk_queued_tail. This makes exposure event compression work again.

(gdk_WindowProc): Comment out a posting of gdk_ping_msg, doesn't
seem to be needed?
This commit is contained in:
Tor Lillqvist 2000-01-02 11:03:12 +00:00 committed by Tor Lillqvist
parent 6e3522ab2c
commit d475580348
8 changed files with 79 additions and 10 deletions

View File

@ -1,3 +1,13 @@
2000-01-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c: Clean up some more leftovers from
before Owen's reorganization: Don't have queued_events and
queued_tail statics in this file, but use gdk_queued_events and
gdk_queued_tail. This makes exposure event compression work again.
(gdk_WindowProc): Comment out a posting of gdk_ping_msg, doesn't
seem to be needed?
1999-12-30 Tor Lillqvist <tml@iki.fi> 1999-12-30 Tor Lillqvist <tml@iki.fi>
* gdk/gdk.c: If we don't HAVE_XCONVERTCASE we must #include * gdk/gdk.c: If we don't HAVE_XCONVERTCASE we must #include

View File

@ -1,3 +1,13 @@
2000-01-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c: Clean up some more leftovers from
before Owen's reorganization: Don't have queued_events and
queued_tail statics in this file, but use gdk_queued_events and
gdk_queued_tail. This makes exposure event compression work again.
(gdk_WindowProc): Comment out a posting of gdk_ping_msg, doesn't
seem to be needed?
1999-12-30 Tor Lillqvist <tml@iki.fi> 1999-12-30 Tor Lillqvist <tml@iki.fi>
* gdk/gdk.c: If we don't HAVE_XCONVERTCASE we must #include * gdk/gdk.c: If we don't HAVE_XCONVERTCASE we must #include

View File

@ -1,3 +1,13 @@
2000-01-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c: Clean up some more leftovers from
before Owen's reorganization: Don't have queued_events and
queued_tail statics in this file, but use gdk_queued_events and
gdk_queued_tail. This makes exposure event compression work again.
(gdk_WindowProc): Comment out a posting of gdk_ping_msg, doesn't
seem to be needed?
1999-12-30 Tor Lillqvist <tml@iki.fi> 1999-12-30 Tor Lillqvist <tml@iki.fi>
* gdk/gdk.c: If we don't HAVE_XCONVERTCASE we must #include * gdk/gdk.c: If we don't HAVE_XCONVERTCASE we must #include

View File

@ -1,3 +1,13 @@
2000-01-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c: Clean up some more leftovers from
before Owen's reorganization: Don't have queued_events and
queued_tail statics in this file, but use gdk_queued_events and
gdk_queued_tail. This makes exposure event compression work again.
(gdk_WindowProc): Comment out a posting of gdk_ping_msg, doesn't
seem to be needed?
1999-12-30 Tor Lillqvist <tml@iki.fi> 1999-12-30 Tor Lillqvist <tml@iki.fi>
* gdk/gdk.c: If we don't HAVE_XCONVERTCASE we must #include * gdk/gdk.c: If we don't HAVE_XCONVERTCASE we must #include

View File

@ -1,3 +1,13 @@
2000-01-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c: Clean up some more leftovers from
before Owen's reorganization: Don't have queued_events and
queued_tail statics in this file, but use gdk_queued_events and
gdk_queued_tail. This makes exposure event compression work again.
(gdk_WindowProc): Comment out a posting of gdk_ping_msg, doesn't
seem to be needed?
1999-12-30 Tor Lillqvist <tml@iki.fi> 1999-12-30 Tor Lillqvist <tml@iki.fi>
* gdk/gdk.c: If we don't HAVE_XCONVERTCASE we must #include * gdk/gdk.c: If we don't HAVE_XCONVERTCASE we must #include

View File

@ -1,3 +1,13 @@
2000-01-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c: Clean up some more leftovers from
before Owen's reorganization: Don't have queued_events and
queued_tail statics in this file, but use gdk_queued_events and
gdk_queued_tail. This makes exposure event compression work again.
(gdk_WindowProc): Comment out a posting of gdk_ping_msg, doesn't
seem to be needed?
1999-12-30 Tor Lillqvist <tml@iki.fi> 1999-12-30 Tor Lillqvist <tml@iki.fi>
* gdk/gdk.c: If we don't HAVE_XCONVERTCASE we must #include * gdk/gdk.c: If we don't HAVE_XCONVERTCASE we must #include

View File

@ -1,3 +1,13 @@
2000-01-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c: Clean up some more leftovers from
before Owen's reorganization: Don't have queued_events and
queued_tail statics in this file, but use gdk_queued_events and
gdk_queued_tail. This makes exposure event compression work again.
(gdk_WindowProc): Comment out a posting of gdk_ping_msg, doesn't
seem to be needed?
1999-12-30 Tor Lillqvist <tml@iki.fi> 1999-12-30 Tor Lillqvist <tml@iki.fi>
* gdk/gdk.c: If we don't HAVE_XCONVERTCASE we must #include * gdk/gdk.c: If we don't HAVE_XCONVERTCASE we must #include

View File

@ -133,12 +133,6 @@ static HCURSOR p_grab_cursor;
static GList *client_filters; /* Filters for client messages */ static GList *client_filters; /* Filters for client messages */
/* FIFO's for event queue, and for events put back using
* gdk_event_put().
*/
static GList *queued_events = NULL;
static GList *queued_tail = NULL;
static GSourceFuncs event_funcs = { static GSourceFuncs event_funcs = {
gdk_event_prepare, gdk_event_prepare,
gdk_event_check, gdk_event_check,
@ -197,7 +191,7 @@ gdk_WindowProc (HWND hWnd,
if (event.any.type == GDK_CONFIGURE) if (event.any.type == GDK_CONFIGURE)
{ {
/* Compress configure events */ /* Compress configure events */
GList *list = queued_events; GList *list = gdk_queued_events;
while (list != NULL while (list != NULL
&& (((GdkEvent *)list->data)->any.type != GDK_CONFIGURE && (((GdkEvent *)list->data)->any.type != GDK_CONFIGURE
@ -205,6 +199,8 @@ gdk_WindowProc (HWND hWnd,
list = list->next; list = list->next;
if (list != NULL) if (list != NULL)
{ {
GDK_NOTE (EVENTS, g_print ("... compressing an CONFIGURE event\n"));
*((GdkEvent *)list->data) = event; *((GdkEvent *)list->data) = event;
gdk_window_unref (event.any.window); gdk_window_unref (event.any.window);
/* Wake up WaitMessage */ /* Wake up WaitMessage */
@ -215,7 +211,7 @@ gdk_WindowProc (HWND hWnd,
else if (event.any.type == GDK_EXPOSE) else if (event.any.type == GDK_EXPOSE)
{ {
/* Compress expose events */ /* Compress expose events */
GList *list = queued_events; GList *list = gdk_queued_events;
while (list != NULL while (list != NULL
&& (((GdkEvent *)list->data)->any.type != GDK_EXPOSE && (((GdkEvent *)list->data)->any.type != GDK_EXPOSE
@ -225,13 +221,16 @@ gdk_WindowProc (HWND hWnd,
{ {
GdkRectangle u; GdkRectangle u;
GDK_NOTE (EVENTS, g_print ("... compressing an EXPOSE event\n"));
gdk_rectangle_union (&event.expose.area, gdk_rectangle_union (&event.expose.area,
&((GdkEvent *)list->data)->expose.area, &((GdkEvent *)list->data)->expose.area,
&u); &u);
((GdkEvent *)list->data)->expose.area = u; ((GdkEvent *)list->data)->expose.area = u;
gdk_window_unref (event.any.window); gdk_window_unref (event.any.window);
#if 0
/* Wake up WaitMessage */ /* Wake up WaitMessage */
PostMessage (NULL, gdk_ping_msg, 0, 0); PostMessage (NULL, gdk_ping_msg, 0, 0);
#endif
return FALSE; return FALSE;
} }
} }
@ -3845,7 +3844,7 @@ gdk_event_translate (GdkEvent *event,
return_val = !GDK_DRAWABLE_DESTROYED (window); return_val = !GDK_DRAWABLE_DESTROYED (window);
if (return_val) if (return_val)
{ {
GList *list = queued_events; GList *list = gdk_queued_events;
while (list != NULL ) while (list != NULL )
{ {
if ((((GdkEvent *)list->data)->any.type == GDK_EXPOSE) && if ((((GdkEvent *)list->data)->any.type == GDK_EXPOSE) &&
@ -4197,7 +4196,7 @@ gdk_events_queue (void)
((GdkEventPrivate *)event)->flags |= GDK_EVENT_PENDING; ((GdkEventPrivate *)event)->flags |= GDK_EVENT_PENDING;
gdk_event_queue_append (event); gdk_event_queue_append (event);
node = queued_tail; node = gdk_queued_tail;
if (gdk_event_translate (event, &msg, NULL, NULL)) if (gdk_event_translate (event, &msg, NULL, NULL))
((GdkEventPrivate *)event)->flags &= ~GDK_EVENT_PENDING; ((GdkEventPrivate *)event)->flags &= ~GDK_EVENT_PENDING;