thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MAEMO: Minor cleanup

Browse source
This commit is contained in:
Cameron Cawley 2019-07-02 19:30:38 +01:00 • committed by Tarek Soliman
parent 0334411d63
commit 6e690c5a8b
5 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
backends/events/maemosdl/maemosdl-events.cpp
View file

@ -25,6 +25,7 @@
#include "common/scummsys.h" #include "common/scummsys.h"
#include "backends/events/maemosdl/maemosdl-events.h" #include "backends/events/maemosdl/maemosdl-events.h"
#include "backends/platform/maemo/maemo.h"
#include "common/translation.h" #include "common/translation.h"
namespace Maemo { namespace Maemo {

2
backends/events/maemosdl/maemosdl-events.h
View file

@ -26,8 +26,6 @@
#define BACKEND_EVENTS_SDL_MAEMO_H #define BACKEND_EVENTS_SDL_MAEMO_H
#include "backends/events/sdl/sdl-events.h" #include "backends/events/sdl/sdl-events.h"
#include "backends/platform/maemo/maemo.h"
#include "backends/graphics/surfacesdl/surfacesdl-graphics.h"
namespace Maemo { namespace Maemo {

4
backends/graphics/maemosdl/maemosdl-graphics.cpp
View file

@ -24,7 +24,6 @@
#include "common/scummsys.h" #include "common/scummsys.h"
#include "backends/platform/maemo/maemo.h" #include "backends/platform/maemo/maemo.h"
#include "backends/events/maemosdl/maemosdl-events.h"
#include "backends/graphics/maemosdl/maemosdl-graphics.h" #include "backends/graphics/maemosdl/maemosdl-graphics.h"
MaemoSdlGraphicsManager::MaemoSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window) MaemoSdlGraphicsManager::MaemoSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window)
@ -36,8 +35,7 @@ bool MaemoSdlGraphicsManager::loadGFXMode() {
// fix the problematic zoom key capture in Maemo5/N900 // fix the problematic zoom key capture in Maemo5/N900
SDL_SysWMinfo info; SDL_SysWMinfo info;
SDL_VERSION(&info.version); if (_window->getSDLWMInformation(&info)) {
if (SDL_GetWMInfo(&info)) {
Display *dpy = info.info.x11.display; Display *dpy = info.info.x11.display;
Window win; Window win;
unsigned long val = 1; unsigned long val = 1;

5
backends/platform/maemo/maemo.cpp
View file

@ -129,8 +129,7 @@ void OSystem_SDL_Maemo::fatalError() {
void OSystem_SDL_Maemo::setXWindowName(const char *caption) { void OSystem_SDL_Maemo::setXWindowName(const char *caption) {
SDL_SysWMinfo info; SDL_SysWMinfo info;
SDL_VERSION(&info.version); if (_window->getSDLWMInformation(&info)) {
if (SDL_GetWMInfo(&info)) {
Display *dpy = info.info.x11.display; Display *dpy = info.info.x11.display;
Window win; Window win;
win = info.info.x11.fswindow; win = info.info.x11.fswindow;
@ -155,7 +154,7 @@ void OSystem_SDL_Maemo::setWindowCaption(const char *caption) {
} }
} }
SDL_WM_SetCaption(cap.c_str(), cap.c_str()); _window->setWindowCaption(cap);
Common::String cap2("ScummVM - "); // 2 lines in OS2008 task switcher, set first line Common::String cap2("ScummVM - "); // 2 lines in OS2008 task switcher, set first line
cap = cap2 + cap; cap = cap2 + cap;

4
backends/platform/maemo/main.cpp
View file

@ -22,14 +22,10 @@
#if defined(MAEMO) #if defined(MAEMO)
#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
#include "backends/platform/maemo/maemo.h" #include "backends/platform/maemo/maemo.h"
#include "backends/plugins/sdl/sdl-provider.h" #include "backends/plugins/sdl/sdl-provider.h"
#include "base/main.h" #include "base/main.h"
#include <unistd.h>
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
g_system = new Maemo::OSystem_SDL_Maemo(); g_system = new Maemo::OSystem_SDL_Maemo();
assert(g_system); assert(g_system);