Changeset 81

Timestamp:

04/13/07 17:51:30 (2 years ago)

Author:

mike

Message:

[fix] "#define kju_debug 1" for verbous log messages (txs Andreas F for suggestion)
[fix] added openbios-sparc32 to sparc package (txs Andreas F)
[fix] simplyfied "make install" (txs Andreas F for suggestion)

Files:

• trunk/changelog.txt (modified) (1 diff)
• trunk/qcontrol/Makefile (modified) (3 diffs)
• trunk/qcontrol/cocoaControlController.m (modified) (6 diffs)
• trunk/qcontrol/cocoaControlDOServer.m (modified) (9 diffs)

trunk/changelog.txt

@@ +1 @@
+Q-0.9.0d81
+[fix] "#define kju_debug 1" for verbous log messages (txs Andreas F for suggestion)
+[fix] added openbios-sparc32 to sparc package (txs Andreas F)
+[fix] simplyfied "make install" (txs Andreas F for suggestion)
+
-Q-0.9.0d80
-[fix] tools: localizationStringsUpdate: semicolon

trunk/qcontrol/Makefile

@@ -33 +33 @@
-                nibtool -d "../$(prefix)/Q.app/Contents/Resources/"$$d".lproj/cocoaControlPreferences.strings" "../$(prefix)/Q.app/Contents/Resources/English.lproj/cocoaControlPreferences.nib" -W "../$(prefix)/Q.app/Contents/Resources/"$$d".lproj/cocoaControlPreferences.nib"; \
-                nibtool -d "../$(prefix)/Q.app/Contents/Resources/"$$d".lproj/cocoaDownload.strings" "../$(prefix)/Q.app/Contents/Resources/English.lproj/cocoaDownload.nib" -W "../$(prefix)/Q.app/Contents/Resources/"$$d".lproj/cocoaDownload.nib"; \
-        
+               
-
-        for d in $(TARGET_DIRS); do \
@@ -53 +53 @@
-                        ;; \
-                        sparc-softmmu) \
-
+
+
-                        ;; \
-                        mips-softmmu) \
@@ -70 +71 @@
-
-# generate OS X .app Packages and install it to /applications
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+

trunk/qcontrol/cocoaControlController.m

@@ -784 +784 @@
-    
-    [[thisPC objectForKey:@"Temporary"] setObject:path forKey:@"-cocoapath"];
+#if kju_debug
-    NSLog(@"-cocoapath: %@", path);
+#endif
-    [[thisPC objectForKey:@"PC Data"] setObject:name forKey:@"name"];
-    
@@ -1099 +1101 @@
-        /* set the -cocoapath */
-        [[thisPC objectForKey:@"Temporary"] setObject:[NSString stringWithFormat:@"%@/%@.qvm", [userDefaults objectForKey:@"dataPath"], name] forKey:@"-cocoapath"];
+#if kju_debug
-        NSLog(@"cocoapath: %@", [[thisPC objectForKey:@"Temporary"] objectForKey:@"-cocoapath"]);
+#endif
-        
-        /* Create .qvm */
@@ -1129 +1133 @@
-                // copy over into .qvm
-                [fileManager copyPath:[[qemux objectAtIndex:i] objectForKey:[hds objectAtIndex:ii]] toPath:[NSString stringWithFormat:@"%@/%@",  [[thisPC objectForKey:@"Temporary"] objectForKey:@"-cocoapath"], [[[qemux objectAtIndex:i] objectForKey:[hds objectAtIndex:ii]] lastPathComponent]] handler:nil];
+#if kju_debug
-                NSLog(@"copy allowed, done.");
+#endif
-            }
+#if kju_debug
-            NSLog(@"hd: %@", [[qemux objectAtIndex:i] objectForKey:[hds objectAtIndex:ii]]);
-            NSLog(@"copy from %@ to %@", [[qemux objectAtIndex:i] objectForKey:[hds objectAtIndex:ii]], [NSString stringWithFormat:@"%@/%@",    [[thisPC objectForKey:@"Temporary"] objectForKey:@"-cocoapath"], [[[qemux objectAtIndex:i] objectForKey:[hds objectAtIndex:ii]] lastPathComponent]]);
+#endif
-        }
-        
@@ -1561 +1569 @@
-    
-    file = [filename stringByAppendingPathComponent:[@"Contents/Resources/Guest" stringByAppendingPathComponent:file]];
+#if kju_debug
-    NSLog(@"file: %@", file);
+#endif
-    
-    /* ready now, show progressPanel */
@@ -1700 +1710 @@
-- (void) startPC:(NSString *)filename
-{
-  
+//
-    
-    NSData *data = [NSData dataWithContentsOfFile:[NSString stringWithFormat:@"%@/configuration.plist", filename]];
@@ -1813 +1823 @@
-    }
-
+#if kju_debug
-    for (i = 0; i < [arguments count]; i++)
-        NSLog(@"Argument: %@", [arguments objectAtIndex:i]);
-
+
+
-    /* save Status */
-    [[thisPC objectForKey:@"PC Data"] setObject:@"running" forKey:@"state"];

