Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

check if window is not the same as the one where the command started … #35

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −1
Open

check if window is not the same as the one where the command started … #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,15 @@ then all the values in ``AUTO_NOTIFY_IGNORE`` are not used.

export AUTO_NOTIFY_WHITELIST=("apt-get" "docker")

**Ignoring Window Check**

By default the notification only shows if the active window is not the same as the the one that the command was run
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would probably make this the non default for backwards compatibility purposes. I'll give it some thought

in when the command finishes. If you wish to skip window checking, set ``AUTO_NOTIFY_IGNORE_WINDOW_CHECK``.

::

export AUTO_NOTIFY_IGNORE_WINDOW_CHECK=true

Temporarily Disabling Notifications
-----------------------------------

Expand Down
17 changes: 16 additions & 1 deletion auto-notify.plugin.zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ function _auto_notify_message() {
fi
}

function _auto_notify_active_window_id () {
if [[ -n $DISPLAY ]] ; then
xprop -root _NET_ACTIVE_WINDOW | awk '{print $5}'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this work on Mac?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure. Only tested on linux.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We would need this to work on Mac or at the very least gracefully ignore this feature in order for this to get merged. Wouldnt want this to not work for non-linux users.

The same question also applies to those using wayland, does xprop work there?

For example on my machine I get:

$ xprop -root _NET_ACTIVE_WINDOW | awk '{print $5}'                                                                                                                                                                                                   
0x0

which doesnt look right.

return
fi
echo nowindowid
}

function _is_auto_notify_ignored() {
local command="$1"
# split the command if its been piped one or more times
Expand Down Expand Up @@ -101,8 +109,12 @@ function _auto_notify_send() {
if [[ "$(_is_auto_notify_ignored "$AUTO_COMMAND_FULL")" == "no" ]]; then
local current="$(date +"%s")"
let "elapsed = current - AUTO_COMMAND_START"
local current_window="$(_auto_notify_active_window_id)"

if [[ $elapsed -gt $AUTO_NOTIFY_THRESHOLD ]]; then
if [[ $current_window != $AUTO_NOTIFY_ACTIVE_WINDOW_ID ]] ||
[[ ! -z "$AUTO_NOTIFY_IGNORE_WINDOW_CHECK" ]] ||
[[ $current_window == "nowindowid" ]] &&
[[ $elapsed -gt $AUTO_NOTIFY_THRESHOLD ]]; then
_auto_notify_message "$AUTO_COMMAND" "$elapsed" "$exit_code"
fi
fi
Expand All @@ -119,6 +131,7 @@ function _auto_notify_track() {
AUTO_COMMAND="${1:-$2}"
AUTO_COMMAND_FULL="$3"
AUTO_COMMAND_START="$(date +"%s")"
AUTO_NOTIFY_ACTIVE_WINDOW_ID="$(_auto_notify_active_window_id)"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it won't work if multiple commands are running at once?

}

function _auto_notify_reset_tracking() {
Expand All @@ -128,6 +141,8 @@ function _auto_notify_reset_tracking() {
unset AUTO_COMMAND_FULL
# Command that the user has executed
unset AUTO_COMMAND
# window id of where the command was executed
unset AUTO_NOTIFY_ACTIVE_WINDOW_ID
}

function disable_auto_notify() {
Expand Down