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

SDL2 Update for Windows Tray Notification

Browse source 
As requested by Aginor, update anything necessary for compilation with SDL 2.0.
This commit is contained in:
Wedge009 2015-08-15 11:04:13 +10:00
parent 9a752aa3d9
commit 8610a67b87
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/desktop/windows_tray_notification.cpp
View file

@ -20,6 +20,10 @@
#include "serialization/string_utils.hpp"
#include "serialization/unicode.hpp"
#if SDL_VERSION_ATLEAST(2, 0, 0)
#include "video.hpp" // CVideo class holds the twindow -> SDL_Window object which contains the handle of the main window
#endif
NOTIFYICONDATA* windows_tray_notification::nid = NULL;
bool windows_tray_notification::message_reset = false;
@ -40,14 +44,26 @@ void windows_tray_notification::destroy_tray_icon()
void windows_tray_notification::handle_system_event(const SDL_Event& event)
{
#if !SDL_VERSION_ATLEAST(2, 0, 0)
if (event.syswm.msg->msg != WM_TRAYNOTIFY) {
#else
if (event.syswm.msg->msg.win.msg != WM_TRAYNOTIFY) {
#endif
return;
}
#if !SDL_VERSION_ATLEAST(2, 0, 0)
if (event.syswm.msg->lParam == NIN_BALLOONUSERCLICK) {
#else
if (event.syswm.msg->msg.win.lParam == NIN_BALLOONUSERCLICK) {
#endif
switch_to_wesnoth_window();
destroy_tray_icon();
#if !SDL_VERSION_ATLEAST(2, 0, 0)
} else if (event.syswm.msg->lParam == NIN_BALLOONTIMEOUT) {
#else
} else if (event.syswm.msg->msg.win.lParam == NIN_BALLOONTIMEOUT) {
#endif
destroy_tray_icon();
}
}
@ -157,11 +173,20 @@ HWND windows_tray_notification::get_window_handle()
{
SDL_SysWMinfo wmInfo;
SDL_VERSION(&wmInfo.version);
#if !SDL_VERSION_ATLEAST(2, 0, 0)
if (SDL_GetWMInfo(&wmInfo) != 1) {
#else
// SDL 1.2 keeps track of window handles internally whereas SDL 2.0 allows the caller control over which window to use
if (SDL_GetWindowWMInfo (static_cast<SDL_Window *> (*CVideo::get_window()), &wmInfo) != SDL_TRUE) {
#endif
return NULL;
}
#if !SDL_VERSION_ATLEAST(2, 0, 0)
return wmInfo.window;
#else
return wmInfo.info.win.window;
#endif
}
void windows_tray_notification::switch_to_wesnoth_window()