Skip to content

Fix overlay selection when tmux fills window-number gaps, close #13 #14

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

Open
hmgle wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix overlay selection when tmux fills window-number gaps, close #13 #14

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

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion easymotion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,16 @@ def get_terminal_size():
return width, height - 1 # Subtract 1 from height


def get_current_window_id():
"""Return the window_id for the pane running this script"""
pane_target = os.environ.get("TMUX_PANE")
cmd = ["tmux", "display-message", "-p"]
if pane_target:
cmd.extend(["-t", pane_target])
cmd.append("#{window_id}")
return sh(cmd).strip()


def getch(input_file=None, num_chars=1):
"""Get character(s) from terminal or file

Expand Down Expand Up @@ -758,7 +768,8 @@ def main(screen: Screen):
terminal_width, terminal_height = get_terminal_size()
draw_all_panes(panes, max_x, padding_cache, terminal_height, screen)
draw_all_hints(positions, terminal_height, screen)
sh(['tmux', 'select-window', '-t', '{end}'])
overlay_window_id = get_current_window_id()
sh(["tmux", "select-window", "-t", overlay_window_id])

# Handle user input
key_sequence = ""
Expand Down