X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c42404a58eac2c9eb0557565a471a794c387a715..dc26eeb36a7415bd73d3e442c79b7acc0aeed6eb:/src/msw/taskbar.cpp diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index fc4f1cb9ca..503480beae 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -1,65 +1,46 @@ ///////////////////////////////////////////////////////////////////////// -// File: taskbar.cpp +// File: src/msw/taskbar.cpp // Purpose: Implements wxTaskBarIcon class for manipulating icons on // the Windows task bar. // Author: Julian Smart -// Modified by: +// Modified by: Vaclav Slavik // Created: 24/3/98 // RCS-ID: $Id$ // Copyright: (c) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "taskbar.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/defs.h" -#include "wx/window.h" -#include "wx/frame.h" -#include "wx/utils.h" -#include "wx/menu.h" + #include "wx/window.h" + #include "wx/frame.h" + #include "wx/utils.h" + #include "wx/menu.h" #endif -#if defined(__WIN95__) && !defined(__TWIN32__) - -#include - +#include "wx/msw/private.h" #include "wx/msw/winundef.h" #include -#include "wx/msw/taskbar.h" -#include "wx/msw/private.h" +#include "wx/taskbar.h" -#ifndef __TWIN32__ - #ifdef __GNUWIN32_OLD__ - #include "wx/msw/gnuwin32/extra.h" - #endif -#endif - -#ifdef __SALFORDC__ +#ifdef __WXWINCE__ + #include #include #endif -LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg, - UINT wParam, LONG lParam ); - -wxChar *wxTaskBarWindowClass = wxT("wxTaskBarWindowClass"); - -wxList wxTaskBarIcon::sm_taskBarIcons; -bool wxTaskBarIcon::sm_registeredClass = FALSE; -UINT wxTaskBarIcon::sm_taskbarMsg = 0; - +// initialized on demand +UINT gs_msgTaskbar = 0; +UINT gs_msgRestartTaskbar = 0; -BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler) +#if WXWIN_COMPATIBILITY_2_4 +BEGIN_EVENT_TABLE(wxTaskBarIcon, wxTaskBarIconBase) EVT_TASKBAR_MOVE (wxTaskBarIcon::_OnMouseMove) EVT_TASKBAR_LEFT_DOWN (wxTaskBarIcon::_OnLButtonDown) EVT_TASKBAR_LEFT_UP (wxTaskBarIcon::_OnLButtonUp) @@ -68,251 +49,236 @@ BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler) EVT_TASKBAR_LEFT_DCLICK (wxTaskBarIcon::_OnLButtonDClick) EVT_TASKBAR_RIGHT_DCLICK (wxTaskBarIcon::_OnRButtonDClick) END_EVENT_TABLE() +#endif IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler) +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxTaskBarIconWindow: helper window +// ---------------------------------------------------------------------------- -wxTaskBarIcon::wxTaskBarIcon(void) +// NB: this class serves two purposes: +// 1. win32 needs a HWND associated with taskbar icon, this provides it +// 2. we need wxTopLevelWindow so that the app doesn't exit when +// last frame is closed but there still is a taskbar icon +class wxTaskBarIconWindow : public wxFrame { - m_hWnd = 0; - m_iconAdded = FALSE; +public: + wxTaskBarIconWindow(wxTaskBarIcon *icon) + : wxFrame(NULL, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0), + m_icon(icon) + { + } - AddObject(this); + WXLRESULT MSWWindowProc(WXUINT msg, + WXWPARAM wParam, WXLPARAM lParam) + { + if (msg == gs_msgRestartTaskbar || msg == gs_msgTaskbar) + { + return m_icon->WindowProc(msg, wParam, lParam); + } + else + { + return wxFrame::MSWWindowProc(msg, wParam, lParam); + } + } - if (RegisterWindowClass()) - m_hWnd = CreateTaskBarWindow(); -} +private: + wxTaskBarIcon *m_icon; +}; + + +// ---------------------------------------------------------------------------- +// NotifyIconData: wrapper around NOTIFYICONDATA +// ---------------------------------------------------------------------------- -wxTaskBarIcon::~wxTaskBarIcon(void) +struct NotifyIconData : public NOTIFYICONDATA { - RemoveObject(this); + NotifyIconData(WXHWND hwnd) + { + memset(this, 0, sizeof(NOTIFYICONDATA)); + cbSize = sizeof(NOTIFYICONDATA); + hWnd = (HWND) hwnd; + uCallbackMessage = gs_msgTaskbar; + uFlags = NIF_MESSAGE; + + // we use the same id for all taskbar icons as we don't need it to + // distinguish between them + uID = 99; + } +}; + +// ---------------------------------------------------------------------------- +// wxTaskBarIcon +// ---------------------------------------------------------------------------- + +wxTaskBarIcon::wxTaskBarIcon() +{ + m_win = NULL; + m_iconAdded = false; + RegisterWindowMessages(); +} +wxTaskBarIcon::~wxTaskBarIcon() +{ if (m_iconAdded) - { RemoveIcon(); - } - if (m_hWnd) - { - ::DestroyWindow((HWND) m_hWnd); - m_hWnd = 0; - } + if (m_win) + m_win->Destroy(); } // Operations bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) { - if (!IsOK()) - return FALSE; + // NB: we have to create the window lazily because of backward compatibility, + // old applications may create a wxTaskBarIcon instance before wxApp + // is initialized (as samples/taskbar used to do) + if (!m_win) + { + m_win = new wxTaskBarIconWindow(this); + } + + m_icon = icon; + m_strTooltip = tooltip; - NOTIFYICONDATA notifyData; + NotifyIconData notifyData(GetHwndOf(m_win)); - memset(¬ifyData, 0, sizeof(notifyData)); - notifyData.cbSize = sizeof(notifyData); - notifyData.hWnd = (HWND) m_hWnd; - notifyData.uCallbackMessage = sm_taskbarMsg; - notifyData.uFlags = NIF_MESSAGE ; - if (icon.Ok()) + if (icon.Ok()) { - notifyData.uFlags |= NIF_ICON; - notifyData.hIcon = (HICON) icon.GetHICON(); + notifyData.uFlags |= NIF_ICON; + notifyData.hIcon = GetHiconOf(icon); } - if (((const wxChar*) tooltip != NULL) && (tooltip != wxT(""))) + if ( !tooltip.empty() ) { - notifyData.uFlags |= NIF_TIP ; - lstrcpyn(notifyData.szTip, WXSTRINGCAST tooltip, sizeof(notifyData.szTip)); + notifyData.uFlags |= NIF_TIP; +// lstrcpyn(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip)); + wxStrncpy(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip)); } - notifyData.uID = 99; + bool ok = Shell_NotifyIcon(m_iconAdded ? NIM_MODIFY + : NIM_ADD, ¬ifyData) != 0; - if (m_iconAdded) - return (Shell_NotifyIcon(NIM_MODIFY, & notifyData) != 0); - else - { - m_iconAdded = (Shell_NotifyIcon(NIM_ADD, & notifyData) != 0); - return m_iconAdded; - } + if ( !m_iconAdded && ok ) + m_iconAdded = true; + + return ok; } -bool wxTaskBarIcon::RemoveIcon(void) +bool wxTaskBarIcon::RemoveIcon() { if (!m_iconAdded) - return FALSE; + return false; - NOTIFYICONDATA notifyData; + m_iconAdded = false; - memset(¬ifyData, 0, sizeof(notifyData)); - notifyData.cbSize = sizeof(notifyData); - notifyData.hWnd = (HWND) m_hWnd; - notifyData.uCallbackMessage = sm_taskbarMsg; - notifyData.uFlags = NIF_MESSAGE; - notifyData.hIcon = 0 ; // hIcon; - notifyData.uID = 99; - m_iconAdded = FALSE; + NotifyIconData notifyData(GetHwndOf(m_win)); - return (Shell_NotifyIcon(NIM_DELETE, & notifyData) != 0); + return Shell_NotifyIcon(NIM_DELETE, ¬ifyData) != 0; } -bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y); +bool wxTaskBarIcon::PopupMenu(wxMenu *menu) { - // OK, so I know this isn't thread-friendly, but - // what to do? We need this check. + wxASSERT_MSG( m_win != NULL, _T("taskbar icon not initialized") ); - static bool s_inPopup = FALSE; + static bool s_inPopup = false; if (s_inPopup) - return FALSE; + return false; - s_inPopup = TRUE; + s_inPopup = true; - bool rval = FALSE; - wxWindow* win; int x, y; wxGetMousePosition(&x, &y); - // is wxFrame the best window type to use??? - win = new wxFrame(NULL, -1, "", wxPoint(x,y), wxSize(-1,-1), 0); - win->PushEventHandler(this); + m_win->Move(x, y); - // Remove from record of top-level windows, or will confuse wxWindows - // if we try to exit right now. - wxTopLevelWindows.DeleteObject(win); + m_win->PushEventHandler(this); menu->UpdateUI(); - rval = win->PopupMenu(menu, 0, 0); + // the SetForegroundWindow() and PostMessage() calls are needed to work + // around Win32 bug with the popup menus shown for the notifications as + // documented at http://support.microsoft.com/kb/q135788/ + ::SetForegroundWindow(GetHwndOf(m_win)); + + bool rval = m_win->PopupMenu(menu, 0, 0); - win->PopEventHandler(FALSE); - win->Destroy(); - delete win; + ::PostMessage(GetHwndOf(m_win), WM_NULL, 0, 0L); - s_inPopup = FALSE; + m_win->PopEventHandler(false); + + s_inPopup = false; return rval; } - +#if WXWIN_COMPATIBILITY_2_4 // Overridables -void wxTaskBarIcon::OnMouseMove(wxEvent&) -{ -} +void wxTaskBarIcon::OnMouseMove(wxEvent& e) { e.Skip(); } +void wxTaskBarIcon::OnLButtonDown(wxEvent& e) { e.Skip(); } +void wxTaskBarIcon::OnLButtonUp(wxEvent& e) { e.Skip(); } +void wxTaskBarIcon::OnRButtonDown(wxEvent& e) { e.Skip(); } +void wxTaskBarIcon::OnRButtonUp(wxEvent& e) { e.Skip(); } +void wxTaskBarIcon::OnLButtonDClick(wxEvent& e) { e.Skip(); } +void wxTaskBarIcon::OnRButtonDClick(wxEvent& e) { e.Skip(); } + +void wxTaskBarIcon::_OnMouseMove(wxTaskBarIconEvent& e) + { OnMouseMove(e); } +void wxTaskBarIcon::_OnLButtonDown(wxTaskBarIconEvent& e) + { OnLButtonDown(e); } +void wxTaskBarIcon::_OnLButtonUp(wxTaskBarIconEvent& e) + { OnLButtonUp(e); } +void wxTaskBarIcon::_OnRButtonDown(wxTaskBarIconEvent& e) + { OnRButtonDown(e); } +void wxTaskBarIcon::_OnRButtonUp(wxTaskBarIconEvent& e) + { OnRButtonUp(e); } +void wxTaskBarIcon::_OnLButtonDClick(wxTaskBarIconEvent& e) + { OnLButtonDClick(e); } +void wxTaskBarIcon::_OnRButtonDClick(wxTaskBarIconEvent& e) + { OnRButtonDClick(e); } +#endif -void wxTaskBarIcon::OnLButtonDown(wxEvent&) +void wxTaskBarIcon::RegisterWindowMessages() { -} + static bool s_registered = false; -void wxTaskBarIcon::OnLButtonUp(wxEvent&) -{ -} + if ( !s_registered ) + { + // Taskbar restart msg will be sent to us if the icon needs to be redrawn + gs_msgRestartTaskbar = RegisterWindowMessage(wxT("TaskbarCreated")); -void wxTaskBarIcon::OnRButtonDown(wxEvent&) -{ -} + // Also register the taskbar message here + gs_msgTaskbar = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage")); -void wxTaskBarIcon::OnRButtonUp(wxEvent&) -{ + s_registered = true; + } } -void wxTaskBarIcon::OnLButtonDClick(wxEvent&) -{ -} +// ---------------------------------------------------------------------------- +// wxTaskBarIcon window proc +// ---------------------------------------------------------------------------- -void wxTaskBarIcon::OnRButtonDClick(wxEvent&) +long wxTaskBarIcon::WindowProc(unsigned int msg, + unsigned int WXUNUSED(wParam), + long lParam) { -} - -void wxTaskBarIcon::_OnMouseMove(wxEvent& e) { OnMouseMove(e); } -void wxTaskBarIcon::_OnLButtonDown(wxEvent& e) { OnLButtonDown(e); } -void wxTaskBarIcon::_OnLButtonUp(wxEvent& e) { OnLButtonUp(e); } -void wxTaskBarIcon::_OnRButtonDown(wxEvent& e) { OnRButtonDown(e); } -void wxTaskBarIcon::_OnRButtonUp(wxEvent& e) { OnRButtonUp(e); } -void wxTaskBarIcon::_OnLButtonDClick(wxEvent& e) { OnLButtonDClick(e); } -void wxTaskBarIcon::_OnRButtonDClick(wxEvent& e) { OnRButtonDClick(e); } - + wxEventType eventType = 0; -wxTaskBarIcon* wxTaskBarIcon::FindObjectForHWND(WXHWND hWnd) -{ - wxNode*node = sm_taskBarIcons.First(); - while (node) + if (msg == gs_msgRestartTaskbar) // does the icon need to be redrawn? { - wxTaskBarIcon* obj = (wxTaskBarIcon*) node->Data(); - if (obj->GetHWND() == hWnd) - return obj; - node = node->Next(); + m_iconAdded = false; + SetIcon(m_icon, m_strTooltip); } - return NULL; -} -void wxTaskBarIcon::AddObject(wxTaskBarIcon* obj) -{ - sm_taskBarIcons.Append(obj); -} - -void wxTaskBarIcon::RemoveObject(wxTaskBarIcon* obj) -{ - sm_taskBarIcons.DeleteObject(obj); -} - -bool wxTaskBarIcon::RegisterWindowClass() -{ - if (sm_registeredClass) - return TRUE; - - // Also register the taskbar message here - sm_taskbarMsg = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage")); - - WNDCLASS wc; - bool rc; - - HINSTANCE hInstance = GetModuleHandle(NULL); - - /* - * set up and register window class - */ - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = (WNDPROC) wxTaskBarIconWindowProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = hInstance; - wc.hIcon = 0; - wc.hCursor = 0; - wc.hbrBackground = 0; - wc.lpszMenuName = NULL; - wc.lpszClassName = wxTaskBarWindowClass ; - rc = (::RegisterClass( &wc ) != 0); - - sm_registeredClass = (rc != 0); - - return( (rc != 0) ); -} - -WXHWND wxTaskBarIcon::CreateTaskBarWindow() -{ - HINSTANCE hInstance = GetModuleHandle(NULL); - - HWND hWnd = CreateWindowEx (0, wxTaskBarWindowClass, - wxT("wxTaskBarWindow"), - WS_OVERLAPPED, - 0, - 0, - 10, - 10, - NULL, - (HMENU) 0, - hInstance, - NULL); - - return (WXHWND) hWnd; -} - -long wxTaskBarIcon::WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wParam, long lParam ) -{ - wxEventType eventType = 0; - - if (msg != sm_taskbarMsg) - return DefWindowProc((HWND) hWnd, msg, wParam, lParam); + // this function should only be called for gs_msg(Restart)Taskbar messages + wxASSERT(msg == gs_msgTaskbar); switch (lParam) { @@ -346,27 +312,14 @@ long wxTaskBarIcon::WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wPar default: break; - } + } - if (eventType) { - wxEvent event; - event.SetEventType(eventType); - event.SetEventObject(this); + if (eventType) + { + wxTaskBarIconEvent event(eventType, this); ProcessEvent(event); } - return 0; -} -LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg, - UINT wParam, LONG lParam ) -{ - wxTaskBarIcon* obj = wxTaskBarIcon::FindObjectForHWND((WXHWND) hWnd); - if (obj) - return obj->WindowProc((WXHWND) hWnd, msg, wParam, lParam); - else - return DefWindowProc(hWnd, msg, wParam, lParam); + return 0; } - -#endif - // __WIN95__