Changeset 113

Timestamp:

02/06/08 22:06:34 (2 years ago)

Author:

mike

Message:

[fix] QDocumentOpenGLView draw black bg if no savedImage
[fix] remove of dead code

Location:

trunk

Files:

• QControl/QControlTableView.m (modified) (1 diff)
• QControl/QControlTableViewController.m (modified) (1 diff)
• QDocument/QDocument.m (modified) (2 diffs)
• QDocument/QDocumentOpenGLView.m (modified) (8 diffs)
• QDocument/QDocumentWindowController.m (modified) (2 diffs)
• QShared/QWindow.m (modified) (11 diffs)
• Q_Prefix.pch (modified) (1 diff)

trunk/QControl/QControlTableView.m

@@ -94 +94 @@
     else {
         pointClicked = NSZeroPoint;
-        [super mouseDown: event];
+                [super mouseDown: event];
     }
 }

trunk/QControl/QControlTableViewController.m

@@ -79 +79 @@
 - (id) tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
 {
-        Q_DEBUG(@"tableView");
+        Q_DEBUG(@"tableView: objectValueForTableColumn: row:%D", rowIndex);
 
     id VM;

trunk/QDocument/QDocument.m

@@ -62 +62 @@
                         NSLog(@"QEditVM.nib not loaded!");
                 }
-                //[[editPC editPCPanel] center];
         
         // Todo, define some globals
         // set allowed filetypes
-        fileTypes = [[NSMutableArray arrayWithObjects:@"qcow2", @"qcow", @"raw", @"cow", @"vmdk", @"cloop", @"img", @"iso", @"dsk", @"dmg", @"cdr", @"toast", @"flp", @"fs", nil] retain];
+        fileTypes = [[NSArray alloc] initWithArrayOfAllowedFileTypes];
 
     }
@@ -467 +466 @@
                         [self setVMState:QDocumentSaving];
             [distributedObject setCommand:'Z' arg1:0 arg2:0 arg3:0 arg4:0];
-                        bitmapImageRep = [[[screenView screenshot:NSMakeSize(0,0)] representations] objectAtIndex:0];
+                        bitmapImageRep = [NSBitmapImageRep imageRepWithData:[[screenView screenshot:NSMakeSize(0.0, 0.0)] TIFFRepresentation]];
                         data =[bitmapImageRep representationUsingType: NSPNGFileType properties: nil];
                         fileManager = [NSFileManager defaultManager];

trunk/QDocument/QDocumentOpenGLView.m

@@ -246 +246 @@
     // disabnle drag'n'drop
     [self unregisterDraggedTypes];
-
+/* TODO: freezes Q up to several minutes (Lock on screenBuffer?)
     if (screenProperties.screenBufferSize > 0) {
                 if (munmap(screenBuffer, screenProperties.screenBufferSize) == -1) {
@@ -254 +254 @@
                 }
         }
-
+*/
     [super dealloc];
 }
@@ -277 +277 @@
         screenProperties.screenBufferSize = 0;
         
+        displayProperties.x = 0.0;
+        displayProperties.y = ICON_BAR_HEIGHT;
+        displayProperties.width = 640;
+        displayProperties.height = 480;
         displayProperties.zoom = 1.0;
         
@@ -290 +294 @@
     mouseGrabed = FALSE; // we start non grabbed
     is_graphic_console = TRUE; // we start in grafic mode
+
 }
 
@@ -313 +318 @@
     onePixel[0] = 2.0 / displayProperties.width;
     onePixel[1] = 2.0 / displayProperties.height;
-        
-        if ([document VMState] == QDocumentSaved) {
+
+        if ([document VMState] == QDocumentShutdown) {
 
                 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-                glClearColor(1.0, 1.0, 1.0, 1.0);
+                glClearColor(.0, .0, .0, .0);
+
+        } else if ([document VMState] == QDocumentSaved) {
+
+                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+                glClearColor(0.0, 0.0, 0.0, 1.0);
 
                 // draw saved image
@@ -535 +545 @@
                 glGetTexLevelParameteriv( GL_TEXTURE_RECTANGLE_ARB, 0, GL_TEXTURE_HEIGHT, (GLint*)&screenProperties.height );   
         }
-        [self resizeContentToWidth:screenProperties.width height:screenProperties.height];
+        [self resizeContentToWidth:screenProperties.width height:screenProperties.height ];
 }
 
@@ -542 +552 @@
         Q_DEBUG(@"screenshot NSSize(%f,  %f)", size.width, size.height);
 
-        // if no size is set, make fullsize shot */ 
-        if (size.width == 0 || !size.height == 0) 
+        // if no size is set, make a fullsize shot
+        if (size.width == 0.0 || size.height == 0.0) 
                 size = [self bounds].size;
 
@@ -657 +667 @@
                 displayProperties.width = rect.size.width;
                 displayProperties.height = rect.size.height;
-                displayProperties.x = 0.0;//rect.origin.x;//([self bounds].size.width - cw) / 2.0;
-                displayProperties.y = ICON_BAR_HEIGHT;//([self bounds].size.height - ch) / 2.0;
+                displayProperties.x = 0.0;
+                displayProperties.y = ICON_BAR_HEIGHT;
         }
 

trunk/QDocument/QDocumentWindowController.m

@@ -28 +28 @@
 #import "QDocumentOpenGLView.h"
 
-// #define QDOCUMENTWINDOWCONTROLLER_DEBUG 1
+
 
 @implementation QDocumentWindowController
@@ -68 +68 @@
     if ([document VMPauseWhileInactive])
         [document VMUnpause:self];
-
 }
 

trunk/QShared/QWindow.m

@@ -49 +49 @@
 #define FOOTER_INACTIVE NSMakeRect(3 * (IMG_WIDTH + 2) + 1, 0, IMG_WIDTH, BG_BOTTOM)
 
-// #define QWINDOWDEBUG 1
+
 
 @implementation QWindow
@@ -56 +56 @@
 - (id)initWithContentRect:(NSRect)contentRect styleMask:(unsigned int)styleMask backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag
 {
-        Q_DEBUG(@" initWithContentRect");
+        Q_DEBUG(@"initWithContentRect");
     
     // Conditionally add textured window flag to stylemask
@@ -91 +91 @@
 - (void)dealloc
 {
-        Q_DEBUG(@" dealloc");
+        Q_DEBUG(@"dealloc");
     
     [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidResizeNotification object:self];
@@ -105 +105 @@
 - (void) setYellow:(id)sender
 {
-        Q_DEBUG(@" setYellow");
+        Q_DEBUG(@"setYellow");
 
         yellow = [[NSUserDefaults standardUserDefaults] boolForKey:@"yellow"];
@@ -115 +115 @@
 - (void)setToolbar:(NSToolbar *)toolbar
 {
-        Q_DEBUG(@" setToolbar");
+        Q_DEBUG(@"setToolbar");
     
     // Only actually call this if we respond to it on this machine
@@ -128 +128 @@
 -(void)awakeFromNib
 {
-        Q_DEBUG(@" awakeFromNib");
+        Q_DEBUG(@"awakeFromNib");
 
     [self setBackgroundColor:[self sizedPolishedBackground]];
@@ -136 +136 @@
 - (void)windowNeedsUpdate:(NSNotification *)aNotification
 {
-        Q_DEBUG(@" windowNeedsUpdate: %@", aNotification);
+        Q_DEBUG(@"windowNeedsUpdate: %@", aNotification);
 
     [self setBackgroundColor:[self sizedPolishedBackground]];
@@ -146 +146 @@
 - (void)setMinSize:(NSSize)aSize
 {
-        Q_DEBUG(@" setMinSize");
+        Q_DEBUG(@"setMinSize");
     
     [super setMinSize:NSMakeSize(MAX(aSize.width, 128.0), MAX(aSize.height, 128.0))];
@@ -153 +153 @@
 - (void)setFrame:(NSRect)frameRect display:(BOOL)displayFlag animate:(BOOL)animationFlag
 {
-        Q_DEBUG(@" setFrame");
+        Q_DEBUG(@"setFrame NSRect(%f, %f, %f, %f) display:%D animate:%D", frameRect.origin.x, frameRect.origin.y, frameRect.size.width, frameRect.size.height, displayFlag, animationFlag);
 
     forceDisplay = YES;
@@ -162 +162 @@
 - (NSColor *)sizedPolishedBackground
 {
-        Q_DEBUG(@" sizedPolishedBackground");
+        Q_DEBUG(@"sizedPolishedBackground");
     
     NSImage *bg = [[NSImage alloc] initWithSize:[self frame].size];
@@ -189 +189 @@
                 footer = FOOTER_INACTIVE;
         }
-/*      
-    // draw background
-    if ([self isKeyWindow]) {
-        [[NSColor colorWithDeviceRed:1.0 green:1.0 blue:0.0 alpha:1.0] setFill];
-    } else if ([NSApp isActive]) {
-        [[NSColor colorWithDeviceRed:1.0 green:1.0 blue:0.75 alpha:1.0] setFill];
-    } else {
-        [[NSColor colorWithDeviceWhite:1.0 alpha:1.0] setFill];
-    }
-    NSRectFillUsingOperation(NSMakeRect(0, 0, [self frame].size.width, [self frame].size.height), NSCompositeSourceOver);
-*/      
+
     // header
     [template

trunk/Q_Prefix.pch

@@ -16 +16 @@
 
 #define cgrect(nsrect) (*(CGRect *)&(nsrect))
+
+#define initWithArrayOfAllowedFileTypes initWithObjects:@"qcow2", @"qcow", @"raw", @"cow", @"vmdk", @"cloop", @"img", @"iso", @"dsk", @"dmg", @"cdr", @"toast", @"flp", @"fs", nil