Changeset 189

Timestamp:

21.06.2008 12:39:59 (7 months ago)

Author:

poillubo

Message:

* some modifications for the config generator:

+ added functions to know if a fun/meth arg is a **args or **kwargs
+ added a special case in get_default_arg when there are no default args
+ added the find_default_buttons functions (same use as find_default_plugins, ...)
+ added an overriding constructor in some buttons
+ changed a useless PlopButton? into Button in the default config

Files:

• trunk/conf/config-example.py (modified) (2 diffs)
• trunk/pycawm/button.py (modified) (3 diffs)
• trunk/pycawm/misc.py (modified) (4 diffs)

trunk/conf/config-example.py

@@ -24 +24 @@
-from pycawm import (Client, ClientUnderPointer, MoveUnderPointer, PycaWM,
-                    ScreenshotUnderPointer)
-
-, PlopButton
+Button, 
+
-from pycawm.hookmanager import add_post_hook, add_pre_hook
-from pycawm.menu import (Menu, FocusesMenu, IconifiedClientsMenu,
@@ -215 +215 @@
-                dict(x=500, y=0,
-                     buttons=[
-Plop
+
-                action_1=lambda self, x, y: ApplicationMenu(pika, x=x, y=y+16)),
-Plop
+
-                action_1=lambda self, x, y: ConfigMenu(pika, x=x, y=y+16)),
-Plop
+
-                action_1=lambda self, x, y: ConfigMenu(pika, x=x, y=y+16))],
-Plop
+
-                action_1=lambda self, x, y: ConfigMenu(pika, x=x, y=y+16))],
-Plop
+
-                action_1=lambda self, x, y: ApplicationMenu(pika, x=x, y=y+16)),
-Plop
+
-                action_1=lambda self, x, y: ConfigMenu(pika, x=x, y=y+16))]]))
-

trunk/pycawm/button.py

@@ -129 +129 @@
-
-class PlopButton(Button):
+    def __init__(self, image):
+        Button.__init__(self, image)
+
-    def action_2(self):
-        print 'plop!'
@@ -136 +139 @@
-
-class CloseButton(Button):
+    def __init__(self, image):
+        Button.__init__(self, image)
+
-    def action_1(self):
-        self.container.close()
-
-class MiniIconButton(Button):
-*args, **kwargs
-*args, **kwargs
+image
+image
-        self.images['miniicon'] = Client.get_mini_icon
-
@@ -150 +156 @@
-
-class IconifyButton(Button):
+    def __init__(self, image):
+        Button.__init__(self, image)
+
-    def action_1(self):
-        self.container.iconify()

trunk/pycawm/misc.py

@@ -25 +25 @@
-from types import ClassType, TypeType, MethodType, FunctionType
-
+import button
-import focuses
-import placements
@@ -93 +94 @@
-
-    defaults = fun.func_defaults
+    if defaults is None:
+        return None
+
-    indice = list(co.co_varnames).index(name)
-    offset = co.co_argcount - len(defaults)
@@ -99 +103 @@
-        return defaults[indice - offset]
-    return None
+
+def is_arg_args(fun, name):
+    """Is the NAME argument for the method/function FUN a **args?"""
+    fun = get_func_object(fun)
+    if fun is None:
+        return False
+
+    co = fun.func_code
+    # no *args for this code object?
+    if not co.co_flags & 4:
+        return False
+
+    if name not in co.co_varnames:
+        return False
+
+    indice = list(co.co_varnames).index(name)
+    return indice == co.co_argcount
+
+def is_arg_kwargs(fun, name):
+    """Is the NAME argument for the method/function FUN a **kwargs?"""
+    fun = get_func_object(fun)
+    if fun is None:
+        return False
+
+    co = fun.func_code
+    # no **kwargs for this code object?
+    if not co.co_flags & 8:
+        return False
+
+    if name not in co.co_varnames:
+        return False
+
+    indice = list(co.co_varnames).index(name)
+    return indice == co.co_argcount + 1
-
-def is_class_valid(klass, base):
@@ -132 +170 @@
-    return [plugin for plugin in gen_plugs
-            if is_plugin_valid(plugin)]
+
+def is_button_valid(button_):
+    try:
+        # do not use is_strict_subclass here, Button is a usable button too
+        return (issubclass(button_, button.Button) and
+                not button_.__name__.startswith('_'))
+    except TypeError:
+        return False
+
+def find_default_buttons():
+    """Find all the button classes in the "button" module."""
+    gen_buttons = (button.__dict__.get(button_name)
+                   for button_name in dir(button))
+    return [button_ for button_ in gen_buttons
+            if is_button_valid(button_)]