Skip to content

Alternative profile support #55

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
eruffaldi wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Alternative profile support #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
65bccab
added support for profiles - except when opening new window
eruffaldi Nov 4, 2016
5c0b9b3
documentation
eruffaldi Nov 4, 2016
7132cdd
minor on panes profile, using default instead of same
eruffaldi Nov 4, 2016
69475b5
Update README.md
eruffaldi Nov 4, 2016
6dbca36
Merge branch 'master' of https://github.com/eruffaldi/itermocil
eruffaldi Nov 4, 2016
de39575
added support for classic behavior
eruffaldi Nov 4, 2016
95094e6
removed TODO notice
eruffaldi Nov 4, 2016
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
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ iTermocil is compatible with all of teamocil's flags, and they all work in the s
|------------|----------------------------
| `name` | All iTerm panes in this window will be given this name.
| `root` | The path where all panes in the window will be started
| `profile` | The profile for all the panes of the window (default is the standard one) (only if new window)
| `layout` | The layout format that iTermocil will use (see below)
| `panes` | An `Array` of panes
| `command` | A command to run in the current window. Ignored if `panes` is present
Expand All @@ -87,6 +88,7 @@ A pane can either be a `String` or a `Hash`. If it’s a `String`, Teamocil will
|------------|----------------------------
| `commands` | An `Array` of commands that will be ran when the pane is created
| `focus` | If set to `true`, the pane will be selected after the layout has been executed
| `profile` | The profile of the specific panel otherwise the one of parent window

## Examples

Expand Down
108 changes: 81 additions & 27 deletions itermocil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from math import ceil


__version__ = '0.2.1'
__version__ = '0.2.2'


class Itermocil(object):
Expand Down Expand Up @@ -60,12 +60,23 @@ def __init__(self, teamocil_file, here=False, cwd=None):
if 'pre' in self.parsed_config:
self.applescript.append('do shell script "' + self.parsed_config['pre'] + ';"')

# cannot be set AFTER loading so it does not work for reusing windows
# and for the first pane of first window
firstprofile = "default"
try:
fw = self.parsed_config["windows"][0]
firstprofile = fw.get("profile",firstprofile)
if "panes" in fw and len(fw["panes"]) > 0 and type(fw["panes"][0]) == dict:
firstprofile = fw["panes"][0].get("profile",firstprofile)
except:
pass
# If we need to open a new window, then add necessary commands
# to script.
if not self.here:
if self.new_iterm:
ps = "default profile" if firstprofile == "default" else "profile \"%s\"" % firstprofile
self.applescript.append('tell current window')
self.applescript.append('create tab with default profile')
self.applescript.append('create tab with %s' % ps)
self.applescript.append('end tell')
# self.applescript.append('create window with default profile')
else:
Expand Down Expand Up @@ -145,7 +156,7 @@ def script(self):

return parsed_script

def arrange_panes(self, num_panes, layout="tiled"):
def arrange_panes(self, num_panes, profiles=[], layout="tiled"):
""" Create a set of Applescript instructions to generate the desired
layout of panes. Attempt to match teamocil layout behaviour as
closely as is possible.
Expand All @@ -154,12 +165,18 @@ def arrange_panes(self, num_panes, layout="tiled"):
generating a version for old iTerm.
"""

def create_pane(parent, child, split="vertical"):

