for built-in dialogs, there is no m_peer instance, and still we might have a Refresh...

[wxWidgets.git] / src / unix / taskbarx11.cpp

diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index 3611d4dc129edc0cef18b21d133a39aac13c54b3..cf64c408a6715b52cd1967a3150f6b4582c509a8 100644 (file)
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -14,13 +14,9 @@
 #endif
 
 // NB: This implementation does *not* work with every X11 window manager.
 #endif
 
 // NB: This implementation does *not* work with every X11 window manager.

-//     Currently only GNOME 1.2 and KDE 1,2,3 methods are implemented.
-//
-//     FIXME: implement:
-//               - GNOME 2 support (see www.freedesktop.org for specification;
-//                 KDE 3 uses this method as well, even though legacy KDE
-//                 method we implement works as well)
-//               - IceWM support (?)
+//     Currently only GNOME 1.2 and KDE 1,2,3 methods are implemented here.
+//     Freedesktop.org's System Tray specification is implemented in
+//     src/gtk/taskbar.cpp and used from here under wxGTK.

 //
 //     Thanks to Ian Campbell, author of XMMS Status Docklet, for publishing
 //     KDE and GNOME 1.2 methods.
 //
 //     Thanks to Ian Campbell, author of XMMS Status Docklet, for publishing
 //     KDE and GNOME 1.2 methods.


@@ -35,6 +31,8 @@
 #include "wx/statbmp.h"
 #include "wx/sizer.h"
 #include "wx/dcclient.h"
 #include "wx/statbmp.h"
 #include "wx/sizer.h"
 #include "wx/dcclient.h"

+#include "wx/log.h"
+#include "wx/image.h"

 
 #ifdef __VMS
 #pragma message disable nosimpint
 
 #ifdef __VMS
 #pragma message disable nosimpint


@@ -45,6 +43,27 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

+// ----------------------------------------------------------------------------
+// base class that implements toolkit-specific method:
+// ----------------------------------------------------------------------------
+
+#ifdef __WXGTK20__
+    #include "wx/gtk/taskbarpriv.h"
+#else
+    class WXDLLIMPEXP_ADV wxTaskBarIconAreaBase : public wxFrame
+    {
+    public:
+        wxTaskBarIconAreaBase()
+            : wxFrame(NULL, wxID_ANY, _T("systray icon"),
+                      wxDefaultPosition, wxDefaultSize,
+                      wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR |
+                      wxSIMPLE_BORDER | wxFRAME_SHAPED) {}
+
+        bool IsProtocolSupported() const { return false; }
+    };
+#endif
+
+

 // ----------------------------------------------------------------------------
 // toolkit dependent methods to set properties on helper window:
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // toolkit dependent methods to set properties on helper window:
 // ----------------------------------------------------------------------------


@@ -68,46 +87,86 @@
 // wxTaskBarIconArea is the real window that shows the icon:
 // ----------------------------------------------------------------------------
 
 // wxTaskBarIconArea is the real window that shows the icon:
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_ADV wxTaskBarIconArea : public wxFrame
+class WXDLLIMPEXP_ADV wxTaskBarIconArea : public wxTaskBarIconAreaBase

 {
 public:
 {
 public:

-    wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp)
-        : wxFrame(NULL, -1, wxT("taskbar icon"),
-                  wxDefaultPosition, wxDefaultSize,
-                  wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR |
-                  wxSIMPLE_BORDER | wxFRAME_SHAPED),
-          m_icon(icon), m_bmp(bmp)
-    {
-        SetWMProperties();
-        SetSize(wxSize(bmp.GetWidth(), bmp.GetHeight()));
-    }
-
+    wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp);
+    void SetTrayIcon(const wxBitmap& bmp);

     bool IsOk() { return true; }
     
 protected:
     bool IsOk() { return true; }
     
 protected:

-    void SetWMProperties();
+    void SetLegacyWMProperties();

     
     

