Changeset 4bf9740 in nscp for helpers

Timestamp:

09/17/08 21:10:18 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

08f0346

Parents:

7e74e2c

Message:

2008-09-17 MickeM - 0.3.4 RC-6

• Fixed issue on all filters so == takes the "usual" 2 equalsigns (old still works).
• Added so tray icon can get "propper" name from core for "description".

2008-09-16 MickeM - 0.3.4 RC-5

• Fixed an issue with the session launcher

Location:

helpers/systray_helper

Files:

• TrayWidget.cpp (modified) (14 diffs)
• TrayWidget.h (modified) (2 diffs)

helpers/systray_helper/TrayWidget.cpp

@@ -50 +50 @@
 typedef BOOL (WINAPI *LPFN_CHANGEWINDOWMESSAGEFILTER) (UINT, DWORD);
 LPFN_CHANGEWINDOWMESSAGEFILTER fnChangeWindowMessageFilter = NULL;
-BOOL ChangeWindowMessageFilter(UINT message, DWORD what)
+BOOL ChangeWindowMessageFilter_(UINT message, DWORD what)
 {
   if (fnChangeWindowMessageFilter == NULL) {
@@ -85 +85 @@
   LOG_MESSAGE_TRAY(_T("Attempting to launch system tray module for ") + channel_id_);
   gTrayInstance = this;
-  try {
-    shared_client_.reset(new nsclient_session::shared_client_session(channel_id_, this));
-    if (shared_client_.get() != NULL)
-      shared_client_->attach_to_session(channel_id_);
-  } catch (nsclient_session::session_exception e) {
-    LOG_ERROR_TRAY(_T("Failed to attach to shared session: ") + e.what());
-  }
 }
 TrayWidget::~TrayWidget() {
@@ -111 +104 @@
   try {
     shared_client_.reset(new nsclient_session::shared_client_session(channel_id_, this));
-    if (shared_client_.get() != NULL)
+    if (shared_client_.get() != NULL) {
       shared_client_->attach_to_session(channel_id_);
+      TrayIcon::addIcon(hDlgWnd);
+    }
   } catch (nsclient_session::session_exception e) {
     LOG_ERROR_TRAY(_T("Failed to attach to shared session: ") + e.what());
@@ -124 +119 @@
   return shared_client_->inject(command, arguments, splitter, escape, msg, perf);
 }
+std::pair<std::wstring,std::wstring> TrayWidget::get_client_name() {
+  if (shared_client_.get() == NULL) {
+    LOG_ERROR_TRAY(_T("No active shared instance!"));
+    return std::pair<std::wstring,std::wstring>(_T("NSClient++ system tray offline"), _T(""));
+  }
+  return shared_client_->get_client_name();
+}
 
 
@@ -131 +133 @@
   LOG_MESSAGE_TRAY(_T("Creating dialog..."));
   ghInstance = hInstance;
-  //hDlgWnd = ::CreateDialog(hInstance,MAKEINTRESOURCE(IDD_NSTRAYDLG),NULL,TrayIcon::DialogProc);
-  //if ((hDlgWnd == NULL)||!IsWindow(hDlgWnd)) {
-//    LOG_ERROR_TRAY(_T("Failed to create windows: ") + error::lookup::last_error());
-//  }
 
   WNDCLASSEX wndclass;
@@ -149 +147 @@
   wndclass.lpszClassName=_T("NSClient_pp_TrayClass");
   wndclass.style=0;
-  // register task bar restore event after crash
-  //WM_TASKBARCREATED=RegisterWindowMessage(TEXT("TaskbarCreated"));
-  //MyChangeWindowMessageFilter(WM_TASKBARCREATED, MSGFLT_ADD); 
 
   UINT UDM_TASKBARCREATED = RegisterWindowMessage(_T("TaskbarCreated"));
@@ -157 +152 @@
     LOG_ERROR_TRAY(_T("Failed to register 'TaskbarCreated': ") + error::lookup::last_error());
   }
-  if (!ChangeWindowMessageFilter(UDM_TASKBARCREATED, MSGFLT_ADD)) {
+  if (!ChangeWindowMessageFilter_(UDM_TASKBARCREATED, MSGFLT_ADD)) {
     LOG_ERROR_TRAY(_T("Failed to cchange window filter: ") + error::lookup::last_error());
   }
@@ -185 +180 @@
   }
   return;
-  
-  /*
-  MSG Msg;
-  BOOL bRet;
-  while((bRet = ::GetMessage(&Msg, NULL, 0, 0)) != 0)
-  {
-    if (Msg.message == WM_MY_CLOSE) {
-      ::DestroyWindow(hDlgWnd);
-    } else if (Msg.message == UDM_TASKBARCREATED) {
-      LOG_MESSAGE_TRAY(_T("Recreating systray icon..."));
-      TrayIcon::addIcon(Msg.hwnd);
-    } else if (bRet == -1) {
-      // handle the error and possibly exit
-      LOG_ERROR_TRAY(_T("Wonder what this is... please let me know..."));
-      return;
-    } else {
-    //} else if (!::IsWindow(hDlgWnd) || !::IsDialogMessage(hDlgWnd, &Msg)) {
-      ::TranslateMessage(&Msg); 
-      ::DispatchMessage(&Msg); 
-    } 
-  }
-  */
 }
 
 void TrayWidget::session_error(std::wstring file, unsigned int line, std::wstring msg) {
   log(_T("error"), file.c_str(), line, msg);
+}
+void TrayWidget::session_info(std::wstring file, unsigned int line, std::wstring msg) {
+  log(_T("info"), file.c_str(), line, msg);
 }
 
