makoctl: add command to list history

Author: Gusser93

contrib/completions/bash/makoctl

@@ -11,6 +11,7 @@ _makoctl()
     'invoke'
     'menu'
     'list'
+    'history'
     'reload'
     'set-mode'
     'help'

contrib/completions/fish/makoctl.fish

@@ -12,6 +12,7 @@ complete -c makoctl -n '__fish_makoctl_complete_no_subcommand' -a restore -d 'Re
 complete -c makoctl -n '__fish_makoctl_complete_no_subcommand' -a invoke -d 'Invoke an action on the notification (the last one if none is given)' -x
 complete -c makoctl -n '__fish_makoctl_complete_no_subcommand' -a menu -d 'Use a program to select one action to be invoked on the notification (the last one if none is given)' -x
 complete -c makoctl -n '__fish_makoctl_complete_no_subcommand' -a list -d 'List notifications' -x
+complete -c makoctl -n '__fish_makoctl_complete_no_subcommand' -a history -d 'List history' -x
 complete -c makoctl -n '__fish_makoctl_complete_no_subcommand' -a reload -d 'Reload the configuration file' -x
 complete -c makoctl -n '__fish_makoctl_complete_no_subcommand' -a help -d 'Show help message and quit' -x
 

contrib/completions/zsh/_makoctl

@@ -7,6 +7,7 @@ makoctl_cmds=(
 	'restore:Restore the most recently expired notification from the history buffer'
 	'invoke:Invoke an action on the first notification. If action is not specified, invoke the default action'
 	'list:Retrieve a list of current notifications'
+	'history:Retrieve a list of dismissed notifications'
 	'reload:Reload the configuration file'
 	'help:Show help message and quit'
 )

dbus/mako.c

@@ -140,9 +140,7 @@ static int handle_restore_action(sd_bus_message *msg, void *data,
 	return sd_bus_reply_method_return(msg, "");
 }
 
-static int handle_list_notifications(sd_bus_message *msg, void *data,
-		sd_bus_error *ret_error) {
-	struct mako_state *state = data;
+static int handle_list(sd_bus_message *msg, struct wl_list *list) {
 
 	sd_bus_message *reply = NULL;
 	int ret = sd_bus_message_new_method_return(msg, &reply);
@@ -156,7 +154,7 @@ static int handle_list_notifications(sd_bus_message *msg, void *data,
 	}
 
 	struct mako_notification *notif;
-	wl_list_for_each(notif, &state->notifications, link) {
+	wl_list_for_each(notif, list, link) {
 		ret = sd_bus_message_open_container(reply, 'a', "{sv}");
 		if (ret < 0) {
 			return ret;
@@ -267,6 +265,18 @@ static int handle_list_notifications(sd_bus_message *msg, void *data,
 	return 0;
 }
 
+static int handle_list_notifications(sd_bus_message *msg, void *data,
+		sd_bus_error *ret_error) {
+	struct mako_state *state = data;
+	return handle_list(msg, &state->notifications);
+}
+
+static int handle_list_history(sd_bus_message *msg, void *data,
+		sd_bus_error *ret_error) {
+	struct mako_state *state = data;
+	return handle_list(msg, &state->history);
+}
+
 /**
  * The way surfaces are re-build here is not quite intuitive.
  * 1. All surfaces are destroyed.
@@ -428,6 +438,7 @@ static const sd_bus_vtable service_vtable[] = {
 	SD_BUS_METHOD("InvokeAction", "us", "", handle_invoke_action, SD_BUS_VTABLE_UNPRIVILEGED),
 	SD_BUS_METHOD("RestoreNotification", "", "", handle_restore_action, SD_BUS_VTABLE_UNPRIVILEGED),
 	SD_BUS_METHOD("ListNotifications", "", "aa{sv}", handle_list_notifications, SD_BUS_VTABLE_UNPRIVILEGED),
+	SD_BUS_METHOD("ListHistory", "", "aa{sv}", handle_list_history, SD_BUS_VTABLE_UNPRIVILEGED),
 	SD_BUS_METHOD("Reload", "", "", handle_reload, SD_BUS_VTABLE_UNPRIVILEGED),
 	SD_BUS_METHOD("SetMode", "s", "", handle_set_mode, SD_BUS_VTABLE_UNPRIVILEGED),
 	SD_BUS_METHOD("ListModes", "", "as", handle_list_modes, SD_BUS_VTABLE_UNPRIVILEGED),

makoctl

@@ -20,6 +20,7 @@ usage() {
 	echo "                                 with the given id, or the last"
 	echo "                                 notification if none is given"
 	echo "  list                           List notifications"
+	echo "  history                        List history"
 	echo "  reload                         Reload the configuration file"
 	echo "  mode                           List modes"
 	echo "  mode [-a mode]... [-r mode]... Add/remove modes"
@@ -133,6 +134,9 @@ case "$1" in
 "list")
 	call ListNotifications
 	;;
+"history")
+	call ListHistory
+	;;
 "reload")
 	call Reload
 	;;

makoctl.1.scd

@@ -67,6 +67,9 @@ Sends IPC commands to the running mako daemon via dbus.
 *list*
 	Retrieve a list of current notifications.
 
+*history*
+	Retrieve a list of dismissed notifications.
+
 *reload*
 	Reloads the configuration file.