2
2
# -*- mode: python; coding: utf-8 -*-
4
# Mandos Monitor - Control and monitor the Mandos server
6
# Copyright © 2009-2015 Teddy Hogeborn
7
# Copyright © 2009-2015 Björn Påhlsson
9
# This program is free software: you can redistribute it and/or modify
10
# it under the terms of the GNU General Public License as published by
11
# the Free Software Foundation, either version 3 of the License, or
12
# (at your option) any later version.
14
# This program is distributed in the hope that it will be useful,
15
# but WITHOUT ANY WARRANTY; without even the implied warranty of
16
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17
# GNU General Public License for more details.
19
# You should have received a copy of the GNU General Public License
20
# along with this program. If not, see
21
# <http://www.gnu.org/licenses/>.
23
# Contact the authors at <mandos@recompile.se>.
26
from __future__ import (division, absolute_import, print_function,
29
from future_builtins import *
4
from __future__ import division, absolute_import, with_statement
41
15
from dbus.mainloop.glib import DBusGMainLoop
45
from gi.repository import GObject as gobject
51
if sys.version_info.major == 2:
54
locale.setlocale(locale.LC_ALL, '')
24
locale.setlocale(locale.LC_ALL, u'')
57
27
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
59
29
# Some useful constants
60
domain = 'se.recompile'
30
domain = 'se.bsnet.fukt'
61
31
server_interface = domain + '.Mandos'
62
32
client_interface = domain + '.Mandos.Client'
35
# Always run in monochrome mode
36
urwid.curses_display.curses.has_colors = lambda : False
38
# Urwid doesn't support blinking, but we want it. Since we have no
39
# use for underline on its own, we make underline also always blink.
40
urwid.curses_display.curses.A_UNDERLINE |= (
41
urwid.curses_display.curses.A_BLINK)
65
43
def isoformat_to_datetime(iso):
66
44
"Parse an ISO 8601 date string to a datetime.datetime()"
69
d, t = iso.split("T", 1)
70
year, month, day = d.split("-", 2)
71
hour, minute, second = t.split(":", 2)
47
d, t = iso.split(u"T", 1)
48
year, month, day = d.split(u"-", 2)
49
hour, minute, second = t.split(u":", 2)
72
50
second, fraction = divmod(float(second), 1)
73
51
return datetime.datetime(int(year),
83
61
properties and calls a hook function when any of them are
86
def __init__(self, proxy_object=None, properties=None, **kwargs):
64
def __init__(self, proxy_object=None, *args, **kwargs):
87
65
self.proxy = proxy_object # Mandos Client proxy object
88
self.properties = dict() if properties is None else properties
89
self.property_changed_match = (
90
self.proxy.connect_to_signal("PropertiesChanged",
91
self.properties_changed,
92
dbus.PROPERTIES_IFACE,
95
if properties is None:
96
self.properties.update(
97
self.proxy.GetAll(client_interface,
99
= dbus.PROPERTIES_IFACE))
101
super(MandosClientPropertyCache, self).__init__(**kwargs)
67
self.properties = dict()
68
self.proxy.connect_to_signal(u"PropertyChanged",
69
self.property_changed,
73
self.properties.update(
74
self.proxy.GetAll(client_interface,
75
dbus_interface = dbus.PROPERTIES_IFACE))
77
#XXX This break good super behaviour!
78
# super(MandosClientPropertyCache, self).__init__(
103
def properties_changed(self, interface, properties, invalidated):
104
"""This is called whenever we get a PropertiesChanged signal
105
It updates the changed properties in the "properties" dict.
81
def property_changed(self, property=None, value=None):
82
"""This is called whenever we get a PropertyChanged signal
83
It updates the changed property in the "properties" dict.
107
85
# Update properties dict with new value
108
self.properties.update(properties)
111
self.property_changed_match.remove()
86
self.properties[property] = value
114
89
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
127
102
self.logger = logger
129
104
self._update_timer_callback_tag = None
105
self.last_checker_failed = False
131
107
# The widget shown normally
132
self._text_widget = urwid.Text("")
108
self._text_widget = urwid.Text(u"")
133
109
# The widget shown when we have focus
134
self._focus_text_widget = urwid.Text("")
135
super(MandosClientWidget, self).__init__(**kwargs)
110
self._focus_text_widget = urwid.Text(u"")
111
super(MandosClientWidget, self).__init__(
112
update_hook=update_hook, delete_hook=delete_hook,
137
115
self.opened = False
139
self.match_objects = (
140
self.proxy.connect_to_signal("CheckerCompleted",
141
self.checker_completed,
144
self.proxy.connect_to_signal("CheckerStarted",
145
self.checker_started,
148
self.proxy.connect_to_signal("GotSecret",
152
self.proxy.connect_to_signal("NeedApproval",
156
self.proxy.connect_to_signal("Rejected",
160
self.logger('Created client {}'
161
.format(self.properties["Name"]), level=0)
163
def using_timer(self, flag):
164
"""Call this method with True or False when timer should be
165
activated or deactivated.
167
if flag and self._update_timer_callback_tag is None:
168
# Will update the shown timer value every second
116
self.proxy.connect_to_signal(u"CheckerCompleted",
117
self.checker_completed,
120
self.proxy.connect_to_signal(u"CheckerStarted",
121
self.checker_started,
124
self.proxy.connect_to_signal(u"GotSecret",
128
self.proxy.connect_to_signal(u"NeedApproval",
132
self.proxy.connect_to_signal(u"Rejected",
136
last_checked_ok = isoformat_to_datetime(self.properties
138
if last_checked_ok is None:
139
self.last_checker_failed = True
141
self.last_checker_failed = ((datetime.datetime.utcnow()
147
if self.last_checker_failed:
169
148
self._update_timer_callback_tag = (gobject.timeout_add
171
150
self.update_timer))
172
elif not (flag or self._update_timer_callback_tag is None):
173
gobject.source_remove(self._update_timer_callback_tag)
174
self._update_timer_callback_tag = None
176
152
def checker_completed(self, exitstatus, condition, command):
177
153
if exitstatus == 0:
178
self.logger('Checker for client {} (command "{}")'
179
' succeeded'.format(self.properties["Name"],
154
if self.last_checker_failed:
155
self.last_checker_failed = False
156
gobject.source_remove(self._update_timer_callback_tag)
157
self._update_timer_callback_tag = None
158
#self.logger(u'Checker for client %s (command "%s")'
160
# % (self.properties[u"Name"], command))
164
if not self.last_checker_failed:
165
self.last_checker_failed = True
166
self._update_timer_callback_tag = (gobject.timeout_add
184
169
if os.WIFEXITED(condition):
185
self.logger('Checker for client {} (command "{}") failed'
187
.format(self.properties["Name"], command,
188
os.WEXITSTATUS(condition)))
170
self.logger(u'Checker for client %s (command "%s")'
171
u' failed with exit code %s'
172
% (self.properties[u"Name"], command,
173
os.WEXITSTATUS(condition)))
189
174
elif os.WIFSIGNALED(condition):
190
self.logger('Checker for client {} (command "{}") was'
191
' killed by signal {}'
192
.format(self.properties["Name"], command,
193
os.WTERMSIG(condition)))
175
self.logger(u'Checker for client %s (command "%s")'
176
u' was killed by signal %s'
177
% (self.properties[u"Name"], command,
178
os.WTERMSIG(condition)))
179
elif os.WCOREDUMP(condition):
180
self.logger(u'Checker for client %s (command "%s")'
182
% (self.properties[u"Name"], command))
184
self.logger(u'Checker for client %s completed'
196
188
def checker_started(self, command):
197
"""Server signals that a checker started."""
198
self.logger('Client {} started checker "{}"'
199
.format(self.properties["Name"],
189
#self.logger(u'Client %s started checker "%s"'
190
# % (self.properties[u"Name"], unicode(command)))
202
193
def got_secret(self):
203
self.logger('Client {} received its secret'
204
.format(self.properties["Name"]))
194
self.last_checker_failed = False
195
self.logger(u'Client %s received its secret'
196
% self.properties[u"Name"])
206
198
def need_approval(self, timeout, default):
208
message = 'Client {} needs approval within {} seconds'
200
message = u'Client %s needs approval within %s seconds'
210
message = 'Client {} will get its secret in {} seconds'
211
self.logger(message.format(self.properties["Name"],
202
message = u'Client %s will get its secret in %s seconds'
204
% (self.properties[u"Name"], timeout/1000))
214
206
def rejected(self, reason):
215
self.logger('Client {} was rejected; reason: {}'
216
.format(self.properties["Name"], reason))
207
self.logger(u'Client %s was rejected; reason: %s'
208
% (self.properties[u"Name"], reason))
218
210
def selectable(self):
219
211
"""Make this a "selectable" widget.
220
212
This overrides the method from urwid.FlowWidget."""
223
def rows(self, maxcolrow, focus=False):
215
def rows(self, (maxcol,), focus=False):
224
216
"""How many rows this widget will occupy might depend on
225
217
whether we have focus or not.
226
218
This overrides the method from urwid.FlowWidget"""
227
return self.current_widget(focus).rows(maxcolrow, focus=focus)
219
return self.current_widget(focus).rows((maxcol,), focus=focus)
229
221
def current_widget(self, focus=False):
230
222
if focus or self.opened:
234
226
def update(self):
235
227
"Called when what is visible on the screen should be updated."
236
228
# How to add standout mode to a style
237
with_standout = { "normal": "standout",
238
"bold": "bold-standout",
240
"underline-blink-standout",
241
"bold-underline-blink":
242
"bold-underline-blink-standout",
229
with_standout = { u"normal": u"standout",
230
u"bold": u"bold-standout",
232
u"underline-blink-standout",
233
u"bold-underline-blink":
234
u"bold-underline-blink-standout",
245
237
# Rebuild focus and non-focus widgets using current properties
247
239
# Base part of a client. Name!
248
base = '{name}: '.format(name=self.properties["Name"])
249
if not self.properties["Enabled"]:
251
self.using_timer(False)
252
elif self.properties["ApprovalPending"]:
240
base = (u'%(name)s: '
241
% {u"name": self.properties[u"Name"]})
242
if not self.properties[u"Enabled"]:
243
message = u"DISABLED"
244
elif self.properties[u"ApprovalPending"]:
245
if self.properties[u"ApprovedByDefault"]:
246
message = u"Connection established to client. (d)eny?"
248
message = u"Seeks approval to send secret. (a)pprove?"
249
elif self.last_checker_failed:
253
250
timeout = datetime.timedelta(milliseconds
254
251
= self.properties
256
last_approval_request = isoformat_to_datetime(
257
self.properties["LastApprovalRequest"])
258
if last_approval_request is not None:
259
timer = max(timeout - (datetime.datetime.utcnow()
260
- last_approval_request),
261
datetime.timedelta())
263
timer = datetime.timedelta()
264
if self.properties["ApprovedByDefault"]:
265
message = "Approval in {}. (d)eny?"
267
message = "Denial in {}. (a)pprove?"
268
message = message.format(str(timer).rsplit(".", 1)[0])
269
self.using_timer(True)
270
elif self.properties["LastCheckerStatus"] != 0:
271
# When checker has failed, show timer until client expires
272
expires = self.properties["Expires"]
274
timer = datetime.timedelta(0)
276
expires = (datetime.datetime.strptime
277
(expires, '%Y-%m-%dT%H:%M:%S.%f'))
278
timer = max(expires - datetime.datetime.utcnow(),
279
datetime.timedelta())
280
message = ('A checker has failed! Time until client'
282
.format(str(timer).rsplit(".", 1)[0]))
283
self.using_timer(True)
253
last_ok = isoformat_to_datetime(
254
max((self.properties[u"LastCheckedOK"]
255
or self.properties[u"Created"]),
256
self.properties[u"LastEnabled"]))
257
timer = timeout - (datetime.datetime.utcnow() - last_ok)
258
message = (u'A checker has failed! Time until client'
260
% unicode(timer).rsplit(".", 1)[0])
286
self.using_timer(False)
287
self._text = "{}{}".format(base, message)
263
self._text = "%s%s" % (base, message)
289
265
if not urwid.supports_unicode():
290
266
self._text = self._text.encode("ascii", "replace")
291
textlist = [("normal", self._text)]
267
textlist = [(u"normal", self._text)]
292
268
self._text_widget.set_text(textlist)
293
269
self._focus_text_widget.set_text([(with_standout[text[0]],
303
279
self.update_hook()
305
281
def update_timer(self):
306
"""called by gobject. Will indefinitely loop until
307
gobject.source_remove() on tag is called"""
309
284
return True # Keep calling this
311
def delete(self, **kwargs):
312
287
if self._update_timer_callback_tag is not None:
313
288
gobject.source_remove(self._update_timer_callback_tag)
314
289
self._update_timer_callback_tag = None
315
for match in self.match_objects:
317
self.match_objects = ()
318
290
if self.delete_hook is not None:
319
291
self.delete_hook(self)
320
return super(MandosClientWidget, self).delete(**kwargs)
322
def render(self, maxcolrow, focus=False):
293
def render(self, (maxcol,), focus=False):
323
294
"""Render differently if we have focus.
324
295
This overrides the method from urwid.FlowWidget"""
325
return self.current_widget(focus).render(maxcolrow,
296
return self.current_widget(focus).render((maxcol,),
328
def keypress(self, maxcolrow, key):
299
def keypress(self, (maxcol,), key):
330
301
This overrides the method from urwid.FlowWidget"""
332
self.proxy.Set(client_interface, "Enabled",
333
dbus.Boolean(True), ignore_reply = True,
334
dbus_interface = dbus.PROPERTIES_IFACE)
336
self.proxy.Set(client_interface, "Enabled", False,
338
dbus_interface = dbus.PROPERTIES_IFACE)
303
self.proxy.Enable(dbus_interface = client_interface)
305
self.proxy.Disable(dbus_interface = client_interface)
340
307
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
341
dbus_interface = client_interface,
308
dbus_interface = client_interface)
344
310
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
345
dbus_interface = client_interface,
347
elif key == "R" or key == "_" or key == "ctrl k":
311
dbus_interface = client_interface)
312
elif key == u"r" or key == u"_" or key == u"ctrl k":
348
313
self.server_proxy_object.RemoveClient(self.proxy
352
self.proxy.Set(client_interface, "CheckerRunning",
353
dbus.Boolean(True), ignore_reply = True,
354
dbus_interface = dbus.PROPERTIES_IFACE)
356
self.proxy.Set(client_interface, "CheckerRunning",
357
dbus.Boolean(False), ignore_reply = True,
358
dbus_interface = dbus.PROPERTIES_IFACE)
360
self.proxy.CheckedOK(dbus_interface = client_interface,
316
self.proxy.StartChecker(dbus_interface = client_interface)
318
self.proxy.StopChecker(dbus_interface = client_interface)
320
self.proxy.CheckedOK(dbus_interface = client_interface)
363
# elif key == "p" or key == "=":
322
# elif key == u"p" or key == "=":
364
323
# self.proxy.pause()
365
# elif key == "u" or key == ":":
324
# elif key == u"u" or key == ":":
366
325
# self.proxy.unpause()
326
# elif key == u"RET":
372
def properties_changed(self, interface, properties, invalidated):
373
"""Call self.update() if any properties changed.
331
def property_changed(self, property=None, value=None,
333
"""Call self.update() if old value is not new value.
374
334
This overrides the method from MandosClientPropertyCache"""
375
old_values = { key: self.properties.get(key)
376
for key in properties.keys() }
377
super(MandosClientWidget, self).properties_changed(
378
interface, properties, invalidated)
379
if any(old_values[key] != self.properties.get(key)
380
for key in old_values):
335
property_name = unicode(property)
336
old_value = self.properties.get(property_name)
337
super(MandosClientWidget, self).property_changed(
338
property=property, value=value, *args, **kwargs)
339
if self.properties.get(property_name) != old_value:
397
357
"""This is the entire user interface - the whole screen
398
358
with boxes, lists of client widgets, etc.
400
def __init__(self, max_log_length=1000, log_level=1):
360
def __init__(self, max_log_length=1000):
401
361
DBusGMainLoop(set_as_default=True)
403
363
self.screen = urwid.curses_display.Screen()
405
365
self.screen.register_palette((
407
"default", "default", None),
409
"bold", "default", "bold"),
411
"underline,blink", "default", "underline,blink"),
413
"standout", "default", "standout"),
414
("bold-underline-blink",
415
"bold,underline,blink", "default", "bold,underline,blink"),
417
"bold,standout", "default", "bold,standout"),
418
("underline-blink-standout",
419
"underline,blink,standout", "default",
420
"underline,blink,standout"),
421
("bold-underline-blink-standout",
422
"bold,underline,blink,standout", "default",
423
"bold,underline,blink,standout"),
367
u"default", u"default", None),
369
u"default", u"default", u"bold"),
371
u"default", u"default", u"underline"),
373
u"default", u"default", u"standout"),
374
(u"bold-underline-blink",
375
u"default", u"default", (u"bold", u"underline")),
377
u"default", u"default", (u"bold", u"standout")),
378
(u"underline-blink-standout",
379
u"default", u"default", (u"underline", u"standout")),
380
(u"bold-underline-blink-standout",
381
u"default", u"default", (u"bold", u"underline",
426
385
if urwid.supports_unicode():
427
self.divider = "─" # \u2500
428
#self.divider = "━" # \u2501
386
self.divider = u"─" # \u2500
387
#self.divider = u"━" # \u2501
430
#self.divider = "-" # \u002d
431
self.divider = "_" # \u005f
389
#self.divider = u"-" # \u002d
390
self.divider = u"_" # \u005f
433
392
self.screen.start()
450
407
# This keeps track of whether self.uilist currently has
451
408
# self.logbox in it or not
452
409
self.log_visible = True
453
self.log_wrap = "any"
410
self.log_wrap = u"any"
456
self.log_message_raw(("bold",
457
"Mandos Monitor version " + version))
458
self.log_message_raw(("bold",
413
self.log_message_raw((u"bold",
414
u"Mandos Monitor version " + version))
415
self.log_message_raw((u"bold",
461
418
self.busname = domain + '.Mandos'
462
419
self.main_loop = gobject.MainLoop()
420
self.bus = dbus.SystemBus()
421
mandos_dbus_objc = self.bus.get_object(
422
self.busname, u"/", follow_name_owner_changes=True)
423
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
427
mandos_clients = (self.mandos_serv
428
.GetAllClientsWithProperties())
429
except dbus.exceptions.DBusException:
430
mandos_clients = dbus.Dictionary()
433
.connect_to_signal(u"ClientRemoved",
434
self.find_and_remove_client,
435
dbus_interface=server_interface,
438
.connect_to_signal(u"ClientAdded",
440
dbus_interface=server_interface,
443
.connect_to_signal(u"ClientNotFound",
444
self.client_not_found,
445
dbus_interface=server_interface,
447
for path, client in mandos_clients.iteritems():
448
client_proxy_object = self.bus.get_object(self.busname,
450
self.add_client(MandosClientWidget(server_proxy_object
453
=client_proxy_object,
464
463
def client_not_found(self, fingerprint, address):
465
self.log_message("Client with address {} and fingerprint {}"
466
" could not be found"
467
.format(address, fingerprint))
464
self.log_message((u"Client with address %s and fingerprint %s"
465
u" could not be found" % (address,
469
468
def rebuild(self):
470
469
"""This rebuilds the User Interface.
481
480
if self.log_visible:
482
481
self.uilist.append(self.logbox)
483
483
self.topwidget = urwid.Pile(self.uilist)
485
def log_message(self, message, level=1):
486
"""Log message formatted with timestamp"""
487
if level < self.log_level:
485
def log_message(self, message):
489
486
timestamp = datetime.datetime.now().isoformat()
490
self.log_message_raw("{}: {}".format(timestamp, message),
487
self.log_message_raw(timestamp + u": " + message)
493
def log_message_raw(self, markup, level=1):
489
def log_message_raw(self, markup):
494
490
"""Add a log message to the log buffer."""
495
if level < self.log_level:
497
491
self.log.append(urwid.Text(markup, wrap=self.log_wrap))
498
492
if (self.max_log_length
499
493
and len(self.log) > self.max_log_length):
500
494
del self.log[0:len(self.log)-self.max_log_length-1]
501
495
self.logbox.set_focus(len(self.logbox.body.contents),
496
coming_from=u"above")
505
499
def toggle_log_display(self):
506
500
"""Toggle visibility of the log buffer."""
507
501
self.log_visible = not self.log_visible
509
self.log_message("Log visibility changed to: {}"
510
.format(self.log_visible), level=0)
503
#self.log_message(u"Log visibility changed to: "
504
# + unicode(self.log_visible))
512
506
def change_log_display(self):
513
507
"""Change type of log display.
514
508
Currently, this toggles wrapping of text lines."""
515
if self.log_wrap == "clip":
516
self.log_wrap = "any"
509
if self.log_wrap == u"clip":
510
self.log_wrap = u"any"
518
self.log_wrap = "clip"
512
self.log_wrap = u"clip"
519
513
for textwidget in self.log:
520
514
textwidget.set_wrap_mode(self.log_wrap)
521
self.log_message("Wrap mode: {}".format(self.log_wrap),
515
#self.log_message(u"Wrap mode: " + self.log_wrap)
524
517
def find_and_remove_client(self, path, name):
525
"""Find a client by its object path and remove it.
518
"""Find an client from its object path and remove it.
527
520
This is connected to the ClientRemoved signal from the
528
521
Mandos server object."""
573
569
"""Start the main loop and exit when it's done."""
574
self.bus = dbus.SystemBus()
575
mandos_dbus_objc = self.bus.get_object(
576
self.busname, "/", follow_name_owner_changes=True)
577
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
581
mandos_clients = (self.mandos_serv
582
.GetAllClientsWithProperties())
583
if not mandos_clients:
584
self.log_message_raw(("bold", "Note: Server has no clients."))
585
except dbus.exceptions.DBusException:
586
self.log_message_raw(("bold", "Note: No Mandos server running."))
587
mandos_clients = dbus.Dictionary()
590
.connect_to_signal("ClientRemoved",
591
self.find_and_remove_client,
592
dbus_interface=server_interface,
595
.connect_to_signal("ClientAdded",
597
dbus_interface=server_interface,
600
.connect_to_signal("ClientNotFound",
601
self.client_not_found,
602
dbus_interface=server_interface,
604
for path, client in mandos_clients.items():
605
client_proxy_object = self.bus.get_object(self.busname,
607
self.add_client(MandosClientWidget(server_proxy_object
610
=client_proxy_object,
621
571
self._input_callback_tag = (gobject.io_add_watch
622
572
(sys.stdin.fileno(),
648
598
except KeyError: # :-)
651
if key == "q" or key == "Q":
601
if key == u"q" or key == u"Q":
654
elif key == "window resize":
604
elif key == u"window resize":
655
605
self.size = self.screen.get_cols_rows()
657
elif key == "ctrl l":
607
elif key == u"\f": # Ctrl-L
660
elif key == "l" or key == "D":
609
elif key == u"l" or key == u"D":
661
610
self.toggle_log_display()
663
elif key == "w" or key == "i":
612
elif key == u"w" or key == u"i":
664
613
self.change_log_display()
666
elif key == "?" or key == "f1" or key == "esc":
615
elif key == u"?" or key == u"f1" or key == u"esc":
667
616
if not self.log_visible:
668
617
self.log_visible = True
670
self.log_message_raw(("bold",
674
"l: Log window toggle",
675
"TAB: Switch window",
676
"w: Wrap (log lines)",
677
"v: Toggle verbose log",
679
self.log_message_raw(("bold",
685
"s: Start new checker",
619
self.log_message_raw((u"bold",
623
u"l: Log window toggle",
624
u"TAB: Switch window",
626
self.log_message_raw((u"bold",
632
u"s: Start new checker",
692
639
if self.topwidget.get_focus() is self.logbox:
693
640
self.topwidget.set_focus(0)
695
642
self.topwidget.set_focus(self.logbox)
698
if self.log_level == 0:
700
self.log_message("Verbose mode: Off")
703
self.log_message("Verbose mode: On")
704
#elif (key == "end" or key == "meta >" or key == "G"
644
#elif (key == u"end" or key == u"meta >" or key == u"G"
706
646
# pass # xxx end-of-buffer
707
#elif (key == "home" or key == "meta <" or key == "g"
647
#elif (key == u"home" or key == u"meta <" or key == u"g"
709
649
# pass # xxx beginning-of-buffer
710
#elif key == "ctrl e" or key == "$":
650
#elif key == u"ctrl e" or key == u"$":
711
651
# pass # xxx move-end-of-line
712
#elif key == "ctrl a" or key == "^":
652
#elif key == u"ctrl a" or key == u"^":
713
653
# pass # xxx move-beginning-of-line
714
#elif key == "ctrl b" or key == "meta (" or key == "h":
654
#elif key == u"ctrl b" or key == u"meta (" or key == u"h":
715
655
# pass # xxx left
716
#elif key == "ctrl f" or key == "meta )" or key == "l":
656
#elif key == u"ctrl f" or key == u"meta )" or key == u"l":
717
657
# pass # xxx right
719
659
# pass # scroll up log
721
661
# pass # scroll down log
722
662
elif self.topwidget.selectable():
723
663
self.topwidget.keypress(self.size, key)