Merge lp:~nacl/wicd/1.6-urwid-0.9.9-compat into lp:wicd/1.6

[Andrew Psaltis]

[Andrew Psaltis (nacl)]

These are changes to wicd 1.6 that make wicd-curses more compatible with urwid 0.9.9. These changes break compatibility with urwid 0.9.8.*, and should be included in mainline once urwid 0.9.9 is mainstream in all major distributions.

[lp:~nacl/wicd/1.6-urwid-0.9.9-compat]

353. By Andrew Psaltis on 2009-11-21

Added support for the new and improved DropDown that is based on Ian Ward's PopUpTarget.

354. By Andrew Psaltis on 2009-11-21

Trimmed some stuff.

355. By Andrew Psaltis on 2009-11-21

Pad the wpa driver DropDown correctly.

356. By Andrew Psaltis on 2009-11-21

Moved the padding code over to the DropDown itself and cleaned up some stuff.

357. By Andrew Psaltis on 2009-11-21

Added callback support to the DropDown and replaced the remaining ComboBoxes
in the big dialogs.

358. By Andrew Psaltis on 2009-11-21

Fix bug preventing mouse from working with the OptCols.

[Andrew Psaltis (nacl)]

> These are changes to wicd 1.6 that make wicd-curses more compatible with urwid
> 0.9.9. These changes break compatibility with urwid 0.9.8.*, and should be
> included in mainline once urwid 0.9.9 is mainstream in all major
> distributions.

This code went unstable the last time I modified it, so don't even try to merge it until
the new DropDowns are implemented.

[Adam Blackburn (adamblackburn)]

Didn't look at the code, but we've decided not to merge this for 1.7.

review: Disapprove

Unmerged revisions

358. By Andrew Psaltis on 2009-11-21

Fix bug preventing mouse from working with the OptCols.

357. By Andrew Psaltis on 2009-11-21

Added callback support to the DropDown and replaced the remaining ComboBoxes
in the big dialogs.

356. By Andrew Psaltis on 2009-11-21

Moved the padding code over to the DropDown itself and cleaned up some stuff.

355. By Andrew Psaltis on 2009-11-21

Pad the wpa driver DropDown correctly.

354. By Andrew Psaltis on 2009-11-21

Trimmed some stuff.

353. By Andrew Psaltis on 2009-11-21

Added support for the new and improved DropDown that is based on Ian Ward's PopUpTarget.

352. By Andrew Psaltis on 2009-11-02

Fixed up the optcols, apparently, I dropped something. :P

351. By Andrew Psaltis on 2009-11-01

Merge mainline r463.

350. By Andrew Psaltis on 2009-11-01

Merge local formatting/print statement removal changes that didn't seem to make it.

349. By Andrew Psaltis on 2009-09-29

Merge r461 of mainline, providing some bugfixes (some wicd-curses stuff ignored).

=== modified file 'curses/curses_misc.py'
--- curses/curses_misc.py	2009-09-29 16:38:11 +0000
+++ curses/curses_misc.py	2009-11-21 05:36:12 +0000
@@ -547,7 +547,7 @@
     def mouse_event(self,size,event,button,x,y,focus):
         if event == "mouse press":
             # The keypress dealie in wicd-curses.py expects a list of keystrokes
-            self.callback([self.args])
+            self.callback([self.args],size=None)
 
 # htop-style menu menu-bar on the bottom of the screen
 class OptCols(urwid.WidgetWrap):
 
=== modified file 'curses/netentry_curses.py'
--- curses/netentry_curses.py	2009-07-19 02:18:21 +0000
+++ curses/netentry_curses.py	2009-11-21 05:36:12 +0000
@@ -23,6 +23,7 @@
 
 import urwid
 from curses_misc import TextDialog,DynWrap,MaskingEdit,ComboBox,error
+from popup import DropDown
 import wicd.misc as misc
 from wicd.misc import noneToString, stringToNone, noneToBlankString, to_bool
 
@@ -95,7 +96,6 @@
 
 
         self._listbox = urwid.ListBox(walker)
-        #self._frame = urwid.Frame(self._listbox)
         self._frame = urwid.Frame(self._listbox)
         self.__super.__init__(self._frame)
     
@@ -207,7 +207,6 @@
         AdvancedSettingsDialog.save_settings(self)
         if self.set_default.get_state():
             wired.UnsetWiredDefault()
-        print self.set_default.get_state()
         if self.set_default.get_state():
             bool = True
         else:
@@ -236,7 +235,7 @@
         
         self.global_settings_chkbox = urwid.CheckBox(global_settings_t)
         self.encryption_chkbox = urwid.CheckBox(encryption_t,on_state_change=self.encryption_toggle)
-        self.encryption_combo = ComboBox(callback=self.combo_on_change)
+        self.encryption_combo = DynWrap(DropDown(callback=self.combo_on_change))#ComboBox(callback=self.combo_on_change)
         self.autoconnect_chkbox = urwid.CheckBox(autoconnect_t)
         self.pile_encrypt = None
         # _w is a Frame, _w.body is a ListBox, _w.body.body is the ListWalker :-)
@@ -255,7 +254,7 @@
         self.encryption_combo.set_sensitive(new_state)
         self.pile_encrypt.set_sensitive(new_state)
 
-    def combo_on_change(self,combobox,new_index,user_data=None):
+    def combo_on_change(self,lb,user_data=None):
         self.change_encrypt_method()
 
     def set_values(self):
