Navigation

← Previous Changeset
Next Changeset →

Changeset 35

Timestamp:

07/08/06 10:58:32 (3 years ago)

Author:

mike

Message:

new Network cards, VirtueDesktop? fullscreen fix, command-tab fullscreen fix

Files:

trunk/changelog.txt (modified) (2 diffs)
trunk/host-cocoa/CGSPrivate.h (added)
trunk/host-cocoa/cocoaCpuView.m (modified) (3 diffs)
trunk/host-cocoa/cocoaQemu.m (modified) (2 diffs)
trunk/host-cocoa/cocoaQemuOpenGLView.m (modified) (1 diff)
trunk/host-cocoa/cocoaQemuQuartzView.m (modified) (1 diff)
trunk/host-cocoa/cocoaQemuQuickDrawView.m (modified) (1 diff)
trunk/host-cocoa/cocoaQemuWindow.m (modified) (3 diffs)
trunk/qcontrol/Resources/English.lproj/cocoaControlEditPC.nib/classes.nib (modified) (1 diff)
trunk/qcontrol/Resources/English.lproj/cocoaControlEditPC.nib/info.nib (modified) (2 diffs)
trunk/qcontrol/Resources/English.lproj/cocoaControlEditPC.nib/keyedobjects.nib (modified) (523 diffs)
trunk/qcontrol/cocoaControlEditPC.h (modified) (1 diff)
trunk/qcontrol/cocoaControlEditPC.m (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/changelog.txt

r34	r35
1		Q-0.8.0d34
	1	Q-0.8.1d35
	2	[new] rtl8139 Networkcard support
	3	[new] pcnet Networkcard support
	4	[fix] mousegrab is deactivated when application looses key (VirtueDesktops fix)
	5	[fix] fullscreen is deactivated if user is app switching (command-tab fix)
	6	[fix] .toast support for CD-ROM images loaded from toolbar
	7	[fix] grab/ungrab not called when usb-tablet is emulated (mousepointer sync fix)
	8
	9	Q-0.8.1d34
2	10	[new] CPU meter gets Harddisk activity indicator
3	11	[fix] CPU meter gets info right from mach
…	…
11	19	[fix] build_dmg.sh Versioning according to SVN revision
12	20
13		Q-0.8.0d1202
	21	Q-0.8.1d1202
14	22	[new] newPC: assistant
15	23	[fix] editPC: RAM value inserted correctly
16	24	[fix] libtransmission
17	25
18		Q-0.8.0d1148
	26	Q-0.8.1d1148
19	27	[fix] new CPU meter
20	28	[fix] documentation reworked

trunk/host-cocoa/cocoaCpuView.m

r34	r35
189	189	[[NSProcessInfo processInfo] processIdentifier],//pid_t pid
190	190	&task); //task_port_t *target
191		#ifdef ~~qdebug~~
	191	#ifdef QDEBUG
192	192	if (error != KERN_SUCCESS)
193	193	NSLog(@"Call to task_for_pid() failed");
…	…
197	197	&threadList, //thread_act_array_t *act_list
198	198	&threadCount); //mach_msg_type_number_t *act_listCnt
199		#ifdef ~~qdebug~~
	199	#ifdef QDEBUG
200	200	if (error != KERN_SUCCESS)
201	201	NSLog(@"Call to task_threads() failed");
…	…
208	208	&tbi, //thread_info_t thread_info_out
209	209	&thread_info_count); //mach_msg_type_number_t *thread_info_outCnt
210		#ifdef ~~qdebug~~
	210	#ifdef QDEBUG
211	211	if (error != KERN_SUCCESS)
212	212	NSLog(@"Call to thread_info() failed");

trunk/host-cocoa/cocoaQemu.m

