forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adding SDL2 platform support, part 2

This commit is contained in:
Vadim Lopatin 2014-04-27 07:31:07 +04:00
parent 75aafcadcc
commit f72af0f807
2 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlanguilib.dproj
View File

@ -28,8 +28,6 @@
<ObjectsDirectory>obj/Debug</ObjectsDirectory> <ObjectsDirectory>obj/Debug</ObjectsDirectory>
<Externalconsole>true</Externalconsole> <Externalconsole>true</Externalconsole>
<Target>StaticLibrary</Target> <Target>StaticLibrary</Target>
<ExtraCompilerArguments>
</ExtraCompilerArguments>
<UnittestMode>false</UnittestMode> <UnittestMode>false</UnittestMode>
<LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries> <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
<DebugLevel>0</DebugLevel> <DebugLevel>0</DebugLevel>

49
src/dlangui/platforms/sdl/sdlapp.d
View File

@ -30,7 +30,8 @@ version(USE_SDL) {
// pragma(lib, "dl"); // pragma(lib, "dl");
class SDLWindow : Window { class SDLWindow : Window {
SDL_Window * _win;
SDL_Renderer* _renderer;
this(string caption, Window parent) { this(string caption, Window parent) {
_caption = caption; _caption = caption;
Log.d("Creating SDL window"); Log.d("Creating SDL window");
@ -38,10 +39,24 @@ version(USE_SDL) {
} }
~this() { ~this() {
Log.d("Destroying window"); Log.d("Destroying window");
if (_renderer)
SDL_DestroyRenderer(_renderer);
if (_win)
SDL_DestroyWindow(_win);
} }
bool create() { bool create() {
windowCaption = _caption; _win = SDL_CreateWindow(_caption.toStringz, 20, 20, 700, 500, SDL_WINDOW_SHOWN);
if (!_win) {
Log.e("SDL2: Failed to create window");
return false;
}
_renderer = SDL_CreateRenderer(_win, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
if (!_renderer) {
Log.e("SDL2: Failed to create renderer");
return false;
}
//windowCaption = _caption;
return true; return true;
} }
@ -162,12 +177,6 @@ version(USE_SDL) {
} catch (Exception e) { } catch (Exception e) {
Log.e("Cannot load opengl library", e); Log.e("Cannot load opengl library", e);
} }
try {
// Load the SDL 2 library.
DerelictSDL2.load();
} catch (Exception e) {
Log.e("Cannot load SDL2 library", e);
}
return true; return true;
} }
@ -183,6 +192,13 @@ version(USE_SDL) {
} }
override int enterMessageLoop() { override int enterMessageLoop() {
Log.i("entering message loop"); Log.i("entering message loop");
SDL_Event event;
bool quit = false;
while(!quit) {
while(SDL_PollEvent(&event)) {
SDL_PumpEvents();
}
}
Log.i("exiting message loop"); Log.i("exiting message loop");
return 0; return 0;
} }
@ -208,6 +224,23 @@ version(USE_SDL) {
setStderrLogger(); setStderrLogger();
setLogLevel(LogLevel.Trace); setLogLevel(LogLevel.Trace);
try {
// Load the SDL 2 library.
DerelictSDL2.load();
} catch (Exception e) {
Log.e("Cannot load SDL2 library", e);
return 1;
}
SDL_DisplayMode displayMode;
if (SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_EVENTS) != 0) {
Log.e("Cannot init SDL2");
return 2;
}
scope(exit)SDL_Quit();
int request = SDL_GetDesktopDisplayMode(0,&displayMode);
FreeTypeFontManager ft = new FreeTypeFontManager(); FreeTypeFontManager ft = new FreeTypeFontManager();
// TODO: use FontConfig // TODO: use FontConfig
ft.registerFont("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", FontFamily.SansSerif, "DejaVu", false, FontWeight.Normal); ft.registerFont("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", FontFamily.SansSerif, "DejaVu", false, FontWeight.Normal);