Win32: hide to tray, webconsole menu item

Standard icon works for me on Windows 8

Win32/Resource.rc

@@ -53,7 +53,6 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 MAINICON                ICON                    "ictoopie.ico"
-IDI_ICON1		        ICON				"ictoopie_16.ico"
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 

Win32/Win32App.cpp

@@ -1,12 +1,14 @@
 #include <string.h>
 #include <windows.h>
 #include <shellapi.h>
-//#include "../Daemon.h"
+#include "../Config.h"
 #include "resource.h"
 #include "Win32App.h"
 
 #define ID_ABOUT 2000
 #define ID_EXIT 2001
+#define ID_CONSOLE 2002
+#define ID_APP 2003
 
 #define ID_TRAY_ICON 2050
 #define WM_TRAYICON (WM_USER + 1)
@@ -18,10 +20,12 @@ namespace win32
     static void ShowPopupMenu (HWND hWnd, POINT *curpos, int wDefaultItem)
     {
         HMENU hPopup = CreatePopupMenu();
-        InsertMenu (hPopup, 0, MF_BYPOSITION | MF_STRING, ID_ABOUT, "About...");
+        InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_CONSOLE, "Open &console");
-        InsertMenu (hPopup, 1, MF_BYPOSITION | MF_STRING, ID_EXIT , "Exit");
+        InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_APP, "Show app");
-        SetMenuDefaultItem (hPopup, ID_ABOUT, FALSE);
+        InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_ABOUT, "&About...");
-        SetFocus (hWnd);
+        InsertMenu (hPopup, -1, MF_BYPOSITION | MF_SEPARATOR, NULL, NULL);
+        InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_EXIT, "E&xit");
+        SetMenuDefaultItem (hPopup, ID_CONSOLE, FALSE);
         SendMessage (hWnd, WM_INITMENUPOPUP, (WPARAM)hPopup, 0);
 
         POINT p;
@@ -44,10 +48,11 @@ namespace win32
         nid.cbSize = sizeof(nid);
         nid.hWnd = hWnd;
         nid.uID = ID_TRAY_ICON;
-        nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
+        nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP | NIF_INFO;
         nid.uCallbackMessage = WM_TRAYICON;
-        nid.hIcon = LoadIcon (GetModuleHandle(NULL), MAKEINTRESOURCE (IDI_ICON1));
+        nid.hIcon = LoadIcon (GetModuleHandle(NULL), MAKEINTRESOURCE (MAINICON));
         strcpy (nid.szTip, "i2pd");
+        strcpy (nid.szInfo, "i2pd is running");
         Shell_NotifyIcon(NIM_ADD, &nid );
     }
 
@@ -88,14 +93,39 @@ namespace win32
                         PostMessage (hWnd, WM_CLOSE, 0, 0);
                         return 0;
                     }
+                    case ID_CONSOLE:
+                    {
+                        char buf[30];
+                        std::string httpAddr; i2p::config::GetOption("http.address", httpAddr);
+                        uint16_t    httpPort; i2p::config::GetOption("http.port", httpPort);
+                        std::snprintf(buf, 30, "http://%s:%d", httpAddr.c_str(), httpPort);
+                        ShellExecute(NULL, "open", buf, NULL, NULL, SW_SHOWNORMAL);
+                        return 0;
+                    }
+                    case ID_APP:
+                    {
+                        ShowWindow(hWnd, SW_SHOW);
+                        return 0;
+                    }
                 }
                 break;
             }
+            case WM_SYSCOMMAND:
+            {
+                switch (wParam)
+                {
+                    case SC_MINIMIZE:
+                    {
+                        ShowWindow(hWnd, SW_HIDE);
+                        return 0;
+                    }
+                }
+            }
             case WM_TRAYICON:
             {
-                SetForegroundWindow (hWnd);
                 switch (lParam)
                 {
+                    case WM_LBUTTONUP:
                     case WM_RBUTTONUP:
                     {
                         SetForegroundWindow (hWnd);
@@ -127,15 +157,14 @@ namespace win32
         wclx.cbClsExtra = 0;
         wclx.cbWndExtra = 0;
         wclx.hInstance = hInst;
-        wclx.hIcon = LoadIcon (hInst, IDI_APPLICATION);
+        wclx.hIcon = LoadIcon (hInst, MAKEINTRESOURCE(MAINICON));
-        wclx.hIconSm = LoadIcon (hInst, IDI_APPLICATION);
         wclx.hCursor = LoadCursor (NULL, IDC_ARROW);
         wclx.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
         wclx.lpszMenuName = NULL;
         wclx.lpszClassName = I2PD_WIN32_CLASSNAME;
         RegisterClassEx (&wclx);
         // create new window
-        if (!CreateWindow(I2PD_WIN32_CLASSNAME, TEXT("i2pd"), WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 250, 150, NULL, NULL, hInst, NULL))
+        if (!CreateWindow(I2PD_WIN32_CLASSNAME, TEXT("i2pd"), WS_OVERLAPPEDWINDOW, 100, 100, 250, 150, NULL, NULL, hInst, NULL))
         {
             MessageBox(NULL, "Failed to create main window", TEXT("Warning!"), MB_ICONERROR | MB_OK | MB_TOPMOST);
             return false;

Win32/resource.h

@@ -2,7 +2,7 @@
 // Microsoft Visual C++ generated include file.
 // Used by Resource.rc
 //
-#define IDI_ICON1                       101
+#define MAINICON                    101
 
 // Next default values for new objects
 // 

build/CMakeLists.txt

@@ -11,6 +11,7 @@ option(WITH_BINARY    "Build binary" ON)
 option(WITH_STATIC    "Static build" OFF)
 option(WITH_UPNP "Include support for UPnP client" OFF)
 option(WITH_PCH "Use precompiled header" OFF)
+option(WITH_GUI "Include GUI (currently MS Windows only)" ON)
 
 # paths
 set ( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
@@ -157,7 +158,11 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
   list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/DaemonLinux.cpp")
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR MSYS)
   list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/DaemonWin32.cpp")
-  list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/Win32/Win32App.cpp")
+  if (WITH_GUI)
+    list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/Win32/Win32App.cpp")
+    set_source_files_properties("${CMAKE_SOURCE_DIR}/DaemonWin32.cpp"
+      PROPERTIES COMPILE_DEFINITIONS WIN32_APP)
+  endif ()
   list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/Win32/Win32Service.cpp")
   list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/Win32/Resource.rc")
 endif ()
@@ -310,7 +315,7 @@ include(GNUInstallDirs)
 
 if (WITH_BINARY)
   add_executable ( "${PROJECT_NAME}" ${DAEMON_SRC} )
-  if (WIN32)
+  if (WIN32 AND WITH_GUI)
     set_target_properties("${PROJECT_NAME}" PROPERTIES WIN32_EXECUTABLE TRUE )
   endif()
   if(NOT MSVC)