copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reset kbd and mouse activity vars after going active

This commit is contained in:
Nikos Kouremenos 2005-08-07 23:44:44 +00:00
parent e04cc5add5
commit 587ff07b1a
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/tabbed_chat_window.py
View File

@ -364,10 +364,7 @@ class TabbedChatWindow(chat.Chat):
self.childs[contact.jid].show_all() self.childs[contact.jid].show_all()
# chatstates # chatstates
self.kbd_activity_in_last_5_secs = False self.reset_kbd_mouse_timeout_vars()
self.mouse_over_in_last_5_secs = False
self.mouse_over_in_last_30_secs = False
self.kbd_activity_in_last_30_secs = False
self.chatstates[contact.jid] = None # our current chatstate with contact self.chatstates[contact.jid] = None # our current chatstate with contact
self.possible_paused_timeout_id[contact.jid] =\ self.possible_paused_timeout_id[contact.jid] =\
@ -400,13 +397,8 @@ class TabbedChatWindow(chat.Chat):
self.send_chatstate('paused', contact.jid) # pause composing self.send_chatstate('paused', contact.jid) # pause composing
# assume no activity and let the motion-notify or key_press make them True # assume no activity and let the motion-notify or key_press make them True
self.mouse_over_in_last_5_secs = False # refresh 30 seconds vars too or else it's 30 - 5 = 25 seconds!
self.kbd_activity_in_last_5_secs = False self.reset_kbd_mouse_timeout_vars()
# refresh 30 seconds or else it's 30 - 5 = 25 seconds!
self.mouse_over_in_last_30_secs = True
self.kbd_activity_in_last_30_secs = True
return True # loop forever return True # loop forever
def check_for_possible_inactive_chatstate(self, contact): def check_for_possible_inactive_chatstate(self, contact):
@ -423,11 +415,8 @@ class TabbedChatWindow(chat.Chat):
self.send_chatstate('inactive', contact.jid) self.send_chatstate('inactive', contact.jid)
# assume no activity and let the motion-notify or key_press make them True # assume no activity and let the motion-notify or key_press make them True
self.mouse_over_in_last_5_secs = False # refresh 30 seconds too or else it's 30 - 5 = 25 seconds!
self.kbd_activity_in_last_5_secs = False self.reset_kbd_mouse_timeout_vars()
self.mouse_over_in_last_30_secs = False
self.kbd_activity_in_last_30_secs = False
return True # loop forever return True # loop forever
@ -513,6 +502,13 @@ class TabbedChatWindow(chat.Chat):
self.kbd_activity_in_last_30_secs = True self.kbd_activity_in_last_30_secs = True
self.send_chatstate('composing', jid) self.send_chatstate('composing', jid)
def reset_kbd_mouse_timeout_vars(self):
self.kbd_activity_in_last_5_secs = False
self.mouse_over_in_last_5_secs = False
self.mouse_over_in_last_30_secs = False
self.kbd_activity_in_last_30_secs = False
def send_chatstate(self, state, jid = None): def send_chatstate(self, state, jid = None):
''' sends OUR chatstate as STANDLONE chat state message (eg. no body) ''' sends OUR chatstate as STANDLONE chat state message (eg. no body)
to jid only if new chatstate is different to jid only if new chatstate is different
@ -569,16 +565,20 @@ class TabbedChatWindow(chat.Chat):
gajim.connections[self.account].send_message(jid, None, None, gajim.connections[self.account].send_message(jid, None, None,
chatstate = 'active') # go active before chatstate = 'active') # go active before
contact.chatstate = 'active' contact.chatstate = 'active'
self.reset_kbd_mouse_timeout_vars()
# if we're inactive prevent composing (JEP violation) # if we're inactive prevent composing (JEP violation)
if contact.chatstate == 'inactive' and state == 'composing': if contact.chatstate == 'inactive' and state == 'composing':
gajim.connections[self.account].send_message(jid, None, None, gajim.connections[self.account].send_message(jid, None, None,
chatstate = 'active') # go active before chatstate = 'active') # go active before
contact.chatstate = 'active' contact.chatstate = 'active'
self.reset_kbd_mouse_timeout_vars()
gajim.connections[self.account].send_message(jid, None, None, gajim.connections[self.account].send_message(jid, None, None,
chatstate = state) chatstate = state)
contact.chatstate = state contact.chatstate = state
if contact.chatstate == 'active':
self.reset_kbd_mouse_timeout_vars()
def send_message(self, message): def send_message(self, message):
"""Send the given message to the active tab""" """Send the given message to the active tab"""
@ -635,6 +635,7 @@ class TabbedChatWindow(chat.Chat):
#send active chatstate on every message (as JEP says) #send active chatstate on every message (as JEP says)
chatstate_to_send = 'active' chatstate_to_send = 'active'
contact.chatstate = 'active' contact.chatstate = 'active'
self.reset_kbd_mouse_timeout_vars()
gajim.connections[self.account].send_message(jid, message, keyID, gajim.connections[self.account].send_message(jid, message, keyID,
chatstate = chatstate_to_send) chatstate = chatstate_to_send)