Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change namespace Clock into class

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-02-14 22:54:12 +01:00
parent 49abc4d42c
commit 81d685eff8
4 changed files with 95 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
src/clock.cpp
View File

@@ -32,67 +32,71 @@
using namespace Global;
Scrollpad *Global::wClock;
Clock *myClock = new Clock;
namespace
short Clock::disp[11] =
{
short disp[11] =
{
075557, 011111, 071747, 071717,
055711, 074717, 074757, 071111,
075757, 075717, 002020
};
075557, 011111, 071747, 071717,
055711, 074717, 074757, 071111,
075757, 075717, 002020
};
long older[6], next[6], newer[6], mask;
long Clock::older[6], Clock::next[6], Clock::newer[6], Clock::mask;
void set(int t, int n)
{
int m = 7 << n;
for (int i = 0; i < 5; i++)
{
next[i] |= ((disp[t] >> ((4 - i) * 3)) & 07) << n;
mask |= (next[i] ^ older[i]) & m;
}
if (mask & m)
mask |= m;
}
}
namespace Clock
{
const size_t width = Config.clock_display_seconds ? 60 : 40;
const size_t height = 8;
}
const size_t Clock::Width = Config.clock_display_seconds ? 60 : 40;
const size_t Clock::Height = 8;
void Clock::Init()
{
wClock = new Scrollpad((COLS-width)/2, (LINES-height)/2, width, height-1, "", Config.main_color, Border(Config.main_color));
wClock->SetTimeout(ncmpcpp_window_timeout);
w = new Scrollpad((COLS-Width)/2, (LINES-Height)/2, Width, Height-1, "", Config.main_color, Border(Config.main_color));
w->SetTimeout(ncmpcpp_window_timeout);
}
void Clock::Resize()
{
if (width <= size_t(COLS) && height <= main_height)
if (Width <= size_t(COLS) && Height <= main_height)
{
wClock->MoveTo((COLS-width)/2, (LINES-height)/2);
w->MoveTo((COLS-Width)/2, (LINES-Height)/2);
if (current_screen == csClock)
{
myPlaylist->Main()->Hide();
Prepare();
wClock->Display();
w->Display();
}
}
}
void Clock::Prepare()
void Clock::SwitchTo()
{
for (int i = 0; i < 5; i++)
older[i] = newer[i] = next[i] = 0;
if (Width > size_t(COLS) || Height > main_height)
{
ShowMessage("Screen is too small to display clock!");
}
else if (
current_screen != csClock
# ifdef HAVE_TAGLIB_H
&& current_screen != csTinyTagEditor
# endif // HAVE_TAGLIB_H
)
{
CLEAR_FIND_HISTORY;
wCurrent = w;
myPlaylist->Main()->Hide();
current_screen = csClock;
redraw_header = 1;
Clock::Prepare();
w->Display();
}
}
std::string Clock::Title()
{
return "Clock";
}
void Clock::Update()
{
if (width > size_t(COLS) || height > main_height)
if (Width > size_t(COLS) || Height > main_height)
return;
time_t rawtime;
@@ -100,19 +104,19 @@ void Clock::Update()
tm *time = localtime(&rawtime);
mask = 0;
set(time->tm_sec % 10, 0);
set(time->tm_sec / 10, 4);
set(time->tm_min % 10, 10);
set(time->tm_min / 10, 14);
set(time->tm_hour % 10, 20);
set(time->tm_hour / 10, 24);
set(10, 7);
set(10, 17);
Set(time->tm_sec % 10, 0);
Set(time->tm_sec / 10, 4);
Set(time->tm_min % 10, 10);
Set(time->tm_min / 10, 14);
Set(time->tm_hour % 10, 20);
Set(time->tm_hour / 10, 24);
Set(10, 7);
Set(10, 17);
char buf[54];
strftime(buf, 64, "%x", time);
attron(COLOR_PAIR(Config.main_color));
mvprintw(wCurrent->GetStartY()+wCurrent->GetHeight(), wCurrent->GetStartX()+(wCurrent->GetWidth()-strlen(buf))/2, "%s", buf);
mvprintw(w->GetStartY()+w->GetHeight(), w->GetStartX()+(w->GetWidth()-strlen(buf))/2, "%s", buf);
attroff(COLOR_PAIR(Config.main_color));
refresh();
@@ -122,7 +126,7 @@ void Clock::Update()
next[k] = 0;
for (int s = 1; s >= 0; s--)
{
wCurrent->Reverse(s);
w->Reverse(s);
for (int i = 0; i < 6; i++)
{
long a = (newer[i] ^ older[i]) & (s ? newer : older)[i];
@@ -135,10 +139,10 @@ void Clock::Update()
{
if (!(a & (t << 1)))
{
wCurrent->GotoXY(2*j+2, i);
w->GotoXY(2*j+2, i);
}
if (Global::Config.clock_display_seconds || j < 18)
*wCurrent << " ";
*w << " ";
}
}
}
@@ -151,27 +155,22 @@ void Clock::Update()
}
}
void Clock::SwitchTo()
void Clock::Prepare()
{
if (width > size_t(COLS) || height > main_height)
for (int i = 0; i < 5; i++)
older[i] = newer[i] = next[i] = 0;
}
void Clock::Set(int t, int n)
{
int m = 7 << n;
for (int i = 0; i < 5; i++)
{
ShowMessage("Screen is too small to display clock!");
}
else if (
current_screen != csClock
# ifdef HAVE_TAGLIB_H
&& current_screen != csTinyTagEditor
# endif // HAVE_TAGLIB_H
)
{
CLEAR_FIND_HISTORY;
wCurrent = wClock;
myPlaylist->Main()->Hide();
current_screen = csClock;
redraw_header = 1;
Clock::Prepare();
wCurrent->Display();
next[i] |= ((disp[t] >> ((4 - i) * 3)) & 07) << n;
mask |= (next[i] ^ older[i]) & m;
}
if (mask & m)
mask |= m;
}
#endif // ENABLE_CLOCK

