Merge lp://staging/~stephen-j-boddy/terminator/feature-remember-focus into lp://staging/terminator/trunk

Proposed by Stephen Boddy
Status: Merged
Merged at revision: 1490
Proposed branch: lp://staging/~stephen-j-boddy/terminator/feature-remember-focus
Merge into: lp://staging/terminator/trunk
Diff against target: 443 lines (+186/-28)
6 files modified
terminatorlib/container.py (+15/-3)
terminatorlib/notebook.py (+89/-14)
terminatorlib/terminal.py (+19/-9)
terminatorlib/terminator.py (+49/-0)
terminatorlib/util.py (+3/-1)
terminatorlib/window.py (+11/-1)
To merge this branch: bzr merge lp://staging/~stephen-j-boddy/terminator/feature-remember-focus
Reviewer Review Type Date Requested Status
Terminator Pending
Review via email: mp+199654@code.staging.launchpad.net

Description of the change

OK, This took longer and was more tricky than I first anticipated. When loading/saving layouts, Terminator now remembers which:
1) was the active window,
2) terminal was active in non-tabbed windows,
3) tab was current in tabbed windows,
4) terminal was active in each tab (also remembered when switching between tabs at runtime),
5) UUID was assigned to a terminal, and restores it.

(5) means you can rely on the shell environment variable TERMINATOR_UUID to always be the same on relaunching a layout.

I tend to dogfood everything I code, but I'd appreciate it if some others could download and give this a workout before I go and apply to trunk.

To post a comment you must log in.
Revision history for this message
Stephen Boddy (stephen-j-boddy) wrote :

Ha, continuing my tradition of spotting errors after I submit for merging, I just noticed the following:
terminatorlib/window.py
@@ -239,6 +241,17 @@
Of that entire block of added lines, only the last two are needed. It doesn't do any harm being there, so I'll change it later. Must be something I tried while fighting to get all these other lines to do what *I* wanted.

1484. By Stephen Boddy

Remove the unnecessary cruft left over in the windows on_focus_in related to terminal focus

1485. By Stephen Boddy

Missed a line in the cruft removal

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.