From 94ea8c4aec18b65edee5fe9e0d6a4bd4bd9843d3 Mon Sep 17 00:00:00 2001
From: joshholtrop <joshholtrop@8131a0b2-b21c-1c47-bd6a-f003126495bd>
Date: Mon, 3 Aug 2009 14:14:11 +0000
Subject: [PATCH] added pppc-sample.ini, broke out menu item addition
 functionality to addMenuItem()

git-svn-id: http://apu.dw.local/svnusers/JoshHoltrop/pppc/trunk@41 8131a0b2-b21c-1c47-bd6a-f003126495bd
---
 pppc-sample.ini | 16 ++++++++++++++++
 pppc.cc         | 27 ++++++++++++++++-----------
 2 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 pppc-sample.ini

diff --git a/pppc-sample.ini b/pppc-sample.ini
new file mode 100644
index 0000000..8bdae44
--- /dev/null
+++ b/pppc-sample.ini
@@ -0,0 +1,16 @@
+
+port = LPT1
+
+[Light]
+pin = 7
+on_start = on
+on_exit = off
+on_lock = off
+on_unlock = on
+
+[Fan]
+pin = 6
+on_start = off
+on_exit = off
+on_lock = off
+on_unlock = previous
diff --git a/pppc.cc b/pppc.cc
index 0fd543e..9cb81a1 100644
--- a/pppc.cc
+++ b/pppc.cc
@@ -11,6 +11,7 @@ using namespace std;
 #define WM_ICON_NOTIFY (WM_APP + 42)
 
 LRESULT WindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+void addMenuItem(HMENU hMenu, CHAR * itemstr, WORD id);
 
 static HINSTANCE m_hInstance;
 
@@ -150,17 +151,7 @@ LRESULT WindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                 if (LOWORD(lParam) == WM_RBUTTONUP)
                 {
                     HMENU hMenu = ::CreatePopupMenu();
-                    MENUITEMINFO mii;
-                    memset(&mii, 0, sizeof(mii));
-                    mii.cbSize      = sizeof(mii);
-                    mii.fMask       = MIIM_STRING | MIIM_ID;
-                    mii.wID         = 0;
-                    mii.dwTypeData  = "E&xit";
-                    mii.cch         = strlen(mii.dwTypeData);
-                    if (::InsertMenuItem(hMenu, 0, TRUE, &mii) == 0)
-                    {
-                        cerr << "Warning: InsertMenuItem(): " << GetLastError() << endl;
-                    }
+                    addMenuItem(hMenu, "E&xit", 0);
                     POINT pos;
                     GetCursorPos(&pos);
                     ::SetForegroundWindow(hWnd);  
@@ -177,3 +168,17 @@ LRESULT WindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     return 0;
 }
 
+void addMenuItem(HMENU hMenu, CHAR * itemstr, WORD id)
+{
+    MENUITEMINFO mii;
+    memset(&mii, 0, sizeof(mii));
+    mii.cbSize      = sizeof(mii);
+    mii.fMask       = MIIM_STRING | MIIM_ID;
+    mii.wID         = id;
+    mii.dwTypeData  = itemstr;
+    mii.cch         = strlen(mii.dwTypeData);
+    if (::InsertMenuItem(hMenu, 0, TRUE, &mii) == 0)
+    {
+        cerr << "Warning: InsertMenuItem(): " << GetLastError() << endl;
+    }
+}