Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added share/icons/hicolor/16x16/apps/iptux-icon-reverse.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/iptux/pixmaps/icon/iptux-icon-reverse.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions src/iptux/AppIndicator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ class IptuxAppIndicatorPrivate {
public:
IptuxAppIndicatorPrivate(IptuxAppIndicator* owner) : owner(owner) {}
~IptuxAppIndicatorPrivate() {
if (blinkTimerId) {
g_source_remove(blinkTimerId);
}
if (indicator) {
g_object_unref(indicator);
}
Expand All @@ -22,12 +25,40 @@ class IptuxAppIndicatorPrivate {
GtkBuilder* menuBuilder;
StatusIconMode mode = STATUS_ICON_MODE_NORMAL;
int unreadCount = 0;
guint blinkTimerId = 0;
bool blinkState = false;

static void onScrollEvent(IptuxAppIndicatorPrivate* self) {
self->owner->sigActivateMainWindow.emit();
}
};

static gboolean blinkTimerCallback(gpointer data) {
auto priv = static_cast<IptuxAppIndicatorPrivate*>(data);
priv->blinkState = !priv->blinkState;
if (priv->blinkState) {
app_indicator_set_icon_full(priv->indicator, "iptux-icon-reverse",
"iptux-icon-reverse");
} else {
app_indicator_set_icon_full(priv->indicator, "iptux-icon", "iptux-icon");
}
return G_SOURCE_CONTINUE;
}

static void startBlinkTimer(IptuxAppIndicatorPrivate* priv) {
if (priv->blinkTimerId) return;
priv->blinkState = false;
priv->blinkTimerId = g_timeout_add(500, blinkTimerCallback, priv);
}

static void stopBlinkTimer(IptuxAppIndicatorPrivate* priv) {
if (priv->blinkTimerId) {
g_source_remove(priv->blinkTimerId);
priv->blinkTimerId = 0;
}
priv->blinkState = false;
}

IptuxAppIndicator::IptuxAppIndicator(GActionGroup* action_group) {
this->priv = std::make_shared<IptuxAppIndicatorPrivate>(this);

Expand Down Expand Up @@ -61,6 +92,18 @@ IptuxAppIndicator::IptuxAppIndicator(GActionGroup* action_group) {
void IptuxAppIndicator::SetUnreadCount(int i) {
priv->unreadCount = i;
if (priv->mode == STATUS_ICON_MODE_NONE) return;

if (priv->mode == STATUS_ICON_MODE_BLINKING) {
if (i > 0) {
startBlinkTimer(priv.get());
} else {
stopBlinkTimer(priv.get());
app_indicator_set_icon_full(priv->indicator, "iptux-icon", "iptux-icon");
app_indicator_set_status(priv->indicator, APP_INDICATOR_STATUS_ACTIVE);
}
return;
}

if (i > 0) {
app_indicator_set_status(priv->indicator, APP_INDICATOR_STATUS_ATTENTION);
} else {
Expand All @@ -69,12 +112,26 @@ void IptuxAppIndicator::SetUnreadCount(int i) {
}

void IptuxAppIndicator::SetMode(StatusIconMode mode) {
StatusIconMode oldMode = priv->mode;
priv->mode = mode;

if (oldMode == STATUS_ICON_MODE_BLINKING) {
stopBlinkTimer(priv.get());
app_indicator_set_icon_full(priv->indicator, "iptux-icon", "iptux-icon");
}

if (mode == STATUS_ICON_MODE_NONE) {
app_indicator_set_status(priv->indicator, APP_INDICATOR_STATUS_PASSIVE);
} else {
SetUnreadCount(priv->unreadCount);
}
}

void IptuxAppIndicator::StopBlinking() {
stopBlinkTimer(priv.get());
app_indicator_set_icon_full(priv->indicator, "iptux-icon", "iptux-icon");
if (priv->mode == STATUS_ICON_MODE_NONE) return;
app_indicator_set_status(priv->indicator, APP_INDICATOR_STATUS_ACTIVE);
}

} // namespace iptux
1 change: 1 addition & 0 deletions src/iptux/AppIndicator.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class IptuxAppIndicator {
IptuxAppIndicator(GActionGroup* action_group);
void SetUnreadCount(int count);
void SetMode(StatusIconMode mode);
void StopBlinking();

sigc::signal<void> sigActivateMainWindow;

Expand Down
4 changes: 4 additions & 0 deletions src/iptux/AppIndicatorDummy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ void IptuxAppIndicator::SetUnreadCount(int) {
void IptuxAppIndicator::SetMode(StatusIconMode) {
// Dummy implementation
}

void IptuxAppIndicator::StopBlinking() {
// Dummy implementation
}
} // namespace iptux
65 changes: 65 additions & 0 deletions src/iptux/AppIndicatorMac.mm
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ - (void)statusItemClicked:(id)sender {
public:
IptuxAppIndicatorPrivate() {}
~IptuxAppIndicatorPrivate() {
if (blinkTimerId) {
g_source_remove(blinkTimerId);
}
if (statusItem) {
[[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
[statusItem release];
Expand All @@ -124,14 +127,20 @@ - (void)statusItemClicked:(id)sender {
if (attentionIcon) {
[attentionIcon release];
}
if (reverseIcon) {
[reverseIcon release];
}
}

NSStatusItem* statusItem = nil;
IptuxStatusItemHelper* helper = nil;
NSImage* normalIcon = nil;
NSImage* attentionIcon = nil;
NSImage* reverseIcon = nil;
StatusIconMode mode = STATUS_ICON_MODE_NORMAL;
int unreadCount = 0;
guint blinkTimerId = 0;
bool blinkState = false;
};

IptuxAppIndicator::IptuxAppIndicator(GActionGroup* action_group) {
Expand All @@ -143,6 +152,7 @@ - (void)statusItemClicked:(id)sender {
// Load icons
priv->normalIcon = loadIcon("iptux-icon", 64);
priv->attentionIcon = loadIcon("iptux-attention", 64);
priv->reverseIcon = loadIcon("iptux-icon-reverse", 64);

// Create status item
priv->statusItem =
Expand Down Expand Up @@ -186,10 +196,48 @@ - (void)statusItemClicked:(id)sender {
[menu release];
}

static gboolean blinkTimerCallback(gpointer data) {
auto priv = static_cast<IptuxAppIndicatorPrivate*>(data);
if (!priv->statusItem) return G_SOURCE_REMOVE;
priv->blinkState = !priv->blinkState;
if (priv->blinkState && priv->reverseIcon) {
priv->statusItem.button.image = priv->reverseIcon;
} else if (priv->normalIcon) {
priv->statusItem.button.image = priv->normalIcon;
}
return G_SOURCE_CONTINUE;
}

static void startBlinkTimer(IptuxAppIndicatorPrivate* priv) {
if (priv->blinkTimerId) return;
priv->blinkState = false;
priv->blinkTimerId = g_timeout_add(500, blinkTimerCallback, priv);
}

static void stopBlinkTimer(IptuxAppIndicatorPrivate* priv) {
if (priv->blinkTimerId) {
g_source_remove(priv->blinkTimerId);
priv->blinkTimerId = 0;
}
priv->blinkState = false;
}

void IptuxAppIndicator::SetUnreadCount(int count) {
priv->unreadCount = count;
if (!priv->statusItem || priv->mode == STATUS_ICON_MODE_NONE) return;

if (priv->mode == STATUS_ICON_MODE_BLINKING) {
if (count > 0) {
startBlinkTimer(priv.get());
} else {
stopBlinkTimer(priv.get());
if (priv->normalIcon) {
priv->statusItem.button.image = priv->normalIcon;
}
}
return;
}

if (count > 0 && priv->attentionIcon) {
priv->statusItem.button.image = priv->attentionIcon;
} else if (priv->normalIcon) {
Expand All @@ -198,12 +246,29 @@ - (void)statusItemClicked:(id)sender {
}

void IptuxAppIndicator::SetMode(StatusIconMode mode) {
StatusIconMode oldMode = priv->mode;
priv->mode = mode;
if (!priv->statusItem) return;
priv->statusItem.visible = (mode != STATUS_ICON_MODE_NONE);

if (oldMode == STATUS_ICON_MODE_BLINKING) {
stopBlinkTimer(priv.get());
if (priv->normalIcon) {
priv->statusItem.button.image = priv->normalIcon;
}
}

if (mode != STATUS_ICON_MODE_NONE) {
SetUnreadCount(priv->unreadCount);
}
}

void IptuxAppIndicator::StopBlinking() {
stopBlinkTimer(priv.get());
if (!priv->statusItem || priv->mode == STATUS_ICON_MODE_NONE) return;
if (priv->normalIcon) {
priv->statusItem.button.image = priv->normalIcon;
}
}

} // namespace iptux
18 changes: 18 additions & 0 deletions src/iptux/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,24 @@ void Application::onStartup(Application& self) {
});
self.cthrd->sigUnreadMsgCountUpdated.connect(
sigc::mem_fun(*self.app_indicator, &IptuxAppIndicator::SetUnreadCount));

g_signal_connect(self.app, "window-added",
G_CALLBACK(+[](GtkApplication*, GtkWindow* window,
gpointer user_data) {
g_signal_connect(
window, "notify::is-active",
G_CALLBACK(+[](GtkWindow* win, GParamSpec*,
gpointer ud) {
if (gtk_window_is_active(win)) {
auto a = static_cast<Application*>(ud);
if (a->app_indicator) {
a->app_indicator->StopBlinking();
}
}
}),
user_data);
}),
&self);
}

bool use_app_menu = true;
Expand Down
Loading