ProxyPage: new Page implementation

diff --git a/meson.build b/meson.build
index 11193bf..6f569eb 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -350,6 +350,7 @@ ncmpc = executable('ncmpc',
   'src/screen_queue.cxx',
   'src/screen_browser.cxx',
   'src/screen_file.cxx',
+  'src/ProxyPage.cxx',
   'src/ListWindow.cxx',
   'src/save_playlist.cxx',
   'src/song_paint.cxx',

diff --git a/src/Page.hxx b/src/Page.hxx
index 051609b..a0c780a 100644 (file)
--- a/src/Page.hxx
+++ b/src/Page.hxx
@@ -73,6 +73,12 @@ public:
                Update(c, std::exchange(pending_events, 0));
        }
 
+protected:
+       const Size &GetLastSize() const {
+               return last_size;
+       }
+
+public:
        virtual void OnOpen(struct mpdclient &) {}
        virtual void OnClose() {}
        virtual void OnResize(Size size) = 0;

diff --git a/src/ProxyPage.cxx b/src/ProxyPage.cxx
new file mode 100644 (file)
index 0000000..4c3db1f
--- /dev/null
+++ b/src/ProxyPage.cxx
@@ -0,0 +1,122 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2018 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "ProxyPage.hxx"
+
+#include <assert.h>
+
+void
+ProxyPage::SetCurrentPage(struct mpdclient &c, Page *new_page)
+{
+       if (current_page != nullptr && is_open)
+               current_page->OnClose();
+
+       current_page = new_page;
+
+       if (current_page != nullptr && is_open) {
+               current_page->OnOpen(c);
+               current_page->Resize(GetLastSize());
+               current_page->Update(c);
+               current_page->SetDirty(false);
+       }
+
+       SetDirty();
+}
+
+void
+ProxyPage::OnOpen(struct mpdclient &c)
+{
+       assert(!is_open);
+       is_open = true;
+
+       if (current_page != nullptr)
+               current_page->OnOpen(c);
+
+       MoveDirty();
+}
+
+void
+ProxyPage::OnClose()
+{
+       assert(is_open);
+       is_open = false;
+
+       if (current_page != nullptr)
+               current_page->OnClose();
+}
+
+void
+ProxyPage::OnResize(Size size)
+{
+       if (current_page != nullptr)
+               current_page->Resize(size);
+
+       MoveDirty();
+}
+
+void
+ProxyPage::Paint() const
+{
+       if (current_page != nullptr)
+               current_page->Paint();
+       else
+               wclrtobot(w);
+}
+
+void
+ProxyPage::Update(struct mpdclient &c, unsigned events)
+{
+       if (current_page != nullptr) {
+               current_page->AddPendingEvents(events);
+               current_page->Update(c);
+               MoveDirty();
+       }
+}
+
+bool
+ProxyPage::OnCommand(struct mpdclient &c, command_t cmd)
+{
+       if (current_page != nullptr) {
+               bool result = current_page->OnCommand(c, cmd);
+               MoveDirty();
+               return result;
+       } else
+               return false;
+}
+
+#ifdef HAVE_GETMOUSE
+bool
+ProxyPage::OnMouse(struct mpdclient &c, Point p, mmask_t bstate)
+{
+       if (current_page != nullptr) {
+               bool result = current_page->OnMouse(c, p, bstate);
+               MoveDirty();
+               return result;
+       } else
+               return false;
+}
+#endif
+
+const char *
+ProxyPage::GetTitle(char *s, size_t size) const
+{
+       return current_page != nullptr
+               ? current_page->GetTitle(s, size)
+               : "";
+}

diff --git a/src/ProxyPage.hxx b/src/ProxyPage.hxx
new file mode 100644 (file)
index 0000000..df3f3b8
--- /dev/null
+++ b/src/ProxyPage.hxx
@@ -0,0 +1,69 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2018 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef NCMPC_PROXY_PAGE_HXX
+#define NCMPC_PROXY_PAGE_HXX
+
+#include "Page.hxx"
+
+class ProxyPage : public Page {
+       WINDOW *const w;
+
+       Page *current_page = nullptr;
+
+       bool is_open = false;
+
+public:
+       explicit ProxyPage(WINDOW *_w):w(_w) {}
+
+       const Page *GetCurrentPage() const {
+               return current_page;
+       }
+
+       Page *GetCurrentPage() {
+               return current_page;
+       }
+
+       void SetCurrentPage(struct mpdclient &c, Page *new_page);
+
+private:
+       void MoveDirty() {
+               if (current_page != nullptr && current_page->IsDirty()) {
+                       current_page->SetDirty(false);
+                       SetDirty();
+               }
+       }
+
+public:
+       /* virtual methods from Page */
+       void OnOpen(struct mpdclient &c) override;
+       void OnClose() override;
+       void OnResize(Size size) override;
+       void Paint() const override;
+       void Update(struct mpdclient &c, unsigned events) override;
+       bool OnCommand(struct mpdclient &c, command_t cmd) override;
+
+#ifdef HAVE_GETMOUSE
+       bool OnMouse(struct mpdclient &c, Point p, mmask_t bstate) override;
+#endif
+
+       const char *GetTitle(char *s, size_t size) const override;
+};
+
+#endif