@@ -353 +329 @@
       SetDlgItemText(hWnd, IDC_MSG, msg.c_str());
       SetDlgItemText(hWnd, IDC_PERF, perf.c_str());
+    } else if (cmd == _T("connect-service")) {
+      gTrayInstance->connectService();
     }
     return 0;
@@ -364 +342 @@
   }
 
+  static void connectService() {
+    Thread<worker_thread> *pThread = new Thread<worker_thread>(_T("tray-worker-thread"));
+    pThread->createThread(worker_thread::init(_T("connect-service"), NULL));
+  }
   static void updateServiceStatus(HMENU hMenu) {
     Thread<worker_thread> *pThread = new Thread<worker_thread>(_T("tray-worker-thread"));
@@ -586 +568 @@
   if (uMsg == UDM_TASKBARCREATED) {
     addIcon(hwndDlg);
-    LOG_MESSAGE_TO_TRAY(_T("UDM_TASKBARCREATED"));
   }
 
@@ -600 +581 @@
   case WM_CREATE:
   case WM_INITDIALOG:
-    LOG_MESSAGE_TO_TRAY(_T("WM_INITDIALOG"));
-
-
     UDM_TASKBARCREATED = RegisterWindowMessage(_T("TaskbarCreated"));
     if (UDM_TASKBARCREATED == 0) {
       LOG_MESSAGE_TO_TRAY(_T("Failed to register 'TaskbarCreated': ") + error::lookup::last_error());
     }
-    if (!ChangeWindowMessageFilter(UDM_TASKBARCREATED, MSGFLT_ADD)) {
+    if (!ChangeWindowMessageFilter_(UDM_TASKBARCREATED, MSGFLT_ADD)) {
       LOG_MESSAGE_TO_TRAY(_T("Failed to cchange window filter: ") + error::lookup::last_error());
     }
 
     addIcon(hwndDlg);
+    worker_thread::connectService();
     break;
 
@@ -619 +598 @@
       {
       case ID_POPUP_CONNECT:
-        gTrayInstance->connectService();
+        worker_thread::connectService();
         break;
       case ID_POPUP_CLOSE:
@@ -680 +659 @@
   ndata.uCallbackMessage=WM_ICON_NOTIFY;
   ndata.hIcon=::LoadIcon(ghInstance,MAKEINTRESOURCE(IDI_NSCP));
-  std::wstring title = _T("NSClient++ SystemTray (TODO)"); //NSCModuleHelper::getApplicationName() + _T(" - ") + NSCModuleHelper::getApplicationVersionString();
+  std::pair<std::wstring,std::wstring> version = gTrayInstance->get_client_name();
+  std::wstring title = version.first + _T(" - ") + version.second;
   wcsncpy_s(ndata.szTip, 64, title.c_str(), min(64, title.size()));
   Shell_NotifyIcon(NIM_ADD,&ndata);

helpers/systray_helper/TrayWidget.h

@@ -60 +60 @@
   void log(std::wstring category, const TCHAR* file, const int line, std::wstring message);
   void session_error(std::wstring file, unsigned int line, std::wstring msg);
+  void session_info(std::wstring file, unsigned int line, std::wstring msg);
   void session_log_message(int msgType, const TCHAR* file, const int line, std::wstring message);
   int session_inject(std::wstring command, std::wstring arguments, TCHAR splitter, bool escape, std::wstring &msg, std::wstring & perf) {
     return -1;
+  }
+  std::pair<std::wstring,std::wstring> session_get_name() {
+    return std::pair<std::wstring,std::wstring>(_T("NSClient++ systray"),_T(""));
   }
 
@@ -69 +73 @@
   HWND getLogWindow() const { return hLogWnd; }
   int inject(std::wstring command, std::wstring arguments, TCHAR splitter, bool escape, std::wstring &msg, std::wstring & perf);
+  std::pair<std::wstring,std::wstring> get_client_name();