summaryrefslogtreecommitdiff
path: root/src/trayItem.vala
diff options
context:
space:
mode:
Diffstat (limited to 'src/trayItem.vala')
-rw-r--r--src/trayItem.vala228
1 files changed, 114 insertions, 114 deletions
diff --git a/src/trayItem.vala b/src/trayItem.vala
index 4261e52..11840d5 100644
--- a/src/trayItem.vala
+++ b/src/trayItem.vala
@@ -7,7 +7,7 @@ namespace AstalTray {
int height;
uint8[] bytes;
}
-
+
public struct Tooltip {
string icon_name;
Pixmap[] icon;
@@ -16,64 +16,64 @@ namespace AstalTray {
}
[DBus (use_string_marshalling = true)]
- public enum Category {
- [DBus (value = "ApplicationStatus")]
- APPLICATION,
- [DBus (value = "Communications")]
- COMMUNICATIONS,
- [DBus (value = "SystemServices")]
- SYSTEM,
- [DBus (value = "Hardware")]
- HARDWARE
- }
+ public enum Category {
+ [DBus (value = "ApplicationStatus")]
+ APPLICATION,
+ [DBus (value = "Communications")]
+ COMMUNICATIONS,
+ [DBus (value = "SystemServices")]
+ SYSTEM,
+ [DBus (value = "Hardware")]
+ HARDWARE
+ }
[DBus (use_string_marshalling = true)]
- public enum Status {
- [DBus (value = "Passive")]
- PASSIVE,
- [DBus (value = "Active")]
- ACTIVE,
- [DBus (value = "NeedsAttention")]
- NEEDS_ATTENTION
- }
+ public enum Status {
+ [DBus (value = "Passive")]
+ PASSIVE,
+ [DBus (value = "Active")]
+ ACTIVE,
+ [DBus (value = "NeedsAttention")]
+ NEEDS_ATTENTION
+ }
-[DBus (name="org.kde.StatusNotifierItem")]
-internal interface IItem : DBusProxy {
-
- public abstract string Title { owned get; }
- public abstract Category Category { owned get; }
- public abstract Status Status { owned get; }
- public abstract Tooltip? ToolTip { owned get; }
- public abstract string Id { owned get; }
- public abstract string? IconThemePath { owned get; }
- public abstract bool ItemIsMenu { owned get; }
- public abstract ObjectPath? Menu { owned get; }
- public abstract string IconName { owned get; }
- public abstract Pixmap[] IconPixmap { owned get; }
- public abstract string AttentionIconName { owned get; }
- public abstract Pixmap[] AttentionIconPixmap { owned get; }
- public abstract string OverlayIconName { owned get; }
- public abstract Pixmap[] OverlayIconPixmap { owned get; }
-
- public abstract void ContexMenu(int x, int y) throws DBusError, IOError;
- public abstract void Activate(int x, int y) throws DBusError, IOError;
- public abstract void SecondaryActivate(int x, int y) throws DBusError, IOError;
- public abstract void Scroll(int delta, string orientation) throws DBusError, IOError;
-
- public signal void NewTitle();
- public signal void NewIcon();
- public signal void NewAttentionIcon();
- public signal void NewOverlayIcon();
- public signal void NewToolTip();
- public signal void NewStatus(string status);
+ [DBus (name="org.kde.StatusNotifierItem")]
+ internal interface IItem : DBusProxy {
+
+ public abstract string Title { owned get; }
+ public abstract Category Category { owned get; }
+ public abstract Status Status { owned get; }
+ public abstract Tooltip? ToolTip { owned get; }
+ public abstract string Id { owned get; }
+ public abstract string? IconThemePath { owned get; }
+ public abstract bool ItemIsMenu { owned get; }
+ public abstract ObjectPath? Menu { owned get; }
+ public abstract string IconName { owned get; }
+ public abstract Pixmap[] IconPixmap { owned get; }
+ public abstract string AttentionIconName { owned get; }
+ public abstract Pixmap[] AttentionIconPixmap { owned get; }
+ public abstract string OverlayIconName { owned get; }
+ public abstract Pixmap[] OverlayIconPixmap { owned get; }
+
+ public abstract void ContexMenu(int x, int y) throws DBusError, IOError;
+ public abstract void Activate(int x, int y) throws DBusError, IOError;
+ public abstract void SecondaryActivate(int x, int y) throws DBusError, IOError;
+ public abstract void Scroll(int delta, string orientation) throws DBusError, IOError;
+
+ public signal void NewTitle();
+ public signal void NewIcon();
+ public signal void NewAttentionIcon();
+ public signal void NewOverlayIcon();
+ public signal void NewToolTip();
+ public signal void NewStatus(string status);
-}
+ }
-public class TrayItem : Object {
+ public class TrayItem : Object {
private IItem proxy;
private List<ulong> connection_ids;
-
+
public string title { owned get { return proxy.Title; } }
public Category category { get { return proxy.Category; } }
public Status status { get { return proxy.Status; } }
@@ -84,7 +84,7 @@ public class TrayItem : Object {
string tt = proxy.ToolTip.title;
if (proxy.ToolTip.description != "")
- tt += "\n" + proxy.ToolTip.description;
+ tt += "\n" + proxy.ToolTip.description;
return tt;
}
@@ -108,41 +108,42 @@ public class TrayItem : Object {
public signal void ready();
public TrayItem(string service, string path) {
-
+
connection_ids = new List<ulong>();
setup_proxy(service, path);
-
+
}
private async void setup_proxy(string service, string path) {
-
- proxy = yield Bus.get_proxy(
- BusType.SESSION,
- service,
- path
- );
-
- if(proxy.Menu != null) {
- menu = new DbusmenuGtk.Menu(
- proxy.get_name_owner(),
- proxy.Menu);
- }
- connection_ids.append(proxy.NewStatus.connect(() => refresh_all_properties()));
- connection_ids.append(proxy.NewToolTip.connect(() => refresh_all_properties()));
- connection_ids.append(proxy.NewTitle.connect(() => refresh_all_properties()));
- connection_ids.append(proxy.NewIcon.connect(() => refresh_all_properties()));
+ try {
+ proxy = yield Bus.get_proxy(
+ BusType.SESSION,
+ service,
+ path);
+
+ if(proxy.Menu != null) {
+ menu = new DbusmenuGtk.Menu(
+ proxy.get_name_owner(),
+ proxy.Menu);
+ }
+
+ connection_ids.append(proxy.NewStatus.connect(() => refresh_all_properties()));
+ connection_ids.append(proxy.NewToolTip.connect(() => refresh_all_properties()));
+ connection_ids.append(proxy.NewTitle.connect(() => refresh_all_properties()));
+ connection_ids.append(proxy.NewIcon.connect(() => refresh_all_properties()));
- proxy.notify["g-name-owner"].connect(
- () => {
+ proxy.notify["g-name-owner"].connect(() => {
if (proxy.g_name_owner == null) {
foreach (var id in connection_ids)
SignalHandler.disconnect(proxy, id);
- }
- }
- );
+ }
+ });
- ready();
+ ready();
+ } catch (Error err) {
+ critical("%s", err.message);
+ }
}
@@ -151,7 +152,7 @@ public class TrayItem : Object {
"category", "id", "title", "status", "is-menu",
"tooltip-markup"
};
-
+
foreach (string prop in props)
notify_property(prop);
@@ -160,49 +161,49 @@ public class TrayItem : Object {
private void refresh_all_properties() {
proxy.g_connection.call.begin(
- proxy.g_name,
- proxy.g_object_path,
- "org.freedesktop.DBus.Properties",
- "GetAll",
- new Variant("(s)", proxy.g_interface_name),
- new VariantType("(a{sv})"),
- DBusCallFlags.NONE,
- -1,
- null,
- (_, result) => {
- try {
- Variant parameters = proxy.g_connection.call.end(result);
- VariantIter prop_iter;
- parameters.get("(a{sv})", out prop_iter);
-
- string prop_key;
- Variant prop_value;
-
- while (prop_iter.next ("{sv}", out prop_key, out prop_value)) {
- proxy.set_cached_property(prop_key, prop_value);
+ proxy.g_name,
+ proxy.g_object_path,
+ "org.freedesktop.DBus.Properties",
+ "GetAll",
+ new Variant("(s)", proxy.g_interface_name),
+ new VariantType("(a{sv})"),
+ DBusCallFlags.NONE,
+ -1,
+ null,
+ (_, result) => {
+ try {
+ Variant parameters = proxy.g_connection.call.end(result);
+ VariantIter prop_iter;
+ parameters.get("(a{sv})", out prop_iter);
+
+ string prop_key;
+ Variant prop_value;
+
+ while (prop_iter.next ("{sv}", out prop_key, out prop_value)) {
+ proxy.set_cached_property(prop_key, prop_value);
+ }
+ _notify();
+
+ } catch(Error e) {
+ //silently ignore
}
- _notify();
-
- } catch(Error e) {
- //silently ignore
- }
- });
+ });
}
-
+
public Gdk.Pixbuf? _get_icon_pixbuf() {
Pixmap[] pixmaps = proxy.Status == Status.NEEDS_ATTENTION
? proxy.AttentionIconPixmap
: proxy.IconPixmap;
-
-
+
+
string icon_name = proxy.Status == Status.NEEDS_ATTENTION
? proxy.AttentionIconName
: proxy.IconName;
-
+
Gdk.Pixbuf pixbuf = null;
-
+
if(icon_name != null && proxy.IconThemePath != null)
pixbuf = load_from_theme(icon_name, proxy.IconThemePath);
if (pixbuf == null) pixbuf = pixmap_to_pixbuf(pixmaps);
@@ -214,14 +215,14 @@ public class TrayItem : Object {
private Gdk.Pixbuf? load_from_theme(string icon_name, string theme_path) {
if(theme_path == "" || theme_path == null) return null;
if(icon_name == "" || icon_name == null) return null;
-
+
Gtk.IconTheme icon_theme = new Gtk.IconTheme();
string[] paths = {theme_path};
icon_theme.set_search_path(paths);
int size = icon_theme.get_icon_sizes(icon_name)[0];
Gtk.IconInfo icon_info = icon_theme.lookup_icon(
- icon_name, size, Gtk.IconLookupFlags.FORCE_SIZE);
+ icon_name, size, Gtk.IconLookupFlags.FORCE_SIZE);
if (icon_info != null)
return icon_info.load_icon();
@@ -232,7 +233,7 @@ public class TrayItem : Object {
if(pixmaps == null || pixmaps.length == 0) return null;
Pixmap pixmap = pixmaps[0];
uint8[] image_data = pixmap.bytes.copy();
-
+
for (int i = 0; i < pixmap.width * pixmap.height * 4; i += 4) {
uint8 alpha = image_data[i];
image_data[i] = image_data[i + 1];
@@ -240,7 +241,7 @@ public class TrayItem : Object {
image_data[i + 2] = image_data[i + 3];
image_data[i + 3] = alpha;
}
-
+
return new Gdk.Pixbuf.from_bytes(
new Bytes(image_data),
Gdk.Colorspace.RGB,
@@ -250,9 +251,8 @@ public class TrayItem : Object {
(int)pixmap.height,
(int)(pixmap.width * 4)
);
-
}
-}
+ }
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-08 13:09:10 +0000