Added trayicon (no functionaliy yet)

Author: david0

Makefile

@@ -7,7 +7,13 @@ CFLAGS=-DWINVER=0x500 -DWIN32_WINNT=0x500 -Os -DWITH_ICON=1
 LDFLAGS=-mwindows
 
 PROG=neoplace.exe
-OBJS=main.o resources.o
+OBJS=main.o resources.o trayicon.o
+
+
+ifdef DEBUG
+				CFLAGS+= -g
+				LDFLAGS:=$(filter-out -mwindows, $(LDFLAGS))
+endif
 
 all: ${PROG}
 

main.c

@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include "resources.h"
+#include "trayicon.h"
 
 enum {
 	ID_BUTTON_RESIZE,
@@ -45,12 +46,12 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
 HWND createMatrixButton(HWND parent, HINSTANCE hInstance, unsigned i, unsigned j);
 HWND createMainWindow(HINSTANCE current_instance);
+void exitApplication();
 
 HWND top_window, main_window;
 
 HWND buttons[BUTTON_MAX][BUTTON_MAX];
-bool is_checking = false;
-//<is currently checking the size matrix ?
+bool is_checking = false;	//<is currently checking the size matrix ?
 POINT last_click_position;
 
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
@@ -59,6 +60,10 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 
 	top_window = GetForegroundWindow();
 
+	trayicon_init(LoadIcon(hInstance, MAKEINTRESOURCE(IDI_APPICON)), APPNAME);
+	trayicon_add_item(NULL, &exitApplication);
+	trayicon_add_item("Exit", &exitApplication);
+
 	main_window = createMainWindow(hInstance);
 	ShowWindow(main_window, nCmdShow);
 	UpdateWindow(main_window);
@@ -166,6 +171,7 @@ HWND createMainWindow(HINSTANCE current_instance)
 
 void exitApplication()
 {
+	trayicon_remove();
 	PostQuitMessage(0);
 }
 
@@ -179,7 +185,6 @@ HWND createMatrixButton(HWND parent, HINSTANCE hInstance, unsigned i, unsigned j
 			      MARGIN + j * (BUTTON_SIZE + BUTTON_SPACE),
 			      MARGIN + i * (BUTTON_SIZE + BUTTON_SPACE),
 			      BUTTON_SIZE, BUTTON_SIZE, parent, NULL, hInstance, NULL);
-	//ID_LAST + i * BUTTON_MAX_ROWS + j);
 	return button;
 }
 

trayicon.c

@@ -0,0 +1,81 @@
+
+#include <windows.h>
+#include <tchar.h>
+#include "trayicon.h"
+#include "resources.h"
+
+#define WM_ICON_CLICK (WM_USER+1)
+#define LOG_ERROR(text) MessageBox(NULL, TEXT(text), TEXT("Error"), MB_ICONERROR | MB_OK);
+#define WND_CLASS " toolbar"
+
+NOTIFYICONDATA trayicon_data = { };
+
+LRESULT CALLBACK trayicon_messageloop(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
+
+bool trayicon_init(HICON icon, char tooltip[])
+{
+	HWND hidden_window;
+	WNDCLASSEX wc = { 0 };
+	TCHAR class_name[256];
+
+	// build new class name
+	_tcscpy(class_name, tooltip);
+	_tcscat(class_name, WND_CLASS);
+
+	wc.cbSize = sizeof(wc);
+	wc.cbClsExtra = 0;
+	wc.cbWndExtra = 0;
+	wc.style = 0;
+	wc.lpfnWndProc = &trayicon_messageloop;
+	wc.hInstance = GetModuleHandle(NULL);
+	wc.lpszClassName = class_name;
+	if (!RegisterClassEx(&wc)) {
+		LOG_ERROR("Error registering window class.");
+		return false;
+	}
+	hidden_window =
+	    CreateWindowEx(0, class_name, class_name,
+			   0, CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL,
+			   GetModuleHandle(NULL), NULL);
+
+	if (!hidden_window) {
+		LOG_ERROR("Error creating hidden window.");
+		return false;
+	}
+
+	trayicon_data.cbSize = sizeof(trayicon_data);
+	trayicon_data.hIcon = icon;
+	trayicon_data.hWnd = hidden_window;
+	trayicon_data.uCallbackMessage = WM_ICON_CLICK;
+	trayicon_data.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
+
+	strncpy(trayicon_data.szTip, tooltip, 64);
+	trayicon_data.szTip[64] = '\0';
+	Shell_NotifyIcon(NIM_ADD, &trayicon_data);
+}
+
+void trayicon_remove()
+{
+	Shell_NotifyIcon(NIM_DELETE, &trayicon_data);
+}
+
+void trayicon_add_item(char *text, void (functionPtr) ())
+{
+	//FIXME: must be implemented
+}
+
+LRESULT CALLBACK trayicon_messageloop(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+	switch (msg) {
+	case WM_CREATE:
+		{
+			break;
+		}
+	case WM_ICON_CLICK:
+		{
+			break;
+		}
+
+	}
+	return DefWindowProc(hWnd, msg, wParam, lParam);
+}

trayicon.h

@@ -0,0 +1,18 @@
+#ifndef _TRAYICON_H
+#define _TRAYICON_H
+
+#include <windows.h>
+#include <stdbool.h>
+
+typedef enum {
+	TRAYICON_CLICKED,
+	TRAYICON_EXIT_CLICKED,
+	TRAYICON_BEFORE_REMOVE
+} TRAYICON_EVENT;
+
+bool trayicon_init(HICON icon, char tooltip[]);
+void trayicon_remove();
+
+void trayicon_add_item(char *text, void (functionPtr) ());
+
+#endif