Skip to content

Commit 32ff66e

Browse files
committed
update apidocs, changes. Pane.set_height, Pane.set_width
1 parent 525212e commit 32ff66e

File tree

6 files changed

+56
-19
lines changed

6 files changed

+56
-19
lines changed

CHANGES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Here you can find the recent changes to tmuxp.
99
- [cli] fix ``tmuxp load .`` fixed
1010
- [cli] fix ``tmuxp convert <file>`` fixed.
1111
- [internal] `pep257` fixes.
12+
- [internal] [tests] - :class:`Pane` now has :meth:`Pane.set_width` and
13+
:meth:`Pane.set_height`.
1214

1315
2013-10-27
1416
----------

doc/api.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,11 @@ Command Line
8181

8282
.. automethod:: tmuxp.cli.startup
8383

84-
.. automethod:: tmuxp.cli.query_yes_no
84+
.. automethod:: tmuxp.cli.prompt
85+
.. automethod:: tmuxp.cli.prompt_bool
86+
.. automethod:: tmuxp.cli.prompt_choices
8587

86-
.. automethod:: tmuxp.cli.setupLogger
88+
.. automethod:: tmuxp.cli.get_logger
8789

8890
Configuration
8991
-------------

tmuxp/pane.py

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,27 @@ def send_keys(self, cmd, enter=True):
7878
7979
:param enter: bool. send enter after sending the key.
8080
'''
81-
self.tmux('send-keys', '-t%s' % self.target, cmd)
81+
self.tmux('send-keys', '-t%s' % self.get('pane_id'), cmd)
8282

8383
if enter:
8484
self.enter()
8585

86+
def set_width(self, width):
87+
"""Set width of pane.
88+
89+
:param width: pane width, in cells.
90+
:type width: int
91+
"""
92+
self.resize_pane(width=width)
93+
94+
def set_height(self, height):
95+
"""Set height of pane.
96+
97+
:param height: pane height, in cells.
98+
:type height: int
99+
"""
100+
self.resize_pane(height=height)
101+
86102
def resize_pane(self, *args, **kwargs):
87103
'''
88104
``$ tmux resize-pane``
@@ -98,12 +114,12 @@ def resize_pane(self, *args, **kwargs):
98114
# logger.error('resize-pane', '-t%s' % self.target)
99115
if 'height' in kwargs:
100116
proc = self.tmux('resize-pane', '-t%s' %
101-
self.target, '-y%s' % int(kwargs['height']))
117+
self.get('pane_id'), '-y%s' % int(kwargs['height']))
102118
elif 'width' in kwargs:
103119
proc = self.tmux('resize-pane', '-t%s' %
104-
self.target, '-x%s' % int(kwargs['width']))
120+
self.get('pane_id'), '-x%s' % int(kwargs['width']))
105121
else:
106-
proc = self.tmux('resize-pane', '-t%s' % self.target, args[0])
122+
proc = self.tmux('resize-pane', '-t%s' % self.get('pane_id'), args[0])
107123

108124
if proc.stderr:
109125
raise Exception(proc.stderr)
@@ -115,13 +131,7 @@ def enter(self):
115131
'''
116132
``$ tmux send-keys`` send Enter to the pane.
117133
'''
118-
self.tmux('send-keys', '-t%s' % self.target, 'Enter')
119-
120-
@property
121-
def target(self):
122-
# return "%s:%s.%s" % (self.session.get('session_id'),
123-
# self.get('window_id'), self.get('pane_index'))
124-
return self.get('pane_id')
134+
self.tmux('send-keys', '-t%s' % self.get('pane_id'), 'Enter')
125135

126136
def __repr__(self):
127137
return "%s(%s %s)" % (self.__class__.__name__, self.get('pane_id'), self.window)

tmuxp/session.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,17 +246,15 @@ def attached_window(self):
246246
else:
247247
continue
248248

249-
if len(active_windows) == 1:
249+
if len(active_windows) == int(1):
250250
return active_windows[0]
251251
else:
252252
raise Exception(
253253
'multiple active windows found. %s' % active_windows)
254254

255-
if len(self._windows) == 0:
255+
if len(self._windows) == int(0):
256256
raise Exception('No Windows')
257257

258-
return False
259-
260258
def select_window(self, target_window):
261259
'''
262260
``$ tmux select-window``

tmuxp/testsuite/test_pane.py

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313

1414
class ResizeTest(TmuxTestCase):
1515

16-
def test_window_pane(self):
17-
'''Pane.resize_pane()'''
16+
def test_resize_pane(self):
17+
""" Test Pane.resize_pane(). """
1818

1919
window = self.session.attached_window()
20+
window.rename_window('test_resize_pane')
2021

2122
pane1 = window.attached_pane()
2223
pane1_id = pane1['pane_id']
@@ -29,3 +30,25 @@ def test_window_pane(self):
2930

3031
pane1.resize_pane(height=10)
3132
self.assertEqual(int(pane1['pane_height']), 10)
33+
34+
def test_set_height(self):
35+
window = self.session.new_window(window_name='test_set_height')
36+
pane2 = window.split_window()
37+
pane1 = window.attached_pane()
38+
pane1_height = pane1['pane_height']
39+
40+
pane1.set_height(20)
41+
self.assertNotEqual(pane1['pane_height'], pane1_height)
42+
self.assertEqual(int(pane1['pane_height']), 20)
43+
44+
def test_set_width(self):
45+
window = self.session.new_window(window_name='test_set_width')
46+
pane2 = window.split_window()
47+
48+
window.select_layout('main-vertical')
49+
pane1 = window.attached_pane()
50+
pane1_width = pane1['pane_width']
51+
52+
pane1.set_width(25)
53+
self.assertNotEqual(pane1['pane_width'], pane1_width)
54+
self.assertEqual(int(pane1['pane_width']), 25)

tmuxp/window.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,8 @@ def attached_pane(self):
324324
else:
325325
continue
326326

327+
return []
328+
327329
def _list_panes(self):
328330
panes = self.server._update_panes()._panes
329331

0 commit comments

Comments
 (0)