r5	r35
91	91	if ((self = [super init])) {
92	92	/* set allowed filetypes */
93		fileTypes = [[NSArray arrayWithObjects:@"img",@"iso",@"dmg",@"qcow",@"cow",@"cloop",@"vmdk",nil] retain];
	93	fileTypes = [[NSArray arrayWithObjects:@"img",@"iso",@"dmg",@"qcow",@"cow",@"cloop",@"vmdk",@"toast",nil] retain];
94	94
95	95	/* pc */
…	…
1147	1147	[[pc pcWindow] miniaturize:nil];
1148	1148	return;
	1149
	1150	// /* app switch // does not work, as dock is ogging command-tab */
	1151	// case 48: /* tab key */
	1152	// if ([pc fullscreen])
	1153	// [pc setFullscreen:[[pc contentView] toggleFullScreen]];
	1154	// return;
1149	1155	}
1150	1156	}

trunk/host-cocoa/cocoaQemuOpenGLView.m

r5	r35
435	435	/* Mouse-grab is activatet by clicks in Windowed View only,
436	436	so we can handle clicks on other GUI Items */
437		if(!fullscreen && ![pc absolute_enabled])
	437	if(fullscreen) {
	438	} else if([pc absolute_enabled]) {
	439	if (![pc tablet_enabled])
	440	[NSCursor hide];
	441	[pc setTablet_enabled:1];
	442	} else {
438	443	[pc grabMouse];
	444	}
439	445	}
440	446

trunk/host-cocoa/cocoaQemuQuartzView.m

r5	r35
304	304	/* Mouse-grab is activatet by clicks in Windowed View only,
305	305	so we can handle clicks on other GUI Items */
306		if(!fullscreen && ![pc absolute_enabled])
	306	if(fullscreen) {
	307	} else if([pc absolute_enabled]) {
	308	if (![pc tablet_enabled])
	309	[NSCursor hide];
	310	[pc setTablet_enabled:1];
	311	} else {
307	312	[pc grabMouse];
	313	}
308	314	}
309	315

trunk/host-cocoa/cocoaQemuQuickDrawView.m

r5	r35
178	178	/* Mouse-grab is activatet by clicks in Windowed View only,
179	179	so we can handle clicks on other GUI Items */
180		if(!fullscreen && ![pc absolute_enabled])
	180	if(fullscreen) {
	181	} else if([pc absolute_enabled]) {
	182	if (![pc tablet_enabled])
	183	[NSCursor hide];
	184	[pc setTablet_enabled:1];
	185	} else {
181	186	[pc grabMouse];
	187	}
182	188	}
183	189

trunk/host-cocoa/cocoaQemuWindow.m

r34	r35
31	31	#import "cocoaCpuView.h"
32	32	#import "vl.h"
	33	#import "CGSPrivate.h"
33	34
34	35
…	…
356	357	if ([pc wMStopWhenInactive] && ![pc wMPausedByUser])
357	358	[pc startVM];
	359
	360	/* if we are fullscreen, reactivate tablet/grab (fix for virtueDesktop) */
	361	if ([pc fullscreen]) {
	362	if ([pc absolute_enabled]) {
	363	/* enable Tablet */
	364	if (![pc tablet_enabled]) {
	365	[NSCursor hide];
	366	[pc setTablet_enabled:1];
	367	}
	368	} else {
	369	/* grab Mouse */
	370	[pc grabMouse];
	371	}
	372	}
	373
	374	}
	375
	376	- (BOOL) windowIsVisible
	377	{
	378	OSStatus oResult;
	379	int iActiveWorkspace;
	380	int iWindowWorkspace;
	381	CGSConnection oConnection = _CGSDefaultConnection();
	382
	383	/* get active Workspace */
	384	oResult = CGSGetWorkspace(oConnection, &iActiveWorkspace);
	385	if (oResult) {
	386	#ifdef QDEBUG
	387	NSLog(@"Failed getting active workspace [Error: %i]", oResult);
	388	#endif
	389	return YES;
	390	}
	391
	392	/* get window Workspace */
	393	oResult = CGSGetWindowWorkspace(oConnection, [self windowNumber], &iWindowWorkspace);
	394	if (oResult) {
	395	#ifdef QDEBUG
	396	NSLog(@"Failed getting window workspace [Error: %i]", iActiveWorkspace, oResult);
	397	#endif
	398	return YES;
	399	}
	400
	401	/* is the window on the same workspace? */
	402	return (iActiveWorkspace == iWindowWorkspace);
358	403	}
359	404
…	…
362	407	// NSLog(@"cocoaQemuWindow: windowDidResignKey");
363	408
364		/* ungrab Mouse */
365		[pc ungrabMouse];
366		[NSCursor unhide];
367		[pc setTablet_enabled:0];
	409
	410	if ([pc fullscreen] && [self windowIsVisible])
	411	[pc setFullscreen:[[pc contentView] toggleFullScreen]];
	412
	413	if ([pc absolute_enabled]) {
	414	/* disable Tablet */
	415	if ([pc tablet_enabled]) {
	416	[NSCursor unhide];
	417	[pc setTablet_enabled:0];
	418	}
	419	} else {
	420	/* ungrab Mouse */
	421	[pc ungrabMouse];
	422	}