trunk/qcontrol/cocoaControlDOServer.m

@@ -2 +2 @@
- * QEMU Cocoa Control Distributed Object Server
- * 
-
+- 2007 
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -35 +35 @@
-- (id) init
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
--(void) setSender:(id)sender
-{
-     
+  
-
-    qControl = sender;
@@ -64 +62 @@
-- (BOOL) guestRegister: (id) guest withName: (NSString *) name
-{
-     
-
-       
-               
-             
-               
-       
-               
-               
-       
+  
+
+    
+        
+      
+        
+    
+        
+        
+    
-}
-
-- (BOOL) guestUnregisterWithName: (NSString *) name
-{
-     
-
-       
-               
-             
-               
-       
-               
-               
-       
+  
+
+    
+        
+      
+        
+    
+        
+        
+    
-}
-
@@ -97 +95 @@
-    NSArray *keys = [guests allKeys];
-    int a = [keys count] - 1;
-
+
-    if (previousGuestName) {
-        for (i = 0; i < [keys count]; i++) {
@@ -111 +109 @@
-        }
-    }
-
+
-    ProcessSerialNumber psn;
-    id obj = nil;
-    BOOL nFullscreen = FALSE;
-
+
-    if (a > -1) {
-               
-               
-               
-               
+        
+        
+        
+        
-            nFullscreen = TRUE;
-    } else
-        GetProcessForPID( [[NSProcessInfo processInfo ] processIdentifier ], &psn );
-
+
-    if (fullscreen||nFullscreen) {
-        /* setup transition */
@@ -133 +131 @@
-        transitionSpecifications.type = 7;          //transition;
-        transitionSpecifications.option = 2;        //option;
+        transitionSpecifications.wid = 0;           //wid
+        transitionSpecifications.backColour = 0;    //background color
+
+        /* freeze desktop: OSStatus CGSNewTransition(const CGSConnection cid, const CGSTransitionSpec* transitionSpecifications, int *transitionHandle) */
+        CGSNewTransition(cid, &transitionSpecifications, &transitionHandle);
+
+        /* change windows */
+        if (nFullscreen)
+            [obj guestUnhide];
+
+        if (fullscreen)
+            [[guests objectForKey:name] guestHide];
+
+        if (a > -1) //avoid activating "Q Control"
+            SetFrontProcess( &psn );
+        else {
+            [[qControl mainWindow] orderWindow:NSWindowAbove relativeTo:[[guests objectForKey:name] guestWindowNumber]];
+            SetFrontProcess( &psn );
+        }
+
+        /* wait */
+        usleep(10000);
+
+        /* run transition: OSStatus CGSInvokeTransition(const CGSConnection cid, int transitionHandle, float duration) */
+        CGSInvokeTransition(cid, transitionHandle, 1.0);
+        
+    } else {
+        if (a > -1) //avoid activating "Q Control"
+            SetFrontProcess( &psn );
+        else {
+            [[qControl mainWindow] orderWindow:NSWindowAbove relativeTo:[[guests objectForKey:name] guestWindowNumber]];
+            SetFrontProcess( &psn );
+        }
+    }
+
+    return true;
+}
+
+- (BOOL) guestSwitch: (NSString *) name fullscreen:(BOOL)fullscreen nextGuestName:(NSString *)nextGuestName
+{
+//    NSLog(@"guestSwitch: windowSwitchKeyPressed:%@ fullscreen:%d nextGuest:%@\n", name, fullscreen, nextGuestName);
+
+    int i;
+    int a = 0;
+    NSArray *keys = [guests allKeys];
+
+    if (nextGuestName) {
+        for (i = 0; i < [keys count]; i++) {
+            if ([[keys objectAtIndex:i] isEqual:nextGuestName]) {
+                a = i;
+            }
+        }
+    } else {
+        for (i = 0; i < [keys count]; i++) {
+            if ([[keys objectAtIndex:i] isEqual:name]) {
+                a = i + 1;
+            }
+        }
+    }
+
+    ProcessSerialNumber psn;
+    id obj = nil;
+    BOOL nFullscreen = FALSE;
+
+    if (a < [keys count]) {
+        /* move QEMU to front */
+        GetProcessForPID( [[[qControl pcsTasks] objectForKey:[keys objectAtIndex:a]] processIdentifier], &psn );
+        obj = [guests objectForKey:[keys objectAtIndex:a]];
+        if ([obj fullscreen])
+            nFullscreen = TRUE;
+    } else
+        GetProcessForPID( [[NSProcessInfo processInfo ] processIdentifier ], &psn );
+
+    if (fullscreen||nFullscreen) {
+        /* setup transition */
+        CGSConnection cid = _CGSDefaultConnection();
+        int transitionHandle = -1;
+        CGSTransitionSpec transitionSpecifications;
+
+        transitionSpecifications.type = 7;          //transition;
+        transitionSpecifications.option = 1;        //option;
-        transitionSpecifications.wid = 0;           //wid
-        transitionSpecifications.backColour = 0;    //background color
@@ -146 +225 @@
-            [[guests objectForKey:name] guestHide];
-
-> -1
+< [keys count]
-            SetFrontProcess( &psn );
-        else {
@@ -152 +231 @@
-            SetFrontProcess( &psn );
-        }
-
+
-        /* wait */
-        usleep(10000);
-
+
-        /* run transition: OSStatus CGSInvokeTransition(const CGSConnection cid, int transitionHandle, float duration) */
-        CGSInvokeTransition(cid, transitionHandle, 1.0);
-
-
-> -1
+
+
+< [keys count]
-            SetFrontProcess( &psn );
-        else {
@@ -168 +247 @@
-    }
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
-- (int) guestWindowLevel: (NSString *) guest
-{
-     
-
-       
-       
-             
-               
-       
-               
-               
-       
+  
+
+    
+    
+      
+        
+    
+        
+        
+    
-}
-
-- (int) guestWindowNumber: (NSString *) guest
-{
-     
-
-       
-       
-             
-               
-       
-               
-               
-       
+  
+
+    
+    
+      
+        
+    
+//        
+        
+    
-}
-
-- (BOOL) guestOrderFrontRegardless: (NSString *) guest
-{
-     
-
-       
-       
-             
-               
-       
-               
-               
-       
+  
+
+    
+    
+      
+        
+    
+        
+        
+    
-}
-
-- (BOOL) guestOrderWindow:(NSWindowOrderingMode)place relativeTo:(int)otherWindowNumber guest:(NSString *) guest
-{
-     
-
-       
-       
-             
-               
-       
-               
-               
-       
+  
+
+    
+    
+      
+        
+    
+        
+        
+    
-}
-
-- (BOOL) guestHide: (NSString *) guest
-{
-     
-
-       
-       
-             
-               
-       
-               
-               
-       
+  
+
+    
+    
+      
+        
+    
+        
+        
+    
-}
-
-- (BOOL) guestUnhide: (NSString *) guest
-{
-     
-
-       
-       
-             
-               
-       
-               
-               
-       
+  
+
+    
+    
+      
+        
+    
+        
+        
+    
-}
-
-- (BOOL) guestPause: (NSString *) guest
-{
-     
-
-       
-       
-             
-               
-       
-               
-               
-       
+  
+
+    
+    
+      
+        
+    
+        
+        
+    
-}
-
-- (BOOL) guestStop: (NSString *) guest
-{
-     
-
-       
-       
-             
-               
-       
-               
-               
-       
+  
+
+    
+    
+      
+        
+    
+        
+        
+    
-}
-@end