[dasher] Some files & changes missing since / missed from previous MacOSX patch.

[Patrick Welche <pwelche src gnome org>]

commit a17a2b14d35b92cafd617b20571737fa976a20c6
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Tue May 19 16:27:40 2009 +0100

    Some files & changes missing since / missed from previous MacOSX patch.
---
 Src/MacOSX/AlphabetLetter.mm   |   97 ++++++++++++++++++++++++++++++++++++++++
 Src/MacOSX/COSXDasherControl.h |    2 +-
 Src/MacOSX/GLUtils.mm          |    1 +
 3 files changed, 99 insertions(+), 1 deletions(-)

diff --git a/Src/MacOSX/AlphabetLetter.mm b/Src/MacOSX/AlphabetLetter.mm
new file mode 100644
index 0000000..468ad6a
--- /dev/null
+++ b/Src/MacOSX/AlphabetLetter.mm
@@ -0,0 +1,97 @@
+//
+//  AlphabetLetter.m
+//  Dasher
+//
+//  Created by Alan Lawrence on 20/03/2009.
+//  Copyright 2009 Cavendish Laboratory. All rights reserved.
+//
+
+#import "AlphabetLetter.h"
+#import <iostream>
+
+ implementation AlphabetLetter
+
+/*void dump(char *data, int width, int height)
+{
+	static char buf[10240]; buf[0] = 0;
+	for (int h = 0; h < height; h++)
+	{
+		for (int w = 0; w < width; w++)
+			sprintf(buf+strlen(buf), "%i ", *((int*)&data[4* (w + h * width)]));
+		sprintf(buf + strlen(buf), "\n");
+	}
+	std::cout << buf;
+}*/
+
+-(id)initWithString:(NSString *)aString
+{
+    if (self = [super init])
+	{
+		string = aString;
+		int width=1, height=1;
+		GLfloat texw,texh;
+		{
+			NSSize sz = [self sizeWithSize:36];
+			while (width<sz.width) width<<=1;
+			while (height<sz.height) height<<=1;
+			texw = sz.width/(float)width;
+			texh = sz.height/(float)height;
+		}
+
+		char *data = new char[width*height*4];
+		CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+		CGContextRef context = CGBitmapContextCreate(data, width, height, 8, width*4, colorSpace, kCGImageAlphaPremultipliedLast);
+		NSGraphicsContext *old = [NSGraphicsContext currentContext];
+		[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:YES]];
+
+		CGContextClearRect(context, CGRectMake(0.0, 0.0, width, height));
+		[string drawAtPoint:NSMakePoint(0.0, 0.0) withAttributes:[NSDictionary dictionaryWithObject:[NSFont systemFontOfSize:36.0] forKey:NSFontAttributeName]];
+		[NSGraphicsContext setCurrentContext:old];
+
+		glGenTextures(1, &texture);
+		glBindTexture(GL_TEXTURE_2D, texture);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+//		glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, CGBitmapContextGetData(context));
+
+		//set texture coords for the corners of the part of the texture we actually
+		// drew into (as the texture had to be sized to a power of 2; note we rendered
+		// into the *bottom* left portion)
+		texcoords[0] = 0.0; texcoords[1] = 1.0;
+		texcoords[2] = texw; texcoords[3] = 1.0;
+		texcoords[4] = 0.0; texcoords[5] = 1.0-texh;
+		texcoords[6] = texw; texcoords[7] = 1.0-texh;
+		CGContextRelease(context);
+		free(data);
+	}
+	return self;
+}
+
+-(NSSize)sizeWithSize:(int)iSize {
+	return [string sizeWithAttributes:[NSDictionary dictionaryWithObject:[NSFont systemFontOfSize:iSize] forKey:NSFontAttributeName]];
+}
+
+- (void)drawWithSize:(int)iSize x:(int)x y:(int)y r:(float)r g:(float)g b:(float)b {
+	
+	// bind and draw
+	glEnable(GL_TEXTURE_2D);
+	glBindTexture(GL_TEXTURE_2D, texture);
+	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+	glColor4f(r, g, b, 1.0);
+	NSSize sz = [self sizeWithSize:iSize];
+	GLshort coords[8];
+	coords[0] = x; coords[1]=y;
+	coords[2] = x+sz.width; coords[3] = y;
+	coords[4] = x; coords[5] = y+sz.height;
+	coords[6] = x+sz.width; coords[7]=y+sz.height;
+	glVertexPointer(2, GL_SHORT, 0, coords);
+	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+	glTexCoordPointer(2, GL_FLOAT, 0, texcoords);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+	glDisable(GL_TEXTURE_2D);
+}
+
+ end
+
diff --git a/Src/MacOSX/COSXDasherControl.h b/Src/MacOSX/COSXDasherControl.h
index da9f747..312aa19 100644
--- a/Src/MacOSX/COSXDasherControl.h
+++ b/Src/MacOSX/COSXDasherControl.h
@@ -50,7 +50,7 @@ private:
   virtual void ScanAlphabetFiles(std::vector<std::string> &vFileList);
   virtual void ScanColourFiles(std::vector<std::string> &vFileList);
   virtual void SetupPaths();
-  virtual void CreateLocalFactories();
+  virtual void CreateModules();
   virtual void SetupUI();
   virtual void CreateSettingsStore();
   virtual int GetFileSize(const std::string &strFileName);
diff --git a/Src/MacOSX/GLUtils.mm b/Src/MacOSX/GLUtils.mm
new file mode 100644
index 0000000..0ae1338
--- /dev/null
+++ b/Src/MacOSX/GLUtils.mm
@@ -0,0 +1 @@
+//
//  GLUtils.m
//  Alphabet
//
//  Created by mtrent on Sat Feb 09 2002.
//  Copyright (c) 2002 xxxxx. All rights reserved.
//

#import <OpenGL/glu.h>
#import "GLUtils.h"

void CheckGLError(const char *note)
{
    GLenum error;
	while (error = glGetError()) {
        NSLog(@"%s: %s (%d)", note, gluErrorString(error), error);
    }
}

unsigned int P2Ceiling(unsigned int n)
{
    unsigned long i = 1;
    while (i < n) i <<= 1;
    return i;
}
\ No newline at end of file