368	423
369	424	/* reset Key Modifiers */
370	425	[pc resetModifiers];
371
372		~~/* disable Tablet */~~
373		~~if ([pc tablet_enabled]) {~~
374
375		}
376	426
377	427	/* stop WM if required */

trunk/qcontrol/Resources/English.lproj/cocoaControlEditPC.nib/classes.nib

r7	r35
19	19	buttonEnableUSBTablet = NSButton;
20	20	buttonLocaltime = NSButton;
21		buttonNetNic = NSButton;
	21	buttonNetNicNe2000 = NSButton;
	22	buttonNetNicPcnet = NSButton;
	23	buttonNetNicRtl8139 = NSButton;
22	24	buttonNetUser = NSButton;
23	25	buttonOk = NSButton;

trunk/qcontrol/Resources/English.lproj/cocoaControlEditPC.nib/info.nib

r7	r35
8	8	<dict>
9	9	<key>478</key>
10		<string>486 3~~74 440 43~~3 0 0 1440 878 </string>
	10	<string>486 328 440 473 0 0 1440 878 </string>
11	11	<key>570</key>
12	12	<string>486 477 440 216 0 0 1440 878 </string>
…	…
15	15	</dict>
16	16	<key>IBFramework Version</key>
17		<string>44~~3.0~~</string>
	17	<string>446.1</string>
18	18	<key>IBOpenObjects</key>
19	19	<array>
20	20	<integer>570</integer>
	21	<integer>478</integer>
	22	<integer>10</integer>
21	23	<integer>736</integer>
22		~~<integer>10</integer>~~
23		~~<integer>478</integer>~~
24	24	</array>
25	25	<key>IBSystem Version</key>
26		<string>8~~I1119~~</string>
	26	<string>8J2135a</string>
27	27	<key>IBUsesTextArchiving</key>
28	28	<true/>

trunk/qcontrol/Resources/English.lproj/cocoaControlEditPC.nib/keyedobjects.nib

r7	r35
12	12	<dict>
13	13	<key>CF$UID</key>
14		<integer>969</integer>
	14	<integer>987</integer>
15	15	</dict>
16	16	<key>NSAccessibilityConnectors</key>
17	17	<dict>
18	18	<key>CF$UID</key>
19		<integer>966</integer>
	19	<integer>984</integer>
20	20	</dict>
21	21	<key>NSAccessibilityOidsKeys</key>
22	22	<dict>
23	23	<key>CF$UID</key>
24		<integer>967</integer>
	24	<integer>985</integer>
25	25	</dict>
26	26	<key>NSAccessibilityOidsValues</key>
27	27	<dict>
28	28	<key>CF$UID</key>
29		<integer>968</integer>
	29	<integer>986</integer>
30	30	</dict>
31	31	<key>NSClassesKeys</key>
32	32	<dict>
33	33	<key>CF$UID</key>
34		<integer>754</integer>
	34	<integer>768</integer>
