Mercurial > sdl-ios-xcode

diff test/threadwin.c @ 4429:faa9fc8e7f67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
General improvements for user custom event registration * Switched event type to enum (int32) * Switched polling by mask to polling by type range * Added SDL_RegisterEvents() to allow dynamic user event registration * Spread events out to allow inserting new related events without breaking binary compatibility * Added padding to event structures so they're the same size regardless of 32-bit compiler structure packing settings * Split SDL_HasEvent() to SDL_HasEvent() for a single event and SDL_HasEvents() for a range of events * Added SDL_GetEventState() as a shortcut for SDL_EventState(X, SDL_QUERY) * Added SDL_FlushEvent() and SDL_FlushEvents() to clear events from the event queue
author Sam Lantinga <slouken@libsdl.org>
date Thu, 25 Mar 2010 01:08:26 -0700
parents 40888832d785
children dc0dfdd58f27
line wrap: on
line diff
--- a/test/threadwin.c	Wed Mar 10 15:07:20 2010 +0000
+++ b/test/threadwin.c	Thu Mar 25 01:08:26 2010 -0700
@@ -133,14 +133,10 @@
 {
     SDL_Event events[10];
     int i, found;
-    Uint32 mask;
 
     /* Handle mouse events here */
-    mask =
-        (SDL_MOUSEMOTIONMASK | SDL_MOUSEBUTTONDOWNMASK |
-         SDL_MOUSEBUTTONUPMASK);
     while (!done) {
-        found = SDL_PeepEvents(events, 10, SDL_GETEVENT, mask);
+        found = SDL_PeepEvents(events, 10, SDL_GETEVENT, SDL_MOUSEMOTION, SDL_MOUSEBUTTONUP);
         for (i = 0; i < found; ++i) {
             switch (events[i].type) {
                 /* We want to toggle visibility on buttonpress */
@@ -173,12 +169,10 @@
 {
     SDL_Event events[10];
     int i, found;
-    Uint32 mask;
 
     /* Handle mouse events here */
-    mask = (SDL_KEYDOWNMASK | SDL_KEYUPMASK);
     while (!done) {
-        found = SDL_PeepEvents(events, 10, SDL_GETEVENT, mask);
+        found = SDL_PeepEvents(events, 10, SDL_GETEVENT, SDL_KEYDOWN, SDL_KEYUP);
         for (i = 0; i < found; ++i) {
             switch (events[i].type) {
                 /* We want to toggle visibility on buttonpress */
@@ -329,7 +323,7 @@
         if (!(init_flags & SDL_INIT_EVENTTHREAD)) {
             SDL_PumpEvents();   /* Needed when event thread is off */
         }
-        if (SDL_PeepEvents(NULL, 0, SDL_PEEKEVENT, SDL_QUITMASK)) {
+        if (SDL_PeepEvents(NULL, 0, SDL_PEEKEVENT, SDL_QUIT, SDL_QUIT)) {
             done = 1;
         }
         /* Give up some CPU so the events can accumulate */