mirror of https://github.com/adamdruppe/arsd.git
new css selector lexer (thanks ketmar)
This commit is contained in:
Adam D. Ruppe
parent
c4f5e2d6d6
commit
ed9fb7ea6d
88
README
88
README
|
|
@ -141,3 +141,91 @@ minimal.zip - a set of minimal D functions, works on bare metal. see: http://ars
|
|||
Authors:
|
||||
|
||||
Thanks go to Nick Sabalausky, Trass3r, Stanislav Blinov, and maartenvd for input and patches.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Newer writeup:
|
||||
=================
|
||||
|
||||
|
||||
audio.d, screen.d, engine.d - my old game stuff, wrapping SDL, works in D1 and D2 (or at least did last time I tried it about a year ago). Soon to be replaced by the dependency-free simpledisplay.d, simpleaudio.d, joystick.d combo.
|
||||
|
||||
bmp.d, png.d - read/write for bmp and image files.
|
||||
jpg.d - partial read support for jpeg headers (just to get the size of the image).
|
||||
|
||||
cgi.d - basic module for making web apps. Includes cgi, fastcgi, scgi, and an embedded http server. Reads url encoded data, MIME data (for file uploads on the web), and has full URL parsing, among other things.
|
||||
|
||||
characterencodings.d - stuff for converting other strings to UTF-8. Supports about twenty other encodings based on webpage and email mining I've done in the past. Also has a lossy conversion as a catchall.
|
||||
|
||||
color.d - a color struct for RGBA, also does CSS color string read/writing, HSL <-> RGB, some color manipulation, alpha blending, and image base classes including palette to true color and true color to palette (quantization).
|
||||
|
||||
csv.d - simple csv reader, predates std.csv (and is a bit simpler)
|
||||
|
||||
curl.d - wrapper for libcurl (predates std.net.curl)
|
||||
|
||||
database.d - base class for RDBMS access. Also includes basic ORM and query builder in the form of DataObject and SelectBuilder. It is a simple, low-level wrapper of sql so you can manipulate it semantically more easily but you still need to understand sql to use it. (It also doesn't limit your options!)
|
||||
|
||||
mysql.d, postgres.d, mssql.d, sqlite.d - drivers for database.d (wrapping C libraries)
|
||||
|
||||
dom.d - XML and HTML parsing and manipulation, including CSS selectors and other tools that can help for implementing a browser. API inspired by modern Javascript DOM, capable of scraping tag soup web pages.
|
||||
|
||||
email.d - functions for reading and writing emails with MIME attachments, html and text versions, character sets. Can scrape mbox format, I used it to automatically monitor and reply to some email addresses sitting on the smtp server.
|
||||
|
||||
english.d - printing numbers in English
|
||||
|
||||
eventloop.d - an epoll based event loop for responding to and sending events. My other modules can optionally tie into it, so you can have one event loop driving files, networks, terminals, X windows, and more.
|
||||
|
||||
html.d - stuff for html and CSS manipulation. Includes the Css Macro Expander, which is similar to functionality offered by SASS (also available as a stand alone dub package on code.dlang.org btw), and a Javascript macro expander which you can use to add stuff like foreach to that language. Also has HTML sanitization based on a full parser and whitelist.
|
||||
|
||||
htmltotext.d - converts html to plain text so you can display it in a terminal or an email, etc.
|
||||
|
||||
http.d - my old standalone http client. Does NOT depend on curl. I'm in the process of replacing it with http2.d, which has a more flexible, asynchronous api (still dependency free, though I have to add OpenSSL and SChannel support for SSL soon). http2 provides an object that kinda works like a browser -it can understand relative links, maintain cookies, etc.
|
||||
|
||||
joystick.d - code for accessing XBox 360 controllers (and similar ones, like the PS1 controller via usb) on Windows and Linux.
|
||||
|
||||
jsvar.d - a var type similar to Javascript, usable in D. Can be used to read and write JSON with a natural syntax and other dynamic type tasks.
|
||||
|
||||
mangle.d - mangles a D name
|
||||
|
||||
minigui.d - small, dependency-free (except for simpledisplay.d and color.d but doesn't even need Phobos) widget set, using Win32 native widgets where possible, custom Xlib based ones otherwise. Still work in progress but already works for some basic forms.
|
||||
|
||||
oauth.d - OAuth library for client and server. I've used it with Twitter, Linked In, AWeber, Facebook, and more. Has specific functions for the Facebook Graph API, tweeting, serving oauth 1.0 requests, and doing the OAuth authorization flow. Depends on the mhash C library.
|
||||
|
||||
querygenerator.d - a user-contributed module for sql query generation
|
||||
|
||||
rpc.d - a remote procedure call library for D, making interfaces available across the network. You might prefer the apache thrift bindings or something, this is a custom job that I haven't seriously used.
|
||||
|
||||
script.d - a script interpeter based on jsvar.d. The script language is like a cross of D and Javascript. Made for API convenience - very very easy to embed in an application.
|
||||
|
||||
sha.d - implementation of SHA1 and SHA2 in pure D (well and some inline asm).
|
||||
|
||||
simpleaudio.d - access to WinMM on Windows and ALSA on Linux for waveform sound I/O and MIDI I/O.
|
||||
|
||||
simpledisplay.d - dependency-free base windowing library. Allows drawing, input, and other basic functionality. Also allows OpenGL access.
|
||||
|
||||
sslsocket.d - Uses OpenSSL to inherit from std.socket.Socket and give client SSL support.
|
||||
|
||||
stb_truetype.d - port of C library for writing ttf fonts to images. Has some convenience functions (but they aren't great, works, but not great)
|
||||
|
||||
terminal.d - I/O support for the text console. Does real time input, cellular output, getting lines with user editing, coloring, mouse input, and more.
|
||||
|
||||
xwindows.d - functions for working with X, beyond what simpledisplay.d offers. Stuff like interacting with the window manager, getting window icons, etc. I wrote it to support my D xlib taskbar.
|
||||
|
||||
web.d - wraps a D class in an HTTP api, with automatic url routing, view generation, argument conversion, and much more. Also includes a HTML templating system among other stuff that brings a lot of these modules together.
|
||||
|
||||
|
||||
|
||||
There's a few other hidden gems in the files themselves, and so much more on my pipeline. Among the ones you might see added in the next month:
|
||||
|
||||
game.d - helper functions for writing games (bringing together the display, audio, and joystick stuff). I have OpenGL texture stuff written now, almost done with the high level input api, and some math stuff that will probably be in there.
|
||||
|
||||
model.d - loading and displaying a 3d model format with open gl.
|
||||
|
||||
midi.d, wav.d - loading, saving, and working with midi and wav files
|
||||
|
||||
|
||||
(Yes, I'm writing a pair of D games again, finally! First time in a long time, but it is moving along well... and I don't need SDL this time!)
|
||||
|
|
|
|||
209
dom.d
209
dom.d
|
|
@ -20,6 +20,9 @@
|
|||
*/
|
||||
module arsd.dom;
|
||||
|
||||
// FIXME: do parent selector picking in get selector
|
||||
// FIXME: do :has too... or instead, :has is quite nice.
|
||||
|
||||
version(with_arsd_jsvar)
|
||||
import arsd.jsvar;
|
||||
else {
|
||||
|
|
@ -4734,71 +4737,132 @@ int intFromHex(string hex) {
|
|||
}
|
||||
|
||||
///.
|
||||
string[] lexSelector(string selector) {
|
||||
// look, ma, no phobos!
|
||||
// new lexer by ketmar
|
||||
string[] lexSelector (string selstr) {
|
||||
|
||||
// FIXME: it doesn't support quoted attributes
|
||||
// FIXME: it doesn't support backslash escaped characters
|
||||
// FIXME: it should ignore /* comments */
|
||||
string[] tokens;
|
||||
sizediff_t start = -1;
|
||||
bool skip = false;
|
||||
// get rid of useless, non-syntax whitespace
|
||||
|
||||
selector = selector.strip();
|
||||
selector = selector.replace("\n", " "); // FIXME hack
|
||||
|
||||
selector = selector.replace(" >", ">");
|
||||
selector = selector.replace("> ", ">");
|
||||
selector = selector.replace(" +", "+");
|
||||
selector = selector.replace("+ ", "+");
|
||||
selector = selector.replace(" ~", "~");
|
||||
selector = selector.replace("~ ", "~");
|
||||
selector = selector.replace(" <", "<");
|
||||
selector = selector.replace("< ", "<");
|
||||
// FIXME: this is ugly ^^^^^. It should just ignore that whitespace somewhere else.
|
||||
|
||||
// FIXME: another ugly hack. maybe i should just give in and do this the right way......
|
||||
string fixupEscaping(string input) {
|
||||
auto lol = input.replace("\\", "\u00ff");
|
||||
lol = lol.replace("\u00ff\u00ff", "\\");
|
||||
return lol.replace("\u00ff", "");
|
||||
static sizediff_t idToken (string str, size_t stpos) {
|
||||
char c = str[stpos];
|
||||
foreach (sizediff_t tidx, immutable token; selectorTokens) {
|
||||
if (c == token[0]) {
|
||||
if (token.length > 1) {
|
||||
assert(token.length == 2); // we don't have 3-char tokens yet
|
||||
if (str.length-stpos < 2 || str[stpos+1] != token[1]) continue;
|
||||
}
|
||||
return tidx;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
bool escaping = false;
|
||||
foreach(i, c; selector) { // kill useless leading/trailing whitespace too
|
||||
if(skip) {
|
||||
skip = false;
|
||||
// skip spaces and comments
|
||||
static string removeLeadingBlanks (string str) {
|
||||
size_t curpos = 0;
|
||||
while (curpos < str.length) {
|
||||
immutable char ch = str[curpos];
|
||||
// this can overflow on 4GB strings on 32-bit; 'cmon, don't be silly, nobody cares!
|
||||
if (ch == '/' && str.length-curpos > 1 && str[curpos+1] == '*') {
|
||||
// comment
|
||||
curpos += 2;
|
||||
while (curpos < str.length) {
|
||||
if (str[curpos] == '*' && str.length-curpos > 1 && str[curpos+1] == '/') {
|
||||
curpos += 2;
|
||||
break;
|
||||
}
|
||||
++curpos;
|
||||
}
|
||||
} else if (ch <= 32) {
|
||||
// we should consider unicode spaces too, but... unicode sux anyway.
|
||||
++curpos;
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return str[curpos..$];
|
||||
}
|
||||
|
||||
static bool isBlankAt() (string str, size_t pos) {
|
||||
// we should consider unicode spaces too, but... unicode sux anyway.
|
||||
return
|
||||
(pos < str.length && // in string
|
||||
(str[pos] <= 32 || // space
|
||||
(str.length-pos > 1 && str[pos] == '/' && str[pos+1] == '*'))); // comment
|
||||
}
|
||||
|
||||
string[] tokens;
|
||||
// lexx it!
|
||||
while ((selstr = removeLeadingBlanks(selstr)).length > 0) {
|
||||
if(selstr[0] == '\"') {
|
||||
auto pos = 1;
|
||||
bool escaping;
|
||||
while(pos < selstr.length && !escaping && selstr[pos] != '"') {
|
||||
if(escaping)
|
||||
escaping = false;
|
||||
else if(selstr[pos] == '\\')
|
||||
escaping = true;
|
||||
pos++;
|
||||
}
|
||||
|
||||
// FIXME: do better unescaping
|
||||
tokens ~= selstr[1 .. pos].replace(`\"`, `"`);
|
||||
selstr = selstr[pos + 1.. $];
|
||||
continue;
|
||||
}
|
||||
|
||||
sizediff_t tid = -1;
|
||||
|
||||
if(escaping)
|
||||
escaping = false;
|
||||
else if(c == '\\')
|
||||
escaping = true;
|
||||
else
|
||||
tid = idToken(selector, i);
|
||||
|
||||
if(tid == -1) {
|
||||
if(start == -1)
|
||||
start = i;
|
||||
} else {
|
||||
if(start != -1) {
|
||||
tokens ~= fixupEscaping(selector[start..i]);
|
||||
start = -1;
|
||||
}
|
||||
tokens ~= selectorTokens[tid];
|
||||
// no tokens starts with escape
|
||||
immutable tid = idToken(selstr, 0);
|
||||
if (tid >= 0) {
|
||||
// special token
|
||||
tokens ~= selectorTokens[tid]; // it's funnier this way
|
||||
selstr = selstr[selectorTokens[tid].length..$];
|
||||
continue;
|
||||
}
|
||||
|
||||
if (tid != -1 && selectorTokens[tid].length == 2)
|
||||
skip = true;
|
||||
// from start to space or special token
|
||||
size_t escapePos = size_t.max;
|
||||
size_t curpos = 0; // i can has chizburger^w escape at the start
|
||||
while (curpos < selstr.length) {
|
||||
if (selstr[curpos] == '\\') {
|
||||
// this is escape, just skip it and next char
|
||||
if (escapePos == size_t.max) escapePos = curpos;
|
||||
curpos = (selstr.length-curpos >= 2 ? curpos+2 : selstr.length);
|
||||
} else {
|
||||
if (isBlankAt(selstr, curpos) || idToken(selstr, curpos) >= 0) break;
|
||||
++curpos;
|
||||
}
|
||||
}
|
||||
// identifier
|
||||
if (escapePos != size_t.max) {
|
||||
// i hate it when it happens
|
||||
string id = selstr[0..escapePos];
|
||||
while (escapePos < curpos) {
|
||||
if (curpos-escapePos < 2) break;
|
||||
id ~= selstr[escapePos+1]; // escaped char
|
||||
escapePos += 2;
|
||||
immutable stp = escapePos;
|
||||
while (escapePos < curpos && selstr[escapePos] != '\\') ++escapePos;
|
||||
if (escapePos > stp) id ~= selstr[stp..escapePos];
|
||||
}
|
||||
if (id.length > 0) tokens ~= id;
|
||||
} else {
|
||||
tokens ~= selstr[0..curpos];
|
||||
}
|
||||
selstr = selstr[curpos..$];
|
||||
}
|
||||
if(start != -1)
|
||||
tokens ~= fixupEscaping(selector[start..$]);
|
||||
|
||||
return tokens;
|
||||
}
|
||||
version(unittest_domd_lexer) unittest {
|
||||
assert(lexSelector(r" test\=me /*d*/") == [r"test=me"]);
|
||||
assert(lexSelector(r"div/**/. id") == ["div", ".", "id"]);
|
||||
assert(lexSelector(r" < <") == ["<", "<"]);
|
||||
assert(lexSelector(r" <<") == ["<<"]);
|
||||
assert(lexSelector(r" <</") == ["<<", "/"]);
|
||||
assert(lexSelector(r" <</*") == ["<<"]);
|
||||
assert(lexSelector(r" <\</*") == ["<", "<"]);
|
||||
assert(lexSelector(r"heh\") == ["heh"]);
|
||||
assert(lexSelector(r"alice \") == ["alice"]);
|
||||
assert(lexSelector(r"alice,is#best") == ["alice", ",", "is", "#", "best"]);
|
||||
}
|
||||
|
||||
///.
|
||||
struct SelectorPart {
|
||||
|
|
@ -4839,13 +4903,13 @@ int intFromHex(string hex) {
|
|||
}
|
||||
ret ~= tagNameFilter;
|
||||
foreach(a; attributesPresent) ret ~= "[" ~ a ~ "]";
|
||||
foreach(a; attributesEqual) ret ~= "[" ~ a[0] ~ "=" ~ a[1] ~ "]";
|
||||
foreach(a; attributesEndsWith) ret ~= "[" ~ a[0] ~ "$=" ~ a[1] ~ "]";
|
||||
foreach(a; attributesStartsWith) ret ~= "[" ~ a[0] ~ "^=" ~ a[1] ~ "]";
|
||||
foreach(a; attributesNotEqual) ret ~= "[" ~ a[0] ~ "!=" ~ a[1] ~ "]";
|
||||
foreach(a; attributesInclude) ret ~= "[" ~ a[0] ~ "*=" ~ a[1] ~ "]";
|
||||
foreach(a; attributesIncludesSeparatedByDashes) ret ~= "[" ~ a[0] ~ "|=" ~ a[1] ~ "]";
|
||||
foreach(a; attributesIncludesSeparatedBySpaces) ret ~= "[" ~ a[0] ~ "~=" ~ a[1] ~ "]";
|
||||
foreach(a; attributesEqual) ret ~= "[" ~ a[0] ~ "=\"" ~ a[1] ~ "\"]";
|
||||
foreach(a; attributesEndsWith) ret ~= "[" ~ a[0] ~ "$=\"" ~ a[1] ~ "\"]";
|
||||
foreach(a; attributesStartsWith) ret ~= "[" ~ a[0] ~ "^=\"" ~ a[1] ~ "\"]";
|
||||
foreach(a; attributesNotEqual) ret ~= "[" ~ a[0] ~ "!=\"" ~ a[1] ~ "\"]";
|
||||
foreach(a; attributesInclude) ret ~= "[" ~ a[0] ~ "*=\"" ~ a[1] ~ "\"]";
|
||||
foreach(a; attributesIncludesSeparatedByDashes) ret ~= "[" ~ a[0] ~ "|=\"" ~ a[1] ~ "\"]";
|
||||
foreach(a; attributesIncludesSeparatedBySpaces) ret ~= "[" ~ a[0] ~ "~=\"" ~ a[1] ~ "\"]";
|
||||
|
||||
if(firstChild) ret ~= ":first-child";
|
||||
if(lastChild) ret ~= ":last-child";
|
||||
|
|
@ -5087,10 +5151,15 @@ int intFromHex(string hex) {
|
|||
///.
|
||||
Selector[] parseSelectorString(string selector, bool caseSensitiveTags = true) {
|
||||
Selector[] ret;
|
||||
foreach(s; selector.split(",")) {
|
||||
ret ~= parseSelector(lexSelector(s), caseSensitiveTags);
|
||||
auto tokens = lexSelector(selector); // this will parse commas too
|
||||
// and now do comma-separated slices (i haz phobosophobia!)
|
||||
while (tokens.length > 0) {
|
||||
size_t end = 0;
|
||||
while (end < tokens.length && tokens[end] != ",") ++end;
|
||||
if (end > 0) ret ~= parseSelector(tokens[0..end], caseSensitiveTags);
|
||||
if (tokens.length-end < 2) break;
|
||||
tokens = tokens[end+1..$];
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -5131,6 +5200,12 @@ int intFromHex(string hex) {
|
|||
if(tid == -1) {
|
||||
if(!caseSensitiveTags)
|
||||
token = token.toLower();
|
||||
if(current.tagNameFilter) {
|
||||
// if it was already set, we must see two thingies
|
||||
// separated by whitespace...
|
||||
commit();
|
||||
current.separation = 0; // tree
|
||||
}
|
||||
current.tagNameFilter = token;
|
||||
} else {
|
||||
// Selector operators
|
||||
|
|
@ -5268,12 +5343,6 @@ int intFromHex(string hex) {
|
|||
break;
|
||||
}
|
||||
|
||||
// FIXME: HACK this chops off quotes from the outside for the comparison
|
||||
// for compatibility with real CSS. The lexer should be properly fixed, though.
|
||||
// FIXME: when the lexer is fixed, remove this lest you break it moar.
|
||||
if(attributeValue.length > 2 && attributeValue[0] == '"' && attributeValue[$-1] == '"')
|
||||
attributeValue = attributeValue[1 .. $-1];
|
||||
|
||||
// Selector operators
|
||||
switch(attributeComparison) {
|
||||
default: assert(0);
|
||||
|
|
|
|||
54
joystick.d
54
joystick.d
|
|
@ -3,6 +3,22 @@
|
|||
|
||||
This will offer a pollable state of two styles of controller: a PS1 or an XBox 360.
|
||||
|
||||
|
||||
Actually, maybe I'll combine the two controller types. Make L2 and R2 just digital aliases
|
||||
for the triggers, which are analog aliases for it.
|
||||
|
||||
Then have a virtual left stick which has the dpad aliases, while keeping the other two independent
|
||||
(physical dpad and physical left stick).
|
||||
|
||||
Everything else should basically just work. We'll simply be left with naming and I can do them with
|
||||
aliases too.
|
||||
|
||||
|
||||
I do NOT bother with pressure sensitive other buttons, though Xbox original and PS2 had them, they
|
||||
have been removed from the newer models. It makes things simpler anyway since we can check "was just
|
||||
pressed" instead of all deltas.
|
||||
|
||||
|
||||
The PS1 controller style works for a lot of games:
|
||||
* The D-pad is an alias for the left stick. Analog input still works too.
|
||||
* L2 and R2 are given as buttons
|
||||
|
|
@ -326,8 +342,8 @@ struct JoystickUpdate {
|
|||
}
|
||||
|
||||
// Note: UP is negative!
|
||||
short axisPosition(Axis axis) {
|
||||
return axisPositionHelper(axis, ¤t);
|
||||
short axisPosition(Axis axis, short digitalFallbackValue = short.max) {
|
||||
return axisPositionHelper(axis, ¤t, digitalFallbackValue);
|
||||
}
|
||||
|
||||
/* private */
|
||||
|
|
@ -337,31 +353,31 @@ struct JoystickUpdate {
|
|||
return buttonIsPressedHelper(button, &old);
|
||||
}
|
||||
|
||||
short oldAxisPosition(Axis axis) {
|
||||
return axisPositionHelper(axis, &old);
|
||||
short oldAxisPosition(Axis axis, short digitalFallbackValue = short.max) {
|
||||
return axisPositionHelper(axis, &old, digitalFallbackValue);
|
||||
}
|
||||
|
||||
short axisPositionHelper(Axis axis, JoystickState* what) {
|
||||
short axisPositionHelper(Axis axis, JoystickState* what, short digitalFallbackValue = short.max) {
|
||||
version(ps1_style) {
|
||||
// on PS1, the d-pad and left stick are synonyms for each other
|
||||
// the dpad takes precedence, if it is pressed
|
||||
|
||||
if(axis == PS1AnalogAxes.horizontalDpad || axis == PS1AnalogAxes.horizontalLeftStick) {
|
||||
auto it = axisPositionHelperRaw(PS1AnalogAxes.horizontalDpad, what);
|
||||
auto it = axisPositionHelperRaw(PS1AnalogAxes.horizontalDpad, what, digitalFallbackValue);
|
||||
if(!it)
|
||||
it = axisPositionHelperRaw(PS1AnalogAxes.horizontalLeftStick, what);
|
||||
it = axisPositionHelperRaw(PS1AnalogAxes.horizontalLeftStick, what, digitalFallbackValue);
|
||||
return it;
|
||||
}
|
||||
|
||||
if(axis == PS1AnalogAxes.verticalDpad || axis == PS1AnalogAxes.verticalLeftStick) {
|
||||
auto it = axisPositionHelperRaw(PS1AnalogAxes.verticalDpad, what);
|
||||
auto it = axisPositionHelperRaw(PS1AnalogAxes.verticalDpad, what, digitalFallbackValue);
|
||||
if(!it)
|
||||
it = axisPositionHelperRaw(PS1AnalogAxes.verticalLeftStick, what);
|
||||
it = axisPositionHelperRaw(PS1AnalogAxes.verticalLeftStick, what, digitalFallbackValue);
|
||||
return it;
|
||||
}
|
||||
}
|
||||
|
||||
return axisPositionHelperRaw(axis, what);
|
||||
return axisPositionHelperRaw(axis, what, digitalFallbackValue);
|
||||
}
|
||||
|
||||
static short normalizeAxis(short value) {
|
||||
|
|
@ -423,7 +439,7 @@ struct JoystickUpdate {
|
|||
}
|
||||
}
|
||||
|
||||
short axisPositionHelperRaw(Axis axis, JoystickState* what) {
|
||||
short axisPositionHelperRaw(Axis axis, JoystickState* what, short digitalFallbackValue = short.max) {
|
||||
version(linux) {
|
||||
int mapping = -1;
|
||||
if(auto ptr = joystickMapping[player])
|
||||
|
|
@ -444,12 +460,12 @@ struct JoystickUpdate {
|
|||
case XBox360Axes.verticalRightStick:
|
||||
return normalizeAxis(what.Gamepad.sThumbRY);
|
||||
case XBox360Axes.verticalDpad:
|
||||
return (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP) ? short.min :
|
||||
(what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN) ? short.max :
|
||||
return (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP) ? -digitalFallbackValue :
|
||||
(what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN) ? digitalFallbackValue :
|
||||
0;
|
||||
case XBox360Axes.horizontalDpad:
|
||||
return (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT) ? short.min :
|
||||
(what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT) ? short.max :
|
||||
return (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT) ? -digitalFallbackValue :
|
||||
(what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT) ? digitalFallbackValue :
|
||||
0;
|
||||
case XBox360Axes.lt:
|
||||
return normalizeTrigger(what.Gamepad.bLeftTrigger);
|
||||
|
|
@ -460,8 +476,8 @@ struct JoystickUpdate {
|
|||
final switch(axis) {
|
||||
case PS1AnalogAxes.horizontalDpad:
|
||||
case PS1AnalogAxes.horizontalLeftStick:
|
||||
short got = (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT) ? short.min :
|
||||
(what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT) ? short.max :
|
||||
short got = (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT) ? -digitalFallbackValue :
|
||||
(what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT) ? digitalFallbackValue :
|
||||
0;
|
||||
if(got == 0)
|
||||
got = what.Gamepad.sThumbLX;
|
||||
|
|
@ -469,8 +485,8 @@ struct JoystickUpdate {
|
|||
return normalizeAxis(got);
|
||||
case PS1AnalogAxes.verticalDpad:
|
||||
case PS1AnalogAxes.verticalLeftStick:
|
||||
short got = (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP) ? short.max :
|
||||
(what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN) ? short.min :
|
||||
short got = (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP) ? digitalFallbackValue :
|
||||
(what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN) ? -digitalFallbackValue :
|
||||
what.Gamepad.sThumbLY;
|
||||
|
||||
return normalizeAxis(-got);
|
||||
|
|
|
|||
3
jsvar.d
3
jsvar.d
|
|
@ -1635,9 +1635,6 @@ WrappedNativeObject wrapNativeObject(Class)(Class obj) if(is(Class == class)) {
|
|||
_properties[memberName] = new PropertyPrototype(
|
||||
() => var(__traits(getMember, obj, memberName)),
|
||||
(var v) {
|
||||
static if(memberName == "handleCharEvent") {
|
||||
import std.stdio; writeln("setting ", memberName, " to ", v.get!type.ptr);
|
||||
}
|
||||
__traits(getMember, obj, memberName) = v.get!(type);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6207,6 +6207,9 @@ extern(System){
|
|||
void glColor3f(float, float, float);
|
||||
void glColor4f(float, float, float, float);
|
||||
void glTranslatef(float, float, float);
|
||||
void glScalef(float, float, float);
|
||||
|
||||
void glDrawElements(int, int, int, void*);
|
||||
|
||||
void glRotatef(float, float, float, float);
|
||||
|
||||
|
|
@ -6225,7 +6228,7 @@ extern(System){
|
|||
void glGenTextures(uint, uint*);
|
||||
void glBindTexture(int, int);
|
||||
void glTexParameteri(uint, uint, int);
|
||||
void glTexImage2D(int, int, int, int, int, int, int, int, void*);
|
||||
void glTexImage2D(int, int, int, int, int, int, int, int, in void*);
|
||||
|
||||
|
||||
void glTexCoord2f(float, float);
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ struct TtfFont {
|
|||
return ptr[0 .. width * height];
|
||||
}
|
||||
|
||||
void getStringSize(string s, int size, out int width, out int height) {
|
||||
void getStringSize(in char[] s, int size, out int width, out int height) {
|
||||
float xpos=0;
|
||||
|
||||
auto scale = stbtt_ScaleForPixelHeight(&font, size);
|
||||
|
|
@ -55,7 +55,7 @@ struct TtfFont {
|
|||
height = size;
|
||||
}
|
||||
|
||||
ubyte[] renderString(string s, int size, out int width, out int height) {
|
||||
ubyte[] renderString(in char[] s, int size, out int width, out int height) {
|
||||
float xpos=0;
|
||||
|
||||
auto scale = stbtt_ScaleForPixelHeight(&font, size);
|
||||
|
|
|
|||
42
terminal.d
42
terminal.d
|
|
@ -316,6 +316,7 @@ struct Terminal {
|
|||
private int fdOut;
|
||||
private int fdIn;
|
||||
private int[] delegate() getSizeOverride;
|
||||
void delegate(in void[]) _writeDelegate; // used to override the unix write() system call, set it magically
|
||||
}
|
||||
|
||||
version(Posix) {
|
||||
|
|
@ -917,14 +918,21 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
|
|||
/// Flushes your updates to the terminal.
|
||||
/// It is important to call this when you are finished writing for now if you are using the version=with_eventloop
|
||||
void flush() {
|
||||
version(Posix) {
|
||||
ssize_t written;
|
||||
if(writeBuffer.length == 0)
|
||||
return;
|
||||
|
||||
while(writeBuffer.length) {
|
||||
written = unix.write(this.fdOut, writeBuffer.ptr, writeBuffer.length);
|
||||
if(written < 0)
|
||||
throw new Exception("write failed for some reason");
|
||||
writeBuffer = writeBuffer[written .. $];
|
||||
version(Posix) {
|
||||
if(_writeDelegate !is null) {
|
||||
_writeDelegate(writeBuffer);
|
||||
} else {
|
||||
ssize_t written;
|
||||
|
||||
while(writeBuffer.length) {
|
||||
written = unix.write(this.fdOut, writeBuffer.ptr, writeBuffer.length);
|
||||
if(written < 0)
|
||||
throw new Exception("write failed for some reason");
|
||||
writeBuffer = writeBuffer[written .. $];
|
||||
}
|
||||
}
|
||||
} else version(Windows) {
|
||||
while(writeBuffer.length) {
|
||||
|
|
@ -934,7 +942,6 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
|
|||
writeBuffer = writeBuffer[written .. $];
|
||||
}
|
||||
}
|
||||
// not buffering right now on Windows, since it probably isn't on ssh anyway
|
||||
}
|
||||
|
||||
int[] getSize() {
|
||||
|
|
@ -1287,11 +1294,16 @@ struct RealTimeConsoleInput {
|
|||
|
||||
terminal.writeStringRaw("\033[?1000h");
|
||||
destructor ~= { terminal.writeStringRaw("\033[?1000l"); };
|
||||
if(terminal.terminalInFamily("xterm")) {
|
||||
// the MOUSE_HACK env var is for the case where I run screen
|
||||
// but set TERM=xterm (which I do from putty). The 1003 mouse mode
|
||||
// doesn't work there, breaking mouse support entirely. So by setting
|
||||
// MOUSE_HACK=1002 it tells us to use the other mode for a fallback.
|
||||
import std.process : environment;
|
||||
if(terminal.terminalInFamily("xterm") && environment.get("MOUSE_HACK") != "1002") {
|
||||
// this is vt200 mouse with full motion tracking, supported by xterm
|
||||
terminal.writeStringRaw("\033[?1003h");
|
||||
destructor ~= { terminal.writeStringRaw("\033[?1003l"); };
|
||||
} else if(terminal.terminalInFamily("rxvt", "screen")) {
|
||||
} else if(terminal.terminalInFamily("rxvt", "screen") || environment.get("MOUSE_HACK") == "1002") {
|
||||
terminal.writeStringRaw("\033[?1002h"); // this is vt200 mouse with press/release and motion notification iff buttons are pressed
|
||||
destructor ~= { terminal.writeStringRaw("\033[?1002l"); };
|
||||
}
|
||||
|
|
@ -1677,8 +1689,14 @@ struct RealTimeConsoleInput {
|
|||
// it is the simplest thing that can possibly work. The alternative would be
|
||||
// doing non-blocking reads and buffering in the nextRaw function (not a bad idea
|
||||
// btw, just a bit more of a hassle).
|
||||
while(timedCheckForInput(0))
|
||||
initial ~= readNextEventsHelper();
|
||||
while(timedCheckForInput(0)) {
|
||||
auto ne = readNextEventsHelper();
|
||||
initial ~= ne;
|
||||
foreach(n; ne)
|
||||
if(n.type == InputEvent.Type.EndOfFileEvent)
|
||||
return initial; // hit end of file, get out of here lest we infinite loop
|
||||
// (select still returns info available even after we read end of file)
|
||||
}
|
||||
return initial;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue