Changeset 93 for trunk/qcontrol/cocoaControlDOServer.m

Timestamp:

09/15/07 01:06:09 (2 years ago)

Author:

mike

Message:

[fix] remove crashed/stray guests from doServer (#15)
[fix] Q Control: StopPC Icon is a forcequit if task is not responding or doServer is not responding (#15)
[fix] Fullscreen: alt-tabing back to Q brings you back to FS Guest (#32)
[fix] Fullscreen: switching animation always vertical
[fix] Fullscreen: honor aspect ratio, only factors of 1/1.25/1.5/1.75/2.0/3.0/4.0... (#18)
[fix] doServer: added missing dealloc
[fix] quartz: panther compiling
[fix] quartz: small drawspeed improvements
[fix] backport bgr support for bigendians (andreasf) (#14)
[new] Q Control: EditPC can be used (read only) when guest is running (#23)
[new] Q Control: commandline as tooltips of guests (#23)
[new] Q icon

Files:

• trunk/qcontrol/cocoaControlDOServer.m (modified) (8 diffs)

trunk/qcontrol/cocoaControlDOServer.m

@@ -35 +35 @@
 - (id) init
 {
-//    NSLog(@"cocoaControlDOServer: init:%@ withName:%@\n", [guest description], name);
+//    NSLog(@"cocoaControlDOServer: init");
 
     [super init];
@@ -49 +49 @@
     guests = [[NSMutableDictionary alloc] init];
     [guests retain];
-    
+
     return self;
+}
+
+- (void) dealloc
+{
+//    NSLog(@"cocoaControlDOServer: dealloc");
+
+    [guests release];
+
+    if (lastGuestDeactivated) {
+        [lastGuestDeactivated release];
+    }
+
+    [super dealloc];
 }
 
@@ -80 +93 @@
     if ([guests objectForKey:name] != nil) {
         [guests removeObjectForKey:name];
-//      NSLog(@"OK");
         return TRUE;
     } else {
@@ -130 +142 @@
 
         transitionSpecifications.type = 7;          //transition;
-        transitionSpecifications.option = 2;        //option;
+        transitionSpecifications.option = 0;        //option;
         transitionSpecifications.wid = 0;           //wid
         transitionSpecifications.backColour = 0;    //background color
@@ -211 +223 @@
 
         transitionSpecifications.type = 7;          //transition;
-        transitionSpecifications.option = 1;        //option;
+        transitionSpecifications.option = 8;        //option;
         transitionSpecifications.wid = 0;           //wid
         transitionSpecifications.backColour = 0;    //background color
@@ -250 +262 @@
 }
 
+/* NEED SOME DOXYGEN HERE */
+- (BOOL) guestDeactivated: (bycopy NSString *) name
+{
+//    NSLog(@"cocoaControlDOServer: guestDeactivated: %@", name);
+
+    if (lastGuestDeactivated) {
+        [lastGuestDeactivated release];
+    }
+    if (name) {
+        lastGuestDeactivated = [NSString stringWithString:name];
+        [lastGuestDeactivated retain];
+    } else {
+        lastGuestDeactivated = nil;
+    }
+
+    return TRUE;
+}
+
 - (int) guestWindowLevel: (NSString *) guest
 {
@@ -354 +384 @@
     id obj = [guests objectForKey:guest];
     if (obj != nil) {
-//      NSLog(@"OK");
         return [obj guestStop];
     } else {
@@ -361 +390 @@
     }
 }
+
+- (id) lastGuestDeactivated
+{
+//  NSLog(@"cocoaControlDOServer: lastGuestDeactivated: %@", lastGuestDeactivated);
+
+    if (lastGuestDeactivated) {
+        if ([[guests objectForKey:lastGuestDeactivated] fullscreen]) {
+            return lastGuestDeactivated;
+        }
+    }
+    return nil;
+}
+
+- (NSMutableDictionary *) guests
+{
+    return guests;
+}
 @end