Remove the old terminator.py, rename newterminator.py accordingly and update all the references to it
This commit is contained in:
Chris Jones
parent
949dc81574
commit
257cc3ead6
|
|
@ -1,222 +0,0 @@
|
|||
#!/usr/bin/python
|
||||
# Terminator by Chris Jones <cmsj@tenshu.net>
|
||||
# GPL v2 only
|
||||
"""terminator.py - class for the master Terminator singleton"""
|
||||
|
||||
import gtk
|
||||
|
||||
from borg import Borg
|
||||
from config import Config
|
||||
from keybindings import Keybindings
|
||||
from util import dbg, get_top_window
|
||||
|
||||
class Terminator(Borg):
|
||||
"""master object for the application"""
|
||||
|
||||
windows = None
|
||||
windowtitle = None
|
||||
terminals = None
|
||||
groups = None
|
||||
config = None
|
||||
keybindings = None
|
||||
|
||||
groupsend = None
|
||||
groupsend_type = {'all':0, 'group':1, 'off':2}
|
||||
|
||||
def __init__(self):
|
||||
"""Class initialiser"""
|
||||
|
||||
Borg.__init__(self, self.__class__.__name__)
|
||||
self.prepare_attributes()
|
||||
|
||||
def prepare_attributes(self):
|
||||
"""Initialise anything that isn't already"""
|
||||
|
||||
if not self.windows:
|
||||
self.windows = []
|
||||
if not self.terminals:
|
||||
self.terminals = []
|
||||
if not self.groups:
|
||||
self.groups = []
|
||||
if not self.groupsend:
|
||||
self.groupsend = self.groupsend_type['group']
|
||||
if not self.config:
|
||||
self.config = Config()
|
||||
if not self.keybindings:
|
||||
self.keybindings = Keybindings()
|
||||
self.keybindings.configure(self.config['keybindings'])
|
||||
|
||||
def register_window(self, window):
|
||||
"""Register a new window widget"""
|
||||
if window not in self.windows:
|
||||
dbg('Terminator::register_window: registering %s:%s' % (id(window),
|
||||
type(window)))
|
||||
self.windows.append(window)
|
||||
|
||||
def deregister_window(self, window):
|
||||
"""de-register a window widget"""
|
||||
dbg('Terminator::deregister_window: de-registering %s:%s' %
|
||||
(id(window), type(window)))
|
||||
self.windows.remove(window)
|
||||
if len(self.windows) == 0:
|
||||
# We have no windows left, we should exit
|
||||
gtk.main_quit()
|
||||
|
||||
def register_terminal(self, terminal):
|
||||
"""Register a new terminal widget"""
|
||||
if terminal not in self.terminals:
|
||||
dbg('Terminator::register_terminal: registering %s:%s' %
|
||||
(id(terminal), type(terminal)))
|
||||
self.terminals.append(terminal)
|
||||
terminal.connect('ungroup-all', self.ungroup_all)
|
||||
terminal.connect('navigate', self.navigate_terminal)
|
||||
terminal.connect('tab-new', self.tab_new)
|
||||
|
||||
def deregister_terminal(self, terminal):
|
||||
"""De-register a terminal widget"""
|
||||
dbg('Terminator::deregister_terminal: de-registering %s:%s' %
|
||||
(id(terminal), type(terminal)))
|
||||
self.terminals.remove(terminal)
|
||||
|
||||
if len(self.terminals) == 0:
|
||||
for window in self.windows:
|
||||
window.destroy()
|
||||
else:
|
||||
dbg('Terminator::deregister_terminal: %d terminals remain' %
|
||||
len(self.terminals))
|
||||
|
||||
def reconfigure(self):
|
||||
"""Update configuration for the whole application"""
|
||||
|
||||
# FIXME: Set handle_size here
|
||||
|
||||
# Cause all the terminals to reconfigure
|
||||
for terminal in self.terminals:
|
||||
terminal.reconfigure()
|
||||
|
||||
def tab_new(self, terminal):
|
||||
"""A terminal asked for a new tab. This function is an indirection
|
||||
to the Window object"""
|
||||
window = get_top_window(terminal)
|
||||
window.tab_new()
|
||||
|
||||
def navigate_terminal(self, terminal, direction):
|
||||
"""Nagivate around the terminals"""
|
||||
current = self.terminals.index(terminal)
|
||||
length = len(self.terminals)
|
||||
next = None
|
||||
|
||||
if length <= 1:
|
||||
return
|
||||
|
||||
print "Current term: %d" % current
|
||||
print "Number of terms: %d" % length
|
||||
|
||||
if direction == 'next':
|
||||
next = current + 1
|
||||
if next >= length:
|
||||
next = 0
|
||||
elif direction == 'prev':
|
||||
next = current - 1
|
||||
if next < 0:
|
||||
next = length - 1
|
||||
else:
|
||||
raise NotImplementedError
|
||||
# FIXME: Do the directional navigation
|
||||
|
||||
if next is not None:
|
||||
print "sending focus to term %d" % next
|
||||
self.terminals[next].grab_focus()
|
||||
|
||||
def create_group(self, name):
|
||||
"""Create a new group"""
|
||||
if name not in self.groups:
|
||||
dbg('Terminator::create_group: registering group %s' % name)
|
||||
self.groups.append(name)
|
||||
|
||||
def ungroup_all(self, widget):
|
||||
"""Remove all groups"""
|
||||
for terminal in self.terminals:
|
||||
terminal.set_group(None, None)
|
||||
self.groups = []
|
||||
|
||||
def closegroupedterms(self, group):
|
||||
"""Close all terminals in a group"""
|
||||
for terminal in self.terminals:
|
||||
if terminal.group == group:
|
||||
terminal.close()
|
||||
|
||||
def group_hoover(self):
|
||||
"""Clean out unused groups"""
|
||||
|
||||
if self.config['autoclean_groups']:
|
||||
inuse = []
|
||||
todestroy = []
|
||||
|
||||
for terminal in self.terminals:
|
||||
if terminal.group:
|
||||
if not terminal.group in inuse:
|
||||
inuse.append(terminal.group)
|
||||
|
||||
for group in self.groups:
|
||||
if not group in inuse:
|
||||
todestroy.append(group)
|
||||
|
||||
dbg('Terminator::group_hoover: %d groups, hoovering %d' %
|
||||
(len(self.groups), len(todestroy)))
|
||||
for group in todestroy:
|
||||
self.groups.remove(group)
|
||||
|
||||
def group_emit(self, terminal, group, type, event):
|
||||
"""Emit to each terminal in a group"""
|
||||
dbg('Terminator::group_emit: emitting a keystroke for group %s' %
|
||||
group)
|
||||
for term in self.terminals:
|
||||
if term != terminal and term.group == group:
|
||||
term.vte.emit(type, event)
|
||||
|
||||
def all_emit(self, terminal, type, event):
|
||||
"""Emit to all terminals"""
|
||||
for term in self.terminals:
|
||||
if term != terminal:
|
||||
term.vte.emit(type, event)
|
||||
|
||||
def do_enumerate(self, widget, pad):
|
||||
"""Insert the number of each terminal in a group, into that terminal"""
|
||||
if pad:
|
||||
numstr = '%0'+str(len(str(len(self.terminals))))+'d'
|
||||
else:
|
||||
numstr = '%d'
|
||||
|
||||
for term in self.get_target_terms(widget):
|
||||
idx = self.terminals.index(term)
|
||||
term.feed(numstr % (idx + 1))
|
||||
|
||||
def get_target_terms(self, widget):
|
||||
"""Get the terminals we should currently be broadcasting to"""
|
||||
if self.groupsend == self.groupsend_type['all']:
|
||||
return(self.terminals)
|
||||
elif self.groupsend == self.groupsend_type['group']:
|
||||
termset = []
|
||||
for term in self.terminals:
|
||||
if term == widget or (term.group != None and term.group ==
|
||||
widget.group):
|
||||
termset.append(term)
|
||||
return(termset)
|
||||
else:
|
||||
return([widget])
|
||||
|
||||
def group_tab(self, widget):
|
||||
"""Group all the terminals in a tab"""
|
||||
pass
|
||||
|
||||
def ungroup_tab(self, widget):
|
||||
"""Ungroup all the terminals in a tab"""
|
||||
pass
|
||||
|
||||
def focus_changed(self, widget):
|
||||
"""We just moved focus to a new terminal"""
|
||||
for terminal in self.terminals:
|
||||
terminal.titlebar.update()
|
||||
return
|
||||
# vim: set expandtab ts=4 sw=4:
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
import gobject
|
||||
import gtk
|
||||
|
||||
from newterminator import Terminator
|
||||
from terminator import Terminator
|
||||
from config import Config
|
||||
from factory import Factory
|
||||
from container import Container
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import gobject
|
|||
import gtk
|
||||
|
||||
from util import dbg, err, get_top_window
|
||||
from newterminator import Terminator
|
||||
from terminator import Terminator
|
||||
from factory import Factory
|
||||
from container import Container
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ from util import dbg
|
|||
import config
|
||||
from keybindings import Keybindings, KeymapError
|
||||
from translation import _
|
||||
from newterminator import Terminator
|
||||
from terminator import Terminator
|
||||
|
||||
# FIXME: We need to check that we have represented all of Config() below
|
||||
class PrefsEditor:
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ from util import dbg, err, gerr, get_top_window
|
|||
import util
|
||||
from config import Config
|
||||
from cwd import get_default_cwd
|
||||
from newterminator import Terminator
|
||||
from terminator import Terminator
|
||||
from titlebar import Titlebar
|
||||
from terminal_popup_menu import TerminalPopupMenu
|
||||
from searchbar import Searchbar
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -8,7 +8,7 @@ import gobject
|
|||
|
||||
from version import APP_NAME
|
||||
from util import dbg
|
||||
from newterminator import Terminator
|
||||
from terminator import Terminator
|
||||
from editablelabel import EditableLabel
|
||||
|
||||
# pylint: disable-msg=R0904
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ from translation import _
|
|||
from version import APP_NAME
|
||||
from container import Container
|
||||
from factory import Factory
|
||||
from newterminator import Terminator
|
||||
from terminator import Terminator
|
||||
|
||||
try:
|
||||
import deskbar.core.keybinder as bindkey
|
||||
|
|
|
|||
Loading…
Reference in New Issue