new feature: support for merging screens together

2011-11-12 19:47:47 +01:00
parent e31dec7005
commit 56467eaac6
44 changed files with 633 additions and 218 deletions
--- a/src/global.h
+++ b/src/global.h
@@ -30,6 +30,8 @@ namespace Global
 	extern BasicScreen *myScreen;
 	extern BasicScreen *myOldScreen;	// for info, lyrics, popups
 	extern BasicScreen *myPrevScreen;	// "real" screen switching (browser, search, etc.)
+	extern BasicScreen *myLockedScreen;     // points at the screen that was locked (or is null if no screen is locked)
+	extern BasicScreen *myInactiveScreen;   // points at inactive screen, if locking was enabled and two screens are displayed
 	
 	extern Window *wHeader;
 	extern Window *wFooter;