+    void OnSizeChange(wxSizeEvent& event);

     void OnPaint(wxPaintEvent& evt);
     void OnPaint(wxPaintEvent& evt);

-    void OnWindowCreate(wxWindowCreateEvent& event);

     void OnMouseEvent(wxMouseEvent& event);
     void OnMenuEvent(wxCommandEvent& event);
 
     wxTaskBarIcon *m_icon;
     void OnMouseEvent(wxMouseEvent& event);
     void OnMenuEvent(wxCommandEvent& event);
 
     wxTaskBarIcon *m_icon;

-    wxBitmap m_bmp;
+    wxPoint        m_pos;
+    wxBitmap       m_bmp;

     
     DECLARE_EVENT_TABLE()
 };
 
     
     DECLARE_EVENT_TABLE()
 };
 

-BEGIN_EVENT_TABLE(wxTaskBarIconArea, wxFrame)
+BEGIN_EVENT_TABLE(wxTaskBarIconArea, wxTaskBarIconAreaBase)
+    EVT_SIZE(wxTaskBarIconArea::OnSizeChange)

     EVT_MOUSE_EVENTS(wxTaskBarIconArea::OnMouseEvent)
     EVT_MENU(-1, wxTaskBarIconArea::OnMenuEvent)
     EVT_PAINT(wxTaskBarIconArea::OnPaint)
     EVT_MOUSE_EVENTS(wxTaskBarIconArea::OnMouseEvent)
     EVT_MENU(-1, wxTaskBarIconArea::OnMenuEvent)
     EVT_PAINT(wxTaskBarIconArea::OnPaint)

-#ifdef __WXGTK__
-    EVT_WINDOW_CREATE(wxTaskBarIconArea::OnWindowCreate)
-#endif

 END_EVENT_TABLE()
 END_EVENT_TABLE()

+        
+wxTaskBarIconArea::wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp)
+    : wxTaskBarIconAreaBase(), m_icon(icon), m_pos(0,0)
+{
+    if (!IsProtocolSupported())
+    {
+        wxLogTrace(_T("systray"),
+                   _T("using legacy KDE1,2 and GNOME 1.2 methods"));
+        SetLegacyWMProperties();
+    }
+   
+    // Set initial size to bitmap size (tray manager may and often will
+    // change it):
+    SetSize(wxSize(bmp.GetWidth(), bmp.GetHeight()));
+    
+    SetTrayIcon(bmp);
+}
+
+void wxTaskBarIconArea::SetTrayIcon(const wxBitmap& bmp)
+{
+    m_bmp = bmp;
+    
+    // determine suitable bitmap size:
+    wxSize winsize(GetSize());
+    wxSize bmpsize(m_bmp.GetWidth(), m_bmp.GetHeight());
+    wxSize iconsize(wxMin(winsize.x, bmpsize.x), wxMin(winsize.y, bmpsize.y));
+
+    // rescale the bitmap to fit into the tray icon window:
+    if (bmpsize != iconsize)
+    {
+        wxImage img = m_bmp.ConvertToImage();
+        img.Rescale(iconsize.x, iconsize.y);
+        m_bmp = wxBitmap(img);
+    }

 
 

-void wxTaskBarIconArea::SetWMProperties()
+    wxRegion region;
+    region.Union(m_bmp);
+
+    // if the bitmap is smaller than the window, offset it:
+    if (winsize != iconsize)
+    {
+        m_pos.x = (winsize.x - iconsize.x) / 2;
+        m_pos.y = (winsize.y - iconsize.y) / 2;
+        region.Offset(m_pos.x, m_pos.y);
+    }
+
+    // set frame's shape to correct value and redraw:
+    SetShape(region);
+    Refresh();
+}
+
+void wxTaskBarIconArea::SetLegacyWMProperties()

 { 
 #ifdef __WXGTK__
     gtk_widget_realize(m_widget);
 { 
 #ifdef __WXGTK__
     gtk_widget_realize(m_widget);


@@ -134,22 +193,26 @@ void wxTaskBarIconArea::SetWMProperties()
                     PropModeReplace, (unsigned char*)data, 1);
 }
     
                     PropModeReplace, (unsigned char*)data, 1);
 }
     