@@ -318,7 +317,6 @@
     def save_settings(self):
         # Check encryption info
         if self.encryption_chkbox.get_state():
-            #print "setting encryption info..."
             encrypt_info = self.encryption_info
             encrypt_methods = self.encrypt_types
             self.set_net_prop("enctype",
@@ -395,10 +393,9 @@
         # Make this into a listbox?
         self.pile_encrypt = DynWrap(urwid.Pile(theList),attrs=('editbx','editnfc'))
         self._w.body.body.insert(self._w.body.body.__len__(),self.pile_encrypt)
-        #self._w.body.body.append(self.pile_encrypt)
 
     def ready_widgets(self,ui,body):
         self.ui = ui
         self.body = body
-        self.encryption_combo.build_combobox(body,ui,14)
+        #self.encryption_combo.build_combobox(body,ui,14)
         self.change_encrypt_method()
 
=== added file 'curses/popup.py'
--- curses/popup.py	1970-01-01 00:00:00 +0000
+++ curses/popup.py	2009-11-21 05:36:12 +0000
@@ -0,0 +1,312 @@
+#!/usr/bin/env python
+
+# Much of this code has been placed into the public domain by its original
+# author and urwid maintainer, Ian Ward. A very big thanks to him for making
+# this available to me, it's going to make greatly simplify the wicd-curses
+# code and make things easier for wicd-curses 2.0 when I actually start working
+# on it.  Urwid in general is fun to work with, and has proven to be a very
+# robust library.
+#
+# ~ Andrew
+
+# NOTE:
+# While much of this file is in the PUBLIC DOMAIN, the DropDown class is
+# licensed under the GNU General Public License, Version 2 or higher.
+# 
+# Standard License statement follows:
+#   Copyright (C) 2009 Andrew Psaltis
+
+#   This file is a part of wicd.
+#   
+#   Wicd is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#   
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#   
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+#   MA 02110-1301, USA.
+
+import urwid
+import urwid.raw_display
+import sys
+from curses_misc import SelText
+
+### BEGIN PUBLIC DOMAIN CODE ###
+class PopUpTarget(urwid.WidgetWrap):
+    def __init__(self, original_widget):
+        self.__super.__init__(original_widget)
+        self._pop_up = None
+        self._current_widget = self._w
+
+    def render(self, size, focus=False):
+        canv = self._current_widget.render(size, focus=focus)
+        if 'pop_up' in canv.coords:
+            x, y, (w, h, widget, set_close) = canv.coords['pop_up']
+            if not self._pop_up:
+                self._open_pop_up(x, y, w, h, widget)
+                set_close(self.close_pop_up)
+            else:
+                self._update_pop_up(x, y, w, h)
+            canv = self._current_widget.render(size, focus=focus)
+
+        return canv
+
+    def _open_pop_up(self, x, y, w, h, widget):
+        assert not self._pop_up
+        self._pop_up = widget
+        self._update_pop_up(x, y, w, h)
+
+    def _update_pop_up(self, x, y, w, h):
+        self._current_widget = urwid.Overlay(self._pop_up, self._w,
+            ('fixed left', x), w, ('fixed top', y), h)
+
+    def close_pop_up(self):
+        if self._pop_up:
+            self._pop_up = None
+            self._current_widget = self._w
+            self._invalidate()
+
+    # use our current widget's methods
+    selectable = property(lambda self:self._current_widget.selectable)
+    get_cursor_coords = property(lambda self:self._current_widget.get_cursor_coords)
+    get_pref_col = property(lambda self:self._current_widget.get_pref_col)
+    keypress = property(lambda self:self._current_widget.keypress)
+    move_cursor_to_coords = property(lambda self:self._current_widget.move_cursor_to_coords)
+    mouse_event = property(lambda self:self._current_widget.mouse_event)
+    sizing = property(lambda self:self._current_widget.sizing)
+
+### BEGIN GPL CODE ###
+class DropDown(urwid.WidgetWrap):
+    def __init__(self,items=[],show_indicator=True,popup_attr='body',popup_f_attr='focus',callback=None,user_args=None):
+        self._popup_attr = popup_attr
+        self._popup_f_attr = popup_f_attr
+        self.callback = callback
+        self.user_args = user_args
+        self.set_list(items,init=True)
+        self.lb = urwid.ListBox(self._walker)
+
+        if len(self._walker) != 0:
+            self.text = self.lb.get_focus()[0].base_widget
+        else:
+            self.text = SelText("")
+        self._open_pop_up = False
+        if show_indicator:
+            self._cols = urwid.Columns([self.text,('fixed',3,urwid.Padding(urwid.Text('[V]'),'right',3))],dividechars=1)
+            self.__super.__init__(urwid.Padding(self._cols,'left',self._maxlen+4))
+        else:
+            self._cols = urwid.Columns([self.text])
+            self.__super.__init__(urwid.Padding(self._cols,'left',self._maxlen))
+
+    def get_popup_attr(self):
+        return self._popup_attr
+    def get_popup_f_attr(self):
+        return self._popup_f_attr
+
+    def set_popup_attr(self,attr):
+        self._popup_attr = attr
+    def set_popup_f_attr(self,attr):
+        self._popup_f_attr = attr
+
+    def remove(self,text):
+        """
+        Remove the first item with text "text" from the DropDown.
+
+        Returns the text if it's in the DropDown, None otherwise
+
+        >>> d = DropDown(['one','rediculously','long','string'])
+        >>> d._maxlen
+        12
+        >>> len('rediculously')
+        12
+        >>> d.remove('rediculously')
+        'rediculously'
+        >>> d._maxlen
+        6
+        >>> d.remove('rediculously')
+        None
+        """
+        swap_out = False
+        for txt in self._walker:
+            if txt.text == text:
+                if self.lb.get_focus()[0] == txt:
+                    swap_out = True
+                self._walker.remove(txt)
+                if txt.base_widget.pack()[0] == self._maxlen:
+                    self._adjust_and_align()
+                if swap_out:
+                    self._cols.widget_list[0] = self.lb.get_focus()[0].base_widget
+                return text
+        return None
+
+    def _align(self):
+        self._maxlen = 0
+        #print >> sys.stderr, "len walker:",len(self._walker)
+        for i in self._walker:
+            #print >>sys.stderr, i.base_widget.pack()[0]
+            if self._maxlen < i.base_widget.pack()[0]:
+                #print >>sys.stderr, "New maxlen is '%s'" % i.text
+                self._maxlen = i.base_widget.pack()[0]
+
+    def _adjust_and_align(self):
+        #print >> sys.stderr, "ADJUST_AND_ALIGN"
+        #print >> sys.stderr, "width is", self._w.width
+        self._w.width -= self._maxlen
+        #print >> sys.stderr, "maxlen is", self._maxlen
+        #print >> sys.stderr, "width is", self._w.width
+        self._align()
+        self._w.width += self._maxlen
+        #print >> sys.stderr, "width is", self._w.width
+
+    def get_focus(self):
+        """ 
+        Get the current focus of the widget.
+
+        """
+        return self.lb.get_focus()
+    def set_focus(self,idx):
+        self.lb.set_focus(idx)
+    focus = property(get_focus,set_focus)
+    
+    def size(self):
+        return len(self._walker)
+
+    def set_list(self,l,init=False):
+        itexts = [urwid.AttrWrap(SelText(i),self._popup_attr,self._popup_f_attr) for i in l]
+        self._walker = urwid.SimpleListWalker(itexts)
+        if init:
+            self._align()
+        # Do additional stuff if this is not called from the constructor
+        else:
+            #print >>sys.stderr,"ddown says", self._w.width
+            self.lb.body = self._walker
+            self._adjust_and_align()
+            if len(self._walker) != 0:
+                self._cols.widget_list[0] = self.lb.get_focus()[0].base_widget
+            else:
+                self._cols.widget_list[0] = SelText("")
+            #print >>sys.stderr,"ddown says", self._w.width
+
+
+    def append_list(self,l):
+        for i in l:
+            self.append_item(i)
+        return True
+
+    def append_item(self,text):
+        return self.insert_item(text,len(self._walker))
+
+    def insert_item(self,text,idx):
+        """
+        Inserts a new item with text 'text' at index 'idx' by calling the
+        'insert' method of the DropDown's ListWalker.
+
+        This raises an IndexError if 'idx' is greater than the length of the
+        list, but negative indices are accepted (and are actually used as the
+        default value for idx).  Be careful!
+
+        This also raises a TypeError if idx is not an integer
+
+        Return value: True
+        """
+        if idx > len(self._walker):
+            raise IndexError("Index '%d' out of listwalker bounds" % idx)
+        if type(idx) != type(0):
+            raise TypeError("Index is of type %s, not an integer" % type(idx))
+        wid = SelText(text)
+        self._walker.insert(idx,urwid.AttrWrap(wid,self._popup_attr,self._popup_f_attr))
+        if len(self._walker) == 1:
+            self._cols.widget_list[0] = self.lb.get_focus()[0].base_widget
+        if wid.pack()[0] > self._maxlen:
+            self._w.width -= self._maxlen
+            self._maxlen = wid.pack()[0]
+            self._w.width += self._maxlen
+
+        return True
+
+    def _create_pop_up(self):
+        class CPane(urwid.Frame):
+            def __init__(self,body,callback):
+                self.callback = callback
+                self.__super.__init__(urwid.LineBox(body))
+            def keypress(self,size,key):
+                self.get_body().keypress(size,key)
+                if key in [ 'enter' ]:
+                    self.do_close()
+                    self.callback()
+                if key in [ 'esc' ]:
+                    self.do_close()
+                    self.callback(False)
+        def callback(save=True):
+            if save:
+                self.sel_item,self.sel_index = self.lb.get_focus()
+                self._cols.widget_list[0] = self.sel_item
+                if self.callback != None:
+                    self.callback(self.lb,self.user_args)
+            self._open_pop_up = False
+            self._invalidate()
+        popup_frame = CPane(self.lb,callback)
+
+        def set_close(fn):
+            popup_frame.do_close = fn
+        return (self._maxlen+2,len(self._walker)+2,popup_frame,set_close)
+        
+    def render(self, size, focus=False):
+        canv = self.__super.render(size, focus)
+        if self._open_pop_up:
+            canv = urwid.CompositeCanvas(canv)
+            # same left column, one line below ourselves
+            canv.coords['pop_up'] = (0, 1, self._pop_up_window)
+        return canv
+    
+    def keypress(self,size,key):
+        if key in [ "enter", ' ' ]:
+            self._pop_up_window = self._create_pop_up()
+            self._open_pop_up = True
+            self._invalidate()
+        return key
+
+ui = urwid.raw_display.Screen()
+ui.register_palette([('popbg', 'white', 'dark blue'),
+                     ('body','light gray','black'),
+                     ('focus','black','light gray')])
+
+def run():
+    size = ui.get_cols_rows()
+    l = ['zero','one','two','three','really_long_item']
+    #d = DropDown(l)
+    d = urwid.AttrWrap(DropDown(l),'body','popbg')
+    #d = DropDown()
+    fill = urwid.Filler(urwid.Padding(urwid.Columns([urwid.Text("Press space:"),d]), 'center', 40))
+    #fill = urwid.Filler(ComboBox())
+    target = PopUpTarget(fill)
+    #print >>sys.stderr, d._maxlen
+    #print >>sys.stderr, d._w.width
+    i = 4
+    while True:
+        canvas = target.render(size, True)
+        ui.draw_screen(size, canvas)
+
+        keys = ui.get_input()
+        if "c" in keys:
+            d.remove(l[i])
+            i-=1
+        for k in keys:
+            target.keypress(size, k)
+        if "window resize" in keys:
+            size = ui.get_cols_rows()
+
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1 and sys.argv[1] == "test":
+        import doctest
+        doctest.testmod()
+    else:
+        ui.run_wrapper(run)
+### END GPL CODE ###
 
=== modified file 'curses/prefs_curses.py'
--- curses/prefs_curses.py	2009-10-31 03:52:30 +0000
+++ curses/prefs_curses.py	2009-11-21 05:36:12 +0000
@@ -21,7 +21,9 @@
 
 import urwid
 import urwid.curses_display
+from popup import DropDown
 
+import sys
 from wicd import misc
 from wicd import dbusmanager
 from curses_misc import SelText,DynWrap,DynRadioButton,ComboBox,TabColumns
@@ -216,11 +218,15 @@
 
         #### Advanced settings
         self.wpa_cat      = urwid.Text(wpa_cat_t)
-        self.wpa_cbox     = ComboBox(wpa_t)
+        self.wpa_ddown    = DropDown()
+        wpa_txt = urwid.Text(wpa_t)
+        self.wpa_cols = urwid.Columns([('fixed',wpa_txt.pack()[0],wpa_txt),urwid.AttrWrap(self.wpa_ddown,'body','focus')])
         self.wpa_warn     = urwid.Text(wpa_warn_t)
         
         self.backend_cat  = urwid.Text(backend_cat_t)
-        self.backend_cbox = ComboBox(backend_t)
+        self.backend_ddown    = DropDown()
+        backend_txt = urwid.Text(backend_t)
+        self.backend_cols = urwid.Columns([('fixed',backend_txt.pack()[0],backend_txt),urwid.AttrWrap(self.backend_ddown,'body','focus')])
         
         self.debug_cat           = urwid.Text(debug_cat_t)
         self.debug_mode_checkb   = urwid.CheckBox(debug_mode_t)
@@ -230,9 +236,9 @@
 
 
         advancedLB = urwid.ListBox([self.wpa_cat,
-                                    self.wpa_cbox,self.wpa_warn,_blank,
+                                    self.wpa_cols,self.wpa_warn,_blank,
                                     self.backend_cat,
-                                    self.backend_cbox,_blank,
+                                    self.backend_cols,_blank,
                                     self.debug_cat,
                                     self.debug_mode_checkb, _blank,
                                     self.wless_cat,
@@ -298,23 +304,24 @@
         self.wpadrivers.append("ralink_legacy")
         # Same as above with the dbus.String
         self.thedrivers = [unicode(w) for w in self.wpadrivers]
-        self.wpa_cbox.set_list(self.thedrivers)
+        self.wpa_ddown.set_list(self.thedrivers)
         
         # Pick where to begin first:
         def_driver = daemon.GetWPADriver()
         try:
-            self.wpa_cbox.set_focus(self.wpadrivers.index(def_driver))
+            self.wpa_ddown.set_focus(self.wpadrivers.index(def_driver))
         except ValueError:
-            pass # It defaults to 0 anyway (I hope)
+            self.wpa_ddown.set_focus(0)
+        #self.wpa_cols._invalidate()
 
         self.backends = daemon.GetBackendList()
         self.thebackends= [unicode(w) for w in self.backends]
-        self.backend_cbox.set_list(self.thebackends) 
+        self.backend_ddown.set_list(self.thebackends) 
         cur_backend = daemon.GetSavedBackend()
         try:
-            self.backend_cbox.set_focus(self.thebackends.index(cur_backend))
+            self.backend_ddown.set_focus(self.thebackends.index(cur_backend))
         except ValueError:
-            self.backend_cbox.set_focus(0)
+            self.backend_ddown.set_focus(0)
 
         # Two last checkboxes
         self.debug_mode_checkb.set_state(daemon.GetDebugMode())
@@ -334,7 +341,7 @@
                             self.search_dom.get_edit_text())
         daemon.SetWirelessInterface(self.wless_edit.get_edit_text())
         daemon.SetWiredInterface(self.wired_edit.get_edit_text())
-        daemon.SetWPADriver(self.wpadrivers[self.wpa_cbox.get_focus()[1]])
+        daemon.SetWPADriver(self.wpadrivers[self.wpa_ddown.get_focus()[1]])
         daemon.SetAlwaysShowWiredInterface(self.always_show_wired_checkb.get_state())
         daemon.SetAutoReconnect(self.auto_reconn_checkb.get_state())
         daemon.SetDebugMode(self.debug_mode_checkb.get_state())
@@ -347,7 +354,7 @@
         else:
             daemon.SetWiredAutoConnectMethod(1)
 
-        daemon.SetBackend(self.backends[self.backend_cbox.get_focus()[1]])
+        daemon.SetBackend(self.backends[self.backend_ddown.get_focus()[1]])
             
         # External Programs Tab
         if self.dhcp0.get_state():
@@ -382,7 +389,3 @@
     def global_dns_trigger(self,check_box,new_state,user_data=None):
         for w in self.dns1,self.dns2,self.dns3,self.dns_dom,self.search_dom:
             w.set_sensitive(new_state)
-
-    def ready_widgets(self,ui,body):
-        self.wpa_cbox.build_combobox(body,ui,4)
-        self.backend_cbox.build_combobox(body,ui,8)
 
=== modified file 'curses/wicd-curses.py'
--- curses/wicd-curses.py	2009-09-29 16:38:11 +0000
+++ curses/wicd-curses.py	2009-11-21 05:36:12 +0000
@@ -59,6 +59,7 @@
 from curses_misc import *
 from prefs_curses import PrefsDialog
 import netentry_curses
+from popup import DropDown, PopUpTarget
 
 from netentry_curses import WirelessSettingsDialog, WiredSettingsDialog,AdvancedSettingsDialog
 
@@ -78,47 +79,10 @@
 from wicd.translations import language
 for i in language.keys():
     language[i] = language[i].decode('utf8')
-
-########################################
-##### SUPPORT CLASSES
-########################################
-# Yay for decorators!
-def wrap_exceptions(func):
-    def wrapper(*args, **kargs):
-            try:
-                return func(*args, **kargs)
-            except KeyboardInterrupt:
-                #gobject.source_remove(redraw_tag)
-                loop.quit()
-                ui.stop()
-                print >> sys.stderr, "\n"+language['terminated']
-                #raise
-            except DBusException:
-                #gobject.source_remove(redraw_tag)
-                loop.quit()
-                ui.stop()
-                print >> sys.stderr,"\n"+language['dbus_fail']
-                raise
-            except :
-                # Quit the loop
-                #if 'loop' in locals():
-                loop.quit()
-                # Zap the screen
-                ui.stop()
-                # Print out standard notification:
-                print >> sys.stderr, "\n" + language['exception']
-                # Flush the buffer so that the notification is always above the
-                # backtrace
-                sys.stdout.flush()
-                # Raise the exception
-                #sleep(2)
-                raise
-
-    wrapper.__name__ = func.__name__
-    wrapper.__module__ = func.__module__
-    wrapper.__dict__ = func.__dict__
-    wrapper.__doc__ = func.__doc__
-    return wrapper
+# Dummies
+def handle_exit(f):
+    return f
+loop = None
 
 ########################################
 ##### SUPPORT FUNCTIONS
@@ -126,7 +90,7 @@
 
 # Look familiar?  These two functions are clones of functions found in wicd's
 # gui.py file, except that now set_status is a function passed to them.
-@wrap_exceptions
+@handle_exit
 def check_for_wired(wired_ip,set_status):
     """ Determine if wired is active, and if yes, set the status. """
     if wired_ip and wired.CheckPluggedIn():
@@ -135,7 +99,7 @@
     else:
         return False
 
-@wrap_exceptions
+@handle_exit
 def check_for_wireless(iwconfig, wireless_ip, set_status):
     """ Determine if wireless is active, and if yes, set the status. """
     if not wireless_ip:
@@ -485,9 +449,9 @@
         self.key_edit.set_sensitive(new_state)
 
     def unhandled_key(self, size, k):
-        if k in ('up','page up'):
+        if k in ('up', 'page up'):
             self.frame.set_focus('body')
-        if k in ('down','page down'):
+        if k in ('down', 'page down'):
             self.frame.set_focus('footer')
         if k == 'enter':
             # pass enter to the "ok" button
@@ -508,15 +472,14 @@
 ##### APPLICATION INTERFACE CLASS
 ########################################
 # The Whole Shebang
-class appGUI():
+class appGUI(urwid.WidgetWrap):
     """The UI itself, all glory belongs to it!"""
     def __init__(self):
         global loop
-        self.size = ui.get_cols_rows()
         # Happy screen saying that you can't do anything because we're scanning
         # for networks.  :-)
-        self.screen_locker = urwid.Filler(urwid.Text(('important',language['scanning_stand_by']), align='center'))
-        self.no_wlan = urwid.Filler(urwid.Text(('important',language['no_wireless_networks_found']), align='center'))
+        self.screen_locker = urwid.Filler(urwid.Text(('important', language['scanning_stand_by']), align='center'))
+        self.no_wlan = urwid.Filler(urwid.Text(('important', language['no_wireless_networks_found']), align='center'))
         self.TITLE = language['wicd_curses']
         self.WIRED_IDX = 1
         self.WLESS_IDX = 3
@@ -544,16 +507,16 @@
         
         # Keymappings proposed by nanotube in #wicd
         keys = [
-                ('H' ,'Help'  ,None),
-                ('right','Config',None),
                 #('  ','         ',None),
-                ('C' ,'Connect',None),
-                ('D' ,'Disconn',None),
-                ('R' ,'Refresh',None),
-                ('P' ,'Prefs',None),
-                ('I' ,'Hidden',None),
-                ('A' ,'About',None),
-                ('Q' ,'Quit',loop.quit)
+                ('H' ,'Help'  , None),
+                ('right','Config', None),
+                ('C', 'Connect', None),
+                ('D', 'Disconn', None),
+                ('R', 'Refresh', None),
+                ('P', 'Prefs', None),
+                ('I', 'Hidden', None),
+                ('A', 'About', None),
+                ('Q', 'Quit', None)
                ]
 
         self.primaryCols = OptCols(keys,self.handle_keys)
@@ -572,11 +535,13 @@
         self.init_other_optcols()
 
         self.frame.set_body(self.thePile)
+        self.target = PopUpTarget(self.frame)
+        urwid.WidgetWrap.__init__(self,self.target)
         # Booleans gallore!
         self.prev_state    = False
         self.connecting    = False
         self.screen_locked = False
-        self.do_diag_lock = False #Whether the screen is locked beneath a dialog
+        self.do_diag_lock = False # Whether the screen is locked beneath a dialog
         self.diag_type = 'none' # The type of dialog that is up
         self.scanning = False
 
@@ -584,19 +549,17 @@
 
         self.update_status()
 
-        #self.max_wait = ui.max_wait
-
     def doScan(self, sync=False):
         self.scanning = True
         wireless.Scan(False)
 
     def init_other_optcols(self):
         # The "tabbed" preferences dialog
-        self.prefCols = OptCols( [ ('f10','OK'),
-                                   ('page up','Tab Left',),
-                                   ('page down', 'Tab Right'),
-                                   ('esc','Cancel') ], self.handle_keys)
-        self.confCols = OptCols( [ ('f10','OK'),
+        self.prefCols = OptCols( [ ('f10','OK'),                                       
+                                   ('page up','Tab Left',),                            
+                                   ('page down', 'Tab Right'),                         
+                                   ('esc','Cancel') ], self.handle_keys)               
+        self.confCols = OptCols( [ ('f10','OK'),                                       
                                    ('esc','Cancel') ],self.handle_keys)
 
     # Does what it says it does
@@ -619,8 +582,9 @@
         self.update_ui()
 
     def raise_hidden_network_dialog(self):
-        dialog = InputDialog(('header',language["select_hidden_essid"]),7,30,language['scan'])
-        exitcode,hidden = dialog.run(ui,self.frame)
+        dialog = InputDialog(
+                ('header', language["select_hidden_essid"]), 7, 30, language['scan'])
+        exitcode,hidden = dialog.run(ui, self.frame)
         if exitcode != -1:
             # That dialog will sit there for a while if I don't get rid of it
             self.update_ui()
@@ -641,13 +605,11 @@
                 where = None
             else: 
                 where = self.thePile.get_focus().get_focus()[1]
-                #where = self.wlessLB.get_focus()[1]
         self.focusloc = [wlessorwired,where]
     
-    # Be clunky until I get to a later stage of development.
     # Update the list of networks.  Usually called by DBus.
-    @wrap_exceptions
-    def update_netlist(self,state=None, x=None, force_check=False,firstrun=False):
+    @handle_exit
+    def update_netlist(self, state=None, x=None, force_check=False, firstrun=False):
         # Don't even try to do this if we are running a dialog
         if self.diag:
             return
@@ -663,7 +625,7 @@
             wiredL,wlessL = gen_network_list()
 
             self.wiredCB.get_body().set_list(wiredL)
-            self.wiredCB.get_body().build_combobox(self.frame,ui,3)
+            self.wiredCB.get_body().build_combobox(self.frame, ui, 3)
             if len(wlessL) != 0:
                 if self.wlessLB == self.no_wlan:
                     self.wlessLB = urwid.ListBox(wlessL)
@@ -688,7 +650,7 @@
                     else:
                         self.thePile.set_focus(self.wiredCB)
             else:
-                self.thePile = urwid.Pile([('fixed',2,self.wlessH),self.wlessLB] )
+                self.thePile = urwid.Pile([('fixed',2,self.wlessH), self.wlessLB] )
                 if not firstrun:
                     self.frame.body = self.thePile
                 if self.focusloc[1] == None:
@@ -705,7 +667,7 @@
 
     # Update the footer/status bar
     conn_status = False
-    @wrap_exceptions
+    @handle_exit
     def update_status(self):
         wired_connecting = wired.CheckIfWiredConnecting()
         wireless_connecting = wireless.CheckIfWirelessConnecting()
@@ -715,10 +677,10 @@
         if self.connecting: 
             if not self.conn_status:
                 self.conn_status = True
-                gobject.timeout_add(250,self.set_connecting_status,fast)
+                gobject.timeout_add(250, self.set_connecting_status, fast)
             return True
         else:
-            if check_for_wired(wired.GetWiredIP(''),self.set_status):
+            if check_for_wired(wired.GetWiredIP(''), self.set_status):
                 return True
             if not fast:
                 iwconfig = wireless.GetIwconfig()
@@ -777,20 +739,17 @@
             self.tcount+=1
             toAppend=self.twirl[self.tcount % 4]
         self.status_label.set_text(text+' '+toAppend)
-        self.update_ui()
+        if loop is not None:
+            self.update_ui()
         return True
 
-    # Make sure the screen is still working by providing a pretty counter.
-    # Not necessary in the end, but I will be using footer1 for stuff in
-    # the long run, so I might as well put something there.
-    #@wrap_exceptions
-    def update_time(self):
+    #@handle_exit
+    def update_time(self,loop,data):
         self.time_label.set_text(strftime('%H:%M:%S'))
-        self.update_ui()
+        loop.set_alarm_in(0.5, self.update_time)
         return True
 
-    # Yeah, I'm copying code.  Anything wrong with that?
-    #@wrap_exceptions
+    #@handle_exit
     def dbus_scan_finished(self):
         # I'm pretty sure that I'll need this later.
         #if not self.connecting:
@@ -798,8 +757,7 @@
         self.unlock_screen()
         self.scanning = False
 
-    # Same, same, same, same, same, same
-    #@wrap_exceptions
+    #@handle_exit
     def dbus_scan_started(self):
         self.scanning = True
         if self.diag_type == 'conf':
@@ -817,11 +775,14 @@
         self.frame.set_footer(urwid.Pile([self.primaryCols,self.footer2]))
         self.update_ui()
 
-    def handle_keys(self,keys):
+    def keypress(self,size,key):
+        self.handle_keys([key],size)
+        return key
+    def handle_keys(self,keys,size=None):
         if not self.diag:
             # Handle keystrokes
             if "f8" in keys or 'Q' in keys or 'q' in keys:
-                loop.quit()
+                raise urwid.ExitMainLoop()
                 #return False
             if "f5" in keys or 'R' in keys:
                 self.lock_screen()
@@ -849,12 +810,12 @@
                     focus = self.frame.body.get_focus()
                     if focus == self.wiredCB:
                         self.special = focus
-                        self.connect("wired",0)
+                        self.connect("wired", 0)
                     else:
                         # wless list only other option, if it is around
                         if self.wlessLB != self.no_wlan:
                             wid,pos = self.thePile.get_focus().get_focus()
-                            self.connect("wireless",pos)
+                            self.connect("wireless", pos)
             if "esc" in keys:
                 # Force disconnect here if connection in progress
                 if self.connecting:
@@ -863,11 +824,10 @@
                     daemon.SetForcedDisconnect(True)
             if "P" in keys:
                 if not self.pref:
-                    self.pref = PrefsDialog(self.frame,(0,1),ui,
+                    self.pref = PrefsDialog(self.frame, (0,1), ui,
                             dbusmanager.get_dbus_ifaces()) 
                 self.pref.load_settings()
-                self.pref.ready_widgets(ui,self.frame)
-                self.frame.set_footer(urwid.Pile([self.prefCols,self.footer2]))
+                self.frame.set_footer(urwid.Pile([self.prefCols, self.footer2]))
                 self.diag = self.pref
                 self.diag_type = 'pref'
                 self.frame.set_body(self.diag)
@@ -890,9 +850,9 @@
                 else:
                     nettype = 'wireless'
                     netname = str(self.wlessLB.get_focus()[1])
-                run_configscript(self.frame,netname,nettype)
+                run_configscript(self.frame, netname, nettype)
             if "O" in keys:
-                exitcode,data = AdHocDialog().run(ui,self.frame)
+                exitcode,data = AdHocDialog().run(ui, self.frame)
                 #data = (essid,ip,channel,use_ics,use_encrypt,key_edit)
                 if exitcode == 1:
                     wireless.CreateAdHocNetwork(data[0],
@@ -901,53 +861,36 @@
                                                 data[5],
                                                 data[4], False)
             
-        for k in keys:
-            if urwid.is_mouse_event(k):
-                event, button, col, row = k
-                self.frame.mouse_event( self.size,
-                        event, button, col, row,
-                        focus=True)
-                continue
-            k = self.frame.keypress(self.size,k)
-            if self.diag:
-                if  k == 'esc' or k == 'q' or k == 'Q':
+        if size is not None:
+            for k in keys:
+                if urwid.is_mouse_event(k):
+                    event, button, col, row = k
+                    self.frame.mouse_event(size,
+                            event, button, col, row,
+                            focus=True)
+                    continue
+                k = self.target.keypress(size, k)
+        elif self.diag:
+            for k in keys:
+                # Hackish ->                vvvvvvvvvvvvv
+                k = self.target.keypress(ui.get_cols_rows(), k)
+        if self.diag:
+            for k in keys:
+                if k == 'esc' or k == 'q' or k == 'Q':
                     self.restore_primary()
                     break
                 if k == 'f10':
                     self.diag.save_settings()
                     self.restore_primary()
                     break
-            if k == "window resize":
-                self.size = ui.get_cols_rows()
-                continue
-
-    def call_update_ui(self,source,cb_condition):
-        self.update_ui(True)
-        return True
 
     # Redraw the screen
-    @wrap_exceptions
-    def update_ui(self,from_key=False):
-        if not ui._started:
-            return False
-        canvas = self.frame.render( (self.size),True )
-
-        # Update the screen
-        ui.draw_screen((self.size),canvas)
-        # Get the input data
-        input_data = ui.get_input_nonblocking()
-        max_wait = input_data[0]
-        keys = input_data[1]
-
-        # Resolve any "alarms" in the waiting
-        if self.update_tag != None:
-            gobject.source_remove(self.update_tag)
-        if from_key:
-            max_wait = 20
-            self.update_tag = gobject.timeout_add(max_wait, \
-                    self.update_ui,True)
-            self.handle_keys(keys)
-        return False
+    @handle_exit
+    def update_ui(self, from_key=True, from_alarm=False):
+        global loop
+        if not loop:
+            loop._update()
+        return True
 
     def connect(self, nettype, networkid, networkentry=None):
         """ Initiates the connection process in the daemon. """
@@ -961,12 +904,8 @@
             wired.ConnectWired()
         self.update_status()
 
-########################################
-##### INITIALIZATION FUNCTIONS
-########################################
-
 def main():
-    global ui, dlogger
+    global ui, loop, dloggger, handle_exit, palette
     # We are _not_ python.
     misc.RenameProcess('wicd-curses')
 
@@ -980,17 +919,11 @@
         import urwid.curses_display
         ui = urwid.curses_display.Screen()
 
-    #if options.debug:
-    #    dlogger = logging.getLogger("Debug")
-    #    dlogger.setLevel(logging.DEBUG)
-    #    dlogger.debug("wicd-curses debug logging started")
-
     # Default Color scheme.
     # Other potential color schemes can be found at:
     # http://excess.org/urwid/wiki/RecommendedPalette
-
     # Thanks to nanotube on #wicd for helping with this
-    ui.register_palette([
+    palette = [
         ('body','default','default'),
         ('focus','black','light gray'),
         ('header','light blue','default'),
@@ -1009,43 +942,45 @@
         ('green','dark green','default'),
         ('blue','light blue','default'),
         ('red','dark red','default'),
-        ('bold','white','black','bold')])
-    # This is a wrapper around a function that calls another a function that
-    # is a wrapper around a infinite loop.  Fun.
+        ('bold','white','black','bold')]
+
     urwid.set_encoding('utf8')
-    ui.run_wrapper(run)
-
-@wrap_exceptions
+    try: 
+        ui.run_wrapper(run)
+    except KeyboardInterrupt:
+        #gobject.source_remove(redraw_tag)
+        ui.stop()
+        print >> sys.stderr, language['terminated']
+    except DBusException:
+        #gobject.source_remove(redraw_tag)
+        ui.stop()
+        print >> sys.stderr, language['dbus_fail']+"\n"
+        raise
+    except :
+        print >> sys.stderr, language['exception']+"\n"
+        sys.stdout.flush()
+        raise
 def run():
-    global loop
-    loop = gobject.MainLoop()
-    
-    ui.set_mouse_tracking()
+    global ui, loop, dloggger, handle_exit, palette
     app = appGUI()
-
-
-    # Connect signals and whatnot to UI screen control functions
+    loop = urwid.MainLoop(app, palette, ui,
+            event_loop=urwid.GLibEventLoop())
+
     bus.add_signal_receiver(app.dbus_scan_finished, 'SendEndScanSignal',
                             'org.wicd.daemon.wireless')
     bus.add_signal_receiver(app.dbus_scan_started, 'SendStartScanSignal',
                             'org.wicd.daemon.wireless')
-    # I've left this commented out many times.
     bus.add_signal_receiver(app.update_netlist, 'StatusChanged',
                             'org.wicd.daemon')
-    # Update what the interface looks like as an idle function
-    #gobject.idle_add(app.update_ui)
-    # Update the connection status on the bottom every 1.5 s.
+    #loop.add
     gobject.timeout_add(2000,app.update_status)
     # This will make sure that it is updated on the second.
-    gobject.timeout_add(500,app.update_time)
-
-    app.update_ui()
-    # Get input file descriptors and add callbacks to the ui-updating function
-    fds = ui.get_input_descriptors()
-    for fd in fds:
-        gobject.io_add_watch(fd, gobject.IO_IN,app.call_update_ui)
+    loop.set_alarm_in(0.5,app.update_time)
+    handle_exit = loop.event_loop.handle_exit
     loop.run()
 
+
+
 # Mostly borrowed from gui.py
 def setup_dbus(force=True):
     global bus, daemon, wireless, wired, DBUS_AVAIL
@@ -1082,14 +1017,11 @@
             sys.exit(1)
         else:
             raise
-    parser.set_defaults(screen='raw',debug=False)
-    parser.add_option("-r", "--raw-screen",action="store_const",const='raw'
-            ,dest='screen',help="use urwid's raw screen controller (default)")
-    parser.add_option("-c", "--curses-screen",action="store_const",const='curses',dest='screen',help="use urwid's curses screen controller")
-    parser.add_option("-d", "--debug",action="store_true"
-            ,dest='debug',help="enable logging of wicd-curses (currently does nothing)")
+    parser.set_defaults(screen='raw', debug=False)
+    parser.add_option("-r", "--raw-screen", action="store_const", const='raw'
+            ,dest='screen', help="use urwid's raw screen controller (default)")
+    parser.add_option("-c", "--curses-screen", action="store_const",const='curses',dest='screen', help="use urwid's curses screen controller")
+    #parser.add_option("-d", "--debug",action="store_true"
+    #       ,dest='debug',help="enable logging of wicd-curses (currently does nothing)")
     (options,args) = parser.parse_args()
     main()
-    # Make sure that the terminal does not try to overwrite the last line of
-    # the program, so that everything looks pretty.
-    #print ""
 
=== modified file 'setup.py'
--- setup.py	2009-07-28 02:09:18 +0000
+++ setup.py	2009-11-21 05:36:12 +0000
@@ -502,6 +502,7 @@
         data.append((wpath.lib, ['curses/wicd-curses.py']))
         data.append((wpath.lib, ['curses/netentry_curses.py']))
         data.append((wpath.lib, ['curses/configscript_curses.py']))
+        data.append((wpath.lib, ['curses/popup.py']))
         data.append((wpath.bin, ['scripts/wicd-curses'])) 
         if not wpath.no_install_man:
             data.append(( wpath.mandir + 'man8/', ['man/wicd-curses.8']))