64 bit support (also fetch new arsd repo updates btw)

bmp.d

@@ -351,7 +351,7 @@ void writeBmp(MemoryImage img, string filename) {
 		bytesPerPixel = 4;
 	else assert(0, "not implemented"); // FIXME
 
-	int offsetStart = data.length;
+	int offsetStart = cast(int) data.length;
 	for(int y = height; y > 0; y--) {
 		offsetStart -= width * bytesPerPixel;
 		int offset = offsetStart;

eventloop.d

@@ -366,6 +366,12 @@ private FileEventDispatcher fileEventDispatcher;
 
 /// To add listeners for file events on a specific file dispatcher, use this.
 /// See FileEventDispatcher.addFile for the parameters
+///
+/// When you get an event that a file is ready, you MUST read all of it until
+/// exhausted (that is, read until it would block - you could use select() for
+/// this or set the file to nonblocking mode) because you only get an event
+/// when the state changes. Failure to read it all will leave whatever is left
+/// in the buffer sitting there unnoticed until even more stuff comes in.
 public void addFileEventListeners(T...)(T t) {// if(__traits(compiles, fileEventDispatcher.addFile(t))) {
 	fileEventDispatcher.addFile!(T)(t);
 }
@@ -378,7 +384,7 @@ public void removeFileEventListeners(OsFileHandle handle) {
 /// If you add a file to the event loop, which events are you interested in?
 public enum FileEvents : int {
 	read = 1, /// the file is ready to be read from
-	write = 2 /// the file is ready to be written to
+	write = 2, /// the file is ready to be written to
 }
 
 /// Adds a file handle to the event loop. When the handle has data available to read
@@ -451,7 +457,10 @@ version(linux) {
 		// to level triggered (the event fires whenever the loop goes through and
 		// there's still data available) and see if things work better.
 
-		// ev.events = EPOLL_EVENTS.EPOLLET; // edge triggered
+		// OK I'm turning it back on because otherwise unhandled events
+		// cause an infinite loop. So when an event comes, you MUST starve
+		// the read to get all your info in a timely fashion. Gonna document this.
+		ev.events = EPOLL_EVENTS.EPOLLET; // edge triggered
 
 		// Oh I think I know why I did this: if it is level triggered
 		// and the data is not actually handled, it infinite loops

joystick.d

@@ -266,13 +266,13 @@ int enableJoystickInput(
 
 		assert(getJoystickOSState !is null);
 
-		if(!getJoystickOSState(player1ControllerId, &(joystickState[0])))
+		if(getJoystickOSState(player1ControllerId, &(joystickState[0])))
 			return 0;
-		if(!getJoystickOSState(player2ControllerId, &(joystickState[1])))
+		if(getJoystickOSState(player2ControllerId, &(joystickState[1])))
 			return 1;
-		if(!getJoystickOSState(player3ControllerId, &(joystickState[2])))
+		if(getJoystickOSState(player3ControllerId, &(joystickState[2])))
 			return 2;
-		if(!getJoystickOSState(player4ControllerId, &(joystickState[3])))
+		if(getJoystickOSState(player4ControllerId, &(joystickState[3])))
 			return 3;
 
 		return 4;
@@ -442,7 +442,7 @@ struct JoystickUpdate {
 				case XBox360Axes.horizontalRightStick:
 					return normalizeAxis(what.Gamepad.sThumbRX);
 				case XBox360Axes.verticalRightStick:
-					return normalizeAxis(what.Gamepad.sThumbRX);
+					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 :
@@ -460,8 +460,8 @@ struct JoystickUpdate {
 			final switch(axis) {
 				case PS1AnalogAxes.horizontalDpad:
 				case PS1AnalogAxes.horizontalLeftStick:
-					short got = (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP) ? short.min :
-					       (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN) ? short.max :
+					short got = (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT) ? short.min :
+					       (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT) ? short.max :
 					       0;
 					if(got == 0)
 						got = what.Gamepad.sThumbLX;
@@ -469,13 +469,11 @@ struct JoystickUpdate {
 					return normalizeAxis(got);
 				case PS1AnalogAxes.verticalDpad:
 				case PS1AnalogAxes.verticalLeftStick:
-					short got = (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT) ? short.min :
-					       (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT) ? short.max :
-					       0;
-					if(got == 0)
-						got = what.Gamepad.sThumbLY;
+					short got = (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP) ? short.max :
+					       (what.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN) ? short.min :
+						what.Gamepad.sThumbLY;
 
-					return normalizeAxis(got);
+					return normalizeAxis(-got);
 				case PS1AnalogAxes.horizontalRightStick:
 					return normalizeAxis(what.Gamepad.sThumbRX);
 				case PS1AnalogAxes.verticalRightStick:
@@ -497,8 +495,9 @@ JoystickUpdate getJoystickUpdate(int player) {
 
 	version(Windows) {
 		assert(getJoystickOSState !is null);
-		if(!getJoystickOSState(player, &(joystickState[player])))
-			throw new Exception("wtf");
+		if(getJoystickOSState(player, &(joystickState[player])))
+			return JoystickUpdate();
+			//throw new Exception("wtf");
 	}
 
 	auto it = JoystickUpdate(player, previous[player], joystickState[player]);

mangle.d

@@ -31,7 +31,7 @@ static immutable string[23] primitives = [
 // FIXME: using this will allocate at *runtime*! Unbelievable.
 // it does that even if everything is enum
 auto dTokensPain() {
-	string[] p = cast(string[]) primitives[];
+	immutable p = cast(immutable(string[])) primitives[];
 	string[] ret;
 	foreach(i; (sort!"a.length > b.length"(
 	p~

minigui.d

@@ -494,6 +494,7 @@ version(win32_widgets) {
 	}
 }
 
+version(Windows)
 extern(Windows) BOOL childHandler(HWND hwnd, LPARAM lparam) {
 	if(hwnd is null || hwnd in Widget.nativeMapping)
 		return true;

mssql.d

@@ -2,6 +2,9 @@
 // It's probably godawful, if it works at all.
 
 module arsd.mssql;
+
+version(Windows):
+
 pragma(lib, "odbc32");
 
 public import arsd.database;

png.d

@@ -233,13 +233,13 @@ PNG* pngFromImage(IndexedImage i) {
 	// FIXME: we'd get a smaller file size if the transparent pixels were arranged first
 	Chunk palette;
 	palette.type = ['P', 'L', 'T', 'E'];
-	palette.size = i.palette.length * 3;
+	palette.size = cast(int) i.palette.length * 3;
 	palette.payload.length = palette.size;
 
 	Chunk alpha;
 	if(i.hasAlpha) {
 		alpha.type = ['t', 'R', 'N', 'S'];
-		alpha.size = i.palette.length;
+		alpha.size = cast(int) i.palette.length;
 		alpha.payload.length = alpha.size;
 	}
 
@@ -398,7 +398,7 @@ void writeImageToPngFile(in char[] filename, TrueColorImage image) {
 
 	com ~= cast(ubyte[]) compressor.flush();
 
-	dat.size = com.length;
+	dat.size = cast(int) com.length;
 	dat.payload = com;
 	dat.checksum = crc("IDAT", dat.payload);
 
@@ -512,7 +512,7 @@ PngHeader getHeaderFromFile(string filename) {
 PNG* readPng(in ubyte[] data) {
 	auto p = new PNG;
 
-	p.length = data.length;
+	p.length = cast(int) data.length;
 	p.header[0..8] = data[0..8];
 
 	if(p.header != [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a])
@@ -607,7 +607,7 @@ void addImageDatastreamToPng(const(ubyte)[] data, PNG* png) {
 	}
 
 	auto com = cast(ubyte[]) compress(output);
-	dat.size = com.length;
+	dat.size = cast(int) com.length;
 	dat.payload = com;
 	dat.checksum = crc("IDAT", dat.payload);
 
@@ -650,7 +650,7 @@ ubyte[] getUnfilteredDatastream(PNG* p) {
 	ubyte[] data = getDatastream(p);
 	ubyte[] ufdata = new ubyte[data.length - h.height];
 
-	int bytesPerLine = ufdata.length / h.height;
+	int bytesPerLine = cast(int) ufdata.length / h.height;
 
 	int pos = 0, pos2 = 0;
 	for(int a = 0; a < h.height; a++) {
@@ -673,10 +673,10 @@ ubyte[] getFlippedUnfilteredDatastream(PNG* p) {
 	ubyte[] data = getDatastream(p);
 	ubyte[] ufdata = new ubyte[data.length - h.height];
 
-	int bytesPerLine = ufdata.length / h.height;
+	int bytesPerLine = cast(int) ufdata.length / h.height;
 
 
-	int pos = ufdata.length - bytesPerLine, pos2 = 0;
+	int pos = cast(int) ufdata.length - bytesPerLine, pos2 = 0;
 	for(int a = 0; a < h.height; a++) {
 		assert(data[pos2] == 0);
 		ufdata[pos..pos+bytesPerLine] = data[pos2+1..pos2+bytesPerLine+1];
@@ -867,7 +867,7 @@ void replacePalette(PNG* p, Color[] colors) {
 	//assert(0, format("%s %s", colors.length, alpha.size));
 	//assert(colors.length == alpha.size);
 	if(alpha) {
-		alpha.size = colors.length;
+		alpha.size = cast(int) colors.length;
 		alpha.payload.length = colors.length; // we make sure there's room for our simple method below
 	}
 	p.length = 0; // so write will recalculate
@@ -1503,7 +1503,7 @@ struct Chunk {
 		}
 	body {
 		Chunk* c = new Chunk;
-		c.size = payload.length;
+		c.size = cast(int) payload.length;
 		c.type[] = (cast(ubyte[]) type)[];
 		c.payload = payload;
 

script.d

@@ -1,7 +1,13 @@
 /**
-   FIXME: easier object interop with D
    FIXME: prettier stack trace when sent to D
 
+   FIXME: interpolated string: "$foo" or "#{expr}" or something.
+   FIXME: support more escape things in strings like \n, \t etc.
+
+   FIXME: add easy to use premade packages for the global object.
+
+   FIXME: maybe simplify the json!q{ } thing a bit.
+
    FIXME: the debugger statement from javascript might be cool to throw in too.
 
    FIXME: add continuations or something too

simpledisplay.d

@@ -5053,8 +5053,6 @@ enum GLX_ACCUM_ALPHA_SIZE=  17;      /* number of alpha accum bits */
 XVisualInfo* glXChooseVisual(Display *dpy, int screen, in int *attrib_list);
 
 
-void gluLookAt(double, double, double, double, double, double, double, double, double);
-
 
 enum GL_TRUE = 1;
 enum GL_FALSE = 0;
@@ -5195,7 +5193,7 @@ struct Visual
 	int DefaultDepth(Display* dpy, int scr) { return ScreenOfDisplay(dpy, scr).root_depth; }
 	int DisplayWidth(Display* dpy, int scr) { return ScreenOfDisplay(dpy, scr).width; }
 	int DisplayHeight(Display* dpy, int scr) { return ScreenOfDisplay(dpy, scr).height; }
-	int DefaultColormap(Display* dpy, int scr) { return ScreenOfDisplay(dpy, scr).cmap; }
+	auto DefaultColormap(Display* dpy, int scr) { return ScreenOfDisplay(dpy, scr).cmap; }
 
 	int ConnectionNumber(Display* dpy) { return dpy.fd; }
 
@@ -6191,6 +6189,11 @@ extern(System){
 	void glPushMatrix();
 	void glLoadIdentity();
 	void glOrtho(double, double, double, double, double, double);
+	void glFrustum(double, double, double, double, double, double);
+
+	void gluLookAt(double, double, double, double, double, double, double, double, double);
+	void gluPerspective(double, double, double, double);
+
 	void glPopMatrix();
 	void glEnable(int);
 	void glDisable(int);

sslsocket.d

@@ -1,3 +1,21 @@
+/*
+	This is CLIENT only at this point. Don't try to
+	bind/accept with these.
+
+	FIXME: Windows isn't implemented
+
+	On Windows, it uses Microsoft schannel so it doesn't
+	need openssl or gnutls as a dependency.
+
+	On other platforms, it uses the openssl api, which should
+	work with both openssl and gnutls.
+
+
+	btw, interesting:
+	http://msdn.microsoft.com/en-us/library/windows/desktop/aa364510%28v=vs.85%29.aspx
+*/
+
+
 public import std.socket;
 
 // see also:

xwindows.d

@@ -62,8 +62,8 @@ TrueColorImage getWindowNetWmIcon(Window window) {
 	if (data.length > 2) {
 		// these are an array of rgba images that we have to convert into pixmaps ourself
 
-		int width = data[0];
-		int height = data[1];
+		int width = cast(int) data[0];
+		int height = cast(int) data[1];
 		data = data[2 .. 2 + width * height];
 
 		auto bytes = cast(ubyte[]) data;