35	35	</dict>
36	36	<key>NSClassesValues</key>
37	37	<dict>
38	38	<key>CF$UID</key>
39		<integer>755</integer>
	39	<integer>769</integer>
40	40	</dict>
41	41	<key>NSConnections</key>
…	…
57	57	<dict>
58	58	<key>CF$UID</key>
59		<integer>672</integer>
	59	<integer>684</integer>
60	60	</dict>
61	61	<key>NSNamesValues</key>
62	62	<dict>
63	63	<key>CF$UID</key>
64		<integer>673</integer>
	64	<integer>685</integer>
65	65	</dict>
66	66	<key>NSNextOid</key>
67		<integer>888</integer>
	67	<integer>893</integer>
68	68	<key>NSObjectsKeys</key>
69	69	<dict>
70	70	<key>CF$UID</key>
71		<integer>669</integer>
	71	<integer>681</integer>
72	72	</dict>
73	73	<key>NSObjectsValues</key>
74	74	<dict>
75	75	<key>CF$UID</key>
76		<integer>671</integer>
	76	<integer>683</integer>
77	77	</dict>
78	78	<key>NSOidsKeys</key>
79	79	<dict>
80	80	<key>CF$UID</key>
81		<integer>756</integer>
	81	<integer>770</integer>
82	82	</dict>
83	83	<key>NSOidsValues</key>
84	84	<dict>
85	85	<key>CF$UID</key>
86		<integer>757</integer>
	86	<integer>771</integer>
87	87	</dict>
88	88	<key>NSRoot</key>
…	…
199	199	<dict>
200	200	<key>CF$UID</key>
201		<integer>160</integer>
202		</dict>
203		<dict>
204		<key>CF$UID</key>
205		<integer>177</integer>
206		</dict>
207		<dict>
208		<key>CF$UID</key>
209		<integer>211</integer>
210		</dict>
211		<dict>
212		<key>CF$UID</key>
213		<integer>231</integer>
214		</dict>
215		<dict>
216		<key>CF$UID</key>
217		<integer>249</integer>
218		</dict>
219		<dict>
220		<key>CF$UID</key>
221		<integer>250</integer>
222		</dict>
223		<dict>
224		<key>CF$UID</key>
225		<integer>324</integer>
226		</dict>
227		<dict>
228		<key>CF$UID</key>
229		<integer>429</integer>
230		</dict>
231		<dict>
232		<key>CF$UID</key>
233		<integer>431</integer>
234		</dict>
235		<dict>
236		<key>CF$UID</key>
237		<integer>433</integer>
	201	<integer>171</integer>
	202	</dict>
	203	<dict>
	204	<key>CF$UID</key>
	205	<integer>205</integer>
	206	</dict>
	207	<dict>
	208	<key>CF$UID</key>
	209	<integer>225</integer>
	210	</dict>
	211	<dict>
	212	<key>CF$UID</key>
	213	<integer>243</integer>
	214	</dict>
	215	<dict>
	216	<key>CF$UID</key>
	217	<integer>244</integer>
	218	</dict>
	219	<dict>
	220	<key>CF$UID</key>
	221	<integer>318</integer>
238	222	</dict>
239	223	<dict>
…	…
247	231	<dict>
248	232	<key>CF$UID</key>
249		<integer>440</integer>
250		</dict>
251		<dict>
252		<key>CF$UID</key>
253		<integer>442</integer>
254		</dict>
255		<dict>
256		<key>CF$UID</key>
257		<integer>444</integer>
	233	<integer>439</integer>
	234	</dict>
	235	<dict>
	236	<key>CF$UID</key>
	237	<integer>441</integer>
	238	</dict>
	239	<dict>
	240	<key>CF$UID</key>
	241	<integer>443</integer>
