Changeset 159

Timestamp:

05/28/04 06:20:30 (4 years ago)

Author:

asterix

Message:

- idle in a C module, auto away / xa feature is back
- no need to store .mo files : they are now created by make

Location:

trunk

Files:

• common/idle.cpp (added)
• common/sleepy.py (modified) (4 diffs)
• Makefile (added)
• Messages/fr/LC_MESSAGES/gajim.mo (deleted)
• plugins/gtkgui/config.py (modified) (6 diffs)
• plugins/gtkgui/gtkgui.py (modified) (6 diffs)
• setup.py (added)

trunk/common/sleepy.py

@@ -3 +3 @@
 
 import time
+import idle
 from string import find, lower
 
@@ -17 +18 @@
     def __init__(self, interval1 = 60, interval2 = 120, devices = ['keyboard', 'mouse', 'ts'] ):
 
-        self.devices       = devices
-        self.time_marker   = time.time()
-        self.interval = self.interval_orig = interval1
-        self.interval_orig2 = interval2
-        self.last_proc_vals = {}
-        for dev in self.devices: self.last_proc_vals[dev] = 0
-        
+        self.interval1 = interval1
+        self.interval2 = interval2
         self.state         = STATE_AWAKE ## assume were awake to stake with
         try:
-            self.proc_int_fh = open("/proc/interrupts",'r')
+            idle.init()
         except:
             NOT_SUPPORTED = 1
             self.state = STATE_UNKNOWN
-        self.proc_int_fh.close()
-        
 
     def poll(self):
@@ -37 +31 @@
         now = time.time()
 
-        changed = 0         ## figure out if we have recieved interupts
-        for dev in self.devices: ## any of the selected devices  
-            proc_val = self._read_proc(dev)
-            changed = changed or ( self.last_proc_vals[dev] != proc_val )
-            self.last_proc_vals[dev] = proc_val
-        
-        if changed:
-            ## we are awake :)
-            self.time_marker = time.time() ## reset marker
-            self.state = STATE_AWAKE
-            self.interval = self.interval_orig
-        else:
-            if (now - self.time_marker >= self.interval):
-                ## we are asleep 
-                if self.state == STATE_AWAKE:
-                    self.state = STATE_AWAY
-                    self.interval = self.interval_orig2 #second interval
-                else:
-                    self.state = STATE_XAWAY
+        idleTime = idle.getIdleSec()
+        if idleTime > self.interval2:
+                self.state = STATE_XAWAY
+        elif idleTime > self.interval1:
+                self.state = STATE_AWAY
+        else:
+                self.state = STATE_AWAKE
         return 1
 
@@ -64 +46 @@
         self.state = val
             
-    def _read_proc(self, device = 'mouse'):
-        proc_int_fh = open("/proc/interrupts",'r')
-        info = proc_int_fh.readlines()
-        ## ignore first line
-        for line in info[1:]:
-            cols = line.strip().split()
-            if (find(lower(cols[-1]),device) != -1):
-                proc_int_fh.close()
-                return int(cols[1])
-        proc_int_fh.close()
-        return 1
-
 if __name__ == '__main__':
     s = Sleepy(10)
     while s.poll():
         print "state is %s" % s.getState() 
-        time.sleep(10)
+        time.sleep(5)

trunk/plugins/gtkgui/config.py

@@ -24 +24 @@
 import gtk.glade,gobject
 import os,string
+import common.sleepy
 from common import i18n
 _ = i18n._
@@ -217 +218 @@
                 if self.plugin.sleeper:
                         self.plugin.sleeper = common.sleepy.Sleepy(\
-                                self.plugin['autoawaytime']*60, self.plugin['autoxatime']*60)
+                                self.plugin.config['autoawaytime']*60, \
+                                self.plugin.config['autoxatime']*60)
                 self.plugin.send('CONFIG', None, ('GtkGui', self.plugin.config))
                 self.plugin.roster.draw_roster()
@@ -307 +309 @@
                         st = self.plugin.config['autoaway']
                 self.chk_autoaway.set_active(st)
-                self.chk_autoaway.set_sensitive(0)
 
                 #Autoawaytime
@@ -314 +315 @@
                         st = self.plugin.config['autoawaytime']
                 self.spin_autoawaytime.set_value(st)
-                self.spin_autoawaytime.set_sensitive(0)
 
                 #Autoxa
