Changeset 109

Timestamp:

02/05/08 16:40:46 (1 year ago)

Author:

mike

Message:

[new] QDocumentOpenGLView: Play overlay
[new] QDocumentOpenGLView: Saved Image overlay
[fix] QDocumentOpenGLView: updateSavedImage
[fix] QControlTableViewController: updateThumbnails

Files:

• trunk/QControl/QControlTableViewController.m (modified) (2 diffs)
• trunk/QDocument/QDocument.m (modified) (3 diffs)
• trunk/QDocument/QDocumentOpenGLView.h (modified) (4 diffs)
• trunk/QDocument/QDocumentOpenGLView.m (modified) (12 diffs)
• trunk/Resources/q_overlay_play.png (modified) (previous)

trunk/QControl/QControlTableViewController.m

@@ -248 +248 @@
-        NSImage *thumbnail;
-        NSImage *savedImage;
-//      NSBitmapImageRep *bitmapImageRep;
-        
-        updateAll = FALSE;
@@ -262 +261 @@
-                qDocument = [[NSDocumentController sharedDocumentController] documentForURL:[[[[qControl VMs] objectAtIndex:i] objectForKey:@"Temporary"] objectForKey:@"URL"]];
-        if (qDocument) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-        } else if (updateAll) {

trunk/QDocument/QDocument.m

@@ -180 +180 @@
-    [super windowControllerDidLoadNib:aController];
-    // Add any code here that needs to be executed once the windowController has loaded the document's window.
-
-
+
+
+
-        // Tiger compatible custom butoonCell
-        [buttonEdit setCell:[[[QButtonCell alloc] initImageCell:[[buttonEdit cell] image] buttonType:QButtonCellAlone target:[[buttonEdit cell] target] action:[[buttonEdit cell] action]] autorelease]];
@@ -466 +467 @@
-                        [self setVMState:QDocumentSaving];
-            [distributedObject setCommand:'Z' arg1:0 arg2:0 arg3:0 arg4:0];
-/*
-                        [screenView lockFocus];
-                        bitmapImageRep = [[NSBitmapImageRep alloc] initWithFocusedViewRect:[screenView bounds]];
-                        [screenView unlockFocus];
-*/
-                        bitmapImageRep = [[[screenView screenshot:NSMakeSize(0,0)] representations] objectAtIndex:0];
-                        data =[bitmapImageRep representationUsingType: NSPNGFileType properties: nil];
@@ -477 +473 @@
-                                [fileManager createDirectoryAtPath: [NSString stringWithFormat: @"%@/QuickLook", [[[configuration objectForKey:@"Temporary"] objectForKey:@"URL"] path]] withIntermediateDirectories: NO attributes: nil error: NULL];
-                        [data writeToFile: [NSString stringWithFormat: @"%@/QuickLook/Thumbnail.png", [[[configuration objectForKey:@"Temporary"] objectForKey:@"URL"] path]] atomically: YES];
-//            [bitmapImageRep release];
-                        [screenView updateSavedImage:self];
-        } else if (returnCode == NSAlertOtherReturn) { // shutdown

trunk/QDocument/QDocumentOpenGLView.h

@@ -42 +42 @@
-        int bitsPerComponent;
-        int bitsPerPixel;
+        size_t screenBufferSize;
-} QScreen;
-
@@ -54 +55 @@
-} QDisplayProperties;
-
+typedef enum {
+        QDocumentOpenGLTextureScreen = 0,
+        QDocumentOpenGLTextureOverlay = 1,
+        QDocumentOpenGLTextureSavedImage = 2
+} QDocumentOpenGLTextures;
+
-@interface QDocumentOpenGLView : NSOpenGLView
-{
-    IBOutlet QDocument *document;
-    IBOutlet NSWindow *normalWindow;
-        CGImageRef savedImageRef;
-    NSWindow *fullScreenWindow;
-    QScreen screenProperties;
@@ -65 +71 @@
-    id fullscreenController;
-
-
-
+
-
-    int modifiers_state[256];
@@ -76 +81 @@
-}
-// saved image and screenshot
+- (GLuint) createTextureFromImagePath:(NSString *)path;
-- (void) updateSavedImage:(id)sender;
-- (NSImage *) screenshot:(NSSize)size;
-- (void) loadOverlay;
-
-// QEMU

trunk/QDocument/QDocumentOpenGLView.m

