# HG changeset patch # User Goffi # Date 1314458141 -7200 # Node ID ede26abf6ca161cad74f38f4d221345dbe2f0a2e # Parent adcc41e4d6eadbe2987dff3638ba7e209f531e68 primitivus: freedesktop notifications (if available) when somebody is talking to us and we have not focus, or our nick is pinged and we have not focus. This need python-Xlib to work, if it's not present, notification are silently ignored. diff -r adcc41e4d6ea -r ede26abf6ca1 frontends/src/primitivus/chat.py --- a/frontends/src/primitivus/chat.py Sat Aug 27 12:39:51 2011 +0200 +++ b/frontends/src/primitivus/chat.py Sat Aug 27 17:15:41 2011 +0200 @@ -231,6 +231,11 @@ self.content.append(ChatText(self, timestamp or None, nick, mymess, msg)) self.text_list.set_focus(len(self.content)-1) self.host.redraw() + if not self.host.notify.hasFocus(): + if self.type=="one2one": + self.host.notify.sendNotification("Primitivus: %s is talking to you" % from_jid) + elif self.getUserNick().lower() in msg.lower(): + self.host.notify.sendNotification("Primitivus: Somebody pinged your name in %s room" % self.target) def printInfo(self, msg, type='normal'): """Print general info @@ -242,6 +247,11 @@ self.content.append(sat_widgets.ClickableText(msg)) self.text_list.set_focus(len(self.content)-1) self.host.redraw() + if not self.host.notify.hasFocus(): + if self.type=="one2one": + self.host.notify.sendNotification("Primitivus: there is a message about you") + elif self.getUserNick().lower() in msg.lower(): + self.host.notify.sendNotification("Primitivus: Somebody is talking about you in %s room" % self.target) def startGame(self, game_type, referee, players): """Configure the chat window to start a game""" diff -r adcc41e4d6ea -r ede26abf6ca1 frontends/src/primitivus/notify.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/frontends/src/primitivus/notify.py Sat Aug 27 17:15:41 2011 +0200 @@ -0,0 +1,78 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +""" +Primitivus: a SAT frontend +Copyright (C) 2009, 2010, 2011 Jérôme Poisson (goffi@goffi.org) + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +""" + +import dbus + +class Notify: + """Used to send notification and detect if we have focus""" + + def __init__(self): + + #X11 stuff + self.display = None + self.X11_id = -1 + + try: + from Xlib import display as X_display + self.display = X_display.Display() + self.X11_id = self.getFocus() + except: + pass + + #Now we try to connect to Freedesktop D-Bus API + try: + bus = dbus.SessionBus() + db_object = bus.get_object('org.freedesktop.Notifications', '/org/freedesktop/Notifications') + self.freedesktop_int = dbus.Interface(db_object, dbus_interface='org.freedesktop.Notifications') + except: + self.freedesktop_int = None + + + def getFocus(self): + if not self.display: + return 0 + return self.display.get_input_focus().focus.id + + def hasFocus(self): + return (self.getFocus() == self.X11_id) if self.display else True + + def useX11(self): + return bool(self.display) + + def sendNotification(self, summ_mess, body_mess=""): + """Send notification to the user if possible""" + #TODO: check options before sending notifications + if self.freedesktop_int: + self.sendFDNotification(summ_mess, body_mess) + + def sendFDNotification(self, summ_mess, body_mess=""): + """Send notification with the FreeDesktop D-Bus API""" + if self.freedesktop_int: + app_name = "Primitivus" + replaces_id = 0 + app_icon = "" + summary = summ_mess + body = body_mess + actions = dbus.Array(signature='s') + hints = dbus.Dictionary(signature='sv') + expire_timeout = -1 + + self.freedesktop_int.Notify(app_name, replaces_id, app_icon, summary, body, actions, hints, expire_timeout) diff -r adcc41e4d6ea -r ede26abf6ca1 frontends/src/primitivus/primitivus --- a/frontends/src/primitivus/primitivus Sat Aug 27 12:39:51 2011 +0200 +++ b/frontends/src/primitivus/primitivus Sat Aug 27 17:15:41 2011 +0200 @@ -36,6 +36,7 @@ from logging import debug, info, error import sys, os from sat.tools.jid import JID +from notify import Notify ### logging configuration FIXME: put this elsewhere ### @@ -104,6 +105,8 @@ self.progress_wid = Progress(self) urwid.connect_signal(self.notBar.progress,'click',lambda x:self.addWindow(self.progress_wid)) self.__saved_overlay = None + + self.notify = Notify() def debug(self): """convenient method to reset screen and launch p(u)db""" diff -r adcc41e4d6ea -r ede26abf6ca1 frontends/src/quick_frontend/quick_chat.py --- a/frontends/src/quick_frontend/quick_chat.py Sat Aug 27 12:39:51 2011 +0200 +++ b/frontends/src/quick_frontend/quick_chat.py Sat Aug 27 17:15:41 2011 +0200 @@ -65,6 +65,9 @@ """Set the nick of the user, usefull for e.g. change the color of the user""" self.nick = nick + def getUserNick(self): + return unicode(self.nick) + def removeUser(self, nick): """Remove a user from the group list""" debug(_("Removing user %s") % nick)