mirror of https://github.com/buggins/dlangui.git
adding SDL2 platform support, part 1
This commit is contained in:
Vadim Lopatin
parent
21cf6bd401
commit
75aafcadcc
|
|
@ -159,6 +159,12 @@ Development using Mono-D:
|
|||
* open solution dlangui/dlanguimonod.sln
|
||||
* build and run project example1
|
||||
|
||||
You need fresh version of MonoDevelop to use Mono-D. It can be installed from PPA repository.
|
||||
|
||||
sudo add-apt-repository ppa:ermshiperete/monodevelop
|
||||
sudo apt-get update
|
||||
sudo apt-get install monodevelop-current
|
||||
|
||||
|
||||
Other platforms
|
||||
---------------
|
||||
|
|
|
|||
|
|
@ -28,11 +28,17 @@
|
|||
<ObjectsDirectory>obj/Debug</ObjectsDirectory>
|
||||
<Externalconsole>true</Externalconsole>
|
||||
<Target>StaticLibrary</Target>
|
||||
<ExtraCompilerArguments>-version=USE_OPENGL
|
||||
<ExtraCompilerArguments>
|
||||
</ExtraCompilerArguments>
|
||||
<UnittestMode>false</UnittestMode>
|
||||
<LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
|
||||
<DebugLevel>0</DebugLevel>
|
||||
<VersionIds>
|
||||
<VersionIds>
|
||||
<String>USE_OPENGL</String>
|
||||
<String>USE_SDL</String>
|
||||
</VersionIds>
|
||||
</VersionIds>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<OutputPath>bin\Release</OutputPath>
|
||||
|
|
@ -192,6 +198,28 @@
|
|||
<Compile Include="src\dlangui\core\collections.d" />
|
||||
<Compile Include="src\dlangui\core\signals.d" />
|
||||
<Compile Include="src\dlangui\widgets\editors.d" />
|
||||
<Compile Include="src\dlangui\platforms\sdl\sdlapp.d" />
|
||||
<Compile Include="..\DerelictSDL2\source\derelict\sdl2\functions.d">
|
||||
<Link>3rdparty\FreetypeSDL2\functions.d</Link>
|
||||
</Compile>
|
||||
<Compile Include="..\DerelictSDL2\source\derelict\sdl2\image.d">
|
||||
<Link>3rdparty\FreetypeSDL2\image.d</Link>
|
||||
</Compile>
|
||||
<Compile Include="..\DerelictSDL2\source\derelict\sdl2\mixer.d">
|
||||
<Link>3rdparty\FreetypeSDL2\mixer.d</Link>
|
||||
</Compile>
|
||||
<Compile Include="..\DerelictSDL2\source\derelict\sdl2\net.d">
|
||||
<Link>3rdparty\FreetypeSDL2\net.d</Link>
|
||||
</Compile>
|
||||
<Compile Include="..\DerelictSDL2\source\derelict\sdl2\sdl.d">
|
||||
<Link>3rdparty\FreetypeSDL2\sdl.d</Link>
|
||||
</Compile>
|
||||
<Compile Include="..\DerelictSDL2\source\derelict\sdl2\ttf.d">
|
||||
<Link>3rdparty\FreetypeSDL2\ttf.d</Link>
|
||||
</Compile>
|
||||
<Compile Include="..\DerelictSDL2\source\derelict\sdl2\types.d">
|
||||
<Link>3rdparty\FreetypeSDL2\types.d</Link>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="src\dlangui\platforms\x11\" />
|
||||
|
|
@ -199,5 +227,6 @@
|
|||
<Folder Include="3rdparty\DerelictGL3\" />
|
||||
<Folder Include="3rdparty\DerelictFT\" />
|
||||
<Folder Include="3rdparty\DerelictFI\" />
|
||||
<Folder Include="3rdparty\FreetypeSDL2\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,242 @@
|
|||
module src.dlangui.platforms.sdl.sdlapp;
|
||||
|
||||
version(USE_SDL) {
|
||||
import std.string;
|
||||
import std.conv;
|
||||
|
||||
import dlangui.core.logger;
|
||||
import dlangui.core.events;
|
||||
import dlangui.graphics.drawbuf;
|
||||
import dlangui.graphics.fonts;
|
||||
import dlangui.graphics.ftfonts;
|
||||
import dlangui.graphics.resources;
|
||||
import dlangui.widgets.styles;
|
||||
import dlangui.platforms.common.platform;
|
||||
|
||||
import derelict.sdl2.sdl;
|
||||
|
||||
version (USE_OPENGL) {
|
||||
import dlangui.graphics.glsupport;
|
||||
}
|
||||
|
||||
import derelict.opengl3.gl3;
|
||||
import derelict.opengl3.glx;
|
||||
|
||||
// pragma(lib, "xcb");
|
||||
// pragma(lib, "xcb-shm");
|
||||
// pragma(lib, "xcb-image");
|
||||
// pragma(lib, "X11-xcb");
|
||||
// pragma(lib, "X11");
|
||||
// pragma(lib, "dl");
|
||||
|
||||
class SDLWindow : Window {
|
||||
|
||||
this(string caption, Window parent) {
|
||||
_caption = caption;
|
||||
Log.d("Creating SDL window");
|
||||
create();
|
||||
}
|
||||
~this() {
|
||||
Log.d("Destroying window");
|
||||
}
|
||||
|
||||
bool create() {
|
||||
windowCaption = _caption;
|
||||
return true;
|
||||
}
|
||||
|
||||
@property uint windowId() {
|
||||
return 1; // TODO;
|
||||
}
|
||||
|
||||
void draw(ColorDrawBuf buf) {
|
||||
}
|
||||
|
||||
bool _derelictgl3Reloaded;
|
||||
override void show() {
|
||||
Log.d("XCBWindow.show()");
|
||||
}
|
||||
|
||||
protected string _caption;
|
||||
|
||||
override @property string windowCaption() {
|
||||
return _caption;
|
||||
}
|
||||
|
||||
override @property void windowCaption(string caption) {
|
||||
_caption = caption;
|
||||
//TODO
|
||||
}
|
||||
|
||||
void redraw() {
|
||||
|
||||
if (_enableOpengl) {
|
||||
version(USE_OPENGL) {
|
||||
}
|
||||
} else {
|
||||
if (!_drawbuf)
|
||||
_drawbuf = new ColorDrawBuf(_dx, _dy);
|
||||
_drawbuf.resize(_dx, _dy);
|
||||
_drawbuf.fill(_backgroundColor);
|
||||
onDraw(_drawbuf);
|
||||
draw(_drawbuf);
|
||||
}
|
||||
}
|
||||
|
||||
ColorDrawBuf _drawbuf;
|
||||
|
||||
bool _exposeSent;
|
||||
void processExpose() {
|
||||
redraw();
|
||||
_exposeSent = false;
|
||||
}
|
||||
|
||||
/// request window redraw
|
||||
override void invalidate() {
|
||||
if (_exposeSent)
|
||||
return;
|
||||
_exposeSent = true;
|
||||
//TODO
|
||||
}
|
||||
|
||||
protected ButtonDetails _lbutton;
|
||||
protected ButtonDetails _mbutton;
|
||||
protected ButtonDetails _rbutton;
|
||||
void processMouseEvent(MouseAction action, ubyte detail, ushort state, short x, short y) {
|
||||
bool res = false; //dispatchMouseEvent(event);
|
||||
if (res) {
|
||||
Log.d("Calling update() after mouse event");
|
||||
invalidate();
|
||||
}
|
||||
}
|
||||
|
||||
uint convertKeyCode(uint keyCode) {
|
||||
return 0x10000 | keyCode;
|
||||
}
|
||||
|
||||
uint convertKeyFlags(uint flags) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool processKeyEvent(KeyAction action, uint keyCode, uint flags) {
|
||||
Log.d("processKeyEvent ", action, " x11 key=", keyCode, " x11 flags=", flags);
|
||||
keyCode = convertKeyCode(keyCode);
|
||||
flags = convertKeyFlags(flags);
|
||||
Log.d("processKeyEvent ", action, " converted key=", keyCode, " converted flags=", flags);
|
||||
bool res = dispatchKeyEvent(new KeyEvent(action, keyCode, flags));
|
||||
if (keyCode & 0x10000 && (keyCode & 0xF000) != 0xF000) {
|
||||
dchar[1] text;
|
||||
text[0] = keyCode & 0xFFFF;
|
||||
res = dispatchKeyEvent(new KeyEvent(KeyAction.Text, keyCode, flags, cast(dstring)text)) || res;
|
||||
}
|
||||
if (res) {
|
||||
Log.d("Calling update() after key event");
|
||||
invalidate();
|
||||
}
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
private __gshared bool _enableOpengl;
|
||||
|
||||
class SDLPlatform : Platform {
|
||||
this() {
|
||||
|
||||
}
|
||||
~this() {
|
||||
foreach(ref SDLWindow wnd; _windowMap) {
|
||||
destroy(wnd);
|
||||
wnd = null;
|
||||
}
|
||||
_windowMap.clear();
|
||||
disconnect();
|
||||
}
|
||||
void disconnect() {
|
||||
/* Cleanup */
|
||||
}
|
||||
bool connect() {
|
||||
|
||||
try {
|
||||
DerelictGL3.load();
|
||||
_enableOpengl = true;
|
||||
} catch (Exception 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;
|
||||
}
|
||||
SDLWindow getWindow(uint w) {
|
||||
if (w in _windowMap)
|
||||
return _windowMap[w];
|
||||
return null;
|
||||
}
|
||||
override Window createWindow(string windowCaption, Window parent) {
|
||||
SDLWindow res = new SDLWindow(windowCaption, parent);
|
||||
_windowMap[res.windowId] = res;
|
||||
return res;
|
||||
}
|
||||
override int enterMessageLoop() {
|
||||
Log.i("entering message loop");
|
||||
Log.i("exiting message loop");
|
||||
return 0;
|
||||
}
|
||||
|
||||
/// retrieves text from clipboard (when mouseBuffer == true, use mouse selection clipboard - under linux)
|
||||
override dstring getClipboardText(bool mouseBuffer = false) {
|
||||
return ""d;
|
||||
}
|
||||
|
||||
/// sets text to clipboard (when mouseBuffer == true, use mouse selection clipboard - under linux)
|
||||
override void setClipboardText(dstring text, bool mouseBuffer = false) {
|
||||
}
|
||||
|
||||
protected SDLWindow[uint] _windowMap;
|
||||
}
|
||||
|
||||
// entry point
|
||||
extern(C) int UIAppMain(string[] args);
|
||||
|
||||
int main(string[] args)
|
||||
{
|
||||
|
||||
setStderrLogger();
|
||||
setLogLevel(LogLevel.Trace);
|
||||
|
||||
FreeTypeFontManager ft = new FreeTypeFontManager();
|
||||
// TODO: use FontConfig
|
||||
ft.registerFont("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", FontFamily.SansSerif, "DejaVu", false, FontWeight.Normal);
|
||||
FontManager.instance = ft;
|
||||
|
||||
currentTheme = createDefaultTheme();
|
||||
|
||||
SDLPlatform sdl = new SDLPlatform();
|
||||
if (!sdl.connect()) {
|
||||
return 1;
|
||||
}
|
||||
Platform.setInstance(sdl);
|
||||
|
||||
int res = 0;
|
||||
|
||||
res = UIAppMain(args);
|
||||
|
||||
Platform.setInstance(null);
|
||||
Log.d("Destroying SDL platform");
|
||||
destroy(sdl);
|
||||
|
||||
currentTheme = null;
|
||||
drawableCache = null;
|
||||
imageCache = null;
|
||||
FontManager.instance = null;
|
||||
|
||||
Log.d("Exiting main");
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
module src.dlangui.platforms.x11.x11app;
|
||||
|
||||
version(linux) {
|
||||
version(USE_XCB) {
|
||||
|
||||
import std.string;
|
||||
import std.c.linux.X11.xcb.xcb;
|
||||
|
|
|
|||
Loading…
Reference in New Issue