def create_pane(parent, child, split="vertical",profile="default"):
# handle special case
if profile == "":
ps = "same profile"
elif profile == "default":
ps = "default profile"
else:
ps = "profile \"%s\"" % profile
return (''' tell pane_{pp}
set pane_{cp} to (split {o}ly with same profile)
set pane_{cp} to (split {o}ly with {ps})
end tell
'''.format(pp=parent, cp=child, o=split))
'''.format(pp=parent, cp=child, o=split,ps=ps))

# Link a variable to the current window.
self.applescript.append("set pane_1 to (current session of current window)")
Expand All @@ -177,55 +194,55 @@ def create_pane(parent, child, split="vertical"):
if layout == 'even-horizontal':

for p in range(2, num_panes+1):
self.applescript.append(create_pane(p-1, p, "vertical"))
self.applescript.append(create_pane(p-1, p, "vertical",profile=profiles[p-1]))

# 'even-vertical' layouts just split horizontally down the screen
elif layout == 'even-vertical':

for p in range(2, num_panes+1):
self.applescript.append(create_pane(p-1, p, "horizontal"))
self.applescript.append(create_pane(p-1, p, "horizontal",profile=profiles[p-1]))

# 'main-vertical' layouts have one left pane that is full height,
# and then split the remaining panes horizontally down the right
elif layout == 'main-vertical':

self.applescript.append(create_pane(1, 2, "vertical"))
self.applescript.append(create_pane(1, 2, "vertical",profile=profiles[1]))
for p in range(3, num_panes+1):
self.applescript.append(create_pane(p-1, p, "horizontal"))
self.applescript.append(create_pane(p-1, p, "horizontal",profile=profiles[p-1]))

# 'main-vertical-flipped' layouts have one right pane that is full height,
# and then split the remaining panes horizontally down the left
elif layout == 'main-vertical-flipped':

self.applescript.append(create_pane(1, num_panes, "vertical"))
self.applescript.append(create_pane(1, num_panes, "vertical",profile=profiles[1]))
for p in range(2, num_panes):
self.applescript.append(create_pane(p-1, p, "horizontal"))
self.applescript.append(create_pane(p-1, p, "horizontal",profile=profiles[p-1]))

# 'main-horizontal' layouts have one left pane that is full height,
# and then split the remaining panes horizontally down the right
elif layout == 'main-horizontal':

self.applescript.append(create_pane(1, 2, "horizontal"))
self.applescript.append(create_pane(1, 2, "horizontal",profile=profiles[1]))
for p in range(3, num_panes+1):
self.applescript.append(create_pane(p-1, p, "vertical"))
self.applescript.append(create_pane(p-1, p, "vertical",profile=profiles[p-1]))

# 'double-main-horizontal' layouts have two left panes that are full height,
# and then split the remaining panes horizontally down the right
elif layout == 'double-main-horizontal':

self.applescript.append(create_pane(1, num_panes-1, "horizontal"))
self.applescript.append(create_pane(num_panes-1, num_panes, "vertical"))
self.applescript.append(create_pane(1, num_panes-1, "horizontal",profile=profiles[1]))
self.applescript.append(create_pane(num_panes-1, num_panes, "vertical",profile=profiles[-1]))
for p in range(2, num_panes-1):
self.applescript.append(create_pane(p-1, p, "vertical"))
self.applescript.append(create_pane(p-1, p, "vertical",profile=profiles[p-1]))

# 'double-main-vertical' layouts have two bottom panes that spllit the width
# and then split the remaining panes vertically across the top
elif layout == 'double-main-vertical':

self.applescript.append(create_pane(1, 2, "vertical"))
self.applescript.append(create_pane(2, 3, "vertical"))
self.applescript.append(create_pane(1, 2, "vertical",profile=profiles[1]))
self.applescript.append(create_pane(2, 3, "vertical",profile=profiles[2]))
for p in range(4, num_panes+1):
self.applescript.append(create_pane(p-1, p, "horizontal"))
self.applescript.append(create_pane(p-1, p, "horizontal",profile=profiles[p-1]))

# 'tiled' layouts create 2 columns and then however many rows as
# needed. If there are odd number of panes then the bottom pane
Expand All @@ -234,16 +251,19 @@ def create_pane(parent, child, split="vertical"):

vertical_splits = int(ceil((num_panes / 2.0))) - 1
second_columns = num_panes / 2
i = 1

for p in range(0, vertical_splits):
pp = (p * 2) + 1
cp = pp + 2
self.applescript.append(create_pane(pp, cp, "horizontal"))
self.applescript.append(create_pane(pp, cp, "horizontal",profile=profiles[k]))
i += 1

for p in range(0, second_columns):
pp = (p * 2) + 1
cp = pp + 1
self.applescript.append(create_pane(pp, cp, "vertical"))
self.applescript.append(create_pane(pp, cp, "vertical",profile=profiles[k]))
i += 1

# '3_columns' layouts create 3 columns and then however many rows as
# needed. If there are odd number of panes then the bottom pane
Expand All @@ -257,8 +277,8 @@ def create_pane(parent, child, split="vertical"):
for p in range(0, vertical_splits):
pp = (p * 3) + 1
cp = pp + 3
self.applescript.append(create_pane(pp, cp, "horizontal",profile=profiles[i]))
i += 1
self.applescript.append(create_pane(pp, cp, "horizontal"))

for p in range(0, vertical_splits+1):
pp = (p * 3) + 1
Expand All @@ -267,8 +287,8 @@ def create_pane(parent, child, split="vertical"):
break
qp = pp + q
cp = pp + 1 + q
self.applescript.append(create_pane(qp, cp, "vertical",profiles[i]))
i += 1
self.applescript.append(create_pane(qp, cp, "vertical"))

# Raise an exception if we don't recognise the layout setting.
else:
Expand Down Expand Up @@ -508,10 +528,44 @@ def process_file(self):
sys.exit(1)

for num, window in enumerate(self.parsed_config['windows']):

# Extract profile
if "profile" in window:
window_profile = window['profile']
window_profile_spec = True
else:
window_profile = "default"
window_profile_spec = False

# Default Behavior: no pane specifies profile and no profile in window => same for panes
# New Behavior: window specifies, or pane specifies => default or specified for panes
if window_profile_spec:
panes_have_profile = True
else:
panes_have_profile = False
for p in window.get("panes",[]):
if type(p) == dict and "profile" in p:
panes_have_profile = True
break

if panes_have_profile:
paneprofiles = [p.get("profile",window_profile) if type(p) == dict else window_profile for p in window.get("panes",[])]
else:
# empty means same
paneprofiles = ["" for p in window.get("panes",[])]

if num > 0:
# Extract profile of first pane => profile of first tab command
if 'panes' in window and len(window["panes"]) > 0 and type(window["panes"][0]) == dict:
firstprofile = window["panes"][0].get("profile",window_profile)
else:
firstprofile = window_profile

# first TAB has been created before this function, so apply window profile
ps = "default profile" if firstprofile == "default" else "profile \"%s\"" % firstprofile
if self.new_iterm:
self.applescript.append('tell current window')
self.applescript.append('create tab with default profile')
self.applescript.append('create tab with %s' % ps)
self.applescript.append('end tell')
# self.applescript.append('create window with default profile')
else:
Expand Down Expand Up @@ -546,7 +600,7 @@ def process_file(self):
if 'panes' in window:

if self.new_iterm:
self.arrange_panes(len(window['panes']), layout)
self.arrange_panes(len(window['panes']),paneprofiles, layout)
else:
self.arrange_panes_old_iterm(len(window['panes']), layout)

Expand Down