From 9fcaa2b8fac647bad41af3bd5d513800160845a1 Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Tue, 27 Jul 2010 23:22:46 +0200
Subject: [PATCH] Give LinkApp a direct reference to the InputManager object
 instead of fetching it from the GMenu2X object.

---
 src/linkapp.cpp | 12 +++++++-----
 src/linkapp.h   |  4 +++-
 src/menu.cpp    |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/linkapp.cpp b/src/linkapp.cpp
index 6067c53..0b0782a 100644
--- a/src/linkapp.cpp
+++ b/src/linkapp.cpp
@@ -30,8 +30,10 @@
 
 using namespace std;
 
-LinkApp::LinkApp(GMenu2X *gmenu2x_, const char* linkfile)
+LinkApp::LinkApp(GMenu2X *gmenu2x_, InputManager &inputMgr_,
+				 const char* linkfile)
 	: Link(gmenu2x_)
+	, inputMgr(inputMgr_)
 {
 	manual = "";
 	file = linkfile;
@@ -329,10 +331,10 @@ void LinkApp::showManual() {
 				repaint = false;
 			}
 
-			gmenu2x->input.update();
-			if ( gmenu2x->input[ACTION_Y] || gmenu2x->input[ACTION_X] || gmenu2x->input[ACTION_START] ) close = true;
-			if ( gmenu2x->input[ACTION_LEFT] && page>0 ) { page--; repaint=true; }
-			if ( gmenu2x->input[ACTION_RIGHT] && page<pagecount-1 ) { page++; repaint=true; }
+			inputMgr.update();
+			if ( inputMgr[ACTION_Y] || inputMgr[ACTION_X] || inputMgr[ACTION_START] ) close = true;
+			if ( inputMgr[ACTION_LEFT] && page>0 ) { page--; repaint=true; }
+			if ( inputMgr[ACTION_RIGHT] && page<pagecount-1 ) { page++; repaint=true; }
 		}
 		return;
 	}
diff --git a/src/linkapp.h b/src/linkapp.h
index 1b57760..57bf363 100644
--- a/src/linkapp.h
+++ b/src/linkapp.h
@@ -28,6 +28,7 @@
 using std::string;
 
 class GMenu2X;
+class InputManager;
 
 /**
 Parses links files.
@@ -36,6 +37,7 @@ Parses links files.
 */
 class LinkApp : public Link {
 private:
+	InputManager &inputMgr;
 	string sclock, svolume;
 	int iclock, ivolume;
 	//G
@@ -55,7 +57,7 @@ private:
 	bool dontleave;
 
 public:
-	LinkApp(GMenu2X *gmenu2x, const char* linkfile);
+	LinkApp(GMenu2X *gmenu2x, InputManager &inputMgr, const char* linkfile);
 	virtual const string &searchIcon();
 
 	const string &getExec();
diff --git a/src/menu.cpp b/src/menu.cpp
index 4835f84..fdbd4e2 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -269,7 +269,7 @@ bool Menu::addLink(string path, string file, string section) {
 #ifdef DEBUG
 			cout << "\033[0;34mGMENU2X:\033[0m Section: " << sections[isection] << "(" << isection << ")" << endl;
 #endif
-			LinkApp* link = new LinkApp(gmenu2x, linkpath.c_str());
+			LinkApp* link = new LinkApp(gmenu2x, gmenu2x->input, linkpath.c_str());
 			link->setSize(gmenu2x->skinConfInt["linkWidth"],gmenu2x->skinConfInt["linkHeight"]);
 			links[isection].push_back( link );
 		}
@@ -425,7 +425,7 @@ void Menu::readLinks() {
 
 		sort(linkfiles.begin(), linkfiles.end(),case_less());
 		for (uint x=0; x<linkfiles.size(); x++) {
-			LinkApp *link = new LinkApp(gmenu2x, linkfiles[x].c_str());
+			LinkApp *link = new LinkApp(gmenu2x, gmenu2x->input, linkfiles[x].c_str());
 			link->setSize(gmenu2x->skinConfInt["linkWidth"],gmenu2x->skinConfInt["linkHeight"]);
 			if (link->targetExists())
 				links[i].push_back( link );