258	242	</dict>
259	243	<dict>
…	…
267	251	<dict>
268	252	<key>CF$UID</key>
	253	<integer>450</integer>
	254	</dict>
	255	<dict>
	256	<key>CF$UID</key>
	257	<integer>452</integer>
	258	</dict>
	259	<dict>
	260	<key>CF$UID</key>
269	261	<integer>454</integer>
270	262	</dict>
271	263	<dict>
272	264	<key>CF$UID</key>
273		<integer>635</integer>
274		</dict>
275		<dict>
276		<key>CF$UID</key>
277		<integer>637</integer>
278		</dict>
279		<dict>
280		<key>CF$UID</key>
281		<integer>639</integer>
282		</dict>
283		<dict>
284		<key>CF$UID</key>
285		<integer>640</integer>
	265	<integer>460</integer>
286	266	</dict>
287	267	<dict>
…	…
299	279	<dict>
300	280	<key>CF$UID</key>
	281	<integer>646</integer>
	282	</dict>
	283	<dict>
	284	<key>CF$UID</key>
301	285	<integer>647</integer>
302	286	</dict>
…	…
327	311	<dict>
328	312	<key>CF$UID</key>
329		~~<integer>660</integer>~~
330		~~</dict>~~
331		~~<dict>~~
332		~~<key>CF$UID</key>~~
333	313	<integer>661</integer>
334	314	</dict>
335	315	<dict>
336	316	<key>CF$UID</key>
337		~~<integer>662</integer>~~
338		~~</dict>~~
339		~~<dict>~~
340		~~<key>CF$UID</key>~~
341	317	<integer>663</integer>
342	318	</dict>
343	319	<dict>
344	320	<key>CF$UID</key>
345		~~<integer>664</integer>~~
346		~~</dict>~~
347		~~<dict>~~
348		~~<key>CF$UID</key>~~
349	321	<integer>665</integer>
350	322	</dict>
…	…
356	328	<key>CF$UID</key>
357	329	<integer>667</integer>
	330	</dict>
	331	<dict>
	332	<key>CF$UID</key>
	333	<integer>668</integer>
	334	</dict>
	335	<dict>
	336	<key>CF$UID</key>
	337	<integer>669</integer>
	338	</dict>
	339	<dict>
	340	<key>CF$UID</key>
	341	<integer>670</integer>
	342	</dict>
	343	<dict>
	344	<key>CF$UID</key>
	345	<integer>671</integer>
	346	</dict>
	347	<dict>
	348	<key>CF$UID</key>
	349	<integer>672</integer>
	350	</dict>
	351	<dict>
	352	<key>CF$UID</key>
	353	<integer>673</integer>
	354	</dict>
	355	<dict>
	356	<key>CF$UID</key>
	357	<integer>675</integer>
	358	</dict>
	359	<dict>
	360	<key>CF$UID</key>
	361	<integer>677</integer>
	362	</dict>
	363	<dict>
	364	<key>CF$UID</key>
	365	<integer>679</integer>
358	366	</dict>
359	367	</array>
…	…
1112	1120	<dict>
1113	1121	<key>CF$UID</key>
1114		<integer>322</integer>
	1122	<integer>316</integer>
1115	1123	</dict>
1116	1124	<key>NSClassName</key>
1117	1125	<dict>
1118	1126	<key>CF$UID</key>
1119		<integer>427</integer>
	1127	<integer>433</integer>
1120	1128	</dict>
1121	1129	<key>NSExtension</key>
1122	1130	<dict>
1123	1131	<key>CF$UID</key>
1124		<integer>321</integer>
	1132	<integer>315</integer>
1125	1133	</dict>
1126	1134	<key>NSFrameSize</key>
1127	1135	<dict>
1128	1136	<key>CF$UID</key>
1129		<integer>426</integer>
	1137	<integer>432</integer>
1130	1138	</dict>
1131	1139	<key>NSNextResponder</key>
…	…
1137	1145	<dict>
1138	1146	<key>CF$UID</key>
1139		<integer>325</integer>
	1147	<integer>319</integer>