-void wxTaskBarIconArea::OnWindowCreate(wxWindowCreateEvent& WXUNUSED(event))
+void wxTaskBarIconArea::OnSizeChange(wxSizeEvent& event)

 {
 {

-    SetShape(wxRegion(m_bmp));
+    wxLogTrace(_T("systray"), _T("icon size changed to %i x %i"),
+               GetSize().x, GetSize().y);
+    // rescale or reposition the icon as needed:
+    wxBitmap bmp(m_bmp);
+    SetTrayIcon(bmp);

 }
 
 void wxTaskBarIconArea::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
 }
 
 void wxTaskBarIconArea::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);

-    dc.DrawBitmap(m_bmp, 0, 0, true);
+    dc.DrawBitmap(m_bmp, m_pos.x, m_pos.y, true);

 }
     
 void wxTaskBarIconArea::OnMouseEvent(wxMouseEvent& event)
 {
     wxEventType type = 0;
     wxEventType mtype = event.GetEventType();
 }
     
 void wxTaskBarIconArea::OnMouseEvent(wxMouseEvent& event)
 {
     wxEventType type = 0;
     wxEventType mtype = event.GetEventType();

-    
+

     if (mtype == wxEVT_LEFT_DOWN)
         type = wxEVT_TASKBAR_LEFT_DOWN;
     else if (mtype == wxEVT_LEFT_UP)
     if (mtype == wxEVT_LEFT_DOWN)
         type = wxEVT_TASKBAR_LEFT_DOWN;
     else if (mtype == wxEVT_LEFT_UP)


@@ -204,29 +267,35 @@ bool wxTaskBarIcon::IsIconInstalled() const
 
 bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {
 
 bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {

-    if (m_iconWnd)
-        RemoveIcon();
-

     wxBitmap bmp;
     bmp.CopyFromIcon(icon);
     wxBitmap bmp;
     bmp.CopyFromIcon(icon);

-    
-    m_iconWnd = new wxTaskBarIconArea(this, bmp);

 
 

-#if wxUSE_TOOLTIPS
-    if (!tooltip.empty())
-        m_iconWnd->SetToolTip(tooltip);
-#endif
-    if (m_iconWnd->IsOk())
+    if (!m_iconWnd)

     {
     {

-        m_iconWnd->Show();
-        return true;
+        m_iconWnd = new wxTaskBarIconArea(this, bmp);
+        if (m_iconWnd->IsOk())
+        {
+            m_iconWnd->Show();
+        }
+        else
+        {
+            m_iconWnd->Destroy();
+            m_iconWnd = NULL;
+            return false;
+        }

     }
     else
     {
     }
     else
     {

-        m_iconWnd->Destroy();
-        m_iconWnd = NULL;
-        return false;
-    }
+        m_iconWnd->SetTrayIcon(bmp);
+    }    
+    
+#if wxUSE_TOOLTIPS
+    if (!tooltip.empty())
+        m_iconWnd->SetToolTip(tooltip);
+    else
+        m_iconWnd->SetToolTip(NULL);
+#endif
+    return true;

 }
 
 bool wxTaskBarIcon::RemoveIcon()
 }
 
 bool wxTaskBarIcon::RemoveIcon()


@@ -242,7 +311,6 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 {
     if (!m_iconWnd)
         return false;
 {
     if (!m_iconWnd)
         return false;

-    wxSize size(m_iconWnd->GetClientSize());
-    m_iconWnd->PopupMenu(menu, size.x/2, size.y/2);
+    m_iconWnd->PopupMenu(menu);

     return true;
 }
     return true;
 }