/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos-monitor

* debian/rules: Only set BROKEN_PIE if binutils is a specific range of
                versions.
* mandos-monitor (MandosClientWidget.keypress): Also accept "Ctrl-K"
                                                for removing client.
  (UserInterface.__init__): Use non-bold line drawing charater.
  (UserInterface.log_message): Scroll to bottom.
  (UserInterface.process_input): Also show help on "ESC" key.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
150
150
            self.proxy.Enable()
151
151
        elif key == u"d" or key == u"-":
152
152
            self.proxy.Disable()
153
 
        elif key == u"r" or key == u"_":
 
153
        elif key == u"r" or key == u"_" or key == u"ctrl k":
154
154
            self.server_proxy_object.RemoveClient(self.proxy
155
155
                                                  .object_path)
156
156
        elif key == u"s":
157
157
            self.proxy.StartChecker()
158
 
        elif key == u"c":
 
158
        elif key == u"S":
159
159
            self.proxy.StopChecker()
160
 
        elif key == u"S":
 
160
        elif key == u"C":
161
161
            self.proxy.CheckedOK()
162
162
        # xxx
163
163
#         elif key == u"p" or key == "=":
223
223
                ))
224
224
        
225
225
        if urwid.supports_unicode():
226
 
            #self.divider = u"─" # \u2500
227
 
            self.divider = u"━" # \u2501
 
226
            self.divider = u"─" # \u2500
 
227
            #self.divider = u"━" # \u2501
228
228
        else:
229
229
            #self.divider = u"-" # \u002d
230
230
            self.divider = u"_" # \u005f
250
250
        self.log_wrap = u"any"
251
251
        
252
252
        self.rebuild()
253
 
        self.log_message(u"Message")
254
 
        self.log_message(u"Message0 Message1 Message2 Message3 Message4 Message5 Message6 Message7 Message8 Message9")
255
 
        self.log_message(u"Message10 Message11 Message12 Message13 Message14 Message15 Message16 Message17 Message18 Message19")
256
 
        self.log_message(u"Message20 Message21 Message22 Message23 Message24 Message25 Message26 Message27 Message28 Message29")
 
253
        self.log_message((u"bold",
 
254
                          u"Mandos Monitor version " + version))
 
255
        self.log_message((u"bold",
 
256
                          u"q: Quit  ?: Help"))
257
257
        
258
258
        self.busname = domain + '.Mandos'
259
259
        self.main_loop = gobject.MainLoop()
313
313
        if (self.max_log_length
314
314
            and len(self.log) > self.max_log_length):
315
315
            del self.log[0:len(self.log)-self.max_log_length-1]
 
316
        self.logbox.set_focus(len(self.logbox.body.contents),
 
317
                              coming_from=u"above")
316
318
    
317
319
    def toggle_log_display(self):
318
320
        """Toggle visibility of the log buffer."""
429
431
            elif key == u"w" or key == u"i":
430
432
                self.change_log_display()
431
433
                self.refresh()
432
 
            elif key == u"?" or key == u"f1":
433
 
                self.log_message(u"Help!")
 
434
            elif key == u"?" or key == u"f1" or key == u"esc":
 
435
                if not self.log_visible:
 
436
                    self.log_visible = True
 
437
                    self.rebuild()
 
438
                self.log_message((u"bold",
 
439
                                  u"  ".join((u"q: Quit",
 
440
                                              u"?: Help",
 
441
                                              u"l: Log window toggle",
 
442
                                              u"TAB: Switch window",
 
443
                                              u"w: Wrap (log)"))))
 
444
                self.log_message((u"bold",
 
445
                                  u"  ".join((u"Clients:",
 
446
                                              u"e: Enable",
 
447
                                              u"d: Disable",
 
448
                                              u"r: Remove",
 
449
                                              u"s: Start new checker",
 
450
                                              u"S: Stop checker",
 
451
                                              u"C: Checker OK"))))
434
452
                self.refresh()
435
453
            elif key == u"tab":
436
454
                if self.topwidget.get_focus() is self.logbox:
438
456
                else:
439
457
                    self.topwidget.set_focus(self.logbox)
440
458
                self.refresh()
441
 
            elif (key == u"end" or key == u"meta >" or key == u"G"
442
 
                  or key == u">"):
443
 
                pass            # xxx end-of-buffer
444
 
            elif (key == u"home" or key == u"meta <" or key == u"g"
445
 
                  or key == u"<"):
446
 
                pass            # xxx beginning-of-buffer
447
 
            elif key == u"ctrl e" or key == u"$":
448
 
                pass            # xxx move-end-of-line
449
 
            elif key == u"ctrl a" or key == u"^":
450
 
                pass            # xxx move-beginning-of-line
451
 
            elif key == u"ctrl b" or key == u"meta (" or key == u"h":
452
 
                pass            # xxx left
453
 
            elif key == u"ctrl f" or key == u"meta )" or key == u"l":
454
 
                pass            # xxx right
455
 
            elif key == u"a":
456
 
                pass            # scroll up log
457
 
            elif key == u"z":
458
 
                pass            # scroll down log
 
459
            #elif (key == u"end" or key == u"meta >" or key == u"G"
 
460
            #      or key == u">"):
 
461
            #    pass            # xxx end-of-buffer
 
462
            #elif (key == u"home" or key == u"meta <" or key == u"g"
 
463
            #      or key == u"<"):
 
464
            #    pass            # xxx beginning-of-buffer
 
465
            #elif key == u"ctrl e" or key == u"$":
 
466
            #    pass            # xxx move-end-of-line
 
467
            #elif key == u"ctrl a" or key == u"^":
 
468
            #    pass            # xxx move-beginning-of-line
 
469
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
 
470
            #    pass            # xxx left
 
471
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
 
472
            #    pass            # xxx right
 
473
            #elif key == u"a":
 
474
            #    pass            # scroll up log
 
475
            #elif key == u"z":
 
476
            #    pass            # scroll down log
459
477
            elif self.topwidget.selectable():
460
478
                self.topwidget.keypress(self.size, key)
461
479
                self.refresh()