X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6af507f77e563a71f8935f67c9c8a9054309d26d..052d2fc5818243dadbc1ec54b1120e295304fc55:/src/msw/taskbar.cpp?ds=sidebyside diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index 39344c02a0..612c198adf 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -3,14 +3,14 @@ // 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__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "taskbar.h" #endif @@ -29,48 +29,29 @@ #include "wx/menu.h" #endif -#if defined(__WIN95__) && !defined(__TWIN32__) - -#include +#if defined(__WIN95__) +#include "wx/msw/private.h" #include "wx/msw/winundef.h" #include #include "wx/taskbar.h" -#include "wx/msw/private.h" -#ifndef __TWIN32__ - #ifdef __GNUWIN32_OLD__ - #include "wx/msw/gnuwin32/extra.h" - #endif +#ifdef __GNUWIN32_OLD__ + #include "wx/msw/gnuwin32/extra.h" #endif -#ifdef __SALFORDC__ +#ifdef __WXWINCE__ + #include #include #endif -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxTaskBarIconList); - -LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg, - UINT wParam, LONG lParam ); - -wxChar *wxTaskBarWindowClass = (wxChar*) wxT("wxTaskBarWindowClass"); - -wxTaskBarIconList wxTaskBarIcon::sm_taskBarIcons; -bool wxTaskBarIcon::sm_registeredClass = FALSE; -UINT wxTaskBarIcon::sm_taskbarMsg = 0; - -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_MOVE ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DOWN ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_UP ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DOWN ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_UP ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DCLICK ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DCLICK ) +// initialized on demand +UINT gs_msgTaskbar = 0; +UINT gs_msgRestartTaskbar = 0; #if WXWIN_COMPATIBILITY_2_4 -BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler) +BEGIN_EVENT_TABLE(wxTaskBarIcon, wxTaskBarIconBase) EVT_TASKBAR_MOVE (wxTaskBarIcon::_OnMouseMove) EVT_TASKBAR_LEFT_DOWN (wxTaskBarIcon::_OnLButtonDown) EVT_TASKBAR_LEFT_UP (wxTaskBarIcon::_OnLButtonUp) @@ -84,93 +65,138 @@ END_EVENT_TABLE() 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; +}; -wxTaskBarIcon::~wxTaskBarIcon(void) + +// ---------------------------------------------------------------------------- +// NotifyIconData: wrapper around NOTIFYICONDATA +// ---------------------------------------------------------------------------- + +struct NotifyIconData : public NOTIFYICONDATA +{ + 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() { - RemoveObject(this); + 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 compatiblity, + // old aplications may create 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((HWND)m_win->GetHWND()); - 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()) { notifyData.uFlags |= NIF_ICON; - notifyData.hIcon = (HICON) icon.GetHICON(); + 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; - NOTIFYICONDATA notifyData; - - 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; - return (Shell_NotifyIcon(NIM_DELETE, & notifyData) != 0); + NotifyIconData notifyData((HWND)m_win->GetHWND()); + + 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; @@ -179,32 +205,24 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y); 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, wxEmptyString, 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(); // Work around a WIN32 bug - ::SetForegroundWindow ((HWND) win->GetHWND ()); + ::SetForegroundWindow((HWND)m_win->GetHWND()); - rval = win->PopupMenu(menu, 0, 0); + bool rval = m_win->PopupMenu(menu, 0, 0); // Work around a WIN32 bug - ::PostMessage ((HWND) win->GetHWND(),WM_NULL,0,0L); + ::PostMessage((HWND)m_win->GetHWND(), WM_NULL, 0, 0L); - win->PopEventHandler(false); - win->Destroy(); - delete win; + m_win->PopEventHandler(false); s_inPopup = false; @@ -213,104 +231,64 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y); #if WXWIN_COMPATIBILITY_2_4 // Overridables -void wxTaskBarIcon::OnMouseMove(wxEvent&) {} -void wxTaskBarIcon::OnLButtonDown(wxEvent&) {} -void wxTaskBarIcon::OnLButtonUp(wxEvent&) {} -void wxTaskBarIcon::OnRButtonDown(wxEvent&) {} -void wxTaskBarIcon::OnRButtonUp(wxEvent&) {} -void wxTaskBarIcon::OnLButtonDClick(wxEvent&) {} -void wxTaskBarIcon::OnRButtonDClick(wxEvent&) {} - -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); } +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 -wxTaskBarIcon* wxTaskBarIcon::FindObjectForHWND(WXHWND hWnd) +void wxTaskBarIcon::RegisterWindowMessages() { - wxTaskBarIconList::Node *node = sm_taskBarIcons.GetFirst(); - while (node) - { - wxTaskBarIcon *obj = node->GetData(); - if (obj->GetHWND() == hWnd) - return obj; - node = node->GetNext(); - } - return NULL; -} + static bool s_registered = false; -void wxTaskBarIcon::AddObject(wxTaskBarIcon* obj) -{ - sm_taskBarIcons.Append(obj); -} + 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::RemoveObject(wxTaskBarIcon* obj) -{ - sm_taskBarIcons.DeleteObject(obj); -} + // Also register the taskbar message here + gs_msgTaskbar = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage")); -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) ); + s_registered = true; + } } -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; -} +// ---------------------------------------------------------------------------- +// wxTaskBarIcon window proc +// ---------------------------------------------------------------------------- -long wxTaskBarIcon::WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wParam, long lParam ) +long wxTaskBarIcon::WindowProc(unsigned int msg, + unsigned int WXUNUSED(wParam), + long lParam) { wxEventType eventType = 0; - if (msg != sm_taskbarMsg) - return DefWindowProc((HWND) hWnd, msg, wParam, lParam); + if (msg == gs_msgRestartTaskbar) // does the icon need to be redrawn? + { + m_iconAdded = false; + SetIcon(m_icon, m_strTooltip); + } + + // this function should only be called for gs_msg(Restart)Taskbar messages + wxASSERT(msg == gs_msgTaskbar); switch (lParam) { @@ -344,25 +322,16 @@ long wxTaskBarIcon::WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wPar default: break; - } + } - if (eventType) { + 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__ +#endif // __WIN95__