From 76036a1adbd29235620020f524d0709f3cefe168 Mon Sep 17 00:00:00 2001 From: Aylur Date: Tue, 21 May 2024 12:14:29 +0200 Subject: init 0.1.0 --- .gitignore | 5 ++ README.md | 11 +++ flake.lock | 27 +++++++ flake.nix | 41 ++++++++++ meson-install.sh | 16 ++++ meson.build | 14 ++++ meson_options.txt | 2 + src/cli.vala.in | 47 +++++++++++ src/daemon.vala | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/meson.build | 76 +++++++++++++++++ src/notifd.vala | 146 +++++++++++++++++++++++++++++++++ src/notification.vala | 163 +++++++++++++++++++++++++++++++++++++ src/proxy.vala | 97 ++++++++++++++++++++++ version | 1 + 14 files changed, 866 insertions(+) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 meson-install.sh create mode 100644 meson.build create mode 100644 meson_options.txt create mode 100644 src/cli.vala.in create mode 100644 src/daemon.vala create mode 100644 src/meson.build create mode 100644 src/notifd.vala create mode 100644 src/notification.vala create mode 100644 src/proxy.vala create mode 100644 version diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f047207 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +build/ +result +.cache/ +test.sh +tmp/ diff --git a/README.md b/README.md new file mode 100644 index 0000000..352f6c1 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# notifd + +a notification daemon + +## TODO + +- docs +- cli options for + - [ ] getting a list of every notification + - [ ] getting a notification by its id + - [ ] invoke notification action by id diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..0c0646b --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1715961556, + "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..5389e8a --- /dev/null +++ b/flake.nix @@ -0,0 +1,41 @@ +{ + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + + outputs = { self, nixpkgs }: + let + version = builtins.replaceStrings ["\n"] [""] (builtins.readFile ./version); + system = "x86_64-linux"; + pkgs = import nixpkgs { inherit system; }; + + nativeBuildInputs = with pkgs; [ + gobject-introspection + meson + pkg-config + ninja + vala + ]; + + buildInputs = with pkgs; [ + glib + gdk-pixbuf + json-glib + ]; + in { + packages.${system} = rec { + default = notifd; + notifd = pkgs.stdenv.mkDerivation { + inherit nativeBuildInputs buildInputs; + pname = "notifd"; + version = version; + src = ./.; + # outputs = ["out" "dev"]; + }; + }; + + devShells.${system} = { + default = pkgs.mkShell { + inherit nativeBuildInputs buildInputs; + }; + }; + }; +} diff --git a/meson-install.sh b/meson-install.sh new file mode 100644 index 0000000..0e6b258 --- /dev/null +++ b/meson-install.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +meson setup \ + --prefix /usr \ + --libexecdir lib \ + --sbindir bin \ + --buildtype plain \ + --auto-features enabled \ + --wrap-mode nodownload \ + -D b_lto=false \ + -D b_pie=true \ + -D python.bytecompile=1 \ + --wipe \ + build + +meson install -C build diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..e85fbc5 --- /dev/null +++ b/meson.build @@ -0,0 +1,14 @@ +project( + 'notifd', + 'vala', + 'c', + version: run_command('cat', join_paths(meson.project_source_root(), 'version')).stdout().strip(), + meson_version: '>= 0.62.0', + default_options: [ + 'warning_level=2', + 'werror=false', + 'c_std=gnu11', + ], +) + +subdir('src') diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 0000000..0966cdf --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,2 @@ +option('typelib', type: 'boolean', value: true, description: 'Needed files for runtime bindings') +option('cli_client', type: 'boolean', value: true, description: 'cli client for notifd') diff --git a/src/cli.vala.in b/src/cli.vala.in new file mode 100644 index 0000000..056a69d --- /dev/null +++ b/src/cli.vala.in @@ -0,0 +1,47 @@ +private static bool version; +private static bool help; + +private const OptionEntry[] options = { + { "version", 'v', OptionFlags.NONE, OptionArg.NONE, ref version, null, null }, + { "help", 'h', OptionFlags.NONE, OptionArg.NONE, ref help, null, null }, + { null }, +}; + +int main(string[] argv) { + try { + var opts = new OptionContext(); + opts.add_main_entries(options, null); + opts.set_help_enabled(false); + opts.set_ignore_unknown_options(false); + opts.parse(ref argv); + } catch (OptionError err) { + printerr (err.message); + return 1; + } + + if (help) { + print("Cli client for astal-notifd\n\n"); + print("Usage:\n"); + print(" %s [flags] message\n\n", argv[0]); + print("Flags:\n"); + print(" -h, --help Print this help and exit\n"); + print(" -v, --version Print version number and exit\n"); + return 0; + } + + if (version) { + print("@VERSION@"); + return 0; + } + + var notifd = new AstalNotifd.Notifd(); + notifd.notified.connect((id) => { + stdout.printf("%s\n", notifd.get_notification_json(id)); + }); + notifd.active.connect(() => { + foreach (var n in notifd.notifications) + stdout.printf("%s\n", n.to_json_string()); + }); + new MainLoop().run(); + return 0; +} diff --git a/src/daemon.vala b/src/daemon.vala new file mode 100644 index 0000000..fd344e7 --- /dev/null +++ b/src/daemon.vala @@ -0,0 +1,220 @@ +namespace AstalNotifd { +public enum ClosedReason { + EXPIRED = 1, + DISMISSED_BY_USER = 2, + CLOSED = 3, + UNDEFINED = 4, +} + +[DBus (name = "org.freedesktop.Notifications")] +internal class Daemon : Object { + public static string name = "notifd"; + public static string vendor = "astal"; + public static string version = "0.1"; + + private string cache_file; + private uint n_id = 1; + private HashTable notifs = + new HashTable((i) => i, (a, b) => a == b); + + public string cache_directory { set; owned get; } + public bool ignore_timeout { get; set; } + public bool dont_disturb { get; set; } + + public signal void notified(uint id); + public signal void resolved(uint id, ClosedReason reason); + + construct { + if (cache_directory == null) + cache_directory = Environment.get_user_cache_dir() + "/astal/notifd"; + + cache_file = cache_directory + "/notifications.json"; + + if (FileUtils.test(cache_file, FileTest.EXISTS)) { + try { + uint8[] json; + File.new_for_path(cache_file).load_contents(null, out json, null); + var parser = new Json.Parser(); + parser.load_from_data((string)json); + var list = parser.get_root().get_array(); + for (var i = 0; i < list.get_length(); ++i) { + var n = new Notification.from_json(list.get_object_element(i)); + notifs.set(n.id, n); + } + } catch (Error err) { + warning("failed to load cache: %s", err.message); + } + } + + notified.connect(() => { + notify_property("notifications"); + }); + + resolved.connect((id, reason) => { + notifs.get(id).resolved(reason); + notifs.remove(id); + cache(); + notify_property("notifications"); + notification_closed(id, reason); + }); + } + + public uint[] notification_ids() throws DBusError, IOError { + var keys = notifs.get_keys(); + uint[] id = new uint[keys.length()]; + for (var i = 0; i < keys.length(); ++i) + id[i] = keys.nth_data(i); + return id; + } + + [DBus (visible = false)] + public List notifications { + owned get { return notifs.get_values(); } + } + + [DBus (visible = false)] + public Notification get_notification(uint id) throws DBusError, IOError { + return notifs.get(id); + } + + public string get_notification_json(uint id) throws DBusError, IOError { + return notifs.get(id).to_json_string(); + } + + [DBus (name = "Notify")] + public uint Notify( + string app_name, + uint replaces_id, + string app_icon, + string summary, + string body, + string[] actions, + HashTable hints, + int expire_timeout + ) throws DBusError, IOError { + if (hints.get("image-data") != null) { + var file = cache_image(hints.get("image-data"), app_name); + if (file != null) { + hints.set("image-path", new Variant.string(file)); + hints.remove("image-data"); + } + } + + // deprecated hints + hints.remove("image_data"); + hints.remove("icon_data"); + + var id = replaces_id > 0 ? replaces_id : n_id++; + var n = new Notification( + app_name, id, app_icon, summary, body, actions, hints, expire_timeout + ); + + n.dismissed.connect(() => resolved(id, ClosedReason.DISMISSED_BY_USER)); + n.invoked.connect((action) => action_invoked(id, action)); + + if (!ignore_timeout && expire_timeout > 0) { + Timeout.add(expire_timeout, () => { + resolved(id, ClosedReason.EXPIRED); + return Source.REMOVE; + }, Priority.DEFAULT); + } + + notifs.set(id, n); + if (!dont_disturb) + notified(id); + + cache(); + return id; + } + + private void cache() { + var list = new Json.Builder().begin_array(); + foreach (var n in notifications) { + list.add_value(n.to_json()); + } + list.end_array(); + var generator = new Json.Generator(); + generator.set_root(list.get_root()); + var json = generator.to_data(null); + + try { + if (!FileUtils.test(cache_directory, FileTest.EXISTS)) + File.new_for_path(cache_directory).make_directory_with_parents(null); + + FileUtils.set_contents_full(cache_file, json); + } catch (Error err) { + warning("failed to cache notifications: %s", err.message); + } + } + + public signal void notification_closed(uint id, uint reason); + public signal void action_invoked(uint id, string action); + public signal void activation_token(uint id, string token); + + public void close_notification(uint id) throws DBusError, IOError { + resolved(id, ClosedReason.CLOSED); + } + + public void get_server_information( + out string name, + out string vendor, + out string version, + out string spec_version + ) throws DBusError, IOError { + name = Daemon.name; + vendor = Daemon.vendor; + version = Daemon.version; + spec_version = "1.2"; + } + + public string[] get_capabilities() throws DBusError, IOError { + return {"action-icons", "actions", "body", "icon-static", "persistence", "sound"}; + } + + private string? cache_image(Variant image, string app_name) { + int w = image.get_child_value(0).get_int32(); + int h = image.get_child_value(1).get_int32(); + int rs = image.get_child_value(2).get_int32(); + bool alpha = image.get_child_value(3).get_boolean(); + int bps = image.get_child_value(4).get_int32(); + Bytes data = image.get_child_value(6).get_data_as_bytes(); + + if (bps != 8) { + warning("Can not cache image from %s. %s", app_name, + "Currently only RGB images with 8 bits per sample are supported."); + return null; + } + + var pixbuf = new Gdk.Pixbuf.from_bytes( + data, Gdk.Colorspace.RGB, alpha, bps, w, h, rs); + + if (pixbuf == null) + return null; + + var file_name = cache_directory + "/" + data.hash().to_string("%u.png"); + + try { + var output_stream = File.new_for_path(file_name) + .replace(null, false, FileCreateFlags.NONE, null); + + pixbuf.save_to_streamv(output_stream, "png", null, null, null); + output_stream.close(null); + } catch (Error err) { + warning("could not cache image %s", err.message); + return null; + } + + return file_name; + } + + [DBus (visible = false)] + public Daemon register(DBusConnection conn) { + try { + conn.register_object("/org/freedesktop/Notifications", this); + } catch (Error err) { + critical(err.message); + } + return this; + } +} +} diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000..c1d8c5e --- /dev/null +++ b/src/meson.build @@ -0,0 +1,76 @@ +version_split = meson.project_version().split('.') +api_version = version_split[0] + '.' + version_split[1] +notifd_gir = 'astal_notifd-' + api_version + '.gir' +notifd_typelib = 'astal_notifd-' + api_version + '.typelib' +notifd_so = 'libastalnotifd.so.' + meson.project_version() + +deps = [ + dependency('glib-2.0'), + dependency('gobject-2.0'), + dependency('gio-2.0'), + dependency('json-glib-1.0'), + dependency('gdk-pixbuf-2.0'), +] + +sources = files( + 'daemon.vala', + 'notifd.vala', + 'proxy.vala', + 'notification.vala', +) + +libnotifd = library( + meson.project_name(), + sources, + dependencies: deps, + vala_header: meson.project_name() + '.h', + vala_vapi: meson.project_name() + '.vapi', + vala_gir: notifd_gir, + version: meson.project_version(), + install: true, + install_dir: [true, true, true, true], +) + +import('pkgconfig').generate( + description: 'libastalnotifd', + libraries: libnotifd, + name: meson.project_name(), + filebase: meson.project_name() + '-' + api_version, + version: meson.project_version(), + subdirs: meson.project_name(), + requires: 'gio-2.0', + install_dir: get_option('libdir') / 'pkgconfig', +) + +if get_option('typelib') + custom_target( + notifd_typelib, + command: [ + find_program('g-ir-compiler'), + '--output', '@OUTPUT@', + '--shared-library', get_option('prefix') / get_option('libdir') / '@PLAINNAME@', + meson.current_build_dir() / notifd_gir, + ], + input: libnotifd, + output: notifd_typelib, + depends: libnotifd, + install: true, + install_dir: get_option('libdir') / 'girepository-1.0', + ) +endif + +if get_option('cli_client') + cli = configure_file( + input: 'cli.vala.in', + output: 'cli.vala', + configuration: { + 'VERSION': meson.project_version(), + }, + ) + executable( + meson.project_name(), + [cli, sources], + dependencies: deps, + install: true, + ) +endif diff --git a/src/notifd.vala b/src/notifd.vala new file mode 100644 index 0000000..220278c --- /dev/null +++ b/src/notifd.vala @@ -0,0 +1,146 @@ +namespace AstalNotifd { +public enum ActiveType { + DAEMON, + PROXY, +} + +public class Notifd : Object { + private Daemon daemon; + private DaemonProxy proxy; + + private HashTable notifs = + new HashTable((i) => i, (a, b) => a == b); + + public signal void active(ActiveType type); + + public string cache_directory { + owned get { + return proxy != null ? proxy.cache_directory : daemon.cache_directory; + } + set { + if (proxy != null) + proxy.cache_directory = value; + else + daemon.cache_directory = value; + } + } + + public bool ignore_timeout { + get { + return proxy != null ? proxy.ignore_timeout : daemon.ignore_timeout; + } + set { + if (proxy != null) + proxy.ignore_timeout = value; + else + daemon.ignore_timeout = value; + } + } + + public bool dont_disturb { + get { + return proxy != null ? proxy.dont_disturb : daemon.dont_disturb; + } + set { + if (proxy != null) + proxy.dont_disturb = value; + else + daemon.dont_disturb = value; + } + } + + public List notifications { + owned get { return notifs.get_values(); } + } + + public uint[] notification_ids() throws Error { + return proxy != null ? proxy.notification_ids() : daemon.notification_ids(); + } + + public Notification get_notification(uint id) { + return notifs.get(id); + } + + public string get_notification_json(uint id) { + return notifs.get(id).to_json_string(); + } + + public signal void notified(uint id) { + add_notification(id); + } + + public signal void resolved(uint id, ClosedReason reason) { + notifs.remove(id); + } + + private void add_notification(uint id) { + try { + if (proxy != null) { + var json = proxy.get_notification_json(id); + notifs.set(id, Notification.from_json_string(json)); + } else { + notifs.set(id, daemon.get_notification(id)); + } + } catch (Error err) { + warning("could not add notification: %s", err.message); + } + } + + construct { + Bus.own_name( + BusType.SESSION, + "org.freedesktop.Notifications", + BusNameOwnerFlags.NONE, + try_daemon, + () => { + if (proxy != null) { + proxy.stop(); + proxy = null; + } + active(ActiveType.DAEMON); + }, + try_proxy + ); + } + + private void try_daemon(DBusConnection conn) { + daemon = new Daemon().register(conn); + daemon.notified.connect((id) => notified(id)); + daemon.resolved.connect((id, reason) => resolved(id, reason)); + daemon.notify.connect((prop) => { + if (get_class().find_property(prop.name) != null) { + notify_property(prop.name); + } + }); + foreach (var n in daemon.notifications) { + notifs.set(n.id, n); + } + } + + private void try_proxy() { + proxy = new DaemonProxy(); + if (proxy.start()) { + try { + foreach (var id in proxy.notification_ids()) { + add_notification(id); + } + } + catch (Error err) { + warning("could not get notification ids: %s", err.message); + } + + active(ActiveType.PROXY); + } else { + return; + } + + proxy.notified.connect((id) => notified(id)); + proxy.resolved.connect((id, reason) => resolved(id, reason)); + proxy.notify.connect((prop) => { + if (get_class().find_property(prop.name) != null) { + notify_property(prop.name); + } + }); + } +} +} diff --git a/src/notification.vala b/src/notification.vala new file mode 100644 index 0000000..bec014d --- /dev/null +++ b/src/notification.vala @@ -0,0 +1,163 @@ +namespace AstalNotifd { +public enum Urgency { + LOW = 0, + NORMAL = 1, + CRITICAL = 2, +} + +public class Action { + public Action(string id, string label) { + this.id = id; + this.label = label; + } + public string id; + public string label; +} + +public class Notification : Object { + private List _actions; + private HashTable hints; + + public int64 time { construct set; get; } + public string app_name { construct set; get; } + public string app_icon { construct set; get; } + public string summary { construct set; get; } + public string body { construct set; get; } + public uint id { construct set; get; } + public int expire_timeout { construct set; get; } + public List actions { get { return _actions; } } + + public string image { get { return get_str_hint("image-path"); } } + public bool action_icons { get { return get_bool_hint("action-icons"); } } + public string category { get { return get_str_hint("category"); } } + public string desktop_entry { get { return get_str_hint("desktop-entry"); } } + public bool resident { get { return get_bool_hint("resident"); } } + public string sound_file { get { return get_str_hint("sound-file"); } } + public string sound_name { get { return get_str_hint("sound-name"); } } + public bool suppress_sound { get { return get_bool_hint("suppress-sound"); } } + public bool transient { get { return get_bool_hint("transient"); } } + public int x { get { return get_int_hint("x"); } } + public int y { get { return get_int_hint("y"); } } + public Urgency urgency { get { return get_int_hint("urgency"); } } + + internal Notification( + string app_name, + uint id, + string app_icon, + string summary, + string body, + string[] actions, + HashTable hints, + int expire_timeout + ) { + Object( + app_name: app_name, + id: id, + app_icon: app_icon, + summary: summary, + body: body, + expire_timeout: expire_timeout, + time: new DateTime.now_local().to_unix() + ); + + this.hints = hints; + _actions = new List(); + for (var i = 0; i < actions.length; i += 2) { + _actions.append(new Action(actions[i], actions[i + 1])); + } + } + + public Variant? get_hint(string hint) { + return hints.contains(hint) ? hints.get(hint) : null; + } + + public unowned string get_str_hint(string hint) { + return hints.contains(hint) ? hints.get(hint).get_string() : null; + } + + public bool get_bool_hint(string hint) { + return hints.contains(hint) ? hints.get(hint).get_boolean() : false; + } + + public int get_int_hint(string hint) { + return hints.contains(hint) ? hints.get(hint).get_int32() : 0; + } + + public signal void resolved(ClosedReason reason); + public signal void dismissed(); + public signal void invoked(string action); + + public void dismiss() { dismissed(); } + public void invoke(string action) { invoked(action); } + + public Notification.from_json(Json.Object root) throws GLib.Error { + foreach (var key in root.get_members()) { + var node = root.get_member(key); + switch (key) { + case "id": id = (uint)node.get_int(); break; + case "time": time = node.get_int(); break; + case "expire_timeout": expire_timeout = (int)node.get_int(); break; + case "app_name": app_name = node.get_string(); break; + case "app_icon": app_icon = node.get_string(); break; + case "summary": summary = node.get_string(); break; + case "body": body = node.get_string(); break; + case "hints": + hints = new HashTable(str_hash, str_equal); + var obj = node.get_object(); + foreach (var hint in obj.get_members()) { + hints.set(hint, Json.gvariant_deserialize(obj.get_member(hint), null)); + } + break; + case "actions": + _actions = new List(); + for (var i = 0; i < node.get_array().get_length(); ++i) { + var o = node.get_array().get_object_element(i); + _actions.append(new Action( + o.get_member("id").get_string(), + o.get_member("label").get_string() + )); + } + break; + default: break; + } + } + } + + public static Notification from_json_string(string json) throws GLib.Error { + var parser = new Json.Parser(); + parser.load_from_data(json); + return new Notification.from_json(parser.get_root().get_object()); + } + + public string to_json_string() { + var generator = new Json.Generator(); + generator.set_root(to_json()); + return generator.to_data(null); + } + + public Json.Node to_json() { + var acts = new Json.Builder().begin_array(); + foreach (var action in actions) { + acts.begin_object() + .set_member_name("id").add_string_value(action.id) + .set_member_name("label").add_string_value(action.label) + .end_object(); + } + acts.end_array(); + + return new Json.Builder() + .begin_object() + .set_member_name("id").add_int_value(id) + .set_member_name("time").add_int_value(time) + .set_member_name("expire_timeout").add_int_value(expire_timeout) + .set_member_name("app_name").add_string_value(app_name) + .set_member_name("app_icon").add_string_value(app_icon) + .set_member_name("summary").add_string_value(summary) + .set_member_name("body").add_string_value(body) + .set_member_name("actions").add_value(acts.get_root()) + .set_member_name("hints").add_value(Json.gvariant_serialize(hints)) + .end_object() + .get_root(); + } +} +} diff --git a/src/proxy.vala b/src/proxy.vala new file mode 100644 index 0000000..526cd13 --- /dev/null +++ b/src/proxy.vala @@ -0,0 +1,97 @@ +namespace AstalNotifd { +[DBus (name = "org.freedesktop.Notifications")] +internal interface IDaemon : Object { + public abstract string cache_directory { owned get; set; } + public abstract bool ignore_timeout { get; set; } + public abstract bool dont_disturb { get; set; } + + public abstract uint[] notification_ids() throws DBusError, IOError; + public abstract string get_notification_json(uint id) throws DBusError, IOError; + + public signal void notified(uint id); + public signal void resolved(uint id, ClosedReason reason); +} + +internal class DaemonProxy : Object { + public string cache_directory { + owned get { return proxy.cache_directory; } + set { proxy.cache_directory = value; } + } + + public bool ignore_timeout { + get { return proxy.ignore_timeout; } + set { proxy.ignore_timeout = value; } + } + + public bool dont_disturb { + get { return proxy.dont_disturb; } + set { proxy.dont_disturb = value; } + } + + public uint[] notification_ids() throws DBusError, IOError { + return proxy.notification_ids(); + } + + public string get_notification_json(uint id) throws DBusError, IOError { + return proxy.get_notification_json(id); + } + + public signal void notified(uint id); + public signal void resolved(uint id, ClosedReason reason); + + IDaemon proxy; + List ids = new List(); + + public void stop() { + if (ids.length() > 0) { + foreach (var id in ids) + SignalHandler.disconnect(proxy, id); + } + } + + public bool start() { + try { + var bus = Bus.get_sync(BusType.SESSION, null); + var variant = bus.call_sync( + "org.freedesktop.Notifications", + "/org/freedesktop/Notifications", + "org.freedesktop.Notifications", + "GetServerInformation", + null, + null, + DBusCallFlags.NONE, + -1, + null); + + var name = variant.get_child_value(0).get_string(); + var vendor = variant.get_child_value(1).get_string(); + var version = variant.get_child_value(2).get_string(); + + var running = name == Daemon.name + && vendor == Daemon.vendor + && version == Daemon.version; + + if (running) { + proxy = Bus.get_proxy_sync( + BusType.SESSION, + "org.freedesktop.Notifications", + "/org/freedesktop/Notifications" + ); + + ids.append(proxy.notified.connect((id) => notified(id))); + ids.append(proxy.resolved.connect((id, reason) => resolved(id, reason))); + ids.append(proxy.notify.connect((pspec) => { + if (get_class().find_property(pspec.name) != null) + notify_property(pspec.name); + })); + return true; + } else { + critical("cannot get proxy: %s is already running", name); + } + } catch (Error err) { + critical("cannot get proxy: %s", err.message); + } + return false; + } +} +} diff --git a/version b/version new file mode 100644 index 0000000..6e8bf73 --- /dev/null +++ b/version @@ -0,0 +1 @@ +0.1.0 -- cgit v1.2.3 From cbe86c0352a81b83c1f6f8d738482b6f756d45b5 Mon Sep 17 00:00:00 2001 From: Aylur Date: Tue, 21 May 2024 12:55:02 +0200 Subject: add license --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 3 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, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. -- cgit v1.2.3 From 5929e35962914331704f88dc45e8b96b30d1448b Mon Sep 17 00:00:00 2001 From: Aylur Date: Tue, 21 May 2024 12:56:58 +0200 Subject: fix introspection --- README.md | 2 +- flake.nix | 4 +++- meson.build | 2 +- src/meson.build | 8 ++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 352f6c1..2958e22 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # notifd -a notification daemon +A notification daemon library and cli tool ## TODO diff --git a/flake.nix b/flake.nix index 5389e8a..15232d3 100644 --- a/flake.nix +++ b/flake.nix @@ -1,4 +1,6 @@ { + description = "Notification daemon library and cli tool"; + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; outputs = { self, nixpkgs }: @@ -28,7 +30,7 @@ pname = "notifd"; version = version; src = ./.; - # outputs = ["out" "dev"]; + outputs = ["out" "dev"]; }; }; diff --git a/meson.build b/meson.build index e85fbc5..17ba93e 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project( - 'notifd', + 'astal-notifd', 'vala', 'c', version: run_command('cat', join_paths(meson.project_source_root(), 'version')).stdout().strip(), diff --git a/src/meson.build b/src/meson.build index c1d8c5e..e965647 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,8 +1,8 @@ version_split = meson.project_version().split('.') api_version = version_split[0] + '.' + version_split[1] -notifd_gir = 'astal_notifd-' + api_version + '.gir' -notifd_typelib = 'astal_notifd-' + api_version + '.typelib' -notifd_so = 'libastalnotifd.so.' + meson.project_version() +notifd_gir = 'AstalNotifd-' + api_version + '.gir' +notifd_typelib = 'AstalNotifd-' + api_version + '.typelib' +notifd_so = 'libastal-notifd.so.' + meson.project_version() deps = [ dependency('glib-2.0'), @@ -32,7 +32,7 @@ libnotifd = library( ) import('pkgconfig').generate( - description: 'libastalnotifd', + description: 'libastal-notifd', libraries: libnotifd, name: meson.project_name(), filebase: meson.project_name() + '-' + api_version, -- cgit v1.2.3 From 81c4e3a12d05a3550f1d8c942f0d919b4688c3bc Mon Sep 17 00:00:00 2001 From: Aylur Date: Tue, 21 May 2024 22:08:41 +0200 Subject: fix proxy, add remaining cli functionality --- README.md | 4 --- flake.nix | 2 +- src/cli.vala.in | 88 +++++++++++++++++++++++++++++++++++++++++++-------- src/daemon.vala | 34 ++++++++++++-------- src/notifd.vala | 55 +++----------------------------- src/notification.vala | 6 ++-- src/proxy.vala | 69 +++++++++++++++++++++++++++++----------- src/signals.md | 32 +++++++++++++++++++ 8 files changed, 186 insertions(+), 104 deletions(-) create mode 100644 src/signals.md diff --git a/README.md b/README.md index 2958e22..da93a6a 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,3 @@ A notification daemon library and cli tool ## TODO - docs -- cli options for - - [ ] getting a list of every notification - - [ ] getting a notification by its id - - [ ] invoke notification action by id diff --git a/flake.nix b/flake.nix index 15232d3..78a2ab1 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,7 @@ default = notifd; notifd = pkgs.stdenv.mkDerivation { inherit nativeBuildInputs buildInputs; - pname = "notifd"; + pname = "astal-notifd"; version = version; src = ./.; outputs = ["out" "dev"]; diff --git a/src/cli.vala.in b/src/cli.vala.in index 056a69d..f49a056 100644 --- a/src/cli.vala.in +++ b/src/cli.vala.in @@ -1,9 +1,19 @@ -private static bool version; -private static bool help; +static bool help; +static bool version; +static bool daemonize; +static bool list; +static string invoke; +static int close_n; +static int get_n; private const OptionEntry[] options = { { "version", 'v', OptionFlags.NONE, OptionArg.NONE, ref version, null, null }, { "help", 'h', OptionFlags.NONE, OptionArg.NONE, ref help, null, null }, + { "daemon", 'd', OptionFlags.NONE, OptionArg.NONE, ref daemonize, null, null }, + { "list", 'l', OptionFlags.NONE, OptionArg.NONE, ref list, null, null }, + { "invoke", 'i', OptionFlags.NONE, OptionArg.STRING, ref invoke, null, null }, + { "close", 'c', OptionFlags.NONE, OptionArg.INT, ref close_n, null, null }, + { "get", 'g', OptionFlags.NONE, OptionArg.INT, ref get_n, null, null }, { null }, }; @@ -22,26 +32,76 @@ int main(string[] argv) { if (help) { print("Cli client for astal-notifd\n\n"); print("Usage:\n"); - print(" %s [flags] message\n\n", argv[0]); + print(" %s [flags]\n\n", argv[0]); print("Flags:\n"); - print(" -h, --help Print this help and exit\n"); - print(" -v, --version Print version number and exit\n"); + print(" -h, --help Print this help and exit\n"); + print(" -v, --version Print version number and exit\n"); + print(" -l, --list Print every notification and exit\n"); + print(" -d, --daemonize Watch for new notifications\n"); + print(" -i, --invoke Invoke a notification action\n"); + print(" -c, --close Close a notification by its id\n"); + print(" -g, --get Print a notification by its id\n"); return 0; } + var loop = new MainLoop(); + var notifd = new AstalNotifd.Notifd(); + if (version) { print("@VERSION@"); return 0; } - var notifd = new AstalNotifd.Notifd(); - notifd.notified.connect((id) => { - stdout.printf("%s\n", notifd.get_notification_json(id)); - }); - notifd.active.connect(() => { - foreach (var n in notifd.notifications) - stdout.printf("%s\n", n.to_json_string()); - }); - new MainLoop().run(); + if (list) { + var cache = Environment.get_user_cache_dir() + "/astal/notifd/notifications.json"; + if (FileUtils.test(cache, FileTest.EXISTS)) { + try { + uint8[] json; + File.new_for_path(cache).load_contents(null, out json, null); + stdout.printf("%s", (string)json); + } catch (Error err) { + stderr.printf("failed to load cache: %s", err.message); + } + } + return 0; + } + + if (daemonize) { + notifd.notified.connect((id) => { + stdout.printf("%s\n", notifd.get_notification_json(id)); + }); + } + + if (invoke != null) { + if (!invoke.contains(":")) { + stderr.printf("invoke format needs to be :"); + return 1; + } + + var split = invoke.split(":"); + var n_id = int.parse(split[0]); + var a_id = split[1]; + + notifd.active.connect(() => { + notifd.get_notification(n_id).invoke(a_id); + loop.quit(); + }); + } + + if (close_n > 0) { + notifd.active.connect(() => { + notifd.get_notification(close_n).dismiss(); + loop.quit(); + }); + } + + if (get_n > 0) { + notifd.active.connect(() => { + stdout.printf("%s", notifd.get_notification(get_n).to_json_string()); + loop.quit(); + }); + } + + loop.run(); return 0; } diff --git a/src/daemon.vala b/src/daemon.vala index fd344e7..69212ef 100644 --- a/src/daemon.vala +++ b/src/daemon.vala @@ -13,21 +13,26 @@ internal class Daemon : Object { public static string version = "0.1"; private string cache_file; + private string cache_directory; + private uint n_id = 1; private HashTable notifs = new HashTable((i) => i, (a, b) => a == b); - public string cache_directory { set; owned get; } public bool ignore_timeout { get; set; } public bool dont_disturb { get; set; } public signal void notified(uint id); public signal void resolved(uint id, ClosedReason reason); + public signal void action_invoked(uint id, string action); - construct { - if (cache_directory == null) - cache_directory = Environment.get_user_cache_dir() + "/astal/notifd"; + // emitting an event from proxy doesn't seem to work + public void emit_notified(uint id) { notified(id); } + public void emit_resolved(uint id, ClosedReason reason) { resolved(id, reason); } + public void emit_action_invoked(uint id, string action) { action_invoked(id, action); } + construct { + cache_directory = Environment.get_user_cache_dir() + "/astal/notifd"; cache_file = cache_directory + "/notifications.json"; if (FileUtils.test(cache_file, FileTest.EXISTS)) { @@ -38,8 +43,7 @@ internal class Daemon : Object { parser.load_from_data((string)json); var list = parser.get_root().get_array(); for (var i = 0; i < list.get_length(); ++i) { - var n = new Notification.from_json(list.get_object_element(i)); - notifs.set(n.id, n); + add_notification(new Notification.from_json(list.get_object_element(i))); } } catch (Error err) { warning("failed to load cache: %s", err.message); @@ -73,7 +77,7 @@ internal class Daemon : Object { } [DBus (visible = false)] - public Notification get_notification(uint id) throws DBusError, IOError { + public Notification get_notification(uint id) { return notifs.get(id); } @@ -105,12 +109,10 @@ internal class Daemon : Object { hints.remove("icon_data"); var id = replaces_id > 0 ? replaces_id : n_id++; - var n = new Notification( - app_name, id, app_icon, summary, body, actions, hints, expire_timeout - ); - n.dismissed.connect(() => resolved(id, ClosedReason.DISMISSED_BY_USER)); - n.invoked.connect((action) => action_invoked(id, action)); + add_notification(new Notification( + app_name, id, app_icon, summary, body, actions, hints, expire_timeout + )); if (!ignore_timeout && expire_timeout > 0) { Timeout.add(expire_timeout, () => { @@ -119,7 +121,6 @@ internal class Daemon : Object { }, Priority.DEFAULT); } - notifs.set(id, n); if (!dont_disturb) notified(id); @@ -127,6 +128,12 @@ internal class Daemon : Object { return id; } + private void add_notification(Notification n) { + n.dismissed.connect(() => resolved(n.id, ClosedReason.DISMISSED_BY_USER)); + n.invoked.connect((action) => action_invoked(n.id, action)); + notifs.set(n.id, n); + } + private void cache() { var list = new Json.Builder().begin_array(); foreach (var n in notifications) { @@ -148,7 +155,6 @@ internal class Daemon : Object { } public signal void notification_closed(uint id, uint reason); - public signal void action_invoked(uint id, string action); public signal void activation_token(uint id, string token); public void close_notification(uint id) throws DBusError, IOError { diff --git a/src/notifd.vala b/src/notifd.vala index 220278c..55d910b 100644 --- a/src/notifd.vala +++ b/src/notifd.vala @@ -8,23 +8,8 @@ public class Notifd : Object { private Daemon daemon; private DaemonProxy proxy; - private HashTable notifs = - new HashTable((i) => i, (a, b) => a == b); - public signal void active(ActiveType type); - public string cache_directory { - owned get { - return proxy != null ? proxy.cache_directory : daemon.cache_directory; - } - set { - if (proxy != null) - proxy.cache_directory = value; - else - daemon.cache_directory = value; - } - } - public bool ignore_timeout { get { return proxy != null ? proxy.ignore_timeout : daemon.ignore_timeout; @@ -50,7 +35,7 @@ public class Notifd : Object { } public List notifications { - owned get { return notifs.get_values(); } + owned get { return proxy != null ? proxy.notifications : daemon.notifications; } } public uint[] notification_ids() throws Error { @@ -58,33 +43,15 @@ public class Notifd : Object { } public Notification get_notification(uint id) { - return notifs.get(id); + return proxy != null ? proxy.get_notification(id) : daemon.get_notification(id); } public string get_notification_json(uint id) { - return notifs.get(id).to_json_string(); - } - - public signal void notified(uint id) { - add_notification(id); + return get_notification(id).to_json_string(); } - public signal void resolved(uint id, ClosedReason reason) { - notifs.remove(id); - } - - private void add_notification(uint id) { - try { - if (proxy != null) { - var json = proxy.get_notification_json(id); - notifs.set(id, Notification.from_json_string(json)); - } else { - notifs.set(id, daemon.get_notification(id)); - } - } catch (Error err) { - warning("could not add notification: %s", err.message); - } - } + public signal void notified(uint id); + public signal void resolved(uint id, ClosedReason reason); construct { Bus.own_name( @@ -112,23 +79,11 @@ public class Notifd : Object { notify_property(prop.name); } }); - foreach (var n in daemon.notifications) { - notifs.set(n.id, n); - } } private void try_proxy() { proxy = new DaemonProxy(); if (proxy.start()) { - try { - foreach (var id in proxy.notification_ids()) { - add_notification(id); - } - } - catch (Error err) { - warning("could not get notification ids: %s", err.message); - } - active(ActiveType.PROXY); } else { return; diff --git a/src/notification.vala b/src/notification.vala index bec014d..55d62d1 100644 --- a/src/notification.vala +++ b/src/notification.vala @@ -90,7 +90,7 @@ public class Notification : Object { public void dismiss() { dismissed(); } public void invoke(string action) { invoked(action); } - public Notification.from_json(Json.Object root) throws GLib.Error { + internal Notification.from_json(Json.Object root) throws GLib.Error { foreach (var key in root.get_members()) { var node = root.get_member(key); switch (key) { @@ -123,7 +123,7 @@ public class Notification : Object { } } - public static Notification from_json_string(string json) throws GLib.Error { + internal static Notification from_json_string(string json) throws GLib.Error { var parser = new Json.Parser(); parser.load_from_data(json); return new Notification.from_json(parser.get_root().get_object()); @@ -135,7 +135,7 @@ public class Notification : Object { return generator.to_data(null); } - public Json.Node to_json() { + internal Json.Node to_json() { var acts = new Json.Builder().begin_array(); foreach (var action in actions) { acts.begin_object() diff --git a/src/proxy.vala b/src/proxy.vala index 526cd13..1f5870d 100644 --- a/src/proxy.vala +++ b/src/proxy.vala @@ -1,7 +1,6 @@ namespace AstalNotifd { [DBus (name = "org.freedesktop.Notifications")] internal interface IDaemon : Object { - public abstract string cache_directory { owned get; set; } public abstract bool ignore_timeout { get; set; } public abstract bool dont_disturb { get; set; } @@ -10,12 +9,19 @@ internal interface IDaemon : Object { public signal void notified(uint id); public signal void resolved(uint id, ClosedReason reason); + public signal void action_invoked(uint id, string action); + + public abstract void emit_notified(uint id); + public abstract void emit_resolved(uint id, ClosedReason reason); + public abstract void emit_action_invoked(uint id, string action); } internal class DaemonProxy : Object { - public string cache_directory { - owned get { return proxy.cache_directory; } - set { proxy.cache_directory = value; } + private HashTable notifs = + new HashTable((i) => i, (a, b) => a == b); + + public List notifications { + owned get { return notifs.get_values(); } } public bool ignore_timeout { @@ -32,8 +38,8 @@ internal class DaemonProxy : Object { return proxy.notification_ids(); } - public string get_notification_json(uint id) throws DBusError, IOError { - return proxy.get_notification_json(id); + public Notification get_notification(uint id) { + return notifs.get(id); } public signal void notified(uint id); @@ -72,18 +78,7 @@ internal class DaemonProxy : Object { && version == Daemon.version; if (running) { - proxy = Bus.get_proxy_sync( - BusType.SESSION, - "org.freedesktop.Notifications", - "/org/freedesktop/Notifications" - ); - - ids.append(proxy.notified.connect((id) => notified(id))); - ids.append(proxy.resolved.connect((id, reason) => resolved(id, reason))); - ids.append(proxy.notify.connect((pspec) => { - if (get_class().find_property(pspec.name) != null) - notify_property(pspec.name); - })); + setup_proxy(); return true; } else { critical("cannot get proxy: %s is already running", name); @@ -93,5 +88,43 @@ internal class DaemonProxy : Object { } return false; } + + private void setup_proxy() throws Error { + proxy = Bus.get_proxy_sync( + BusType.SESSION, + "org.freedesktop.Notifications", + "/org/freedesktop/Notifications" + ); + + foreach (var id in proxy.notification_ids()) + add_notification(id); + + ids.append(proxy.notify.connect((pspec) => { + if (get_class().find_property(pspec.name) != null) + notify_property(pspec.name); + })); + + ids.append(proxy.notified.connect((id) => { + add_notification(id); + notified(id); + })); + + ids.append(proxy.resolved.connect((id, reason) => { + notifs.remove(id); + resolved(id, reason); + })); + } + + private void add_notification(uint id) { + try { + var n = Notification.from_json_string(proxy.get_notification_json(id)); + proxy.resolved.connect((id, reason) => n.resolved(reason)); + n.dismissed.connect(() => proxy.emit_resolved(id, ClosedReason.DISMISSED_BY_USER)); + n.invoked.connect((action) => proxy.emit_action_invoked(id, action)); + notifs.set(id, n); + } catch (Error err) { + critical(err.message); + } + } } } diff --git a/src/signals.md b/src/signals.md new file mode 100644 index 0000000..0111596 --- /dev/null +++ b/src/signals.md @@ -0,0 +1,32 @@ +# Signals + +ignore this, I'm just dumb and can't follow where signals go or get emitted from + +## Notification + +* resolved(reason) - by daemon/proxy +* dismissed() - by user with `.dismiss()` +* invoked(action) - by user with `.invoke()` + +## Deamon + +non-spec, used by user +* notified(id) - by outside through dbus with `.Notify()` +* resolved(id, reason) - by `Notification.dismiss()` or outside with `.CloseNotification` + +spec, not used by user +* notification_closed(id, reason) - sideeffect of `resolved` +* action_invoked(id, action) - by `Notification.invoke()` + +## Proxy + +mirrors Daemon +* notified(id) +* resolved(id, reason) + +creates `Notification` objects through daemon's json strings +and hooks them up to call daemon's signals and vice versa + +## Notifd + +acts as a bridge between Proxy/Daemon, everything else is internal only -- cgit v1.2.3 From cf9125cf31fb5b58be273395726c21041517d64f Mon Sep 17 00:00:00 2001 From: Aylur Date: Wed, 22 May 2024 00:06:27 +0200 Subject: refactor meson into a reusable format that can easily be copied --- flake.lock | 6 +-- meson.build | 5 +++ meson_options.txt | 13 ++++++- src/cli.vala | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/cli.vala.in | 107 ----------------------------------------------------- src/config.vala.in | 6 +++ src/meson.build | 89 +++++++++++++++++++++++--------------------- src/proxy.vala | 1 - 8 files changed, 179 insertions(+), 155 deletions(-) create mode 100644 src/cli.vala delete mode 100644 src/cli.vala.in create mode 100644 src/config.vala.in diff --git a/flake.lock b/flake.lock index 0c0646b..13f566b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1715961556, - "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", + "lastModified": 1716137900, + "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", + "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "type": "github" }, "original": { diff --git a/meson.build b/meson.build index 17ba93e..8fabdb4 100644 --- a/meson.build +++ b/meson.build @@ -11,4 +11,9 @@ project( ], ) +assert( + get_option('lib') or get_option('cli'), + 'Either lib or cli option must be set to true.', +) + subdir('src') diff --git a/meson_options.txt b/meson_options.txt index 0966cdf..f110242 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,2 +1,11 @@ -option('typelib', type: 'boolean', value: true, description: 'Needed files for runtime bindings') -option('cli_client', type: 'boolean', value: true, description: 'cli client for notifd') +option( + 'lib', + type: 'boolean', + value: true, +) + +option( + 'cli', + type: 'boolean', + value: true, +) diff --git a/src/cli.vala b/src/cli.vala new file mode 100644 index 0000000..e9001f5 --- /dev/null +++ b/src/cli.vala @@ -0,0 +1,107 @@ +static bool help; +static bool version; +static bool daemonize; +static bool list; +static string invoke; +static int close_n; +static int get_n; + +const OptionEntry[] options = { + { "version", 'v', OptionFlags.NONE, OptionArg.NONE, ref version, null, null }, + { "help", 'h', OptionFlags.NONE, OptionArg.NONE, ref help, null, null }, + { "daemon", 'd', OptionFlags.NONE, OptionArg.NONE, ref daemonize, null, null }, + { "list", 'l', OptionFlags.NONE, OptionArg.NONE, ref list, null, null }, + { "invoke", 'i', OptionFlags.NONE, OptionArg.STRING, ref invoke, null, null }, + { "close", 'c', OptionFlags.NONE, OptionArg.INT, ref close_n, null, null }, + { "get", 'g', OptionFlags.NONE, OptionArg.INT, ref get_n, null, null }, + { null }, +}; + +int main(string[] argv) { + try { + var opts = new OptionContext(); + opts.add_main_entries(options, null); + opts.set_help_enabled(false); + opts.set_ignore_unknown_options(false); + opts.parse(ref argv); + } catch (OptionError err) { + printerr (err.message); + return 1; + } + + if (help) { + print("Cli client for astal-notifd\n\n"); + print("Usage:\n"); + print(" %s [flags]\n\n", argv[0]); + print("Flags:\n"); + print(" -h, --help Print this help and exit\n"); + print(" -v, --version Print version number and exit\n"); + print(" -l, --list Print every notification and exit\n"); + print(" -d, --daemonize Watch for new notifications\n"); + print(" -i, --invoke Invoke a notification action\n"); + print(" -c, --close Close a notification by its id\n"); + print(" -g, --get Print a notification by its id\n"); + return 0; + } + + var loop = new MainLoop(); + var notifd = new AstalNotifd.Notifd(); + + if (version) { + print(AstalNotifd.VERSION); + return 0; + } + + if (list) { + var cache = Environment.get_user_cache_dir() + "/astal/notifd/notifications.json"; + if (FileUtils.test(cache, FileTest.EXISTS)) { + try { + uint8[] json; + File.new_for_path(cache).load_contents(null, out json, null); + stdout.printf("%s", (string)json); + } catch (Error err) { + stderr.printf("failed to load cache: %s", err.message); + } + } + return 0; + } + + if (daemonize) { + notifd.notified.connect((id) => { + stdout.printf("%s\n", notifd.get_notification_json(id)); + }); + } + + if (invoke != null) { + if (!invoke.contains(":")) { + stderr.printf("invoke format needs to be :"); + return 1; + } + + var split = invoke.split(":"); + var n_id = int.parse(split[0]); + var a_id = split[1]; + + notifd.active.connect(() => { + notifd.get_notification(n_id).invoke(a_id); + loop.quit(); + }); + } + + if (close_n > 0) { + notifd.active.connect(() => { + notifd.get_notification(close_n).dismiss(); + loop.quit(); + }); + } + + if (get_n > 0) { + notifd.active.connect(() => { + stdout.printf("%s", notifd.get_notification(get_n).to_json_string()); + loop.quit(); + }); + } + + loop.run(); + return 0; +} diff --git a/src/cli.vala.in b/src/cli.vala.in deleted file mode 100644 index f49a056..0000000 --- a/src/cli.vala.in +++ /dev/null @@ -1,107 +0,0 @@ -static bool help; -static bool version; -static bool daemonize; -static bool list; -static string invoke; -static int close_n; -static int get_n; - -private const OptionEntry[] options = { - { "version", 'v', OptionFlags.NONE, OptionArg.NONE, ref version, null, null }, - { "help", 'h', OptionFlags.NONE, OptionArg.NONE, ref help, null, null }, - { "daemon", 'd', OptionFlags.NONE, OptionArg.NONE, ref daemonize, null, null }, - { "list", 'l', OptionFlags.NONE, OptionArg.NONE, ref list, null, null }, - { "invoke", 'i', OptionFlags.NONE, OptionArg.STRING, ref invoke, null, null }, - { "close", 'c', OptionFlags.NONE, OptionArg.INT, ref close_n, null, null }, - { "get", 'g', OptionFlags.NONE, OptionArg.INT, ref get_n, null, null }, - { null }, -}; - -int main(string[] argv) { - try { - var opts = new OptionContext(); - opts.add_main_entries(options, null); - opts.set_help_enabled(false); - opts.set_ignore_unknown_options(false); - opts.parse(ref argv); - } catch (OptionError err) { - printerr (err.message); - return 1; - } - - if (help) { - print("Cli client for astal-notifd\n\n"); - print("Usage:\n"); - print(" %s [flags]\n\n", argv[0]); - print("Flags:\n"); - print(" -h, --help Print this help and exit\n"); - print(" -v, --version Print version number and exit\n"); - print(" -l, --list Print every notification and exit\n"); - print(" -d, --daemonize Watch for new notifications\n"); - print(" -i, --invoke Invoke a notification action\n"); - print(" -c, --close Close a notification by its id\n"); - print(" -g, --get Print a notification by its id\n"); - return 0; - } - - var loop = new MainLoop(); - var notifd = new AstalNotifd.Notifd(); - - if (version) { - print("@VERSION@"); - return 0; - } - - if (list) { - var cache = Environment.get_user_cache_dir() + "/astal/notifd/notifications.json"; - if (FileUtils.test(cache, FileTest.EXISTS)) { - try { - uint8[] json; - File.new_for_path(cache).load_contents(null, out json, null); - stdout.printf("%s", (string)json); - } catch (Error err) { - stderr.printf("failed to load cache: %s", err.message); - } - } - return 0; - } - - if (daemonize) { - notifd.notified.connect((id) => { - stdout.printf("%s\n", notifd.get_notification_json(id)); - }); - } - - if (invoke != null) { - if (!invoke.contains(":")) { - stderr.printf("invoke format needs to be :"); - return 1; - } - - var split = invoke.split(":"); - var n_id = int.parse(split[0]); - var a_id = split[1]; - - notifd.active.connect(() => { - notifd.get_notification(n_id).invoke(a_id); - loop.quit(); - }); - } - - if (close_n > 0) { - notifd.active.connect(() => { - notifd.get_notification(close_n).dismiss(); - loop.quit(); - }); - } - - if (get_n > 0) { - notifd.active.connect(() => { - stdout.printf("%s", notifd.get_notification(get_n).to_json_string()); - loop.quit(); - }); - } - - loop.run(); - return 0; -} diff --git a/src/config.vala.in b/src/config.vala.in new file mode 100644 index 0000000..7db3963 --- /dev/null +++ b/src/config.vala.in @@ -0,0 +1,6 @@ +namespace AstalNotifd { + const int MAJOR_VERSION = @MAJOR_VERSION@; + const int MINOR_VERSION = @MINOR_VERSION@; + const int MICRO_VERSION = @MICRO_VERSION@; + const string VERSION = "@VERSION@"; +} diff --git a/src/meson.build b/src/meson.build index e965647..b1d326c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,8 +1,19 @@ version_split = meson.project_version().split('.') api_version = version_split[0] + '.' + version_split[1] -notifd_gir = 'AstalNotifd-' + api_version + '.gir' -notifd_typelib = 'AstalNotifd-' + api_version + '.typelib' -notifd_so = 'libastal-notifd.so.' + meson.project_version() +gir = 'AstalNotifd-' + api_version + '.gir' +typelib = 'AstalNotifd-' + api_version + '.typelib' +so = 'libastal-notifd.so.' + meson.project_version() + +config = configure_file( + input: 'config.vala.in', + output: 'config.vala', + configuration: { + 'VERSION': meson.project_version(), + 'MAJOR_VERSION': version_split[0], + 'MINOR_VERSION': version_split[1], + 'MICRO_VERSION': version_split[2], + }, +) deps = [ dependency('glib-2.0'), @@ -12,64 +23,58 @@ deps = [ dependency('gdk-pixbuf-2.0'), ] -sources = files( +sources = [ + config, 'daemon.vala', 'notifd.vala', - 'proxy.vala', 'notification.vala', -) + 'proxy.vala', +] -libnotifd = library( - meson.project_name(), - sources, - dependencies: deps, - vala_header: meson.project_name() + '.h', - vala_vapi: meson.project_name() + '.vapi', - vala_gir: notifd_gir, - version: meson.project_version(), - install: true, - install_dir: [true, true, true, true], -) +if get_option('lib') + lib = library( + meson.project_name(), + sources, + dependencies: deps, + vala_header: meson.project_name() + '.h', + vala_vapi: meson.project_name() + '.vapi', + vala_gir: gir, + version: meson.project_version(), + install: true, + install_dir: [true, true, true, true], + ) -import('pkgconfig').generate( - description: 'libastal-notifd', - libraries: libnotifd, - name: meson.project_name(), - filebase: meson.project_name() + '-' + api_version, - version: meson.project_version(), - subdirs: meson.project_name(), - requires: 'gio-2.0', - install_dir: get_option('libdir') / 'pkgconfig', -) + import('pkgconfig').generate( + description: 'libastal-notifd', + libraries: lib, + name: meson.project_name(), + filebase: meson.project_name() + '-' + api_version, + version: meson.project_version(), + subdirs: meson.project_name(), + requires: deps, + install_dir: get_option('libdir') / 'pkgconfig', + ) -if get_option('typelib') custom_target( - notifd_typelib, + typelib, command: [ find_program('g-ir-compiler'), '--output', '@OUTPUT@', '--shared-library', get_option('prefix') / get_option('libdir') / '@PLAINNAME@', - meson.current_build_dir() / notifd_gir, + meson.current_build_dir() / gir, ], - input: libnotifd, - output: notifd_typelib, - depends: libnotifd, + input: lib, + output: typelib, + depends: lib, install: true, install_dir: get_option('libdir') / 'girepository-1.0', ) endif -if get_option('cli_client') - cli = configure_file( - input: 'cli.vala.in', - output: 'cli.vala', - configuration: { - 'VERSION': meson.project_version(), - }, - ) +if get_option('cli') executable( meson.project_name(), - [cli, sources], + ['cli.vala', sources], dependencies: deps, install: true, ) diff --git a/src/proxy.vala b/src/proxy.vala index 1f5870d..b5686fe 100644 --- a/src/proxy.vala +++ b/src/proxy.vala @@ -9,7 +9,6 @@ internal interface IDaemon : Object { public signal void notified(uint id); public signal void resolved(uint id, ClosedReason reason); - public signal void action_invoked(uint id, string action); public abstract void emit_notified(uint id); public abstract void emit_resolved(uint id, ClosedReason reason); -- cgit v1.2.3 From 297126f9c85dca14570dc5af29697aae10a65a8f Mon Sep 17 00:00:00 2001 From: Aylur Date: Wed, 22 May 2024 00:07:27 +0200 Subject: fix(cli): flush stdout on each new notification --- src/cli.vala | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cli.vala b/src/cli.vala index e9001f5..1c051d3 100644 --- a/src/cli.vala +++ b/src/cli.vala @@ -69,6 +69,7 @@ int main(string[] argv) { if (daemonize) { notifd.notified.connect((id) => { stdout.printf("%s\n", notifd.get_notification_json(id)); + stdout.flush(); }); } -- cgit v1.2.3 From a8319e1374e1860fa348b2965957ad9f15a8843f Mon Sep 17 00:00:00 2001 From: Aylur Date: Thu, 20 Jun 2024 16:28:59 +0200 Subject: fix: vapi files --- src/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/meson.build b/src/meson.build index b1d326c..8001aa6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -36,8 +36,8 @@ if get_option('lib') meson.project_name(), sources, dependencies: deps, - vala_header: meson.project_name() + '.h', - vala_vapi: meson.project_name() + '.vapi', + vala_header: meson.project_name() + api_version + '.h', + vala_vapi: meson.project_name() + api_version + '.vapi', vala_gir: gir, version: meson.project_version(), install: true, -- cgit v1.2.3 From 758f1b3e4c767a9345a81b0d60873e57264d497f Mon Sep 17 00:00:00 2001 From: Aylur Date: Thu, 20 Jun 2024 16:29:10 +0200 Subject: fix(config): export version numbers --- src/config.vala.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config.vala.in b/src/config.vala.in index 7db3963..752c754 100644 --- a/src/config.vala.in +++ b/src/config.vala.in @@ -1,6 +1,6 @@ namespace AstalNotifd { - const int MAJOR_VERSION = @MAJOR_VERSION@; - const int MINOR_VERSION = @MINOR_VERSION@; - const int MICRO_VERSION = @MICRO_VERSION@; - const string VERSION = "@VERSION@"; + public const int MAJOR_VERSION = @MAJOR_VERSION@; + public const int MINOR_VERSION = @MINOR_VERSION@; + public const int MICRO_VERSION = @MICRO_VERSION@; + public const string VERSION = "@VERSION@"; } -- cgit v1.2.3 From 9812a21318abc3c508c5a6152336578d621a1032 Mon Sep 17 00:00:00 2001 From: Aylur Date: Thu, 20 Jun 2024 16:38:02 +0200 Subject: feat: notified replaced parameter --- src/daemon.vala | 12 ++++++------ src/notifd.vala | 6 +++--- src/proxy.vala | 9 ++++----- src/signals.md | 7 +++++-- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/daemon.vala b/src/daemon.vala index 69212ef..6b11204 100644 --- a/src/daemon.vala +++ b/src/daemon.vala @@ -22,12 +22,11 @@ internal class Daemon : Object { public bool ignore_timeout { get; set; } public bool dont_disturb { get; set; } - public signal void notified(uint id); + public signal void notified(uint id, bool replaced); public signal void resolved(uint id, ClosedReason reason); public signal void action_invoked(uint id, string action); // emitting an event from proxy doesn't seem to work - public void emit_notified(uint id) { notified(id); } public void emit_resolved(uint id, ClosedReason reason) { resolved(id, reason); } public void emit_action_invoked(uint id, string action) { action_invoked(id, action); } @@ -110,7 +109,7 @@ internal class Daemon : Object { var id = replaces_id > 0 ? replaces_id : n_id++; - add_notification(new Notification( + var replaced = add_notification(new Notification( app_name, id, app_icon, summary, body, actions, hints, expire_timeout )); @@ -121,17 +120,18 @@ internal class Daemon : Object { }, Priority.DEFAULT); } - if (!dont_disturb) - notified(id); + notified(id, replaced); cache(); return id; } - private void add_notification(Notification n) { + private bool add_notification(Notification n) { n.dismissed.connect(() => resolved(n.id, ClosedReason.DISMISSED_BY_USER)); n.invoked.connect((action) => action_invoked(n.id, action)); + var replaced = notifs.contains(n.id); notifs.set(n.id, n); + return replaced; } private void cache() { diff --git a/src/notifd.vala b/src/notifd.vala index 55d910b..f967421 100644 --- a/src/notifd.vala +++ b/src/notifd.vala @@ -50,7 +50,7 @@ public class Notifd : Object { return get_notification(id).to_json_string(); } - public signal void notified(uint id); + public signal void notified(uint id, bool replaced); public signal void resolved(uint id, ClosedReason reason); construct { @@ -72,7 +72,7 @@ public class Notifd : Object { private void try_daemon(DBusConnection conn) { daemon = new Daemon().register(conn); - daemon.notified.connect((id) => notified(id)); + daemon.notified.connect((id, replaced) => notified(id, replaced)); daemon.resolved.connect((id, reason) => resolved(id, reason)); daemon.notify.connect((prop) => { if (get_class().find_property(prop.name) != null) { @@ -89,7 +89,7 @@ public class Notifd : Object { return; } - proxy.notified.connect((id) => notified(id)); + proxy.notified.connect((id, replaced) => notified(id, replaced)); proxy.resolved.connect((id, reason) => resolved(id, reason)); proxy.notify.connect((prop) => { if (get_class().find_property(prop.name) != null) { diff --git a/src/proxy.vala b/src/proxy.vala index b5686fe..f32abbd 100644 --- a/src/proxy.vala +++ b/src/proxy.vala @@ -7,10 +7,9 @@ internal interface IDaemon : Object { public abstract uint[] notification_ids() throws DBusError, IOError; public abstract string get_notification_json(uint id) throws DBusError, IOError; - public signal void notified(uint id); + public signal void notified(uint id, bool replaced); public signal void resolved(uint id, ClosedReason reason); - public abstract void emit_notified(uint id); public abstract void emit_resolved(uint id, ClosedReason reason); public abstract void emit_action_invoked(uint id, string action); } @@ -41,7 +40,7 @@ internal class DaemonProxy : Object { return notifs.get(id); } - public signal void notified(uint id); + public signal void notified(uint id, bool replaced); public signal void resolved(uint id, ClosedReason reason); IDaemon proxy; @@ -103,9 +102,9 @@ internal class DaemonProxy : Object { notify_property(pspec.name); })); - ids.append(proxy.notified.connect((id) => { + ids.append(proxy.notified.connect((id, replaced) => { add_notification(id); - notified(id); + notified(id, replaced); })); ids.append(proxy.resolved.connect((id, reason) => { diff --git a/src/signals.md b/src/signals.md index 0111596..cdc6688 100644 --- a/src/signals.md +++ b/src/signals.md @@ -11,17 +11,20 @@ ignore this, I'm just dumb and can't follow where signals go or get emitted from ## Deamon non-spec, used by user -* notified(id) - by outside through dbus with `.Notify()` + +* notified(id, replaced) - by outside through dbus with `.Notify()` * resolved(id, reason) - by `Notification.dismiss()` or outside with `.CloseNotification` spec, not used by user + * notification_closed(id, reason) - sideeffect of `resolved` * action_invoked(id, action) - by `Notification.invoke()` ## Proxy mirrors Daemon -* notified(id) + +* notified(id, replaced) * resolved(id, reason) creates `Notification` objects through daemon's json strings -- cgit v1.2.3 From 3500457e97821d50c067dea37d1a2d28d8db2111 Mon Sep 17 00:00:00 2001 From: Aylur Date: Thu, 20 Jun 2024 16:47:36 +0200 Subject: fix: cli hanging on empty args --- flake.nix | 17 ++++++++++++++--- src/cli.vala | 3 +++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 78a2ab1..b4e7a45 100644 --- a/flake.nix +++ b/flake.nix @@ -3,11 +3,13 @@ inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - outputs = { self, nixpkgs }: - let + outputs = { + self, + nixpkgs, + }: let version = builtins.replaceStrings ["\n"] [""] (builtins.readFile ./version); system = "x86_64-linux"; - pkgs = import nixpkgs { inherit system; }; + pkgs = import nixpkgs {inherit system;}; nativeBuildInputs = with pkgs; [ gobject-introspection @@ -38,6 +40,15 @@ default = pkgs.mkShell { inherit nativeBuildInputs buildInputs; }; + notifd = pkgs.mkShell { + inherit nativeBuildInputs; + buildInputs = + buildInputs + ++ [ + self.packages.${system}.default + pkgs.gjs + ]; + }; }; }; } diff --git a/src/cli.vala b/src/cli.vala index 1c051d3..980de9c 100644 --- a/src/cli.vala +++ b/src/cli.vala @@ -103,6 +103,9 @@ int main(string[] argv) { }); } + if (!daemonize && invoke == null && close_n == 0 && get_n == 0) + return 1; + loop.run(); return 0; } -- cgit v1.2.3 From bb059d38169483378ebc752bb69c383c61f1693d Mon Sep 17 00:00:00 2001 From: Aylur Date: Thu, 20 Jun 2024 16:50:08 +0200 Subject: fix: id counting restarting the daemon would restart the id counter --- src/daemon.vala | 1 + 1 file changed, 1 insertion(+) diff --git a/src/daemon.vala b/src/daemon.vala index 6b11204..fe38364 100644 --- a/src/daemon.vala +++ b/src/daemon.vala @@ -44,6 +44,7 @@ internal class Daemon : Object { for (var i = 0; i < list.get_length(); ++i) { add_notification(new Notification.from_json(list.get_object_element(i))); } + n_id = list.get_length() + 1; } catch (Error err) { warning("failed to load cache: %s", err.message); } -- cgit v1.2.3 From 1b726cfafa3c68e8fdf957f2279a88a1cabcaad9 Mon Sep 17 00:00:00 2001 From: Aylur Date: Thu, 20 Jun 2024 16:55:35 +0200 Subject: fix vapi names --- src/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/meson.build b/src/meson.build index 8001aa6..4c76a35 100644 --- a/src/meson.build +++ b/src/meson.build @@ -36,8 +36,8 @@ if get_option('lib') meson.project_name(), sources, dependencies: deps, - vala_header: meson.project_name() + api_version + '.h', - vala_vapi: meson.project_name() + api_version + '.vapi', + vala_header: meson.project_name() + '-' + api_version + '.h', + vala_vapi: meson.project_name() + '-' + api_version + '.vapi', vala_gir: gir, version: meson.project_version(), install: true, -- cgit v1.2.3 From b152dd61a77f2afe0094c4fc79b8fe5479990ad9 Mon Sep 17 00:00:00 2001 From: Aylur Date: Tue, 25 Jun 2024 22:36:23 +0200 Subject: add global default getter --- src/notifd.vala | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/notifd.vala b/src/notifd.vala index f967421..45e5eb0 100644 --- a/src/notifd.vala +++ b/src/notifd.vala @@ -1,10 +1,17 @@ namespace AstalNotifd { -public enum ActiveType { - DAEMON, - PROXY, +public Notifd get_default() { + return Notifd.get_default(); } public class Notifd : Object { + private static Notifd _instance; + public static Notifd get_default() { + if (_instance == null) + _instance = new Notifd(); + + return _instance; + } + private Daemon daemon; private DaemonProxy proxy; @@ -98,4 +105,9 @@ public class Notifd : Object { }); } } + +public enum ActiveType { + DAEMON, + PROXY, +} } -- cgit v1.2.3 From 1e0f338ebf189014c0515e46358acf520f03a7ea Mon Sep 17 00:00:00 2001 From: Aylur Date: Fri, 28 Jun 2024 14:21:10 +0200 Subject: move c header to includedir/astal --- meson-install.sh | 16 ---------------- src/meson.build | 9 ++++----- 2 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 meson-install.sh diff --git a/meson-install.sh b/meson-install.sh deleted file mode 100644 index 0e6b258..0000000 --- a/meson-install.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -meson setup \ - --prefix /usr \ - --libexecdir lib \ - --sbindir bin \ - --buildtype plain \ - --auto-features enabled \ - --wrap-mode nodownload \ - -D b_lto=false \ - -D b_pie=true \ - -D python.bytecompile=1 \ - --wipe \ - build - -meson install -C build diff --git a/src/meson.build b/src/meson.build index 4c76a35..03966e2 100644 --- a/src/meson.build +++ b/src/meson.build @@ -2,7 +2,7 @@ version_split = meson.project_version().split('.') api_version = version_split[0] + '.' + version_split[1] gir = 'AstalNotifd-' + api_version + '.gir' typelib = 'AstalNotifd-' + api_version + '.typelib' -so = 'libastal-notifd.so.' + meson.project_version() +so = 'lib' + meson.project_name() + '.so.' + meson.project_version() config = configure_file( input: 'config.vala.in', @@ -36,17 +36,16 @@ if get_option('lib') meson.project_name(), sources, dependencies: deps, - vala_header: meson.project_name() + '-' + api_version + '.h', + vala_header: meson.project_name().replace('astal-', '') + '.h', vala_vapi: meson.project_name() + '-' + api_version + '.vapi', vala_gir: gir, version: meson.project_version(), install: true, - install_dir: [true, true, true, true], + install_dir: [true, get_option('includedir') / 'astal', true, true], ) import('pkgconfig').generate( - description: 'libastal-notifd', - libraries: lib, + lib, name: meson.project_name(), filebase: meson.project_name() + '-' + api_version, version: meson.project_version(), -- cgit v1.2.3 From 0cace3140f59ad05362260f8265f598597c24413 Mon Sep 17 00:00:00 2001 From: Aylur Date: Sun, 14 Jul 2024 21:07:10 +0200 Subject: fix daemonize flag --- src/cli.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli.vala b/src/cli.vala index 980de9c..433ba43 100644 --- a/src/cli.vala +++ b/src/cli.vala @@ -9,7 +9,7 @@ static int get_n; const OptionEntry[] options = { { "version", 'v', OptionFlags.NONE, OptionArg.NONE, ref version, null, null }, { "help", 'h', OptionFlags.NONE, OptionArg.NONE, ref help, null, null }, - { "daemon", 'd', OptionFlags.NONE, OptionArg.NONE, ref daemonize, null, null }, + { "daemonize", 'd', OptionFlags.NONE, OptionArg.NONE, ref daemonize, null, null }, { "list", 'l', OptionFlags.NONE, OptionArg.NONE, ref list, null, null }, { "invoke", 'i', OptionFlags.NONE, OptionArg.STRING, ref invoke, null, null }, { "close", 'c', OptionFlags.NONE, OptionArg.INT, ref close_n, null, null }, -- cgit v1.2.3 From 6c7da25ece138063be98029d4e839b40ae8198a1 Mon Sep 17 00:00:00 2001 From: Aylur Date: Thu, 18 Jul 2024 12:18:43 +0200 Subject: move c header back to astal-notifd.h --- src/meson.build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/meson.build b/src/meson.build index 03966e2..d3efa36 100644 --- a/src/meson.build +++ b/src/meson.build @@ -2,7 +2,6 @@ version_split = meson.project_version().split('.') api_version = version_split[0] + '.' + version_split[1] gir = 'AstalNotifd-' + api_version + '.gir' typelib = 'AstalNotifd-' + api_version + '.typelib' -so = 'lib' + meson.project_name() + '.so.' + meson.project_version() config = configure_file( input: 'config.vala.in', @@ -36,12 +35,12 @@ if get_option('lib') meson.project_name(), sources, dependencies: deps, - vala_header: meson.project_name().replace('astal-', '') + '.h', + vala_header: meson.project_name() + '.h', vala_vapi: meson.project_name() + '-' + api_version + '.vapi', vala_gir: gir, version: meson.project_version(), install: true, - install_dir: [true, get_option('includedir') / 'astal', true, true], + install_dir: [true, true, true, true], ) import('pkgconfig').generate( -- cgit v1.2.3 From 48ff8400966bcaef858b33d70c3d46cb08bfb75e Mon Sep 17 00:00:00 2001 From: Aylur Date: Fri, 26 Jul 2024 15:03:41 +0200 Subject: switch to LGPLv2.1 --- LICENSE | 1131 +++++++++++++++++++++++++++------------------------------------ 1 file changed, 480 insertions(+), 651 deletions(-) diff --git a/LICENSE b/LICENSE index f288702..67cd97b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,503 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries - How to Apply These Terms to Your New Programs + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - + Copyright (C) - 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 3 of the License, or - (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + -- cgit v1.2.3 From 7757661ac79455f6765ddde7ea0239771bc9cfce Mon Sep 17 00:00:00 2001 From: Aylur Date: Fri, 26 Jul 2024 19:22:01 +0200 Subject: fix: synchronous constructor --- src/notifd.vala | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/src/notifd.vala b/src/notifd.vala index 45e5eb0..bb027f6 100644 --- a/src/notifd.vala +++ b/src/notifd.vala @@ -61,23 +61,27 @@ public class Notifd : Object { public signal void resolved(uint id, ClosedReason reason); construct { + // hack to make it synchronous + var loop = new MainLoop(); + Bus.own_name( BusType.SESSION, "org.freedesktop.Notifications", BusNameOwnerFlags.NONE, - try_daemon, - () => { - if (proxy != null) { - proxy.stop(); - proxy = null; - } - active(ActiveType.DAEMON); - }, - try_proxy + acquire_daemon, + on_daemon_acquired, + make_proxy ); + + active.connect(() => { + if (loop.is_running()) + loop.quit(); + }); + + loop.run(); } - private void try_daemon(DBusConnection conn) { + private void acquire_daemon(DBusConnection conn) { daemon = new Daemon().register(conn); daemon.notified.connect((id, replaced) => notified(id, replaced)); daemon.resolved.connect((id, reason) => resolved(id, reason)); @@ -88,8 +92,17 @@ public class Notifd : Object { }); } - private void try_proxy() { + private void on_daemon_acquired() { + if (proxy != null) { + proxy.stop(); + proxy = null; + } + active(ActiveType.DAEMON); + } + + private void make_proxy() { proxy = new DaemonProxy(); + if (proxy.start()) { active(ActiveType.PROXY); } else { -- cgit v1.2.3 From e0c70f09729dfe40c2328bd68257556ac411473e Mon Sep 17 00:00:00 2001 From: Aylur Date: Wed, 31 Jul 2024 14:01:04 +0200 Subject: fixes, features * cli dnd-toggle * save dnd and ignore_timeout state * block contstructor until dbus acqusition * fix proxy notify signals --- src/cli.vala | 54 +++++++++++++++++--------------- src/daemon.vala | 86 ++++++++++++++++++++++++++++++++++----------------- src/notifd.vala | 44 +++++++++++++++++--------- src/notification.vala | 33 +++++++++----------- src/proxy.vala | 23 +++++++------- 5 files changed, 142 insertions(+), 98 deletions(-) diff --git a/src/cli.vala b/src/cli.vala index 433ba43..afce774 100644 --- a/src/cli.vala +++ b/src/cli.vala @@ -5,6 +5,7 @@ static bool list; static string invoke; static int close_n; static int get_n; +static bool toggle_dnd; const OptionEntry[] options = { { "version", 'v', OptionFlags.NONE, OptionArg.NONE, ref version, null, null }, @@ -14,6 +15,7 @@ const OptionEntry[] options = { { "invoke", 'i', OptionFlags.NONE, OptionArg.STRING, ref invoke, null, null }, { "close", 'c', OptionFlags.NONE, OptionArg.INT, ref close_n, null, null }, { "get", 'g', OptionFlags.NONE, OptionArg.INT, ref get_n, null, null }, + { "toggle-dnd", 't', OptionFlags.NONE, OptionArg.NONE, ref toggle_dnd, null, null }, { null }, }; @@ -34,17 +36,17 @@ int main(string[] argv) { print("Usage:\n"); print(" %s [flags]\n\n", argv[0]); print("Flags:\n"); - print(" -h, --help Print this help and exit\n"); - print(" -v, --version Print version number and exit\n"); - print(" -l, --list Print every notification and exit\n"); - print(" -d, --daemonize Watch for new notifications\n"); - print(" -i, --invoke Invoke a notification action\n"); - print(" -c, --close Close a notification by its id\n"); - print(" -g, --get Print a notification by its id\n"); + print(" -h, --help Print this help and exit\n"); + print(" -v, --version Print version number and exit\n"); + print(" -l, --list Print every notification and exit\n"); + print(" -d, --daemonize Watch for new notifications\n"); + print(" -i, --invoke Invoke a notification action\n"); + print(" -c, --close Close a notification by its id\n"); + print(" -g, --get Print a notification by its id\n"); + print(" -t, --toggle-dnd Toggle do not disturb\n"); return 0; } - var loop = new MainLoop(); var notifd = new AstalNotifd.Notifd(); if (version) { @@ -53,16 +55,27 @@ int main(string[] argv) { } if (list) { - var cache = Environment.get_user_cache_dir() + "/astal/notifd/notifications.json"; - if (FileUtils.test(cache, FileTest.EXISTS)) { + var state = Environment.get_user_state_dir() + "/astal/notifd/notifications.json"; + if (FileUtils.test(state, FileTest.EXISTS)) { try { uint8[] json; - File.new_for_path(cache).load_contents(null, out json, null); - stdout.printf("%s", (string)json); + File.new_for_path(state).load_contents(null, out json, null); + + var obj = Json.from_string((string)json); + + var list = obj.get_object().get_member("notifications"); + stdout.printf("%s\n", Json.to_string(list, true)); + return 0; } catch (Error err) { stderr.printf("failed to load cache: %s", err.message); } } + stdout.printf("[]\n"); + return 0; + } + + if (toggle_dnd) { + notifd.dont_disturb = !notifd.dont_disturb; return 0; } @@ -71,6 +84,7 @@ int main(string[] argv) { stdout.printf("%s\n", notifd.get_notification_json(id)); stdout.flush(); }); + new MainLoop().run(); } if (invoke != null) { @@ -83,29 +97,19 @@ int main(string[] argv) { var n_id = int.parse(split[0]); var a_id = split[1]; - notifd.active.connect(() => { - notifd.get_notification(n_id).invoke(a_id); - loop.quit(); - }); + notifd.get_notification(n_id).invoke(a_id); } if (close_n > 0) { - notifd.active.connect(() => { - notifd.get_notification(close_n).dismiss(); - loop.quit(); - }); + notifd.get_notification(close_n).dismiss(); } if (get_n > 0) { - notifd.active.connect(() => { - stdout.printf("%s", notifd.get_notification(get_n).to_json_string()); - loop.quit(); - }); + stdout.printf("%s", notifd.get_notification(get_n).to_json_string()); } if (!daemonize && invoke == null && close_n == 0 && get_n == 0) return 1; - loop.run(); return 0; } diff --git a/src/daemon.vala b/src/daemon.vala index fe38364..b8fb598 100644 --- a/src/daemon.vala +++ b/src/daemon.vala @@ -1,30 +1,39 @@ -namespace AstalNotifd { -public enum ClosedReason { - EXPIRED = 1, - DISMISSED_BY_USER = 2, - CLOSED = 3, - UNDEFINED = 4, -} - [DBus (name = "org.freedesktop.Notifications")] -internal class Daemon : Object { +internal class AstalNotifd.Daemon : Object { public static string name = "notifd"; public static string vendor = "astal"; public static string version = "0.1"; - private string cache_file; + private string state_file; + private string state_directory; private string cache_directory; private uint n_id = 1; private HashTable notifs = new HashTable((i) => i, (a, b) => a == b); - public bool ignore_timeout { get; set; } - public bool dont_disturb { get; set; } + private bool _ignore_timeout; + public bool ignore_timeout { + get { return _ignore_timeout; } + set { + _ignore_timeout = value; + write_state(); + } + } + + private bool _dont_disturb; + public bool dont_disturb { + get { return _dont_disturb; } + set { + _dont_disturb = value; + write_state(); + } + } public signal void notified(uint id, bool replaced); public signal void resolved(uint id, ClosedReason reason); public signal void action_invoked(uint id, string action); + public signal void prop_changed(string prop); // emitting an event from proxy doesn't seem to work public void emit_resolved(uint id, ClosedReason reason) { resolved(id, reason); } @@ -32,24 +41,31 @@ internal class Daemon : Object { construct { cache_directory = Environment.get_user_cache_dir() + "/astal/notifd"; - cache_file = cache_directory + "/notifications.json"; + state_directory = Environment.get_user_state_dir() + "/astal/notifd"; + state_file = state_directory + "/notifications.json"; - if (FileUtils.test(cache_file, FileTest.EXISTS)) { + if (FileUtils.test(state_file, FileTest.EXISTS)) { try { uint8[] json; - File.new_for_path(cache_file).load_contents(null, out json, null); - var parser = new Json.Parser(); - parser.load_from_data((string)json); - var list = parser.get_root().get_array(); + File.new_for_path(state_file).load_contents(null, out json, null); + + var obj = Json.from_string((string)json); + + var list = obj.get_object().get_array_member("notifications"); for (var i = 0; i < list.get_length(); ++i) { add_notification(new Notification.from_json(list.get_object_element(i))); } n_id = list.get_length() + 1; + + _dont_disturb = obj.get_object().get_boolean_member("dont_disturb"); + _ignore_timeout = obj.get_object().get_boolean_member("ignore_timeout"); } catch (Error err) { warning("failed to load cache: %s", err.message); } } + notify.connect((prop) => prop_changed(prop.name)); + notified.connect(() => { notify_property("notifications"); }); @@ -57,7 +73,7 @@ internal class Daemon : Object { resolved.connect((id, reason) => { notifs.get(id).resolved(reason); notifs.remove(id); - cache(); + write_state(); notify_property("notifications"); notification_closed(id, reason); }); @@ -123,7 +139,7 @@ internal class Daemon : Object { notified(id, replaced); - cache(); + write_state(); return id; } @@ -135,21 +151,25 @@ internal class Daemon : Object { return replaced; } - private void cache() { + private void write_state() { var list = new Json.Builder().begin_array(); foreach (var n in notifications) { list.add_value(n.to_json()); } list.end_array(); - var generator = new Json.Generator(); - generator.set_root(list.get_root()); - var json = generator.to_data(null); + + var obj = new Json.Builder() + .begin_object() + .set_member_name("notifications").add_value(list.get_root()) + .set_member_name("ignore_timeout").add_boolean_value(ignore_timeout) + .set_member_name("dont_disturb").add_boolean_value(dont_disturb) + .end_object(); try { - if (!FileUtils.test(cache_directory, FileTest.EXISTS)) - File.new_for_path(cache_directory).make_directory_with_parents(null); + if (!FileUtils.test(state_directory, FileTest.EXISTS)) + File.new_for_path(state_directory).make_directory_with_parents(null); - FileUtils.set_contents_full(cache_file, json); + FileUtils.set_contents_full(state_file, Json.to_string(obj.get_root(), false)); } catch (Error err) { warning("failed to cache notifications: %s", err.message); } @@ -201,6 +221,9 @@ internal class Daemon : Object { var file_name = cache_directory + "/" + data.hash().to_string("%u.png"); try { + if (!FileUtils.test(cache_directory, FileTest.EXISTS)) + File.new_for_path(cache_directory).make_directory_with_parents(null); + var output_stream = File.new_for_path(file_name) .replace(null, false, FileCreateFlags.NONE, null); @@ -214,8 +237,7 @@ internal class Daemon : Object { return file_name; } - [DBus (visible = false)] - public Daemon register(DBusConnection conn) { + internal Daemon register(DBusConnection conn) { try { conn.register_object("/org/freedesktop/Notifications", this); } catch (Error err) { @@ -224,4 +246,10 @@ internal class Daemon : Object { return this; } } + +public enum AstalNotifd.ClosedReason { + EXPIRED = 1, + DISMISSED_BY_USER = 2, + CLOSED = 3, + UNDEFINED = 4, } diff --git a/src/notifd.vala b/src/notifd.vala index bb027f6..c962862 100644 --- a/src/notifd.vala +++ b/src/notifd.vala @@ -1,9 +1,10 @@ namespace AstalNotifd { -public Notifd get_default() { - return Notifd.get_default(); + public Notifd get_default() { + return Notifd.get_default(); + } } -public class Notifd : Object { +public class AstalNotifd.Notifd : Object { private static Notifd _instance; public static Notifd get_default() { if (_instance == null) @@ -62,7 +63,13 @@ public class Notifd : Object { construct { // hack to make it synchronous - var loop = new MainLoop(); + MainLoop? loop = null; + + if (!MainContext.default().is_owner()) { + loop = new MainLoop(); + } + + bool done = false; Bus.own_name( BusType.SESSION, @@ -74,22 +81,23 @@ public class Notifd : Object { ); active.connect(() => { - if (loop.is_running()) + done = true; + if (loop != null && loop.is_running()) { loop.quit(); + } }); - loop.run(); + if (loop != null) { + loop.run(); + } else { + while (!done) { + MainContext.default().iteration(false); + } + } } private void acquire_daemon(DBusConnection conn) { daemon = new Daemon().register(conn); - daemon.notified.connect((id, replaced) => notified(id, replaced)); - daemon.resolved.connect((id, reason) => resolved(id, reason)); - daemon.notify.connect((prop) => { - if (get_class().find_property(prop.name) != null) { - notify_property(prop.name); - } - }); } private void on_daemon_acquired() { @@ -97,6 +105,13 @@ public class Notifd : Object { proxy.stop(); proxy = null; } + daemon.notified.connect((id, replaced) => notified(id, replaced)); + daemon.resolved.connect((id, reason) => resolved(id, reason)); + daemon.notify.connect((prop) => { + if (get_class().find_property(prop.name) != null) { + notify_property(prop.name); + } + }); active(ActiveType.DAEMON); } @@ -119,8 +134,7 @@ public class Notifd : Object { } } -public enum ActiveType { +public enum AstalNotifd.ActiveType { DAEMON, PROXY, } -} diff --git a/src/notification.vala b/src/notification.vala index 55d62d1..0b4af06 100644 --- a/src/notification.vala +++ b/src/notification.vala @@ -1,21 +1,16 @@ -namespace AstalNotifd { -public enum Urgency { +public enum AstalNotifd.Urgency { LOW = 0, NORMAL = 1, CRITICAL = 2, } -public class Action { - public Action(string id, string label) { - this.id = id; - this.label = label; - } +public struct AstalNotifd.Action { public string id; public string label; } -public class Notification : Object { - private List _actions; +public class AstalNotifd.Notification : Object { + private List _actions; private HashTable hints; public int64 time { construct set; get; } @@ -25,7 +20,7 @@ public class Notification : Object { public string body { construct set; get; } public uint id { construct set; get; } public int expire_timeout { construct set; get; } - public List actions { get { return _actions; } } + public List actions { get { return _actions; } } public string image { get { return get_str_hint("image-path"); } } public bool action_icons { get { return get_bool_hint("action-icons"); } } @@ -61,9 +56,12 @@ public class Notification : Object { ); this.hints = hints; - _actions = new List(); + _actions = new List(); for (var i = 0; i < actions.length; i += 2) { - _actions.append(new Action(actions[i], actions[i + 1])); + _actions.append(Action() { + id = actions[i], + label = actions[i + 1] + }); } } @@ -109,13 +107,13 @@ public class Notification : Object { } break; case "actions": - _actions = new List(); + _actions = new List(); for (var i = 0; i < node.get_array().get_length(); ++i) { var o = node.get_array().get_object_element(i); - _actions.append(new Action( - o.get_member("id").get_string(), - o.get_member("label").get_string() - )); + _actions.append(Action() { + id = o.get_member("id").get_string(), + label = o.get_member("label").get_string() + }); } break; default: break; @@ -160,4 +158,3 @@ public class Notification : Object { .get_root(); } } -} diff --git a/src/proxy.vala b/src/proxy.vala index f32abbd..bedb8b9 100644 --- a/src/proxy.vala +++ b/src/proxy.vala @@ -1,6 +1,5 @@ -namespace AstalNotifd { [DBus (name = "org.freedesktop.Notifications")] -internal interface IDaemon : Object { +internal interface AstalNotifd.IDaemon : DBusProxy { public abstract bool ignore_timeout { get; set; } public abstract bool dont_disturb { get; set; } @@ -9,12 +8,13 @@ internal interface IDaemon : Object { public signal void notified(uint id, bool replaced); public signal void resolved(uint id, ClosedReason reason); + public signal void prop_changed(string prop); public abstract void emit_resolved(uint id, ClosedReason reason); public abstract void emit_action_invoked(uint id, string action); } -internal class DaemonProxy : Object { +internal class AstalNotifd.DaemonProxy : Object { private HashTable notifs = new HashTable((i) => i, (a, b) => a == b); @@ -43,8 +43,8 @@ internal class DaemonProxy : Object { public signal void notified(uint id, bool replaced); public signal void resolved(uint id, ClosedReason reason); - IDaemon proxy; - List ids = new List(); + private IDaemon proxy; + private List ids = new List(); public void stop() { if (ids.length() > 0) { @@ -72,8 +72,8 @@ internal class DaemonProxy : Object { var version = variant.get_child_value(2).get_string(); var running = name == Daemon.name - && vendor == Daemon.vendor - && version == Daemon.version; + && vendor == Daemon.vendor + && version == Daemon.version; if (running) { setup_proxy(); @@ -97,19 +97,21 @@ internal class DaemonProxy : Object { foreach (var id in proxy.notification_ids()) add_notification(id); - ids.append(proxy.notify.connect((pspec) => { - if (get_class().find_property(pspec.name) != null) - notify_property(pspec.name); + ids.append(proxy.prop_changed.connect((prop) => { + if (prop == "ignore-timeout" || prop == "dont-disturb") + notify_property(prop); })); ids.append(proxy.notified.connect((id, replaced) => { add_notification(id); notified(id, replaced); + notify_property("notifications"); })); ids.append(proxy.resolved.connect((id, reason) => { notifs.remove(id); resolved(id, reason); + notify_property("notifications"); })); } @@ -125,4 +127,3 @@ internal class DaemonProxy : Object { } } } -} -- cgit v1.2.3 From d08cc85fc1f7beba59ec74bd1f2d8a804183ce2d Mon Sep 17 00:00:00 2001 From: Aylur Date: Sun, 1 Sep 2024 02:48:34 +0200 Subject: move to monorepo --- LICENSE | 503 ------------------------------------------- README.md | 7 - flake.lock | 27 --- flake.nix | 54 ----- meson.build | 19 -- meson_options.txt | 11 - notifd/LICENSE | 503 +++++++++++++++++++++++++++++++++++++++++++ notifd/README.md | 7 + notifd/flake.lock | 27 +++ notifd/flake.nix | 54 +++++ notifd/meson.build | 19 ++ notifd/meson_options.txt | 11 + notifd/src/cli.vala | 115 ++++++++++ notifd/src/config.vala.in | 6 + notifd/src/daemon.vala | 255 ++++++++++++++++++++++ notifd/src/meson.build | 79 +++++++ notifd/src/notifd.vala | 140 ++++++++++++ notifd/src/notification.vala | 160 ++++++++++++++ notifd/src/proxy.vala | 129 +++++++++++ notifd/src/signals.md | 35 +++ notifd/version | 1 + src/cli.vala | 115 ---------- src/config.vala.in | 6 - src/daemon.vala | 255 ---------------------- src/meson.build | 79 ------- src/notifd.vala | 140 ------------ src/notification.vala | 160 -------------- src/proxy.vala | 129 ----------- src/signals.md | 35 --- version | 1 - 30 files changed, 1541 insertions(+), 1541 deletions(-) delete mode 100644 LICENSE delete mode 100644 README.md delete mode 100644 flake.lock delete mode 100644 flake.nix delete mode 100644 meson.build delete mode 100644 meson_options.txt create mode 100644 notifd/LICENSE create mode 100644 notifd/README.md create mode 100644 notifd/flake.lock create mode 100644 notifd/flake.nix create mode 100644 notifd/meson.build create mode 100644 notifd/meson_options.txt create mode 100644 notifd/src/cli.vala create mode 100644 notifd/src/config.vala.in create mode 100644 notifd/src/daemon.vala create mode 100644 notifd/src/meson.build create mode 100644 notifd/src/notifd.vala create mode 100644 notifd/src/notification.vala create mode 100644 notifd/src/proxy.vala create mode 100644 notifd/src/signals.md create mode 100644 notifd/version delete mode 100644 src/cli.vala delete mode 100644 src/config.vala.in delete mode 100644 src/daemon.vala delete mode 100644 src/meson.build delete mode 100644 src/notifd.vala delete mode 100644 src/notification.vala delete mode 100644 src/proxy.vala delete mode 100644 src/signals.md delete mode 100644 version diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 67cd97b..0000000 --- a/LICENSE +++ /dev/null @@ -1,503 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - diff --git a/README.md b/README.md deleted file mode 100644 index da93a6a..0000000 --- a/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# notifd - -A notification daemon library and cli tool - -## TODO - -- docs diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 13f566b..0000000 --- a/flake.lock +++ /dev/null @@ -1,27 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1716137900, - "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index b4e7a45..0000000 --- a/flake.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - description = "Notification daemon library and cli tool"; - - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - - outputs = { - self, - nixpkgs, - }: let - version = builtins.replaceStrings ["\n"] [""] (builtins.readFile ./version); - system = "x86_64-linux"; - pkgs = import nixpkgs {inherit system;}; - - nativeBuildInputs = with pkgs; [ - gobject-introspection - meson - pkg-config - ninja - vala - ]; - - buildInputs = with pkgs; [ - glib - gdk-pixbuf - json-glib - ]; - in { - packages.${system} = rec { - default = notifd; - notifd = pkgs.stdenv.mkDerivation { - inherit nativeBuildInputs buildInputs; - pname = "astal-notifd"; - version = version; - src = ./.; - outputs = ["out" "dev"]; - }; - }; - - devShells.${system} = { - default = pkgs.mkShell { - inherit nativeBuildInputs buildInputs; - }; - notifd = pkgs.mkShell { - inherit nativeBuildInputs; - buildInputs = - buildInputs - ++ [ - self.packages.${system}.default - pkgs.gjs - ]; - }; - }; - }; -} diff --git a/meson.build b/meson.build deleted file mode 100644 index 8fabdb4..0000000 --- a/meson.build +++ /dev/null @@ -1,19 +0,0 @@ -project( - 'astal-notifd', - 'vala', - 'c', - version: run_command('cat', join_paths(meson.project_source_root(), 'version')).stdout().strip(), - meson_version: '>= 0.62.0', - default_options: [ - 'warning_level=2', - 'werror=false', - 'c_std=gnu11', - ], -) - -assert( - get_option('lib') or get_option('cli'), - 'Either lib or cli option must be set to true.', -) - -subdir('src') diff --git a/meson_options.txt b/meson_options.txt deleted file mode 100644 index f110242..0000000 --- a/meson_options.txt +++ /dev/null @@ -1,11 +0,0 @@ -option( - 'lib', - type: 'boolean', - value: true, -) - -option( - 'cli', - type: 'boolean', - value: true, -) diff --git a/notifd/LICENSE b/notifd/LICENSE new file mode 100644 index 0000000..67cd97b --- /dev/null +++ b/notifd/LICENSE @@ -0,0 +1,503 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + diff --git a/notifd/README.md b/notifd/README.md new file mode 100644 index 0000000..da93a6a --- /dev/null +++ b/notifd/README.md @@ -0,0 +1,7 @@ +# notifd + +A notification daemon library and cli tool + +## TODO + +- docs diff --git a/notifd/flake.lock b/notifd/flake.lock new file mode 100644 index 0000000..13f566b --- /dev/null +++ b/notifd/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1716137900, + "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/notifd/flake.nix b/notifd/flake.nix new file mode 100644 index 0000000..b4e7a45 --- /dev/null +++ b/notifd/flake.nix @@ -0,0 +1,54 @@ +{ + description = "Notification daemon library and cli tool"; + + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + + outputs = { + self, + nixpkgs, + }: let + version = builtins.replaceStrings ["\n"] [""] (builtins.readFile ./version); + system = "x86_64-linux"; + pkgs = import nixpkgs {inherit system;}; + + nativeBuildInputs = with pkgs; [ + gobject-introspection + meson + pkg-config + ninja + vala + ]; + + buildInputs = with pkgs; [ + glib + gdk-pixbuf + json-glib + ]; + in { + packages.${system} = rec { + default = notifd; + notifd = pkgs.stdenv.mkDerivation { + inherit nativeBuildInputs buildInputs; + pname = "astal-notifd"; + version = version; + src = ./.; + outputs = ["out" "dev"]; + }; + }; + + devShells.${system} = { + default = pkgs.mkShell { + inherit nativeBuildInputs buildInputs; + }; + notifd = pkgs.mkShell { + inherit nativeBuildInputs; + buildInputs = + buildInputs + ++ [ + self.packages.${system}.default + pkgs.gjs + ]; + }; + }; + }; +} diff --git a/notifd/meson.build b/notifd/meson.build new file mode 100644 index 0000000..8fabdb4 --- /dev/null +++ b/notifd/meson.build @@ -0,0 +1,19 @@ +project( + 'astal-notifd', + 'vala', + 'c', + version: run_command('cat', join_paths(meson.project_source_root(), 'version')).stdout().strip(), + meson_version: '>= 0.62.0', + default_options: [ + 'warning_level=2', + 'werror=false', + 'c_std=gnu11', + ], +) + +assert( + get_option('lib') or get_option('cli'), + 'Either lib or cli option must be set to true.', +) + +subdir('src') diff --git a/notifd/meson_options.txt b/notifd/meson_options.txt new file mode 100644 index 0000000..f110242 --- /dev/null +++ b/notifd/meson_options.txt @@ -0,0 +1,11 @@ +option( + 'lib', + type: 'boolean', + value: true, +) + +option( + 'cli', + type: 'boolean', + value: true, +) diff --git a/notifd/src/cli.vala b/notifd/src/cli.vala new file mode 100644 index 0000000..afce774 --- /dev/null +++ b/notifd/src/cli.vala @@ -0,0 +1,115 @@ +static bool help; +static bool version; +static bool daemonize; +static bool list; +static string invoke; +static int close_n; +static int get_n; +static bool toggle_dnd; + +const OptionEntry[] options = { + { "version", 'v', OptionFlags.NONE, OptionArg.NONE, ref version, null, null }, + { "help", 'h', OptionFlags.NONE, OptionArg.NONE, ref help, null, null }, + { "daemonize", 'd', OptionFlags.NONE, OptionArg.NONE, ref daemonize, null, null }, + { "list", 'l', OptionFlags.NONE, OptionArg.NONE, ref list, null, null }, + { "invoke", 'i', OptionFlags.NONE, OptionArg.STRING, ref invoke, null, null }, + { "close", 'c', OptionFlags.NONE, OptionArg.INT, ref close_n, null, null }, + { "get", 'g', OptionFlags.NONE, OptionArg.INT, ref get_n, null, null }, + { "toggle-dnd", 't', OptionFlags.NONE, OptionArg.NONE, ref toggle_dnd, null, null }, + { null }, +}; + +int main(string[] argv) { + try { + var opts = new OptionContext(); + opts.add_main_entries(options, null); + opts.set_help_enabled(false); + opts.set_ignore_unknown_options(false); + opts.parse(ref argv); + } catch (OptionError err) { + printerr (err.message); + return 1; + } + + if (help) { + print("Cli client for astal-notifd\n\n"); + print("Usage:\n"); + print(" %s [flags]\n\n", argv[0]); + print("Flags:\n"); + print(" -h, --help Print this help and exit\n"); + print(" -v, --version Print version number and exit\n"); + print(" -l, --list Print every notification and exit\n"); + print(" -d, --daemonize Watch for new notifications\n"); + print(" -i, --invoke Invoke a notification action\n"); + print(" -c, --close Close a notification by its id\n"); + print(" -g, --get Print a notification by its id\n"); + print(" -t, --toggle-dnd Toggle do not disturb\n"); + return 0; + } + + var notifd = new AstalNotifd.Notifd(); + + if (version) { + print(AstalNotifd.VERSION); + return 0; + } + + if (list) { + var state = Environment.get_user_state_dir() + "/astal/notifd/notifications.json"; + if (FileUtils.test(state, FileTest.EXISTS)) { + try { + uint8[] json; + File.new_for_path(state).load_contents(null, out json, null); + + var obj = Json.from_string((string)json); + + var list = obj.get_object().get_member("notifications"); + stdout.printf("%s\n", Json.to_string(list, true)); + return 0; + } catch (Error err) { + stderr.printf("failed to load cache: %s", err.message); + } + } + stdout.printf("[]\n"); + return 0; + } + + if (toggle_dnd) { + notifd.dont_disturb = !notifd.dont_disturb; + return 0; + } + + if (daemonize) { + notifd.notified.connect((id) => { + stdout.printf("%s\n", notifd.get_notification_json(id)); + stdout.flush(); + }); + new MainLoop().run(); + } + + if (invoke != null) { + if (!invoke.contains(":")) { + stderr.printf("invoke format needs to be :"); + return 1; + } + + var split = invoke.split(":"); + var n_id = int.parse(split[0]); + var a_id = split[1]; + + notifd.get_notification(n_id).invoke(a_id); + } + + if (close_n > 0) { + notifd.get_notification(close_n).dismiss(); + } + + if (get_n > 0) { + stdout.printf("%s", notifd.get_notification(get_n).to_json_string()); + } + + if (!daemonize && invoke == null && close_n == 0 && get_n == 0) + return 1; + + return 0; +} diff --git a/notifd/src/config.vala.in b/notifd/src/config.vala.in new file mode 100644 index 0000000..752c754 --- /dev/null +++ b/notifd/src/config.vala.in @@ -0,0 +1,6 @@ +namespace AstalNotifd { + public const int MAJOR_VERSION = @MAJOR_VERSION@; + public const int MINOR_VERSION = @MINOR_VERSION@; + public const int MICRO_VERSION = @MICRO_VERSION@; + public const string VERSION = "@VERSION@"; +} diff --git a/notifd/src/daemon.vala b/notifd/src/daemon.vala new file mode 100644 index 0000000..b8fb598 --- /dev/null +++ b/notifd/src/daemon.vala @@ -0,0 +1,255 @@ +[DBus (name = "org.freedesktop.Notifications")] +internal class AstalNotifd.Daemon : Object { + public static string name = "notifd"; + public static string vendor = "astal"; + public static string version = "0.1"; + + private string state_file; + private string state_directory; + private string cache_directory; + + private uint n_id = 1; + private HashTable notifs = + new HashTable((i) => i, (a, b) => a == b); + + private bool _ignore_timeout; + public bool ignore_timeout { + get { return _ignore_timeout; } + set { + _ignore_timeout = value; + write_state(); + } + } + + private bool _dont_disturb; + public bool dont_disturb { + get { return _dont_disturb; } + set { + _dont_disturb = value; + write_state(); + } + } + + public signal void notified(uint id, bool replaced); + public signal void resolved(uint id, ClosedReason reason); + public signal void action_invoked(uint id, string action); + public signal void prop_changed(string prop); + + // emitting an event from proxy doesn't seem to work + public void emit_resolved(uint id, ClosedReason reason) { resolved(id, reason); } + public void emit_action_invoked(uint id, string action) { action_invoked(id, action); } + + construct { + cache_directory = Environment.get_user_cache_dir() + "/astal/notifd"; + state_directory = Environment.get_user_state_dir() + "/astal/notifd"; + state_file = state_directory + "/notifications.json"; + + if (FileUtils.test(state_file, FileTest.EXISTS)) { + try { + uint8[] json; + File.new_for_path(state_file).load_contents(null, out json, null); + + var obj = Json.from_string((string)json); + + var list = obj.get_object().get_array_member("notifications"); + for (var i = 0; i < list.get_length(); ++i) { + add_notification(new Notification.from_json(list.get_object_element(i))); + } + n_id = list.get_length() + 1; + + _dont_disturb = obj.get_object().get_boolean_member("dont_disturb"); + _ignore_timeout = obj.get_object().get_boolean_member("ignore_timeout"); + } catch (Error err) { + warning("failed to load cache: %s", err.message); + } + } + + notify.connect((prop) => prop_changed(prop.name)); + + notified.connect(() => { + notify_property("notifications"); + }); + + resolved.connect((id, reason) => { + notifs.get(id).resolved(reason); + notifs.remove(id); + write_state(); + notify_property("notifications"); + notification_closed(id, reason); + }); + } + + public uint[] notification_ids() throws DBusError, IOError { + var keys = notifs.get_keys(); + uint[] id = new uint[keys.length()]; + for (var i = 0; i < keys.length(); ++i) + id[i] = keys.nth_data(i); + return id; + } + + [DBus (visible = false)] + public List notifications { + owned get { return notifs.get_values(); } + } + + [DBus (visible = false)] + public Notification get_notification(uint id) { + return notifs.get(id); + } + + public string get_notification_json(uint id) throws DBusError, IOError { + return notifs.get(id).to_json_string(); + } + + [DBus (name = "Notify")] + public uint Notify( + string app_name, + uint replaces_id, + string app_icon, + string summary, + string body, + string[] actions, + HashTable hints, + int expire_timeout + ) throws DBusError, IOError { + if (hints.get("image-data") != null) { + var file = cache_image(hints.get("image-data"), app_name); + if (file != null) { + hints.set("image-path", new Variant.string(file)); + hints.remove("image-data"); + } + } + + // deprecated hints + hints.remove("image_data"); + hints.remove("icon_data"); + + var id = replaces_id > 0 ? replaces_id : n_id++; + + var replaced = add_notification(new Notification( + app_name, id, app_icon, summary, body, actions, hints, expire_timeout + )); + + if (!ignore_timeout && expire_timeout > 0) { + Timeout.add(expire_timeout, () => { + resolved(id, ClosedReason.EXPIRED); + return Source.REMOVE; + }, Priority.DEFAULT); + } + + notified(id, replaced); + + write_state(); + return id; + } + + private bool add_notification(Notification n) { + n.dismissed.connect(() => resolved(n.id, ClosedReason.DISMISSED_BY_USER)); + n.invoked.connect((action) => action_invoked(n.id, action)); + var replaced = notifs.contains(n.id); + notifs.set(n.id, n); + return replaced; + } + + private void write_state() { + var list = new Json.Builder().begin_array(); + foreach (var n in notifications) { + list.add_value(n.to_json()); + } + list.end_array(); + + var obj = new Json.Builder() + .begin_object() + .set_member_name("notifications").add_value(list.get_root()) + .set_member_name("ignore_timeout").add_boolean_value(ignore_timeout) + .set_member_name("dont_disturb").add_boolean_value(dont_disturb) + .end_object(); + + try { + if (!FileUtils.test(state_directory, FileTest.EXISTS)) + File.new_for_path(state_directory).make_directory_with_parents(null); + + FileUtils.set_contents_full(state_file, Json.to_string(obj.get_root(), false)); + } catch (Error err) { + warning("failed to cache notifications: %s", err.message); + } + } + + public signal void notification_closed(uint id, uint reason); + public signal void activation_token(uint id, string token); + + public void close_notification(uint id) throws DBusError, IOError { + resolved(id, ClosedReason.CLOSED); + } + + public void get_server_information( + out string name, + out string vendor, + out string version, + out string spec_version + ) throws DBusError, IOError { + name = Daemon.name; + vendor = Daemon.vendor; + version = Daemon.version; + spec_version = "1.2"; + } + + public string[] get_capabilities() throws DBusError, IOError { + return {"action-icons", "actions", "body", "icon-static", "persistence", "sound"}; + } + + private string? cache_image(Variant image, string app_name) { + int w = image.get_child_value(0).get_int32(); + int h = image.get_child_value(1).get_int32(); + int rs = image.get_child_value(2).get_int32(); + bool alpha = image.get_child_value(3).get_boolean(); + int bps = image.get_child_value(4).get_int32(); + Bytes data = image.get_child_value(6).get_data_as_bytes(); + + if (bps != 8) { + warning("Can not cache image from %s. %s", app_name, + "Currently only RGB images with 8 bits per sample are supported."); + return null; + } + + var pixbuf = new Gdk.Pixbuf.from_bytes( + data, Gdk.Colorspace.RGB, alpha, bps, w, h, rs); + + if (pixbuf == null) + return null; + + var file_name = cache_directory + "/" + data.hash().to_string("%u.png"); + + try { + if (!FileUtils.test(cache_directory, FileTest.EXISTS)) + File.new_for_path(cache_directory).make_directory_with_parents(null); + + var output_stream = File.new_for_path(file_name) + .replace(null, false, FileCreateFlags.NONE, null); + + pixbuf.save_to_streamv(output_stream, "png", null, null, null); + output_stream.close(null); + } catch (Error err) { + warning("could not cache image %s", err.message); + return null; + } + + return file_name; + } + + internal Daemon register(DBusConnection conn) { + try { + conn.register_object("/org/freedesktop/Notifications", this); + } catch (Error err) { + critical(err.message); + } + return this; + } +} + +public enum AstalNotifd.ClosedReason { + EXPIRED = 1, + DISMISSED_BY_USER = 2, + CLOSED = 3, + UNDEFINED = 4, +} diff --git a/notifd/src/meson.build b/notifd/src/meson.build new file mode 100644 index 0000000..d3efa36 --- /dev/null +++ b/notifd/src/meson.build @@ -0,0 +1,79 @@ +version_split = meson.project_version().split('.') +api_version = version_split[0] + '.' + version_split[1] +gir = 'AstalNotifd-' + api_version + '.gir' +typelib = 'AstalNotifd-' + api_version + '.typelib' + +config = configure_file( + input: 'config.vala.in', + output: 'config.vala', + configuration: { + 'VERSION': meson.project_version(), + 'MAJOR_VERSION': version_split[0], + 'MINOR_VERSION': version_split[1], + 'MICRO_VERSION': version_split[2], + }, +) + +deps = [ + dependency('glib-2.0'), + dependency('gobject-2.0'), + dependency('gio-2.0'), + dependency('json-glib-1.0'), + dependency('gdk-pixbuf-2.0'), +] + +sources = [ + config, + 'daemon.vala', + 'notifd.vala', + 'notification.vala', + 'proxy.vala', +] + +if get_option('lib') + lib = library( + meson.project_name(), + sources, + dependencies: deps, + vala_header: meson.project_name() + '.h', + vala_vapi: meson.project_name() + '-' + api_version + '.vapi', + vala_gir: gir, + version: meson.project_version(), + install: true, + install_dir: [true, true, true, true], + ) + + import('pkgconfig').generate( + lib, + name: meson.project_name(), + filebase: meson.project_name() + '-' + api_version, + version: meson.project_version(), + subdirs: meson.project_name(), + requires: deps, + install_dir: get_option('libdir') / 'pkgconfig', + ) + + custom_target( + typelib, + command: [ + find_program('g-ir-compiler'), + '--output', '@OUTPUT@', + '--shared-library', get_option('prefix') / get_option('libdir') / '@PLAINNAME@', + meson.current_build_dir() / gir, + ], + input: lib, + output: typelib, + depends: lib, + install: true, + install_dir: get_option('libdir') / 'girepository-1.0', + ) +endif + +if get_option('cli') + executable( + meson.project_name(), + ['cli.vala', sources], + dependencies: deps, + install: true, + ) +endif diff --git a/notifd/src/notifd.vala b/notifd/src/notifd.vala new file mode 100644 index 0000000..c962862 --- /dev/null +++ b/notifd/src/notifd.vala @@ -0,0 +1,140 @@ +namespace AstalNotifd { + public Notifd get_default() { + return Notifd.get_default(); + } +} + +public class AstalNotifd.Notifd : Object { + private static Notifd _instance; + public static Notifd get_default() { + if (_instance == null) + _instance = new Notifd(); + + return _instance; + } + + private Daemon daemon; + private DaemonProxy proxy; + + public signal void active(ActiveType type); + + public bool ignore_timeout { + get { + return proxy != null ? proxy.ignore_timeout : daemon.ignore_timeout; + } + set { + if (proxy != null) + proxy.ignore_timeout = value; + else + daemon.ignore_timeout = value; + } + } + + public bool dont_disturb { + get { + return proxy != null ? proxy.dont_disturb : daemon.dont_disturb; + } + set { + if (proxy != null) + proxy.dont_disturb = value; + else + daemon.dont_disturb = value; + } + } + + public List notifications { + owned get { return proxy != null ? proxy.notifications : daemon.notifications; } + } + + public uint[] notification_ids() throws Error { + return proxy != null ? proxy.notification_ids() : daemon.notification_ids(); + } + + public Notification get_notification(uint id) { + return proxy != null ? proxy.get_notification(id) : daemon.get_notification(id); + } + + public string get_notification_json(uint id) { + return get_notification(id).to_json_string(); + } + + public signal void notified(uint id, bool replaced); + public signal void resolved(uint id, ClosedReason reason); + + construct { + // hack to make it synchronous + MainLoop? loop = null; + + if (!MainContext.default().is_owner()) { + loop = new MainLoop(); + } + + bool done = false; + + Bus.own_name( + BusType.SESSION, + "org.freedesktop.Notifications", + BusNameOwnerFlags.NONE, + acquire_daemon, + on_daemon_acquired, + make_proxy + ); + + active.connect(() => { + done = true; + if (loop != null && loop.is_running()) { + loop.quit(); + } + }); + + if (loop != null) { + loop.run(); + } else { + while (!done) { + MainContext.default().iteration(false); + } + } + } + + private void acquire_daemon(DBusConnection conn) { + daemon = new Daemon().register(conn); + } + + private void on_daemon_acquired() { + if (proxy != null) { + proxy.stop(); + proxy = null; + } + daemon.notified.connect((id, replaced) => notified(id, replaced)); + daemon.resolved.connect((id, reason) => resolved(id, reason)); + daemon.notify.connect((prop) => { + if (get_class().find_property(prop.name) != null) { + notify_property(prop.name); + } + }); + active(ActiveType.DAEMON); + } + + private void make_proxy() { + proxy = new DaemonProxy(); + + if (proxy.start()) { + active(ActiveType.PROXY); + } else { + return; + } + + proxy.notified.connect((id, replaced) => notified(id, replaced)); + proxy.resolved.connect((id, reason) => resolved(id, reason)); + proxy.notify.connect((prop) => { + if (get_class().find_property(prop.name) != null) { + notify_property(prop.name); + } + }); + } +} + +public enum AstalNotifd.ActiveType { + DAEMON, + PROXY, +} diff --git a/notifd/src/notification.vala b/notifd/src/notification.vala new file mode 100644 index 0000000..0b4af06 --- /dev/null +++ b/notifd/src/notification.vala @@ -0,0 +1,160 @@ +public enum AstalNotifd.Urgency { + LOW = 0, + NORMAL = 1, + CRITICAL = 2, +} + +public struct AstalNotifd.Action { + public string id; + public string label; +} + +public class AstalNotifd.Notification : Object { + private List _actions; + private HashTable hints; + + public int64 time { construct set; get; } + public string app_name { construct set; get; } + public string app_icon { construct set; get; } + public string summary { construct set; get; } + public string body { construct set; get; } + public uint id { construct set; get; } + public int expire_timeout { construct set; get; } + public List actions { get { return _actions; } } + + public string image { get { return get_str_hint("image-path"); } } + public bool action_icons { get { return get_bool_hint("action-icons"); } } + public string category { get { return get_str_hint("category"); } } + public string desktop_entry { get { return get_str_hint("desktop-entry"); } } + public bool resident { get { return get_bool_hint("resident"); } } + public string sound_file { get { return get_str_hint("sound-file"); } } + public string sound_name { get { return get_str_hint("sound-name"); } } + public bool suppress_sound { get { return get_bool_hint("suppress-sound"); } } + public bool transient { get { return get_bool_hint("transient"); } } + public int x { get { return get_int_hint("x"); } } + public int y { get { return get_int_hint("y"); } } + public Urgency urgency { get { return get_int_hint("urgency"); } } + + internal Notification( + string app_name, + uint id, + string app_icon, + string summary, + string body, + string[] actions, + HashTable hints, + int expire_timeout + ) { + Object( + app_name: app_name, + id: id, + app_icon: app_icon, + summary: summary, + body: body, + expire_timeout: expire_timeout, + time: new DateTime.now_local().to_unix() + ); + + this.hints = hints; + _actions = new List(); + for (var i = 0; i < actions.length; i += 2) { + _actions.append(Action() { + id = actions[i], + label = actions[i + 1] + }); + } + } + + public Variant? get_hint(string hint) { + return hints.contains(hint) ? hints.get(hint) : null; + } + + public unowned string get_str_hint(string hint) { + return hints.contains(hint) ? hints.get(hint).get_string() : null; + } + + public bool get_bool_hint(string hint) { + return hints.contains(hint) ? hints.get(hint).get_boolean() : false; + } + + public int get_int_hint(string hint) { + return hints.contains(hint) ? hints.get(hint).get_int32() : 0; + } + + public signal void resolved(ClosedReason reason); + public signal void dismissed(); + public signal void invoked(string action); + + public void dismiss() { dismissed(); } + public void invoke(string action) { invoked(action); } + + internal Notification.from_json(Json.Object root) throws GLib.Error { + foreach (var key in root.get_members()) { + var node = root.get_member(key); + switch (key) { + case "id": id = (uint)node.get_int(); break; + case "time": time = node.get_int(); break; + case "expire_timeout": expire_timeout = (int)node.get_int(); break; + case "app_name": app_name = node.get_string(); break; + case "app_icon": app_icon = node.get_string(); break; + case "summary": summary = node.get_string(); break; + case "body": body = node.get_string(); break; + case "hints": + hints = new HashTable(str_hash, str_equal); + var obj = node.get_object(); + foreach (var hint in obj.get_members()) { + hints.set(hint, Json.gvariant_deserialize(obj.get_member(hint), null)); + } + break; + case "actions": + _actions = new List(); + for (var i = 0; i < node.get_array().get_length(); ++i) { + var o = node.get_array().get_object_element(i); + _actions.append(Action() { + id = o.get_member("id").get_string(), + label = o.get_member("label").get_string() + }); + } + break; + default: break; + } + } + } + + internal static Notification from_json_string(string json) throws GLib.Error { + var parser = new Json.Parser(); + parser.load_from_data(json); + return new Notification.from_json(parser.get_root().get_object()); + } + + public string to_json_string() { + var generator = new Json.Generator(); + generator.set_root(to_json()); + return generator.to_data(null); + } + + internal Json.Node to_json() { + var acts = new Json.Builder().begin_array(); + foreach (var action in actions) { + acts.begin_object() + .set_member_name("id").add_string_value(action.id) + .set_member_name("label").add_string_value(action.label) + .end_object(); + } + acts.end_array(); + + return new Json.Builder() + .begin_object() + .set_member_name("id").add_int_value(id) + .set_member_name("time").add_int_value(time) + .set_member_name("expire_timeout").add_int_value(expire_timeout) + .set_member_name("app_name").add_string_value(app_name) + .set_member_name("app_icon").add_string_value(app_icon) + .set_member_name("summary").add_string_value(summary) + .set_member_name("body").add_string_value(body) + .set_member_name("actions").add_value(acts.get_root()) + .set_member_name("hints").add_value(Json.gvariant_serialize(hints)) + .end_object() + .get_root(); + } +} diff --git a/notifd/src/proxy.vala b/notifd/src/proxy.vala new file mode 100644 index 0000000..bedb8b9 --- /dev/null +++ b/notifd/src/proxy.vala @@ -0,0 +1,129 @@ +[DBus (name = "org.freedesktop.Notifications")] +internal interface AstalNotifd.IDaemon : DBusProxy { + public abstract bool ignore_timeout { get; set; } + public abstract bool dont_disturb { get; set; } + + public abstract uint[] notification_ids() throws DBusError, IOError; + public abstract string get_notification_json(uint id) throws DBusError, IOError; + + public signal void notified(uint id, bool replaced); + public signal void resolved(uint id, ClosedReason reason); + public signal void prop_changed(string prop); + + public abstract void emit_resolved(uint id, ClosedReason reason); + public abstract void emit_action_invoked(uint id, string action); +} + +internal class AstalNotifd.DaemonProxy : Object { + private HashTable notifs = + new HashTable((i) => i, (a, b) => a == b); + + public List notifications { + owned get { return notifs.get_values(); } + } + + public bool ignore_timeout { + get { return proxy.ignore_timeout; } + set { proxy.ignore_timeout = value; } + } + + public bool dont_disturb { + get { return proxy.dont_disturb; } + set { proxy.dont_disturb = value; } + } + + public uint[] notification_ids() throws DBusError, IOError { + return proxy.notification_ids(); + } + + public Notification get_notification(uint id) { + return notifs.get(id); + } + + public signal void notified(uint id, bool replaced); + public signal void resolved(uint id, ClosedReason reason); + + private IDaemon proxy; + private List ids = new List(); + + public void stop() { + if (ids.length() > 0) { + foreach (var id in ids) + SignalHandler.disconnect(proxy, id); + } + } + + public bool start() { + try { + var bus = Bus.get_sync(BusType.SESSION, null); + var variant = bus.call_sync( + "org.freedesktop.Notifications", + "/org/freedesktop/Notifications", + "org.freedesktop.Notifications", + "GetServerInformation", + null, + null, + DBusCallFlags.NONE, + -1, + null); + + var name = variant.get_child_value(0).get_string(); + var vendor = variant.get_child_value(1).get_string(); + var version = variant.get_child_value(2).get_string(); + + var running = name == Daemon.name + && vendor == Daemon.vendor + && version == Daemon.version; + + if (running) { + setup_proxy(); + return true; + } else { + critical("cannot get proxy: %s is already running", name); + } + } catch (Error err) { + critical("cannot get proxy: %s", err.message); + } + return false; + } + + private void setup_proxy() throws Error { + proxy = Bus.get_proxy_sync( + BusType.SESSION, + "org.freedesktop.Notifications", + "/org/freedesktop/Notifications" + ); + + foreach (var id in proxy.notification_ids()) + add_notification(id); + + ids.append(proxy.prop_changed.connect((prop) => { + if (prop == "ignore-timeout" || prop == "dont-disturb") + notify_property(prop); + })); + + ids.append(proxy.notified.connect((id, replaced) => { + add_notification(id); + notified(id, replaced); + notify_property("notifications"); + })); + + ids.append(proxy.resolved.connect((id, reason) => { + notifs.remove(id); + resolved(id, reason); + notify_property("notifications"); + })); + } + + private void add_notification(uint id) { + try { + var n = Notification.from_json_string(proxy.get_notification_json(id)); + proxy.resolved.connect((id, reason) => n.resolved(reason)); + n.dismissed.connect(() => proxy.emit_resolved(id, ClosedReason.DISMISSED_BY_USER)); + n.invoked.connect((action) => proxy.emit_action_invoked(id, action)); + notifs.set(id, n); + } catch (Error err) { + critical(err.message); + } + } +} diff --git a/notifd/src/signals.md b/notifd/src/signals.md new file mode 100644 index 0000000..cdc6688 --- /dev/null +++ b/notifd/src/signals.md @@ -0,0 +1,35 @@ +# Signals + +ignore this, I'm just dumb and can't follow where signals go or get emitted from + +## Notification + +* resolved(reason) - by daemon/proxy +* dismissed() - by user with `.dismiss()` +* invoked(action) - by user with `.invoke()` + +## Deamon + +non-spec, used by user + +* notified(id, replaced) - by outside through dbus with `.Notify()` +* resolved(id, reason) - by `Notification.dismiss()` or outside with `.CloseNotification` + +spec, not used by user + +* notification_closed(id, reason) - sideeffect of `resolved` +* action_invoked(id, action) - by `Notification.invoke()` + +## Proxy + +mirrors Daemon + +* notified(id, replaced) +* resolved(id, reason) + +creates `Notification` objects through daemon's json strings +and hooks them up to call daemon's signals and vice versa + +## Notifd + +acts as a bridge between Proxy/Daemon, everything else is internal only diff --git a/notifd/version b/notifd/version new file mode 100644 index 0000000..6e8bf73 --- /dev/null +++ b/notifd/version @@ -0,0 +1 @@ +0.1.0 diff --git a/src/cli.vala b/src/cli.vala deleted file mode 100644 index afce774..0000000 --- a/src/cli.vala +++ /dev/null @@ -1,115 +0,0 @@ -static bool help; -static bool version; -static bool daemonize; -static bool list; -static string invoke; -static int close_n; -static int get_n; -static bool toggle_dnd; - -const OptionEntry[] options = { - { "version", 'v', OptionFlags.NONE, OptionArg.NONE, ref version, null, null }, - { "help", 'h', OptionFlags.NONE, OptionArg.NONE, ref help, null, null }, - { "daemonize", 'd', OptionFlags.NONE, OptionArg.NONE, ref daemonize, null, null }, - { "list", 'l', OptionFlags.NONE, OptionArg.NONE, ref list, null, null }, - { "invoke", 'i', OptionFlags.NONE, OptionArg.STRING, ref invoke, null, null }, - { "close", 'c', OptionFlags.NONE, OptionArg.INT, ref close_n, null, null }, - { "get", 'g', OptionFlags.NONE, OptionArg.INT, ref get_n, null, null }, - { "toggle-dnd", 't', OptionFlags.NONE, OptionArg.NONE, ref toggle_dnd, null, null }, - { null }, -}; - -int main(string[] argv) { - try { - var opts = new OptionContext(); - opts.add_main_entries(options, null); - opts.set_help_enabled(false); - opts.set_ignore_unknown_options(false); - opts.parse(ref argv); - } catch (OptionError err) { - printerr (err.message); - return 1; - } - - if (help) { - print("Cli client for astal-notifd\n\n"); - print("Usage:\n"); - print(" %s [flags]\n\n", argv[0]); - print("Flags:\n"); - print(" -h, --help Print this help and exit\n"); - print(" -v, --version Print version number and exit\n"); - print(" -l, --list Print every notification and exit\n"); - print(" -d, --daemonize Watch for new notifications\n"); - print(" -i, --invoke Invoke a notification action\n"); - print(" -c, --close Close a notification by its id\n"); - print(" -g, --get Print a notification by its id\n"); - print(" -t, --toggle-dnd Toggle do not disturb\n"); - return 0; - } - - var notifd = new AstalNotifd.Notifd(); - - if (version) { - print(AstalNotifd.VERSION); - return 0; - } - - if (list) { - var state = Environment.get_user_state_dir() + "/astal/notifd/notifications.json"; - if (FileUtils.test(state, FileTest.EXISTS)) { - try { - uint8[] json; - File.new_for_path(state).load_contents(null, out json, null); - - var obj = Json.from_string((string)json); - - var list = obj.get_object().get_member("notifications"); - stdout.printf("%s\n", Json.to_string(list, true)); - return 0; - } catch (Error err) { - stderr.printf("failed to load cache: %s", err.message); - } - } - stdout.printf("[]\n"); - return 0; - } - - if (toggle_dnd) { - notifd.dont_disturb = !notifd.dont_disturb; - return 0; - } - - if (daemonize) { - notifd.notified.connect((id) => { - stdout.printf("%s\n", notifd.get_notification_json(id)); - stdout.flush(); - }); - new MainLoop().run(); - } - - if (invoke != null) { - if (!invoke.contains(":")) { - stderr.printf("invoke format needs to be :"); - return 1; - } - - var split = invoke.split(":"); - var n_id = int.parse(split[0]); - var a_id = split[1]; - - notifd.get_notification(n_id).invoke(a_id); - } - - if (close_n > 0) { - notifd.get_notification(close_n).dismiss(); - } - - if (get_n > 0) { - stdout.printf("%s", notifd.get_notification(get_n).to_json_string()); - } - - if (!daemonize && invoke == null && close_n == 0 && get_n == 0) - return 1; - - return 0; -} diff --git a/src/config.vala.in b/src/config.vala.in deleted file mode 100644 index 752c754..0000000 --- a/src/config.vala.in +++ /dev/null @@ -1,6 +0,0 @@ -namespace AstalNotifd { - public const int MAJOR_VERSION = @MAJOR_VERSION@; - public const int MINOR_VERSION = @MINOR_VERSION@; - public const int MICRO_VERSION = @MICRO_VERSION@; - public const string VERSION = "@VERSION@"; -} diff --git a/src/daemon.vala b/src/daemon.vala deleted file mode 100644 index b8fb598..0000000 --- a/src/daemon.vala +++ /dev/null @@ -1,255 +0,0 @@ -[DBus (name = "org.freedesktop.Notifications")] -internal class AstalNotifd.Daemon : Object { - public static string name = "notifd"; - public static string vendor = "astal"; - public static string version = "0.1"; - - private string state_file; - private string state_directory; - private string cache_directory; - - private uint n_id = 1; - private HashTable notifs = - new HashTable((i) => i, (a, b) => a == b); - - private bool _ignore_timeout; - public bool ignore_timeout { - get { return _ignore_timeout; } - set { - _ignore_timeout = value; - write_state(); - } - } - - private bool _dont_disturb; - public bool dont_disturb { - get { return _dont_disturb; } - set { - _dont_disturb = value; - write_state(); - } - } - - public signal void notified(uint id, bool replaced); - public signal void resolved(uint id, ClosedReason reason); - public signal void action_invoked(uint id, string action); - public signal void prop_changed(string prop); - - // emitting an event from proxy doesn't seem to work - public void emit_resolved(uint id, ClosedReason reason) { resolved(id, reason); } - public void emit_action_invoked(uint id, string action) { action_invoked(id, action); } - - construct { - cache_directory = Environment.get_user_cache_dir() + "/astal/notifd"; - state_directory = Environment.get_user_state_dir() + "/astal/notifd"; - state_file = state_directory + "/notifications.json"; - - if (FileUtils.test(state_file, FileTest.EXISTS)) { - try { - uint8[] json; - File.new_for_path(state_file).load_contents(null, out json, null); - - var obj = Json.from_string((string)json); - - var list = obj.get_object().get_array_member("notifications"); - for (var i = 0; i < list.get_length(); ++i) { - add_notification(new Notification.from_json(list.get_object_element(i))); - } - n_id = list.get_length() + 1; - - _dont_disturb = obj.get_object().get_boolean_member("dont_disturb"); - _ignore_timeout = obj.get_object().get_boolean_member("ignore_timeout"); - } catch (Error err) { - warning("failed to load cache: %s", err.message); - } - } - - notify.connect((prop) => prop_changed(prop.name)); - - notified.connect(() => { - notify_property("notifications"); - }); - - resolved.connect((id, reason) => { - notifs.get(id).resolved(reason); - notifs.remove(id); - write_state(); - notify_property("notifications"); - notification_closed(id, reason); - }); - } - - public uint[] notification_ids() throws DBusError, IOError { - var keys = notifs.get_keys(); - uint[] id = new uint[keys.length()]; - for (var i = 0; i < keys.length(); ++i) - id[i] = keys.nth_data(i); - return id; - } - - [DBus (visible = false)] - public List notifications { - owned get { return notifs.get_values(); } - } - - [DBus (visible = false)] - public Notification get_notification(uint id) { - return notifs.get(id); - } - - public string get_notification_json(uint id) throws DBusError, IOError { - return notifs.get(id).to_json_string(); - } - - [DBus (name = "Notify")] - public uint Notify( - string app_name, - uint replaces_id, - string app_icon, - string summary, - string body, - string[] actions, - HashTable hints, - int expire_timeout - ) throws DBusError, IOError { - if (hints.get("image-data") != null) { - var file = cache_image(hints.get("image-data"), app_name); - if (file != null) { - hints.set("image-path", new Variant.string(file)); - hints.remove("image-data"); - } - } - - // deprecated hints - hints.remove("image_data"); - hints.remove("icon_data"); - - var id = replaces_id > 0 ? replaces_id : n_id++; - - var replaced = add_notification(new Notification( - app_name, id, app_icon, summary, body, actions, hints, expire_timeout - )); - - if (!ignore_timeout && expire_timeout > 0) { - Timeout.add(expire_timeout, () => { - resolved(id, ClosedReason.EXPIRED); - return Source.REMOVE; - }, Priority.DEFAULT); - } - - notified(id, replaced); - - write_state(); - return id; - } - - private bool add_notification(Notification n) { - n.dismissed.connect(() => resolved(n.id, ClosedReason.DISMISSED_BY_USER)); - n.invoked.connect((action) => action_invoked(n.id, action)); - var replaced = notifs.contains(n.id); - notifs.set(n.id, n); - return replaced; - } - - private void write_state() { - var list = new Json.Builder().begin_array(); - foreach (var n in notifications) { - list.add_value(n.to_json()); - } - list.end_array(); - - var obj = new Json.Builder() - .begin_object() - .set_member_name("notifications").add_value(list.get_root()) - .set_member_name("ignore_timeout").add_boolean_value(ignore_timeout) - .set_member_name("dont_disturb").add_boolean_value(dont_disturb) - .end_object(); - - try { - if (!FileUtils.test(state_directory, FileTest.EXISTS)) - File.new_for_path(state_directory).make_directory_with_parents(null); - - FileUtils.set_contents_full(state_file, Json.to_string(obj.get_root(), false)); - } catch (Error err) { - warning("failed to cache notifications: %s", err.message); - } - } - - public signal void notification_closed(uint id, uint reason); - public signal void activation_token(uint id, string token); - - public void close_notification(uint id) throws DBusError, IOError { - resolved(id, ClosedReason.CLOSED); - } - - public void get_server_information( - out string name, - out string vendor, - out string version, - out string spec_version - ) throws DBusError, IOError { - name = Daemon.name; - vendor = Daemon.vendor; - version = Daemon.version; - spec_version = "1.2"; - } - - public string[] get_capabilities() throws DBusError, IOError { - return {"action-icons", "actions", "body", "icon-static", "persistence", "sound"}; - } - - private string? cache_image(Variant image, string app_name) { - int w = image.get_child_value(0).get_int32(); - int h = image.get_child_value(1).get_int32(); - int rs = image.get_child_value(2).get_int32(); - bool alpha = image.get_child_value(3).get_boolean(); - int bps = image.get_child_value(4).get_int32(); - Bytes data = image.get_child_value(6).get_data_as_bytes(); - - if (bps != 8) { - warning("Can not cache image from %s. %s", app_name, - "Currently only RGB images with 8 bits per sample are supported."); - return null; - } - - var pixbuf = new Gdk.Pixbuf.from_bytes( - data, Gdk.Colorspace.RGB, alpha, bps, w, h, rs); - - if (pixbuf == null) - return null; - - var file_name = cache_directory + "/" + data.hash().to_string("%u.png"); - - try { - if (!FileUtils.test(cache_directory, FileTest.EXISTS)) - File.new_for_path(cache_directory).make_directory_with_parents(null); - - var output_stream = File.new_for_path(file_name) - .replace(null, false, FileCreateFlags.NONE, null); - - pixbuf.save_to_streamv(output_stream, "png", null, null, null); - output_stream.close(null); - } catch (Error err) { - warning("could not cache image %s", err.message); - return null; - } - - return file_name; - } - - internal Daemon register(DBusConnection conn) { - try { - conn.register_object("/org/freedesktop/Notifications", this); - } catch (Error err) { - critical(err.message); - } - return this; - } -} - -public enum AstalNotifd.ClosedReason { - EXPIRED = 1, - DISMISSED_BY_USER = 2, - CLOSED = 3, - UNDEFINED = 4, -} diff --git a/src/meson.build b/src/meson.build deleted file mode 100644 index d3efa36..0000000 --- a/src/meson.build +++ /dev/null @@ -1,79 +0,0 @@ -version_split = meson.project_version().split('.') -api_version = version_split[0] + '.' + version_split[1] -gir = 'AstalNotifd-' + api_version + '.gir' -typelib = 'AstalNotifd-' + api_version + '.typelib' - -config = configure_file( - input: 'config.vala.in', - output: 'config.vala', - configuration: { - 'VERSION': meson.project_version(), - 'MAJOR_VERSION': version_split[0], - 'MINOR_VERSION': version_split[1], - 'MICRO_VERSION': version_split[2], - }, -) - -deps = [ - dependency('glib-2.0'), - dependency('gobject-2.0'), - dependency('gio-2.0'), - dependency('json-glib-1.0'), - dependency('gdk-pixbuf-2.0'), -] - -sources = [ - config, - 'daemon.vala', - 'notifd.vala', - 'notification.vala', - 'proxy.vala', -] - -if get_option('lib') - lib = library( - meson.project_name(), - sources, - dependencies: deps, - vala_header: meson.project_name() + '.h', - vala_vapi: meson.project_name() + '-' + api_version + '.vapi', - vala_gir: gir, - version: meson.project_version(), - install: true, - install_dir: [true, true, true, true], - ) - - import('pkgconfig').generate( - lib, - name: meson.project_name(), - filebase: meson.project_name() + '-' + api_version, - version: meson.project_version(), - subdirs: meson.project_name(), - requires: deps, - install_dir: get_option('libdir') / 'pkgconfig', - ) - - custom_target( - typelib, - command: [ - find_program('g-ir-compiler'), - '--output', '@OUTPUT@', - '--shared-library', get_option('prefix') / get_option('libdir') / '@PLAINNAME@', - meson.current_build_dir() / gir, - ], - input: lib, - output: typelib, - depends: lib, - install: true, - install_dir: get_option('libdir') / 'girepository-1.0', - ) -endif - -if get_option('cli') - executable( - meson.project_name(), - ['cli.vala', sources], - dependencies: deps, - install: true, - ) -endif diff --git a/src/notifd.vala b/src/notifd.vala deleted file mode 100644 index c962862..0000000 --- a/src/notifd.vala +++ /dev/null @@ -1,140 +0,0 @@ -namespace AstalNotifd { - public Notifd get_default() { - return Notifd.get_default(); - } -} - -public class AstalNotifd.Notifd : Object { - private static Notifd _instance; - public static Notifd get_default() { - if (_instance == null) - _instance = new Notifd(); - - return _instance; - } - - private Daemon daemon; - private DaemonProxy proxy; - - public signal void active(ActiveType type); - - public bool ignore_timeout { - get { - return proxy != null ? proxy.ignore_timeout : daemon.ignore_timeout; - } - set { - if (proxy != null) - proxy.ignore_timeout = value; - else - daemon.ignore_timeout = value; - } - } - - public bool dont_disturb { - get { - return proxy != null ? proxy.dont_disturb : daemon.dont_disturb; - } - set { - if (proxy != null) - proxy.dont_disturb = value; - else - daemon.dont_disturb = value; - } - } - - public List notifications { - owned get { return proxy != null ? proxy.notifications : daemon.notifications; } - } - - public uint[] notification_ids() throws Error { - return proxy != null ? proxy.notification_ids() : daemon.notification_ids(); - } - - public Notification get_notification(uint id) { - return proxy != null ? proxy.get_notification(id) : daemon.get_notification(id); - } - - public string get_notification_json(uint id) { - return get_notification(id).to_json_string(); - } - - public signal void notified(uint id, bool replaced); - public signal void resolved(uint id, ClosedReason reason); - - construct { - // hack to make it synchronous - MainLoop? loop = null; - - if (!MainContext.default().is_owner()) { - loop = new MainLoop(); - } - - bool done = false; - - Bus.own_name( - BusType.SESSION, - "org.freedesktop.Notifications", - BusNameOwnerFlags.NONE, - acquire_daemon, - on_daemon_acquired, - make_proxy - ); - - active.connect(() => { - done = true; - if (loop != null && loop.is_running()) { - loop.quit(); - } - }); - - if (loop != null) { - loop.run(); - } else { - while (!done) { - MainContext.default().iteration(false); - } - } - } - - private void acquire_daemon(DBusConnection conn) { - daemon = new Daemon().register(conn); - } - - private void on_daemon_acquired() { - if (proxy != null) { - proxy.stop(); - proxy = null; - } - daemon.notified.connect((id, replaced) => notified(id, replaced)); - daemon.resolved.connect((id, reason) => resolved(id, reason)); - daemon.notify.connect((prop) => { - if (get_class().find_property(prop.name) != null) { - notify_property(prop.name); - } - }); - active(ActiveType.DAEMON); - } - - private void make_proxy() { - proxy = new DaemonProxy(); - - if (proxy.start()) { - active(ActiveType.PROXY); - } else { - return; - } - - proxy.notified.connect((id, replaced) => notified(id, replaced)); - proxy.resolved.connect((id, reason) => resolved(id, reason)); - proxy.notify.connect((prop) => { - if (get_class().find_property(prop.name) != null) { - notify_property(prop.name); - } - }); - } -} - -public enum AstalNotifd.ActiveType { - DAEMON, - PROXY, -} diff --git a/src/notification.vala b/src/notification.vala deleted file mode 100644 index 0b4af06..0000000 --- a/src/notification.vala +++ /dev/null @@ -1,160 +0,0 @@ -public enum AstalNotifd.Urgency { - LOW = 0, - NORMAL = 1, - CRITICAL = 2, -} - -public struct AstalNotifd.Action { - public string id; - public string label; -} - -public class AstalNotifd.Notification : Object { - private List _actions; - private HashTable hints; - - public int64 time { construct set; get; } - public string app_name { construct set; get; } - public string app_icon { construct set; get; } - public string summary { construct set; get; } - public string body { construct set; get; } - public uint id { construct set; get; } - public int expire_timeout { construct set; get; } - public List actions { get { return _actions; } } - - public string image { get { return get_str_hint("image-path"); } } - public bool action_icons { get { return get_bool_hint("action-icons"); } } - public string category { get { return get_str_hint("category"); } } - public string desktop_entry { get { return get_str_hint("desktop-entry"); } } - public bool resident { get { return get_bool_hint("resident"); } } - public string sound_file { get { return get_str_hint("sound-file"); } } - public string sound_name { get { return get_str_hint("sound-name"); } } - public bool suppress_sound { get { return get_bool_hint("suppress-sound"); } } - public bool transient { get { return get_bool_hint("transient"); } } - public int x { get { return get_int_hint("x"); } } - public int y { get { return get_int_hint("y"); } } - public Urgency urgency { get { return get_int_hint("urgency"); } } - - internal Notification( - string app_name, - uint id, - string app_icon, - string summary, - string body, - string[] actions, - HashTable hints, - int expire_timeout - ) { - Object( - app_name: app_name, - id: id, - app_icon: app_icon, - summary: summary, - body: body, - expire_timeout: expire_timeout, - time: new DateTime.now_local().to_unix() - ); - - this.hints = hints; - _actions = new List(); - for (var i = 0; i < actions.length; i += 2) { - _actions.append(Action() { - id = actions[i], - label = actions[i + 1] - }); - } - } - - public Variant? get_hint(string hint) { - return hints.contains(hint) ? hints.get(hint) : null; - } - - public unowned string get_str_hint(string hint) { - return hints.contains(hint) ? hints.get(hint).get_string() : null; - } - - public bool get_bool_hint(string hint) { - return hints.contains(hint) ? hints.get(hint).get_boolean() : false; - } - - public int get_int_hint(string hint) { - return hints.contains(hint) ? hints.get(hint).get_int32() : 0; - } - - public signal void resolved(ClosedReason reason); - public signal void dismissed(); - public signal void invoked(string action); - - public void dismiss() { dismissed(); } - public void invoke(string action) { invoked(action); } - - internal Notification.from_json(Json.Object root) throws GLib.Error { - foreach (var key in root.get_members()) { - var node = root.get_member(key); - switch (key) { - case "id": id = (uint)node.get_int(); break; - case "time": time = node.get_int(); break; - case "expire_timeout": expire_timeout = (int)node.get_int(); break; - case "app_name": app_name = node.get_string(); break; - case "app_icon": app_icon = node.get_string(); break; - case "summary": summary = node.get_string(); break; - case "body": body = node.get_string(); break; - case "hints": - hints = new HashTable(str_hash, str_equal); - var obj = node.get_object(); - foreach (var hint in obj.get_members()) { - hints.set(hint, Json.gvariant_deserialize(obj.get_member(hint), null)); - } - break; - case "actions": - _actions = new List(); - for (var i = 0; i < node.get_array().get_length(); ++i) { - var o = node.get_array().get_object_element(i); - _actions.append(Action() { - id = o.get_member("id").get_string(), - label = o.get_member("label").get_string() - }); - } - break; - default: break; - } - } - } - - internal static Notification from_json_string(string json) throws GLib.Error { - var parser = new Json.Parser(); - parser.load_from_data(json); - return new Notification.from_json(parser.get_root().get_object()); - } - - public string to_json_string() { - var generator = new Json.Generator(); - generator.set_root(to_json()); - return generator.to_data(null); - } - - internal Json.Node to_json() { - var acts = new Json.Builder().begin_array(); - foreach (var action in actions) { - acts.begin_object() - .set_member_name("id").add_string_value(action.id) - .set_member_name("label").add_string_value(action.label) - .end_object(); - } - acts.end_array(); - - return new Json.Builder() - .begin_object() - .set_member_name("id").add_int_value(id) - .set_member_name("time").add_int_value(time) - .set_member_name("expire_timeout").add_int_value(expire_timeout) - .set_member_name("app_name").add_string_value(app_name) - .set_member_name("app_icon").add_string_value(app_icon) - .set_member_name("summary").add_string_value(summary) - .set_member_name("body").add_string_value(body) - .set_member_name("actions").add_value(acts.get_root()) - .set_member_name("hints").add_value(Json.gvariant_serialize(hints)) - .end_object() - .get_root(); - } -} diff --git a/src/proxy.vala b/src/proxy.vala deleted file mode 100644 index bedb8b9..0000000 --- a/src/proxy.vala +++ /dev/null @@ -1,129 +0,0 @@ -[DBus (name = "org.freedesktop.Notifications")] -internal interface AstalNotifd.IDaemon : DBusProxy { - public abstract bool ignore_timeout { get; set; } - public abstract bool dont_disturb { get; set; } - - public abstract uint[] notification_ids() throws DBusError, IOError; - public abstract string get_notification_json(uint id) throws DBusError, IOError; - - public signal void notified(uint id, bool replaced); - public signal void resolved(uint id, ClosedReason reason); - public signal void prop_changed(string prop); - - public abstract void emit_resolved(uint id, ClosedReason reason); - public abstract void emit_action_invoked(uint id, string action); -} - -internal class AstalNotifd.DaemonProxy : Object { - private HashTable notifs = - new HashTable((i) => i, (a, b) => a == b); - - public List notifications { - owned get { return notifs.get_values(); } - } - - public bool ignore_timeout { - get { return proxy.ignore_timeout; } - set { proxy.ignore_timeout = value; } - } - - public bool dont_disturb { - get { return proxy.dont_disturb; } - set { proxy.dont_disturb = value; } - } - - public uint[] notification_ids() throws DBusError, IOError { - return proxy.notification_ids(); - } - - public Notification get_notification(uint id) { - return notifs.get(id); - } - - public signal void notified(uint id, bool replaced); - public signal void resolved(uint id, ClosedReason reason); - - private IDaemon proxy; - private List ids = new List(); - - public void stop() { - if (ids.length() > 0) { - foreach (var id in ids) - SignalHandler.disconnect(proxy, id); - } - } - - public bool start() { - try { - var bus = Bus.get_sync(BusType.SESSION, null); - var variant = bus.call_sync( - "org.freedesktop.Notifications", - "/org/freedesktop/Notifications", - "org.freedesktop.Notifications", - "GetServerInformation", - null, - null, - DBusCallFlags.NONE, - -1, - null); - - var name = variant.get_child_value(0).get_string(); - var vendor = variant.get_child_value(1).get_string(); - var version = variant.get_child_value(2).get_string(); - - var running = name == Daemon.name - && vendor == Daemon.vendor - && version == Daemon.version; - - if (running) { - setup_proxy(); - return true; - } else { - critical("cannot get proxy: %s is already running", name); - } - } catch (Error err) { - critical("cannot get proxy: %s", err.message); - } - return false; - } - - private void setup_proxy() throws Error { - proxy = Bus.get_proxy_sync( - BusType.SESSION, - "org.freedesktop.Notifications", - "/org/freedesktop/Notifications" - ); - - foreach (var id in proxy.notification_ids()) - add_notification(id); - - ids.append(proxy.prop_changed.connect((prop) => { - if (prop == "ignore-timeout" || prop == "dont-disturb") - notify_property(prop); - })); - - ids.append(proxy.notified.connect((id, replaced) => { - add_notification(id); - notified(id, replaced); - notify_property("notifications"); - })); - - ids.append(proxy.resolved.connect((id, reason) => { - notifs.remove(id); - resolved(id, reason); - notify_property("notifications"); - })); - } - - private void add_notification(uint id) { - try { - var n = Notification.from_json_string(proxy.get_notification_json(id)); - proxy.resolved.connect((id, reason) => n.resolved(reason)); - n.dismissed.connect(() => proxy.emit_resolved(id, ClosedReason.DISMISSED_BY_USER)); - n.invoked.connect((action) => proxy.emit_action_invoked(id, action)); - notifs.set(id, n); - } catch (Error err) { - critical(err.message); - } - } -} diff --git a/src/signals.md b/src/signals.md deleted file mode 100644 index cdc6688..0000000 --- a/src/signals.md +++ /dev/null @@ -1,35 +0,0 @@ -# Signals - -ignore this, I'm just dumb and can't follow where signals go or get emitted from - -## Notification - -* resolved(reason) - by daemon/proxy -* dismissed() - by user with `.dismiss()` -* invoked(action) - by user with `.invoke()` - -## Deamon - -non-spec, used by user - -* notified(id, replaced) - by outside through dbus with `.Notify()` -* resolved(id, reason) - by `Notification.dismiss()` or outside with `.CloseNotification` - -spec, not used by user - -* notification_closed(id, reason) - sideeffect of `resolved` -* action_invoked(id, action) - by `Notification.invoke()` - -## Proxy - -mirrors Daemon - -* notified(id, replaced) -* resolved(id, reason) - -creates `Notification` objects through daemon's json strings -and hooks them up to call daemon's signals and vice versa - -## Notifd - -acts as a bridge between Proxy/Daemon, everything else is internal only diff --git a/version b/version deleted file mode 100644 index 6e8bf73..0000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -0.1.0 -- cgit v1.2.3