1140	1148	</dict>
1141	1149	<key>NSvFlags</key>
1142	1150	<integer>8</integer>
1143	1151	</dict>
1144		<string>{{136, 346}, {134, 22}}</string>
	1152	<string>{{136, 386}, {134, 22}}</string>
1145	1153	<dict>
1146	1154	<key>$class</key>
…	…
1806	1814	<integer>256</integer>
1807	1815	</dict>
1808		<string>{{139, 314}, {99, 19}}</string>
	1816	<string>{{139, 354}, {99, 19}}</string>
1809	1817	<dict>
1810	1818	<key>$class</key>
…	…
1951	1959	<integer>256</integer>
1952	1960	</dict>
1953		<string>{{136, 276}, {267, 22}}</string>
	1961	<string>{{136, 316}, {267, 22}}</string>
1954	1962	<dict>
1955	1963	<key>$class</key>
…	…
2221	2229	<integer>256</integer>
2222	2230	</dict>
2223		<string>{{136, 249}, {64, 18}}</string>
	2231	<string>{{136, 289}, {64, 18}}</string>
2224	2232	<dict>
2225	2233	<key>$class</key>
…	…
2371	2379	<integer>256</integer>
2372	2380	</dict>
2373		<string>{{136, 229}, {127, 18}}</string>
	2381	<string>{{136, 269}, {127, 18}}</string>
2374	2382	<dict>
2375	2383	<key>$class</key>
…	…
2481	2489	<integer>256</integer>
2482	2490	</dict>
2483		<string>{{136, 209}, {173, 18}}</string>
	2491	<string>{{136, 249}, {173, 18}}</string>
2484	2492	<dict>
2485	2493	<key>$class</key>
…	…
2552	2560	<dict>
2553	2561	<key>CF$UID</key>
2554		<integer>159</integer>
	2562	<integer>170</integer>
2555	2563	</dict>
2556	2564	<key>NSSource</key>
…	…
2564	2572	<dict>
2565	2573	<key>CF$UID</key>
2566		<integer>45</integer>
	2574	<integer>104</integer>
2567	2575	</dict>
2568	2576	<key>NSCell</key>
…	…
2577	2585	<key>CF$UID</key>
2578	2586	<integer>156</integer>
2579		~~</dict>~~
2580		~~<key>NSNextResponder</key>~~
2581		~~<dict>~~
2582		~~<key>CF$UID</key>~~
2583		~~<integer>65</integer>~~
2584		~~</dict>~~
2585		~~<key>NSSuperview</key>~~
2586		~~<dict>~~
2587		~~<key>CF$UID</key>~~
2588		~~<integer>65</integer>~~
2589		~~</dict>~~
2590		~~<key>NSvFlags</key>~~
2591		~~<integer>256</integer>~~
2592		~~</dict>~~
2593		~~<string>{{136, 127}, {176, 18}}</string>~~
2594		~~<dict>~~
2595		~~<key>$class</key>~~
2596		~~<dict>~~
2597		~~<key>CF$UID</key>~~
2598		~~<integer>44</integer>~~
2599		~~</dict>~~
2600		~~<key>NSAlternateContents</key>~~
2601		~~<dict>~~
2602		~~<key>CF$UID</key>~~
2603		~~<integer>42</integer>~~
2604		~~</dict>~~
2605		~~<key>NSAlternateImage</key>~~
2606		~~<dict>~~
2607		~~<key>CF$UID</key>~~
2608		~~<integer>138</integer>~~
2609		~~</dict>~~
2610		~~<key>NSButtonFlags</key>~~
2611		~~<integer>1211912703</integer>~~
2612		~~<key>NSButtonFlags2</key>~~
2613		~~<integer>2</integer>~~
2614		~~<key>NSCellFlags</key>~~
2615		~~<integer>67239424</integer>~~
2616		~~<key>NSCellFlags2</key>~~
2617		~~<integer>131072</integer>~~
2618		~~<key>NSContents</key>~~
2619		~~<dict>~~