/[circus]/circus/circus/circus.py
ViewVC logotype

Diff of /circus/circus/circus.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.5 by bskahan, Thu Nov 14 20:26:20 2002 UTC revision 1.6 by tvon, Fri Nov 15 00:43:12 2002 UTC
# Line 21  __author__ = "Thomas von Schwerdtner <tv Line 21  __author__ = "Thomas von Schwerdtner <tv
21  __date__ = "Wed Nov 11 2002"  __date__ = "Wed Nov 11 2002"
22  __version__ = "$Revision$"  __version__ = "$Revision$"
23    
24  import module  # base imports
25  import config  import sys, os
26  import display  # circus imports
27    import module, config, display
28  import sys  # Xlib imports
 import os  
29  from Xlib import X, Xutil  from Xlib import X, Xutil
 import Xlib.protocol.event  
30  from Xlib.protocol import event  from Xlib.protocol import event
31    
32  class Ringmaster:  class Ringmaster:
33      """Main circus class      """Main circus class
34      """      """
35    
36      # Why is this crapping out?      config = None    
     #conf = config.Config()      
37      display = None      display = None
38      screen = None      screen = None
39      events = None      events = None
     # 35  
40      module_events = [range(0, 36)]      module_events = [range(0, 36)]
41            
42      def __init__(self, d = None):      def __init__(self, d = None):
43                    # FIXME: Do some work on the config defaults
44            self.config = config.Config()
45    
46          if d:          if d:
47              self.display = display.Display(d)              self.display = display.Display(d)
48          else:          else:
# Line 107  class Ringmaster: Line 105  class Ringmaster:
105    
106      def load_module(self, module):      def load_module(self, module):
107          for e in module.my_events:          for e in module.my_events:
108              if e in self.module_events:              if self.module_events[e]:
109                  self.module_events[e] = module                  self.module_events[e] = module
110              else:              else:
111                  self.module_events[e].append(module)                  self.module_events[e].append(module)

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26