summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-08-23 15:02:10 +0300
committerAndrei Karas <akaras@inbox.ru>2013-08-24 21:08:16 +0300
commitb9fe47de21f8c899bfe36f70633a8c8110314d77 (patch)
tree5699072a9b0a29f3ca31c0646c3cec65b07dbbf5
parentc6519e4cf281c2b9dade62c806647930868c4abc (diff)
downloadplus-b9fe47de21f8c899bfe36f70633a8c8110314d77.tar.gz
plus-b9fe47de21f8c899bfe36f70633a8c8110314d77.tar.bz2
plus-b9fe47de21f8c899bfe36f70633a8c8110314d77.tar.xz
plus-b9fe47de21f8c899bfe36f70633a8c8110314d77.zip
extent SDL event logging for SDL2.
add events logging before login into game.
-rw-r--r--src/client.cpp55
-rw-r--r--src/client.h1
2 files changed, 54 insertions, 2 deletions
diff --git a/src/client.cpp b/src/client.cpp
index f615ec2d2..ea1da8247 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -317,7 +317,8 @@ Client::Client(const Options &options) :
mIsMinimized(false),
mInputFocused(true),
mMouseFocused(true),
- mNewMessageFlag(false)
+ mNewMessageFlag(false),
+ mLogInput(false)
{
mInstance = this;
@@ -677,7 +678,6 @@ void Client::gameInit()
const int fpsLimit = config.getIntValue("fpslimit");
mLimitFps = fpsLimit > 0;
-
SDL_initFramerate(&mFpsManager);
setFramerate(fpsLimit);
config.addListener("fpslimit", this);
@@ -688,7 +688,9 @@ void Client::gameInit()
config.addListener("vsync", this);
config.addListener("repeateDelay", this);
config.addListener("repeateInterval", this);
+ config.addListener("logInput", this);
setGuiAlpha(config.getFloatValue("guialpha"));
+ mLogInput = config.getBoolValue("logInput");
optionChanged("fpslimit");
start_time = static_cast<int>(time(nullptr));
@@ -939,6 +941,8 @@ int Client::gameExec()
// Handle SDL events
while (SDL_PollEvent(&event))
{
+ if (mLogInput)
+ logEvent(event);
switch (event.type)
{
case SDL_QUIT:
@@ -1846,6 +1850,10 @@ void Client::optionChanged(const std::string &name)
{
applyKeyRepeat();
}
+ else if (name == "logInput")
+ {
+ mLogInput = config.getBoolValue("logInput");
+ }
}
void Client::action(const gcn::ActionEvent &event)
@@ -2942,6 +2950,11 @@ void Client::logEvent(const SDL_Event &event)
event.motion.state, event.motion.x, event.motion.y);
break;
#ifdef USE_SDL2
+#define winEventLog(name, name2) \
+ case name: \
+ str = name2; \
+ break
+
case SDL_KEYDOWN:
logger->log("event: SDL_KEYDOWN: %d,%d", event.key.state,
event.key.keysym.scancode);
@@ -2950,6 +2963,44 @@ void Client::logEvent(const SDL_Event &event)
logger->log("event: SDL_KEYUP: %d,%d", event.key.state,
event.key.keysym.scancode);
break;
+ case SDL_WINDOWEVENT:
+ {
+ const int data1 = event.window.data1;
+ const int data2 = event.window.data2;
+ std::string str;
+ switch (event.window.event)
+ {
+ winEventLog(SDL_WINDOWEVENT_NONE, "SDL_WINDOWEVENT_NONE");
+ winEventLog(SDL_WINDOWEVENT_SHOWN, "SDL_WINDOWEVENT_SHOWN");
+ winEventLog(SDL_WINDOWEVENT_HIDDEN, "SDL_WINDOWEVENT_HIDDEN");
+ winEventLog(SDL_WINDOWEVENT_EXPOSED,
+ "SDL_WINDOWEVENT_EXPOSED");
+ winEventLog(SDL_WINDOWEVENT_MOVED, "SDL_WINDOWEVENT_MOVED");
+ winEventLog(SDL_WINDOWEVENT_RESIZED,
+ "SDL_WINDOWEVENT_RESIZED");
+ winEventLog(SDL_WINDOWEVENT_SIZE_CHANGED,
+ "SDL_WINDOWEVENT_SIZE_CHANGED");
+ winEventLog(SDL_WINDOWEVENT_MINIMIZED,
+ "SDL_WINDOWEVENT_MINIMIZED");
+ winEventLog(SDL_WINDOWEVENT_MAXIMIZED,
+ "SDL_WINDOWEVENT_MAXIMIZED");
+ winEventLog(SDL_WINDOWEVENT_RESTORED,
+ "SDL_WINDOWEVENT_RESTORED");
+ winEventLog(SDL_WINDOWEVENT_ENTER, "SDL_WINDOWEVENT_ENTER");
+ winEventLog(SDL_WINDOWEVENT_LEAVE, "SDL_WINDOWEVENT_LEAVE");
+ winEventLog(SDL_WINDOWEVENT_FOCUS_GAINED,
+ "SDL_WINDOWEVENT_FOCUS_GAINED");
+ winEventLog(SDL_WINDOWEVENT_FOCUS_LOST,
+ "SDL_WINDOWEVENT_FOCUS_LOST");
+ winEventLog(SDL_WINDOWEVENT_CLOSE, "SDL_WINDOWEVENT_CLOSE");
+ default:
+ str = "unknown";
+ break;
+ }
+ logger->log("event: SDL_WINDOWEVENT: %s: %d,%d",
+ str.c_str(), data1, data2);
+ break;
+ }
#else
case SDL_KEYDOWN:
logger->log("event: SDL_KEYDOWN: %d,%d,%d", event.key.state,
diff --git a/src/client.h b/src/client.h
index 318dbb14b..938170610 100644
--- a/src/client.h
+++ b/src/client.h
@@ -440,6 +440,7 @@ private:
bool mInputFocused;
bool mMouseFocused;
bool mNewMessageFlag;
+ bool mLogInput;
};
#endif // CLIENT_H