From 60cfcb0e4456f963539b0afad89618784acab8df Mon Sep 17 00:00:00 2001
From: kohait <kohait@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 19 Jul 2011 08:35:13 +0000
Subject: [PATCH] rainbow: 'quit' porting and some minor cleanup

git-svn-id: svn://ultimatepp.org/upp/trunk@3674 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 rainbow/LinuxFb/LinuxFbLocal.h | 2 --
 rainbow/LinuxFb/Win.cpp        | 6 ++----
 rainbow/SDLFb/Proc.cpp         | 1 +
 rainbow/SDLFb/SDLFbLocal.h     | 1 -
 rainbow/SDLFb/Win.cpp          | 8 +++++---
 rainbow/WinFb/Win.cpp          | 1 -
 rainbow/WinFb/WinFb.h          | 2 --
 7 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/rainbow/LinuxFb/LinuxFbLocal.h b/rainbow/LinuxFb/LinuxFbLocal.h
index fc3ffd6b0..c8c3eb554 100644
--- a/rainbow/LinuxFb/LinuxFbLocal.h
+++ b/rainbow/LinuxFb/LinuxFbLocal.h
@@ -17,8 +17,6 @@
 
 NAMESPACE_UPP
 
-extern bool fbEndSession;
-
 extern int fbfd;
 extern struct fb_var_screeninfo vinfo;
 extern struct fb_fix_screeninfo finfo;
diff --git a/rainbow/LinuxFb/Win.cpp b/rainbow/LinuxFb/Win.cpp
index 3056c171b..d51439de0 100644
--- a/rainbow/LinuxFb/Win.cpp
+++ b/rainbow/LinuxFb/Win.cpp
@@ -5,8 +5,6 @@
 
 NAMESPACE_UPP
 
-bool fbEndSession = false;
-
 //video
 int fbfd = -1;
 struct fb_var_screeninfo vinfo;
@@ -27,9 +25,9 @@ int cvt = -1;
 //event
 int pend = 0;
 
-bool FBEndSession()
+bool FBQuitSession()
 {
-	return fbEndSession;
+	Ctrl::EndSession();
 }
 
 bool FBIsWaitingEvent()
diff --git a/rainbow/SDLFb/Proc.cpp b/rainbow/SDLFb/Proc.cpp
index 776781127..87b3dad4c 100644
--- a/rainbow/SDLFb/Proc.cpp
+++ b/rainbow/SDLFb/Proc.cpp
@@ -134,6 +134,7 @@ void HandleSDLEvent(SDL_Event* event)
 		case SDL_VIDEOEXPOSE: //SDL_ExposeEvent
 			break;
 		case SDL_QUIT: //SDL_QuitEvent
+			Ctrl::EndSession();
 			break;
 		case SDL_USEREVENT: //SDL_UserEvent
 			HandleUserEvent(event);
diff --git a/rainbow/SDLFb/SDLFbLocal.h b/rainbow/SDLFb/SDLFbLocal.h
index 42525dc9d..53e260146 100644
--- a/rainbow/SDLFb/SDLFbLocal.h
+++ b/rainbow/SDLFb/SDLFbLocal.h
@@ -8,7 +8,6 @@
 
 NAMESPACE_UPP
 
-extern bool fbEndSession;
 extern SDL_Surface * screen;
 extern int videoflags;
 extern int height;
diff --git a/rainbow/SDLFb/Win.cpp b/rainbow/SDLFb/Win.cpp
index 0d2fa10aa..32bc3e432 100644
--- a/rainbow/SDLFb/Win.cpp
+++ b/rainbow/SDLFb/Win.cpp
@@ -4,16 +4,17 @@ NAMESPACE_UPP
 
 #define LLOG(x)       //LOG(x)
 
-bool fbEndSession = false;
 SDL_Surface * screen = NULL;
 int videoflags = 0;
 int height = 0;
 int width = 0;
 int bpp = 0;
 
-bool FBEndSession()
+void FBQuitSession()
 {
-	return fbEndSession;
+	SDL_Event event;
+	event.type=SDL_QUIT;
+	SDL_PushEvent(&event);
 }
 
 bool FBIsWaitingEvent()
@@ -72,6 +73,7 @@ void FBUpdate(const Rect& inv)
 
 void FBFlush()
 {
+	
 }
 
 void FBInit()
diff --git a/rainbow/WinFb/Win.cpp b/rainbow/WinFb/Win.cpp
index abd06494d..d6ac2b694 100644
--- a/rainbow/WinFb/Win.cpp
+++ b/rainbow/WinFb/Win.cpp
@@ -5,7 +5,6 @@ NAMESPACE_UPP
 #define LLOG(x)
 
 HWND fbHWND;
-bool fbEndSession = false;
 
 bool FBIsWaitingEvent()
 {
diff --git a/rainbow/WinFb/WinFb.h b/rainbow/WinFb/WinFb.h
index 98f036d49..dc134c746 100644
--- a/rainbow/WinFb/WinFb.h
+++ b/rainbow/WinFb/WinFb.h
@@ -5,8 +5,6 @@
 
 NAMESPACE_UPP
 
-extern bool fbEndSession;
-
 LRESULT CALLBACK fbWindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 void             fbUpdate(HDC hdc, const Rect& r);