@@ -247 +247 @@
-    [self unregisterDraggedTypes];
-
-
-
+
+
+
+
+
+
+
-
-    [super dealloc];
@@ -256 +261 @@
-{
-        Q_DEBUG(@"awakeFromNib");
-
-    
+
+       
-    screenProperties.bitsPerComponent = 8;
-    screenProperties.bitsPerPixel = 32;
-        screenProperties.width = 640;
-        screenProperties.height = 480;
+        screenProperties.screenBufferSize = 0;
-        
-        displayProperties.zoom = 1.0;
-
-
+
+
+
+
+
-
-    // enable drag'n'drop for files
@@ -273 +282 @@
-    mouseGrabed = FALSE; // we start non grabbed
-    is_graphic_console = TRUE; // we start in grafic mode
-        
-        // load Texture
-        [self loadOverlay];
-}
-
@@ -299 +305 @@
-    onePixel[0] = 2.0 / displayProperties.width;
-    onePixel[1] = 2.0 / displayProperties.height;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                // remove old texture
-screen_tex
-screen_tex
+textures[QDocumentOpenGLTextureScreen]
+textures[QDocumentOpenGLTextureScreen]
-                }
-
-screen_tex
+textures[QDocumentOpenGLTextureScreen]
-                
-                //calculate the texure rect
@@ -332 +358 @@
-                glPixelStorei(GL_UNPACK_ALIGNMENT, 1); // Sets the byte-aligned unpacking that's needed for bitmaps that are 3 bytes per pixel.
-
-screen_tex
+textures[QDocumentOpenGLTextureScreen]
-                glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR); // Sets filtering so that it does not use a mipmap, which would be redundant for the texture rectangle extension
-
@@ -358 +384 @@
-                glBegin(GL_QUADS);
-                {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                }
-                glEnd();
+                glDisable( GL_TEXTURE_RECTANGLE_ARB );
-
-        } else {
@@ -383 +403 @@
-
-                glBegin(GL_QUAD_STRIP);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                glEnd();
-        }
-
+
-        // play overlay
-        if ([document VMState] != QDocumentRunning) {
-
+                // draw background
-                glEnable(GL_BLEND);
-
+ 
-                glBegin(GL_QUADS);
-                {
-0
+
-                glVertex2f(-1.0, -1.0);
-                glVertex2f(1.0, -1.0);
@@ -416 +428 @@
-                }
-                glEnd();
-
-
-
+
+
+
+
+
-                glBegin(GL_QUADS);
-                {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                }
-                glEnd();
+                glDisable(GL_BLEND);
+                glDisable(GL_TEXTURE_RECTANGLE_ARB);
+
-        }
-
+
-    glFlush();
-}
@@ -442 +452 @@
-
-#pragma mark saved image and screenshots
+- (GLuint) createTextureFromImagePath:(NSString *)path
+{
+        Q_DEBUG(@"loadTextureFromImagePath: %@", path);
+
+        GLuint texture;
+        CGImageSourceRef sourceRef;
+        CGImageRef imageRef;
+        CGColorSpaceRef colorSpaceRef;
+        CGContextRef contextRef;
+        void * textureData;
+        CGRect textureRect;
+        size_t textureWidth;
+        size_t textureHeight;
+
+        sourceRef = CGImageSourceCreateWithURL((CFURLRef)[NSURL fileURLWithPath:path], NULL);
+        if (!sourceRef)
+                return 0;
+
+        imageRef = CGImageSourceCreateImageAtIndex(sourceRef, 0, NULL);
+        textureWidth = CGImageGetWidth(imageRef);
+    textureHeight = CGImageGetHeight(imageRef);
+        textureRect = CGRectMake(0, 0, textureWidth, textureHeight);
+        textureData = calloc(textureWidth * 4, textureHeight);
+        colorSpaceRef = CGColorSpaceCreateDeviceRGB();
+        contextRef = CGBitmapContextCreate (textureData, textureWidth, textureHeight, 8, textureWidth*4, colorSpaceRef, kCGImageAlphaPremultipliedLast);
+
+        CGContextDrawImage(contextRef, textureRect, imageRef);
+        CGContextRelease(contextRef);
+        CFRelease(imageRef);
+        CFRelease(sourceRef);
+
+        glPixelStorei(GL_UNPACK_ROW_LENGTH, textureWidth);
+        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+        glGenTextures(1, &texture);
+        glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture);
+        glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        glTexImage2D(
+                GL_TEXTURE_RECTANGLE_ARB,
+                0,
+                GL_RGBA8,
+                textureWidth,
+                textureHeight,
+                0,
+#if __LITTLE_ENDIAN__
+                GL_RGBA,
+                GL_UNSIGNED_BYTE,
+#else
+                GL_BGRA,
+                GL_UNSIGNED_INT_8_8_8_8_REV,
+#endif
+                textureData);
+
+        free(textureData);
+
+        return texture;
+}
+
-- (void) updateSavedImage:(id)sender
-{
-
-
-
-
+
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        }
+
+        textures[QDocumentOpenGLTextureSavedImage] = [self createTextureFromImagePath:[NSString stringWithFormat:@"%@/QuickLook/Thumbnail.png", [[[[document configuration] objectForKey:@"Temporary"] objectForKey:@"URL"] path]]];
+        if (textures[QDocumentOpenGLTextureSavedImage] != 0) {
+                glBindTexture(GL_TEXTURE_RECTANGLE_ARB, textures[QDocumentOpenGLTextureSavedImage]);
+                glGetTexLevelParameteriv( GL_TEXTURE_RECTANGLE_ARB, 0, GL_TEXTURE_WIDTH, (GLint*)&screenProperties.width );
+                glGetTexLevelParameteriv( GL_TEXTURE_RECTANGLE_ARB, 0, GL_TEXTURE_HEIGHT, (GLint*)&screenProperties.height );   
+        }
+        [self resizeContentToWidth:screenProperties.width height:screenProperties.height];
-}
-
-- (NSImage *) screenshot:(NSSize)size
-{
-
-
-
-
-
+
-
-        NSBitmapImageRep* sBitmapImageRep = [[[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
@@ -527 +587 @@
-}
-
-- (void) loadOverlay
-{
-/*
-        CGImageSourceRef sourceRef;
-        NSURL *url;
-        CGImageRef overlayImageRef;
-        url = [NSURL fileURLWithPath:[NSString stringWithFormat:@"%@/q_overlay_play.png", [[NSBundle mainBundle] resourcePath]]];
-        sourceRef = CGImageSourceCreateWithURL((CFURLRef)url, NULL);
-        if (sourceRef) {
-                overlayImageRef = CGImageSourceCreateImageAtIndex(sourceRef, 0, NULL);
-                CFRelease(sourceRef);
-
-                size_t width = CGImageGetWidth(overlayImageRef);
-                size_t height = CGImageGetHeight(overlayImageRef);
-                CGRect rect = {{0, 0}, {width, height}};
-                void * myData = calloc(width * 4, height);
-                CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-                CGContextRef myBitmapContext = CGBitmapContextCreate (myData,
-                        width, height, 8,
-                        width*4, space,
-                        kCGImageAlphaPremultipliedFirst);
-                CGContextDrawImage(myBitmapContext, rect, overlayImageRef);
-                CGContextRelease(myBitmapContext);
-
-                glPixelStorei(GL_UNPACK_ROW_LENGTH, width);
-                glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-                glGenTextures(1, &overlay_tex);
-                glBindTexture(GL_TEXTURE_RECTANGLE_ARB, overlay_tex);
-                glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-                glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, width, height, 0, GL_BGRA_EXT, GL_UNSIGNED_INT_8_8_8_8_REV, myData);
-                free(myData);
-        }
-*/
-        NSImage *overlay = [NSImage imageNamed:@"q_overlay_play.png"];
-        NSBitmapImageRep *bitmapImageRep = [[overlay representations] objectAtIndex:0];
-
-        glGenTextures(1, &overlay_tex);                                 //Create The Texture
-        glBindTexture(GL_TEXTURE_2D, overlay_tex);              //Typical Texture Generation Using Data From The Bitmap
-        glTexImage2D(                                                                   //Generate The Texture
-                GL_TEXTURE_2D,                                                          //kind of texture
-                0,                                                                                      //Level of detail
-                [bitmapImageRep samplesPerPixel],               //Number of Data Components (rgb/rgba etc)
-                [bitmapImageRep bytesPerRow] / [bitmapImageRep samplesPerPixel],        //width
-                [bitmapImageRep bytesPerPlane] / [bitmapImageRep bytesPerRow],  //height
-                0,                                                                                      //border width
-                GL_RGBA,                                                                        //color components order
-                GL_UNSIGNED_BYTE,                                                       //kind of data
-                [bitmapImageRep bitmapData]                     //pointer to data
-        );
-        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR); //Linear Filtering
-        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); //Linear Filtering
-}
-
-
-
@@ -644 +651 @@
-
-    [[self openGLContext] makeCurrentContext];
-, 
-update
+.0, 0.
+display
-}
-
@@ -751 +758 @@
-    // screenbuffer with mmap
-    int fd;
-
-
+
+
+
+
+
+
+
+
-    fd = open([[NSString stringWithFormat:@"/private/tmp/qDocument_%D.vga", [document uniqueDocumentID]] cString], O_RDONLY); // open file
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // update screen state