@@ -321 +321 @@
                         st = self.plugin.config['autoxa']
                 self.chk_autoxa.set_active(st)
-                self.chk_autoxa.set_sensitive(0)
 
                 #Autoxatime
@@ -328 +327 @@
                         st = self.plugin.config['autoxatime']
                 self.spin_autoxatime.set_value(st)
-                self.spin_autoxatime.set_sensitive(0)
 
                 self.xml.signal_connect('gtk_widget_destroy', self.delete_event)

trunk/plugins/gtkgui/gtkgui.py

@@ -786 +786 @@
                         txt = status
                         self.plugin.send('STATUS', account, (status, txt))
+                        if status == 'online':
+                                self.plugin.sleeper_state[account] = 1
 
         def on_optionmenu_changed(self, widget):
@@ -806 +808 @@
                 for acct in accounts:
                         self.plugin.send('STATUS', acct, (status, txt))
+                        if status == 'online':
+                                self.plugin.sleeper_state[acct] = 1
         
         def set_optionmenu(self):
@@ -834 +838 @@
                                         self.chg_user_status(user, 'offline', 'Disconnected', account)
                 elif self.plugin.connected[account] == 0:
-                        self.plugin.sleeper = None#common.sleepy.Sleepy(\
-                                #self.plugin.config['autoawaytime']*60, \
-                                #self.plugin.config['autoxatime']*60)
+                        if (self.plugin.config['autoaway'] or self.plugin.config['autoxa']):
+                                self.plugin.sleeper = common.sleepy.Sleepy(\
+                                        self.plugin.config['autoawaytime']*60, \
+                                        self.plugin.config['autoxatime']*60)
                 self.plugin.connected[account] = statuss.index(status)
                 self.set_optionmenu()
@@ -1350 +1355 @@
         def read_sleepy(self):  
                 """Check if we are idle"""
-                if self.sleeper and (self.config['autoaway'] or self.config['autoxa'])\
-                        and (self.roster.optionmenu.get_history()==0 or \
-                        self.sleeper_state!=common.sleepy.STATE_AWAKE):
+                if self.sleeper:
                         self.sleeper.poll()
                         state = self.sleeper.getState()
-                        if state != self.sleeper_state:
-                                if state == common.sleepy.STATE_AWAKE:
-                                        #we go online
-                                        self.roster.optionmenu.set_history(0)
-                                        self.send('STATUS', None, ('online', ''))
-                                elif state == common.sleepy.STATE_AWAY and self.config['autoaway']:
-                                        #we go away
-                                        self.roster.optionmenu.set_history(1)
-                                        self.send('STATUS', None, ('away', 'auto away (idle)'))
-                                elif state == common.sleepy.STATE_XAWAY and self.config['autoxa']:
-                                        #we go extended away
-                                        self.roster.optionmenu.set_history(2)
-                                        self.send('STATUS',('xa', 'auto away (idel)'))
-                        self.sleeper_state = state
+                        for account in self.accounts.keys():
+                                if self.sleeper_state[account]:
+                                        if state == common.sleepy.STATE_AWAKE and \
+                                                self.connected[account] > 1:
+                                                #we go online
+                                                self.send('STATUS', account, ('online', ''))
+                                        elif state == common.sleepy.STATE_AWAY and \
+                                                self.connected[account] == 1 and \
+                                                self.config['autoaway']:
+                                                #we go away
+                                                self.send('STATUS', account, ('away', 'auto away (idle)'))
+                                        elif state == common.sleepy.STATE_XAWAY and \
+                                                self.connected[account] == 2 and \
+                                                self.config['autoxa']:
+                                                #we go extended away
+                                                self.send('STATUS', account, ('xa', 'auto away (idle)'))
                 return 1
 
@@ -1393 +1398 @@
                 self.connected = {}
                 self.nicks = {}
+                self.sleeper_state = {} #whether we pass auto away / xa or not
                 for a in self.accounts.keys():
                         self.windows[a] = {}
@@ -1400 +1406 @@
                         self.connected[a] = 0
                         self.nicks[a] = self.accounts[a]['name']
+                        self.sleeper_state[a] = 0
                 self.roster = roster_Window(self)
                 gtk.timeout_add(100, self.read_queue)
                 gtk.timeout_add(1000, self.read_sleepy)
                 self.sleeper = None
-                self.sleeper_state = None
                 gtk.main()
                 gtk.threads_leave()