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

fixes in 30 secs timer, other chatstate logical fixes, raise exceptions on jep violations

This commit is contained in:
Nikos Kouremenos 2005-07-20 15:57:55 +00:00
parent 0bde1f52ef
commit bc2309b60b
1 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/tabbed_chat_window.py
View File

@ -228,19 +228,14 @@ class TabbedChatWindow(chat.Chat):
self.send_chatstate('active') self.send_chatstate('active')
def on_tabbed_chat_window_focus_out_event(self, widget, event): def on_tabbed_chat_window_focus_out_event(self, widget, event):
gobject.timeout_add(500, self.check_window_state, widget) '''catch focus out and minimized and send inactive chatstate;
minimize action also focuses out first so it's catched here'''
window_state = widget.window.get_state()
if window_state is None:
print 'return NOOOOOONE'
return
def check_window_state(self, widget): self.send_chatstate('inactive')
''' we want: "minimized" or "focus-out"
not "focus-out, minimized" or "focus-out" '''
widget.realize()
new_state = widget.window.get_state()
if new_state & gtk.gdk.WINDOW_STATE_ICONIFIED:
print 'iconify'
self.send_chatstate('inactive')
else:
print 'just focus-out'
self.send_chatstate('paused')
def on_chat_notebook_key_press_event(self, widget, event): def on_chat_notebook_key_press_event(self, widget, event):
chat.Chat.on_chat_notebook_key_press_event(self, widget, event) chat.Chat.on_chat_notebook_key_press_event(self, widget, event)
@ -324,21 +319,22 @@ class TabbedChatWindow(chat.Chat):
def check_for_possible_paused_chatstate(self, contact): def check_for_possible_paused_chatstate(self, contact):
''' did we move mouse of that window or kbd activity in that window ''' did we move mouse of that window or kbd activity in that window
if yes we go active if not already if yes we go active
if no we go paused if not already ''' if no we go paused if we were previously composing '''
current_state = self.chatstates[contact.jid] current_state = self.chatstates[contact.jid]
if current_state == False: # he doesn't support chatstates if current_state == False: # jid doesn't support chatstates
return False # stop looping return False # stop looping
print 'mouse', self.mouse_over_in_last_5_secs #print 'mouse', self.mouse_over_in_last_5_secs
print 'kbd', self.kbd_activity_in_last_5_secs #print 'kbd', self.kbd_activity_in_last_5_secs
if self.mouse_over_in_last_5_secs: if self.mouse_over_in_last_5_secs:
self.send_chatstate('active') self.send_chatstate('active')
elif self.kbd_activity_in_last_5_secs: elif self.kbd_activity_in_last_5_secs:
self.send_chatstate('composing') self.send_chatstate('composing')
else: else:
self.send_chatstate('paused') if self.chatstates[contact.jid] == 'composing':
self.send_chatstate('paused') # 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 self.mouse_over_in_last_5_secs = False
@ -355,14 +351,11 @@ class TabbedChatWindow(chat.Chat):
if yes we go active if not already if yes we go active if not already
if no we go inactive if not already ''' if no we go inactive if not already '''
current_state = self.chatstates[contact.jid] current_state = self.chatstates[contact.jid]
if current_state == False: # he doesn't support chatstates if current_state == False: # jid doesn't support chatstates
return False # stop looping return False # stop looping
if self.mouse_over_in_last_30_secs: if not (self.mouse_over_in_last_30_secs or\
self.send_chatstate('active') self.kbd_activity_in_last_30_secs):
elif self.kbd_activity_in_last_30_secs:
self.send_chatstate('composing')
else:
self.send_chatstate('inactive') self.send_chatstate('inactive')
# 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
@ -436,23 +429,31 @@ class TabbedChatWindow(chat.Chat):
def send_chatstate(self, state): def send_chatstate(self, state):
''' sends our chatstate to the current tab only if new chatstate ''' sends our chatstate to the current tab only if new chatstate
is different for the previous one''' is different for the previous one'''
# please read jep-85 to get an idea of this # please read jep-85 http://www.jabber.org/jeps/jep-0085.html
# we keep track of jep85 support by the peer by three extra states: # we keep track of jep85 support by the peer by three extra states:
# None, False and 'ask' # None, False and 'ask'
# None if no info about peer # None if no info about peer
# False if peer does not support jep85 # False if peer does not support jep85
# 'ask' if we sent 'active' chatstate and are waiting for reply # 'ask' if we sent 'active' chatstate and are waiting for reply
# JEP 85 does not allow resending the same chatstate
# this function checks for that and just returns so it's safe to call it
# with same state.
# This functions also checks for violation in state transitions
# and raises RuntimeException with appropriate message
# more on that http://www.jabber.org/jeps/jep-0085.html#statechart
# do not send nothing if we have chat state notifications disabled # do not send nothing if we have chat state notifications disabled
if not gajim.config.get('send_chat_state_notifications'): if not gajim.config.get('send_chat_state_notifications'):
return return
jid = self.get_active_jid() jid = self.get_active_jid()
if self.chatstates[jid] == False: if self.chatstates[jid] == False: # jid cannot do jep85
return return
# if current state equals last state, return # if current state equals previous state, return
if self.chatstates[jid] == state: if self.chatstates[jid] == state:
return return
@ -464,17 +465,13 @@ class TabbedChatWindow(chat.Chat):
if self.chatstates[jid] == 'ask': if self.chatstates[jid] == 'ask':
return return
# if last state was composing, don't send active # prevent going paused if we we were not composing (JEP violation)
if self.chatstates[jid] == 'composing' and state == 'active': if state == 'paused' and not self.chatstates[jid] == 'composing':
return raise RuntimeError, 'paused chatstate can only exist after composing'
# if we're inactive prevent paused (inactive is stronger) # if we're inactive prevent composing (JEP violation)
if self.chatstates[jid] == 'inactive' and state == 'paused':
return
# if we're inactive prevent paused (inactive is stronger)
if self.chatstates[jid] == 'inactive' and state == 'composing': if self.chatstates[jid] == 'inactive' and state == 'composing':
return raise RuntimeError, 'inactive chatstate can only be followed by active'
self.chatstates[jid] = state self.chatstates[jid] = state
gajim.connections[self.account].send_message(jid, None, None, gajim.connections[self.account].send_message(jid, None, None,