2
2
# -*- mode: python; coding: utf-8 -*-
4
# Mandos Monitor - Control and monitor the Mandos server
6
# Copyright © 2009-2016 Teddy Hogeborn
7
# Copyright © 2009-2016 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
42
from gi.repository import GLib
48
if sys.version_info.major == 2:
51
locale.setlocale(locale.LC_ALL, '')
54
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
24
locale.setlocale(locale.LC_ALL, u'')
56
26
# Some useful constants
57
domain = 'se.recompile'
27
domain = 'se.bsnet.fukt'
58
28
server_interface = domain + '.Mandos'
59
29
client_interface = domain + '.Mandos.Client'
63
dbus.OBJECT_MANAGER_IFACE
64
except AttributeError:
65
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
67
def isoformat_to_datetime(iso):
68
"Parse an ISO 8601 date string to a datetime.datetime()"
71
d, t = iso.split("T", 1)
72
year, month, day = d.split("-", 2)
73
hour, minute, second = t.split(":", 2)
74
second, fraction = divmod(float(second), 1)
75
return datetime.datetime(int(year),
80
int(second), # Whole seconds
81
int(fraction*1000000)) # Microseconds
32
# Always run in monochrome mode
33
urwid.curses_display.curses.has_colors = lambda : False
35
# Urwid doesn't support blinking, but we want it. Since we have no
36
# use for underline on its own, we make underline also always blink.
37
urwid.curses_display.curses.A_UNDERLINE |= (
38
urwid.curses_display.curses.A_BLINK)
83
40
class MandosClientPropertyCache(object):
84
41
"""This wraps a Mandos Client D-Bus proxy object, caches the
85
42
properties and calls a hook function when any of them are
88
def __init__(self, proxy_object=None, properties=None, **kwargs):
45
def __init__(self, proxy_object=None, *args, **kwargs):
89
46
self.proxy = proxy_object # Mandos Client proxy object
90
self.properties = dict() if properties is None else properties
91
self.property_changed_match = (
92
self.proxy.connect_to_signal("PropertiesChanged",
93
self.properties_changed,
94
dbus.PROPERTIES_IFACE,
97
if properties is None:
98
self.properties.update(
99
self.proxy.GetAll(client_interface,
101
= dbus.PROPERTIES_IFACE))
103
super(MandosClientPropertyCache, self).__init__(**kwargs)
48
self.properties = dict()
49
self.proxy.connect_to_signal(u"PropertyChanged",
50
self.property_changed,
54
self.properties.update(
55
self.proxy.GetAll(client_interface,
56
dbus_interface = dbus.PROPERTIES_IFACE))
57
super(MandosClientPropertyCache, self).__init__(
58
proxy_object=proxy_object, *args, **kwargs)
105
def properties_changed(self, interface, properties, invalidated):
106
"""This is called whenever we get a PropertiesChanged signal
107
It updates the changed properties in the "properties" dict.
60
def property_changed(self, property=None, value=None):
61
"""This is called whenever we get a PropertyChanged signal
62
It updates the changed property in the "properties" dict.
109
64
# Update properties dict with new value
110
if interface == client_interface:
111
self.properties.update(properties)
114
self.property_changed_match.remove()
65
self.properties[property] = value
117
68
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
130
81
self.logger = logger
132
self._update_timer_callback_tag = None
134
83
# The widget shown normally
135
self._text_widget = urwid.Text("")
84
self._text_widget = urwid.Text(u"")
136
85
# The widget shown when we have focus
137
self._focus_text_widget = urwid.Text("")
138
super(MandosClientWidget, self).__init__(**kwargs)
86
self._focus_text_widget = urwid.Text(u"")
87
super(MandosClientWidget, self).__init__(
88
update_hook=update_hook, delete_hook=delete_hook,
140
91
self.opened = False
142
self.match_objects = (
143
self.proxy.connect_to_signal("CheckerCompleted",
144
self.checker_completed,
147
self.proxy.connect_to_signal("CheckerStarted",
148
self.checker_started,
151
self.proxy.connect_to_signal("GotSecret",
155
self.proxy.connect_to_signal("NeedApproval",
159
self.proxy.connect_to_signal("Rejected",
163
self.logger('Created client {}'
164
.format(self.properties["Name"]), level=0)
166
def using_timer(self, flag):
167
"""Call this method with True or False when timer should be
168
activated or deactivated.
170
if flag and self._update_timer_callback_tag is None:
171
# Will update the shown timer value every second
172
self._update_timer_callback_tag = (GLib.timeout_add
175
elif not (flag or self._update_timer_callback_tag is None):
176
GLib.source_remove(self._update_timer_callback_tag)
177
self._update_timer_callback_tag = None
92
self.proxy.connect_to_signal(u"CheckerCompleted",
93
self.checker_completed,
96
self.proxy.connect_to_signal(u"CheckerStarted",
100
self.proxy.connect_to_signal(u"GotSecret",
104
self.proxy.connect_to_signal(u"Rejected",
179
109
def checker_completed(self, exitstatus, condition, command):
180
110
if exitstatus == 0:
181
self.logger('Checker for client {} (command "{}")'
182
' succeeded'.format(self.properties["Name"],
111
self.logger(u'Checker for client %s (command "%s")'
113
% (self.properties[u"name"], command))
187
115
if os.WIFEXITED(condition):
188
self.logger('Checker for client {} (command "{}") failed'
190
.format(self.properties["Name"], command,
191
os.WEXITSTATUS(condition)))
192
elif os.WIFSIGNALED(condition):
193
self.logger('Checker for client {} (command "{}") was'
194
' killed by signal {}'
195
.format(self.properties["Name"], command,
196
os.WTERMSIG(condition)))
116
self.logger(u'Checker for client %s (command "%s")'
117
u' failed with exit code %s'
118
% (self.properties[u"name"], command,
119
os.WEXITSTATUS(condition)))
121
if os.WIFSIGNALED(condition):
122
self.logger(u'Checker for client %s (command "%s")'
123
u' was killed by signal %s'
124
% (self.properties[u"name"], command,
125
os.WTERMSIG(condition)))
127
if os.WCOREDUMP(condition):
128
self.logger(u'Checker for client %s (command "%s")'
130
% (self.properties[u"name"], command))
131
self.logger(u'Checker for client %s completed mysteriously')
199
133
def checker_started(self, command):
200
"""Server signals that a checker started."""
201
self.logger('Client {} started checker "{}"'
202
.format(self.properties["Name"],
134
self.logger(u'Client %s started checker "%s"'
135
% (self.properties[u"name"], unicode(command)))
205
137
def got_secret(self):
206
self.logger('Client {} received its secret'
207
.format(self.properties["Name"]))
209
def need_approval(self, timeout, default):
211
message = 'Client {} needs approval within {} seconds'
213
message = 'Client {} will get its secret in {} seconds'
214
self.logger(message.format(self.properties["Name"],
217
def rejected(self, reason):
218
self.logger('Client {} was rejected; reason: {}'
219
.format(self.properties["Name"], reason))
138
self.logger(u'Client %s received its secret'
139
% self.properties[u"name"])
142
self.logger(u'Client %s was rejected'
143
% self.properties[u"name"])
221
145
def selectable(self):
222
146
"""Make this a "selectable" widget.
223
147
This overrides the method from urwid.FlowWidget."""
226
def rows(self, maxcolrow, focus=False):
150
def rows(self, (maxcol,), focus=False):
227
151
"""How many rows this widget will occupy might depend on
228
152
whether we have focus or not.
229
153
This overrides the method from urwid.FlowWidget"""
230
return self.current_widget(focus).rows(maxcolrow, focus=focus)
154
return self.current_widget(focus).rows((maxcol,), focus=focus)
232
156
def current_widget(self, focus=False):
233
157
if focus or self.opened:
237
161
def update(self):
238
162
"Called when what is visible on the screen should be updated."
239
163
# How to add standout mode to a style
240
with_standout = { "normal": "standout",
241
"bold": "bold-standout",
243
"underline-blink-standout",
244
"bold-underline-blink":
245
"bold-underline-blink-standout",
164
with_standout = { u"normal": u"standout",
165
u"bold": u"bold-standout",
167
u"underline-blink-standout",
168
u"bold-underline-blink":
169
u"bold-underline-blink-standout",
248
172
# Rebuild focus and non-focus widgets using current properties
250
# Base part of a client. Name!
251
base = '{name}: '.format(name=self.properties["Name"])
252
if not self.properties["Enabled"]:
254
self.using_timer(False)
255
elif self.properties["ApprovalPending"]:
256
timeout = datetime.timedelta(milliseconds
259
last_approval_request = isoformat_to_datetime(
260
self.properties["LastApprovalRequest"])
261
if last_approval_request is not None:
262
timer = max(timeout - (datetime.datetime.utcnow()
263
- last_approval_request),
264
datetime.timedelta())
266
timer = datetime.timedelta()
267
if self.properties["ApprovedByDefault"]:
268
message = "Approval in {}. (d)eny?"
270
message = "Denial in {}. (a)pprove?"
271
message = message.format(str(timer).rsplit(".", 1)[0])
272
self.using_timer(True)
273
elif self.properties["LastCheckerStatus"] != 0:
274
# When checker has failed, show timer until client expires
275
expires = self.properties["Expires"]
277
timer = datetime.timedelta(0)
279
expires = (datetime.datetime.strptime
280
(expires, '%Y-%m-%dT%H:%M:%S.%f'))
281
timer = max(expires - datetime.datetime.utcnow(),
282
datetime.timedelta())
283
message = ('A checker has failed! Time until client'
285
.format(str(timer).rsplit(".", 1)[0]))
286
self.using_timer(True)
289
self.using_timer(False)
290
self._text = "{}{}".format(base, message)
173
self._text = (u'%(name)s: %(enabled)s'
174
% { u"name": self.properties[u"name"],
177
if self.properties[u"enabled"]
292
179
if not urwid.supports_unicode():
293
180
self._text = self._text.encode("ascii", "replace")
294
textlist = [("normal", self._text)]
181
textlist = [(u"normal", self._text)]
295
182
self._text_widget.set_text(textlist)
296
183
self._focus_text_widget.set_text([(with_standout[text[0]],
305
192
if self.update_hook is not None:
306
193
self.update_hook()
308
def update_timer(self):
309
"""called by GLib. Will indefinitely loop until
310
GLib.source_remove() on tag is called
313
return True # Keep calling this
315
def delete(self, **kwargs):
316
if self._update_timer_callback_tag is not None:
317
GLib.source_remove(self._update_timer_callback_tag)
318
self._update_timer_callback_tag = None
319
for match in self.match_objects:
321
self.match_objects = ()
322
196
if self.delete_hook is not None:
323
197
self.delete_hook(self)
324
return super(MandosClientWidget, self).delete(**kwargs)
326
def render(self, maxcolrow, focus=False):
199
def render(self, (maxcol,), focus=False):
327
200
"""Render differently if we have focus.
328
201
This overrides the method from urwid.FlowWidget"""
329
return self.current_widget(focus).render(maxcolrow,
202
return self.current_widget(focus).render((maxcol,),
332
def keypress(self, maxcolrow, key):
205
def keypress(self, (maxcol,), key):
334
207
This overrides the method from urwid.FlowWidget"""
336
self.proxy.Set(client_interface, "Enabled",
337
dbus.Boolean(True), ignore_reply = True,
338
dbus_interface = dbus.PROPERTIES_IFACE)
340
self.proxy.Set(client_interface, "Enabled", False,
342
dbus_interface = dbus.PROPERTIES_IFACE)
344
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
345
dbus_interface = client_interface,
348
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
349
dbus_interface = client_interface,
351
elif key == "R" or key == "_" or key == "ctrl k":
208
if key == u"e" or key == u"+":
210
elif key == u"d" or key == u"-":
212
elif key == u"r" or key == u"_" or key == u"ctrl k":
352
213
self.server_proxy_object.RemoveClient(self.proxy
356
self.proxy.Set(client_interface, "CheckerRunning",
357
dbus.Boolean(True), ignore_reply = True,
358
dbus_interface = dbus.PROPERTIES_IFACE)
360
self.proxy.Set(client_interface, "CheckerRunning",
361
dbus.Boolean(False), ignore_reply = True,
362
dbus_interface = dbus.PROPERTIES_IFACE)
364
self.proxy.CheckedOK(dbus_interface = client_interface,
216
self.proxy.StartChecker()
218
self.proxy.StopChecker()
220
self.proxy.CheckedOK()
367
# elif key == "p" or key == "=":
222
# elif key == u"p" or key == "=":
368
223
# self.proxy.pause()
369
# elif key == "u" or key == ":":
224
# elif key == u"u" or key == ":":
370
225
# self.proxy.unpause()
226
# elif key == u"RET":
376
def properties_changed(self, interface, properties, invalidated):
377
"""Call self.update() if any properties changed.
231
def property_changed(self, property=None, value=None,
233
"""Call self.update() if old value is not new value.
378
234
This overrides the method from MandosClientPropertyCache"""
379
old_values = { key: self.properties.get(key)
380
for key in properties.keys() }
381
super(MandosClientWidget, self).properties_changed(
382
interface, properties, invalidated)
383
if any(old_values[key] != self.properties.get(key)
384
for key in old_values):
235
property_name = unicode(property)
236
old_value = self.properties.get(property_name)
237
super(MandosClientWidget, self).property_changed(
238
property=property, value=value, *args, **kwargs)
239
if self.properties.get(property_name) != old_value:
401
256
"""This is the entire user interface - the whole screen
402
257
with boxes, lists of client widgets, etc.
404
def __init__(self, max_log_length=1000, log_level=1):
259
def __init__(self, max_log_length=1000):
405
260
DBusGMainLoop(set_as_default=True)
407
262
self.screen = urwid.curses_display.Screen()
409
264
self.screen.register_palette((
411
"default", "default", None),
413
"bold", "default", "bold"),
415
"underline,blink", "default", "underline,blink"),
417
"standout", "default", "standout"),
418
("bold-underline-blink",
419
"bold,underline,blink", "default", "bold,underline,blink"),
421
"bold,standout", "default", "bold,standout"),
422
("underline-blink-standout",
423
"underline,blink,standout", "default",
424
"underline,blink,standout"),
425
("bold-underline-blink-standout",
426
"bold,underline,blink,standout", "default",
427
"bold,underline,blink,standout"),
266
u"default", u"default", None),
268
u"default", u"default", u"bold"),
270
u"default", u"default", u"underline"),
272
u"default", u"default", u"standout"),
273
(u"bold-underline-blink",
274
u"default", u"default", (u"bold", u"underline")),
276
u"default", u"default", (u"bold", u"standout")),
277
(u"underline-blink-standout",
278
u"default", u"default", (u"underline", u"standout")),
279
(u"bold-underline-blink-standout",
280
u"default", u"default", (u"bold", u"underline",
430
284
if urwid.supports_unicode():
431
self.divider = "─" # \u2500
432
#self.divider = "━" # \u2501
285
self.divider = u"─" # \u2500
286
#self.divider = u"━" # \u2501
434
#self.divider = "-" # \u002d
435
self.divider = "_" # \u005f
288
#self.divider = u"-" # \u002d
289
self.divider = u"_" # \u005f
437
291
self.screen.start()
454
306
# This keeps track of whether self.uilist currently has
455
307
# self.logbox in it or not
456
308
self.log_visible = True
457
self.log_wrap = "any"
309
self.log_wrap = u"any"
460
self.log_message_raw(("bold",
461
"Mandos Monitor version " + version))
462
self.log_message_raw(("bold",
312
self.log_message_raw((u"bold",
313
u"Mandos Monitor version " + version))
314
self.log_message_raw((u"bold",
465
317
self.busname = domain + '.Mandos'
466
self.main_loop = GLib.MainLoop()
318
self.main_loop = gobject.MainLoop()
319
self.bus = dbus.SystemBus()
320
mandos_dbus_objc = self.bus.get_object(
321
self.busname, u"/", follow_name_owner_changes=True)
322
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
326
mandos_clients = (self.mandos_serv
327
.GetAllClientsWithProperties())
328
except dbus.exceptions.DBusException:
329
mandos_clients = dbus.Dictionary()
332
.connect_to_signal(u"ClientRemoved",
333
self.find_and_remove_client,
334
dbus_interface=server_interface,
337
.connect_to_signal(u"ClientAdded",
339
dbus_interface=server_interface,
342
.connect_to_signal(u"ClientNotFound",
343
self.client_not_found,
344
dbus_interface=server_interface,
346
for path, client in mandos_clients.iteritems():
347
client_proxy_object = self.bus.get_object(self.busname,
349
self.add_client(MandosClientWidget(server_proxy_object
352
=client_proxy_object,
468
362
def client_not_found(self, fingerprint, address):
469
self.log_message("Client with address {} and fingerprint {}"
470
" could not be found"
471
.format(address, fingerprint))
363
self.log_message((u"Client with address %s and fingerprint %s"
364
u" could not be found" % (address,
473
367
def rebuild(self):
474
368
"""This rebuilds the User Interface.
475
369
Call this when the widget layout needs to change"""
477
371
#self.uilist.append(urwid.ListBox(self.clients))
478
self.uilist.append(urwid.Frame(ConstrainedListBox(self.
372
self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
480
373
#header=urwid.Divider(),
483
urwid.Divider(div_char=
375
footer=urwid.Divider(div_char=self.divider)))
485
376
if self.log_visible:
486
377
self.uilist.append(self.logbox)
487
379
self.topwidget = urwid.Pile(self.uilist)
489
def log_message(self, message, level=1):
490
"""Log message formatted with timestamp"""
491
if level < self.log_level:
381
def log_message(self, message):
493
382
timestamp = datetime.datetime.now().isoformat()
494
self.log_message_raw("{}: {}".format(timestamp, message),
383
self.log_message_raw(timestamp + u": " + message)
497
def log_message_raw(self, markup, level=1):
385
def log_message_raw(self, markup):
498
386
"""Add a log message to the log buffer."""
499
if level < self.log_level:
501
387
self.log.append(urwid.Text(markup, wrap=self.log_wrap))
502
388
if (self.max_log_length
503
389
and len(self.log) > self.max_log_length):
504
390
del self.log[0:len(self.log)-self.max_log_length-1]
505
391
self.logbox.set_focus(len(self.logbox.body.contents),
392
coming_from=u"above")
509
395
def toggle_log_display(self):
510
396
"""Toggle visibility of the log buffer."""
511
397
self.log_visible = not self.log_visible
513
self.log_message("Log visibility changed to: {}"
514
.format(self.log_visible), level=0)
399
self.log_message(u"Log visibility changed to: "
400
+ unicode(self.log_visible))
516
402
def change_log_display(self):
517
403
"""Change type of log display.
518
404
Currently, this toggles wrapping of text lines."""
519
if self.log_wrap == "clip":
520
self.log_wrap = "any"
405
if self.log_wrap == u"clip":
406
self.log_wrap = u"any"
522
self.log_wrap = "clip"
408
self.log_wrap = u"clip"
523
409
for textwidget in self.log:
524
410
textwidget.set_wrap_mode(self.log_wrap)
525
self.log_message("Wrap mode: {}".format(self.log_wrap),
411
self.log_message(u"Wrap mode: " + self.log_wrap)
528
def find_and_remove_client(self, path, interfaces):
529
"""Find a client by its object path and remove it.
413
def find_and_remove_client(self, path, name):
414
"""Find an client from its object path and remove it.
531
This is connected to the InterfacesRemoved signal from the
416
This is connected to the ClientRemoved signal from the
532
417
Mandos server object."""
533
if client_interface not in interfaces:
534
# Not a Mandos client object; ignore
537
419
client = self.clients_dict[path]
540
self.log_message("Unknown client {!r} removed"
423
self.remove_client(client, path)
545
def add_new_client(self, path, ifs_and_props):
546
"""Find a client by its object path and remove it.
548
This is connected to the InterfacesAdded signal from the
549
Mandos server object.
551
if client_interface not in ifs_and_props:
552
# Not a Mandos client object; ignore
425
def add_new_client(self, path):
554
426
client_proxy_object = self.bus.get_object(self.busname, path)
555
427
self.add_client(MandosClientWidget(server_proxy_object
556
428
=self.mandos_serv,
591
465
"""Start the main loop and exit when it's done."""
592
self.bus = dbus.SystemBus()
593
mandos_dbus_objc = self.bus.get_object(
594
self.busname, "/", follow_name_owner_changes=True)
595
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
599
mandos_clients = (self.mandos_serv
600
.GetAllClientsWithProperties())
601
if not mandos_clients:
602
self.log_message_raw(("bold", "Note: Server has no clients."))
603
except dbus.exceptions.DBusException:
604
self.log_message_raw(("bold", "Note: No Mandos server running."))
605
mandos_clients = dbus.Dictionary()
608
.connect_to_signal("InterfacesRemoved",
609
self.find_and_remove_client,
611
= dbus.OBJECT_MANAGER_IFACE,
614
.connect_to_signal("InterfacesAdded",
617
= dbus.OBJECT_MANAGER_IFACE,
620
.connect_to_signal("ClientNotFound",
621
self.client_not_found,
622
dbus_interface=server_interface,
624
for path, client in mandos_clients.items():
625
client_proxy_object = self.bus.get_object(self.busname,
627
self.add_client(MandosClientWidget(server_proxy_object
630
=client_proxy_object,
641
self._input_callback_tag = (GLib.io_add_watch
467
self._input_callback_tag = (gobject.io_add_watch
642
468
(sys.stdin.fileno(),
644
470
self.process_input))
645
471
self.main_loop.run()
646
472
# Main loop has finished, we should close everything now
647
GLib.source_remove(self._input_callback_tag)
473
gobject.source_remove(self._input_callback_tag)
648
474
self.screen.stop()
668
494
except KeyError: # :-)
671
if key == "q" or key == "Q":
497
if key == u"q" or key == u"Q":
674
elif key == "window resize":
500
elif key == u"window resize":
675
501
self.size = self.screen.get_cols_rows()
677
elif key == "ctrl l":
503
elif key == u"\f": # Ctrl-L
680
elif key == "l" or key == "D":
505
elif key == u"l" or key == u"D":
681
506
self.toggle_log_display()
683
elif key == "w" or key == "i":
508
elif key == u"w" or key == u"i":
684
509
self.change_log_display()
686
elif key == "?" or key == "f1" or key == "esc":
511
elif key == u"?" or key == u"f1" or key == u"esc":
687
512
if not self.log_visible:
688
513
self.log_visible = True
690
self.log_message_raw(("bold",
694
"l: Log window toggle",
695
"TAB: Switch window",
696
"w: Wrap (log lines)",
697
"v: Toggle verbose log",
699
self.log_message_raw(("bold",
705
"s: Start new checker",
515
self.log_message_raw((u"bold",
519
u"l: Log window toggle",
520
u"TAB: Switch window",
522
self.log_message_raw((u"bold",
528
u"s: Start new checker",
712
533
if self.topwidget.get_focus() is self.logbox:
713
534
self.topwidget.set_focus(0)
715
536
self.topwidget.set_focus(self.logbox)
718
if self.log_level == 0:
720
self.log_message("Verbose mode: Off")
723
self.log_message("Verbose mode: On")
724
#elif (key == "end" or key == "meta >" or key == "G"
538
#elif (key == u"end" or key == u"meta >" or key == u"G"
726
540
# pass # xxx end-of-buffer
727
#elif (key == "home" or key == "meta <" or key == "g"
541
#elif (key == u"home" or key == u"meta <" or key == u"g"
729
543
# pass # xxx beginning-of-buffer
730
#elif key == "ctrl e" or key == "$":
544
#elif key == u"ctrl e" or key == u"$":
731
545
# pass # xxx move-end-of-line
732
#elif key == "ctrl a" or key == "^":
546
#elif key == u"ctrl a" or key == u"^":
733
547
# pass # xxx move-beginning-of-line
734
#elif key == "ctrl b" or key == "meta (" or key == "h":
548
#elif key == u"ctrl b" or key == u"meta (" or key == u"h":
735
549
# pass # xxx left
736
#elif key == "ctrl f" or key == "meta )" or key == "l":
550
#elif key == u"ctrl f" or key == u"meta )" or key == u"l":
737
551
# pass # xxx right
739
553
# pass # scroll up log
741
555
# pass # scroll down log
742
556
elif self.topwidget.selectable():
743
557
self.topwidget.keypress(self.size, key)