29
src/clock.h
View File

@@ -28,18 +28,31 @@
#ifdef ENABLE_CLOCK
#include "window.h"
#include "screen.h"
namespace Clock
class Clock : public Screen<Window>
{
void Init();
void Resize();
void SwitchTo();
public:
virtual void Init();
virtual void Resize();
virtual void SwitchTo();
void Update();
void Prepare();
}
virtual std::string Title();
#include <ctime>
virtual void Update();
protected:
static void Prepare();
static void Set(int, int);
static short disp[11];
static long older[6], next[6], newer[6], mask;
static const size_t Width;
static const size_t Height;
};
extern Clock *myClock;
#endif // ENABLE_CLOCK

8
src/global.h
View File

@@ -64,9 +64,9 @@ namespace Global
extern Window *wHeader;
extern Window *wFooter;
# ifdef ENABLE_CLOCK
extern Scrollpad *wClock;
# endif
//# ifdef ENABLE_CLOCK
// extern Scrollpad *wClock;
//# endif
extern MPD::Connection *Mpd;
@@ -109,8 +109,6 @@ namespace Global
// extern bool search_case_sensitive;
// extern bool search_match_to_pattern;
extern std::string volume_state;
// extern const char *search_mode_normal;
// extern const char *search_mode_strict;

10
src/ncmpcpp.cpp
View File

@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
# endif // HAVE_TAGLIB_H
# ifdef ENABLE_CLOCK
Clock::Init();
myClock->Init();
# endif // ENABLE_CLOCK
myHelp->Init();
@@ -264,7 +264,7 @@ int main(int argc, char *argv[])
break;
# ifdef ENABLE_CLOCK
case csClock:
screen_title = "Clock";
screen_title = myClock->Title();
break;
# endif // ENABLE_CLOCK
default:
@@ -324,7 +324,7 @@ int main(int argc, char *argv[])
# ifdef ENABLE_CLOCK
if (current_screen == csClock)
{
Clock::Update();
myClock->Update();
}
else
# endif
@@ -508,7 +508,7 @@ int main(int argc, char *argv[])
# endif // HAVE_TAGLIB_H
# ifdef ENABLE_CLOCK
Clock::Resize();
myClock->Resize();
# endif // ENABLE_CLOCK
if (Config.header_visibility)
@@ -2049,7 +2049,7 @@ int main(int argc, char *argv[])
# ifdef ENABLE_CLOCK
else if (Keypressed(input, Key.Clock))
{
Clock::SwitchTo();
myClock->SwitchTo();
}
# endif // ENABLE_CLOCK
else if (Keypressed(input, Key.Quit))