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

more utf8 support, linux this time

This commit is contained in:
Adam D. Ruppe 2016-04-08 19:36:53 -04:00
parent 6b77a0b679
commit b1fe71324c
1 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
simpledisplay.d
View File

@ -4160,6 +4160,7 @@ version(X11) {
static XFontStruct* font; static XFontStruct* font;
static bool fontAttempted; static bool fontAttempted;
static XFontSet fontset;
void create(NativeWindowHandle window) { void create(NativeWindowHandle window) {
this.display = XDisplayConnection.get(); this.display = XDisplayConnection.get();
@ -4181,6 +4182,11 @@ version(X11) {
if(font is null) if(font is null)
font = XLoadQueryFont(display, "-*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*".ptr); font = XLoadQueryFont(display, "-*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*".ptr);
char** lol;
int lol2;
char* lol3;
fontset = XCreateFontSet(display, xfontstr.ptr, &lol, &lol2, &lol3);
fontAttempted = true; fontAttempted = true;
} }
@ -4205,6 +4211,9 @@ version(X11) {
version(none) // we don't want to free it because we can use it later version(none) // we don't want to free it because we can use it later
if(font) if(font)
XFreeFont(display, font); XFreeFont(display, font);
version(none) // we don't want to free it because we can use it later
if(fontset)
XFreeFontSet(display, fontset);
XFlush(display); XFlush(display);
if(window.paintingFinished !is null) if(window.paintingFinished !is null)
@ -4309,6 +4318,7 @@ version(X11) {
foreach(line; text.split('\n')) { foreach(line; text.split('\n')) {
int textWidth; int textWidth;
if(font) if(font)
// FIXME: unicode
textWidth = XTextWidth( font, line.ptr, cast(int) line.length); textWidth = XTextWidth( font, line.ptr, cast(int) line.length);
else else
textWidth = 12 * cast(int) line.length; textWidth = 12 * cast(int) line.length;
@ -4322,12 +4332,19 @@ version(X11) {
void drawText(in int x, in int y, in int x2, in int y2, in char[] originalText, in uint alignment) { void drawText(in int x, in int y, in int x2, in int y2, in char[] originalText, in uint alignment) {
// FIXME: we should actually draw unicode.. but until then, I'm going to strip out multibyte chars // FIXME: we should actually draw unicode.. but until then, I'm going to strip out multibyte chars
immutable(ubyte)[] text; const(char)[] text;
// the first 256 unicode codepoints are the same as ascii and latin-1, which is what X expects, so we can keep all those if(fontset)
// then strip the rest so there isn't garbage text = originalText;
foreach(dchar ch; originalText) else {
if(ch < 256) text.reserve(originalText.length);
text ~= cast(ubyte) ch; // the first 256 unicode codepoints are the same as ascii and latin-1, which is what X expects, so we can keep all those
// then strip the rest so there isn't garbage
foreach(dchar ch; originalText)
if(ch < 256)
text ~= cast(ubyte) ch;
else
text ~= 191; // FIXME: using a random character to fill the space
}
if(text.length == 0) if(text.length == 0)
return; return;
@ -4366,6 +4383,7 @@ version(X11) {
foreach(line; text.split('\n')) { foreach(line; text.split('\n')) {
int textWidth; int textWidth;
if(font) if(font)
// FIXME: unicode
textWidth = XTextWidth( font, line.ptr, cast(int) line.length); textWidth = XTextWidth( font, line.ptr, cast(int) line.length);
else else
textWidth = 12 * cast(int) line.length; textWidth = 12 * cast(int) line.length;
@ -4384,7 +4402,11 @@ version(X11) {
px = pos; px = pos;
} }
XDrawString(display, d, gc, px, py + (font ? font.max_bounds.ascent : lineHeight), line.ptr, cast(int) line.length); if(fontset)
Xutf8DrawString(display, d, fontset, gc, px, py + (font ? font.max_bounds.ascent : lineHeight), line.ptr, cast(int) line.length);
else
XDrawString(display, d, gc, px, py + (font ? font.max_bounds.ascent : lineHeight), line.ptr, cast(int) line.length);
cy += lineHeight + 4; cy += lineHeight + 4;
} }
} }
@ -6930,6 +6952,11 @@ struct Visual
int XSetForeground(Display*, GC, uint); int XSetForeground(Display*, GC, uint);
int XSetBackground(Display*, GC, uint); int XSetBackground(Display*, GC, uint);
alias void* XFontSet; // i think
XFontSet XCreateFontSet(Display*, const char*, char***, int*, char**);
void XFreeFontSet(Display*, XFontSet);
void Xutf8DrawString(Display*, Drawable, XFontSet, GC, int, int, in char*, int);
int XSetFunction(Display*, GC, int); int XSetFunction(Display*, GC, int);
enum GXcopy = 0x3; enum GXcopy = 0x3;
enum GXxor = 0x6; enum GXxor = 0x6;