0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix the keylogger effect (for real this time)!

Browse source
This commit is contained in:
Patrick Parker 2007-02-05 04:31:33 +00:00
parent ca4aca8104
commit 7966589b87
5 changed files with 78 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -144,7 +144,7 @@ Version 1.3-svn:
* fix the completion when controlling multiple sides (bug #8101, patch #653)
* smarter focus handling when user input is irrelevant to the current focus
but relevant to another widget
* fix (partially) the "keylogger" effect when joining the MP Lobby
* fix the "keylogger" effect when joining the MP Lobby
* menus can now stay scrolled to the bottom if they were already scrolled
to the bottom
* friends list

44
src/events.cpp
View file

@ -17,6 +17,7 @@
#include "cursor.hpp"
#include "events.hpp"
#include "gp2x.hpp"
#include "log.hpp"
#include "preferences_display.hpp"
#include "sound.hpp"
#include "video.hpp"
@ -29,6 +30,11 @@
#include <utility>
#include <vector>
#define ERR_GEN LOG_STREAM(err, general)
unsigned input_blocker::instance_count = 0; //static initialization
namespace events
{
@ -272,10 +278,17 @@ void pump()
switch(event.type) {
case SDL_APPMOUSEFOCUS: {
case SDL_ACTIVEEVENT: {
SDL_ActiveEvent& ae = reinterpret_cast<SDL_ActiveEvent&>(event);
if(ae.state == SDL_APPMOUSEFOCUS || ae.state == SDL_APPINPUTFOCUS) {
cursor::set_focus(ae.gain == 1);
if((ae.state & SDL_APPMOUSEFOCUS) != 0 || (ae.state & SDL_APPINPUTFOCUS) != 0) {
cursor::set_focus(ae.gain != 0);
events::flush( SDL_EVENTMASK(SDL_KEYDOWN)|
SDL_EVENTMASK(SDL_KEYUP)|
SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN)|
SDL_EVENTMASK(SDL_MOUSEBUTTONUP)|
SDL_EVENTMASK(SDL_JOYBUTTONDOWN)|
SDL_EVENTMASK(SDL_JOYBUTTONUP)
);
}
break;
}
@ -446,4 +459,29 @@ void raise_help_string_event(int mousex, int mousey)
}
}
int flush(Uint32 event_mask)
{
int flush_count = 0;
SDL_Event temp_event;
std::vector< SDL_Event > keepers;
SDL_Delay(10);
while(SDL_PollEvent(&temp_event) > 0) {
if((SDL_EVENTMASK(temp_event.type) & event_mask) == 0) {
keepers.push_back( temp_event );
} else {
++flush_count;
}
}
//FIXME: there is a chance new events are added before kept events are replaced
std::vector<SDL_Event>::iterator itor;
for(itor = keepers.begin(); itor != keepers.end(); ++itor)
{
if(SDL_PushEvent(itor) != 0) {
ERR_GEN << "failed to return an event to the queue.";
}
}
return flush_count;
}
}

36
src/events.hpp
View file

@ -86,6 +86,7 @@ struct event_context
//causes events to be dispatched to all handler objects.
void pump();
int flush(Uint32 event_mask=SDL_ALLEVENTS);
void raise_process_event();
void raise_draw_event();
@ -96,4 +97,39 @@ void raise_help_string_event(int mousex, int mousey);
typedef std::vector<events::handler*> handler_vector;
struct input_blocker
{
static unsigned instance_count;
input_blocker()
{
SDL_EventState(SDL_KEYDOWN, SDL_IGNORE);
SDL_EventState(SDL_KEYUP, SDL_IGNORE);
SDL_EventState(SDL_MOUSEBUTTONDOWN, SDL_IGNORE);
SDL_EventState(SDL_MOUSEBUTTONUP, SDL_IGNORE);
SDL_EventState(SDL_JOYBUTTONDOWN, SDL_IGNORE);
SDL_EventState(SDL_JOYBUTTONUP, SDL_IGNORE);
instance_count++;
}
~input_blocker()
{
instance_count--;
if(instance_count == 0) {
events::flush( SDL_EVENTMASK(SDL_KEYDOWN)|
SDL_EVENTMASK(SDL_KEYUP)|
SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN)|
SDL_EVENTMASK(SDL_MOUSEBUTTONUP)|
SDL_EVENTMASK(SDL_JOYBUTTONDOWN)|
SDL_EVENTMASK(SDL_JOYBUTTONUP)
);
SDL_EventState(SDL_KEYDOWN, SDL_ENABLE);
SDL_EventState(SDL_KEYUP, SDL_ENABLE);
SDL_EventState(SDL_MOUSEBUTTONDOWN, SDL_ENABLE);
SDL_EventState(SDL_MOUSEBUTTONUP, SDL_ENABLE);
SDL_EventState(SDL_JOYBUTTONDOWN, SDL_ENABLE);
SDL_EventState(SDL_JOYBUTTONUP, SDL_ENABLE);
}
}
};
#endif

2
src/sdl_utils.cpp
View file

@ -25,8 +25,6 @@
#include <iostream>
#include <map>
unsigned input_blocker::instance_count = 0; //static initialization
SDLKey sdl_keysym_from_name(std::string const &keyname)
{
static bool initialized = false;

28
src/sdl_utils.hpp
View file

@ -167,34 +167,6 @@ struct pixel_data
int r, g, b;
};
struct input_blocker
{
static unsigned instance_count;
input_blocker()
{
SDL_EventState(SDL_KEYDOWN, SDL_IGNORE);
SDL_EventState(SDL_KEYUP, SDL_IGNORE);
SDL_EventState(SDL_MOUSEBUTTONDOWN, SDL_IGNORE);
SDL_EventState(SDL_MOUSEBUTTONUP, SDL_IGNORE);
SDL_EventState(SDL_JOYBUTTONDOWN, SDL_IGNORE);
SDL_EventState(SDL_JOYBUTTONUP, SDL_IGNORE);
instance_count++;
}
~input_blocker()
{
instance_count--;
if(instance_count == 0) {
SDL_EventState(SDL_KEYDOWN, SDL_ENABLE);
SDL_EventState(SDL_KEYUP, SDL_ENABLE);
SDL_EventState(SDL_MOUSEBUTTONDOWN, SDL_ENABLE);
SDL_EventState(SDL_MOUSEBUTTONUP, SDL_ENABLE);
SDL_EventState(SDL_JOYBUTTONDOWN, SDL_ENABLE);
SDL_EventState(SDL_JOYBUTTONUP, SDL_ENABLE);
}
}
};
struct surface_lock
{
surface_lock(surface const &surf) : surface_(surf), locked_(false)