Copyright header and window preservation on mouse enter.

When notification was shown, if given timeout, it can be preserved on screen by entering
with mouse in window area. This can be useful when message with long was shown.

ede-notify-daemon/NotifyWindow.cpp

@@ -1,3 +1,23 @@
+/*
+ * $Id: ede-panel.cpp 3330 2012-05-28 10:57:50Z karijes $
+ *
+ * Copyright (C) 2012 Sanel Zukan
+ * 
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+ 
 #include <FL/Fl.H>
 #include <FL/x.H>
 #include <FL/fl_draw.H>
@@ -31,6 +51,8 @@ static void timeout_cb(void *w) {
 NotifyWindow::NotifyWindow() : Fl_Window(DEFAULT_W, DEFAULT_H) {
 	FL_NORMAL_SIZE = 12;
 
+	timer_set = 0;
+
 	type(NOTIFYWINDOW_TYPE);
 	color(FL_BACKGROUND2_COLOR);
 	box(FL_BORDER_BOX);
@@ -67,6 +89,24 @@ NotifyWindow::NotifyWindow() : Fl_Window(DEFAULT_W, DEFAULT_H) {
 	border(0);
 }
 
+void NotifyWindow::add_timeout(void) {
+	E_DEBUG(E_STRLOC ": adding timer\n");
+	if(timer_set) return;
+
+	if(exp == -1) exp = DEFAULT_EXPIRE;
+	Fl::add_timeout((double)exp / (double)1000, timeout_cb, this);
+
+	timer_set = 1;
+}
+
+void NotifyWindow::remove_timeout(void) {
+	E_DEBUG(E_STRLOC ": removing timer\n");
+	if(!timer_set) return;
+
+	Fl::remove_timeout(timeout_cb);
+	timer_set = 0;
+}
+
 void NotifyWindow::set_icon(const char *img) {
 	E_RETURN_IF_FAIL(IconLoader::inited());
 	E_RETURN_IF_FAIL(img != NULL);
@@ -82,10 +122,9 @@ void NotifyWindow::set_body(const char *s) {
 }
 
 void NotifyWindow::show(void) {
-	if(exp != 0) {
+	/* the case when timer should not be added */
-		if(exp == -1) exp = DEFAULT_EXPIRE;
+	if(exp != 0)
-		Fl::add_timeout((double)exp / (double)1000, timeout_cb, this);
+		add_timeout();
-	}
 
 	Fl_Window::show();
 	netwm_window_set_type(fl_xid(this), NETWM_WINDOW_TYPE_NOTIFICATION);
@@ -161,3 +200,17 @@ void NotifyWindow::resize(int X, int Y, int W, int H) {
 
 	Fl_Window::resize(X, Y, W, H);
 }
+
+int NotifyWindow::handle(int event) {
+	switch(event) {
+		case FL_ENTER:
+			remove_timeout();
+			goto done;
+		case FL_LEAVE:
+			add_timeout();
+			goto done;
+	}
+
+done:
+	return Fl_Window::handle(event);
+}

ede-notify-daemon/NotifyWindow.h

@@ -1,3 +1,23 @@
+/*
+ * $Id: ede-panel.cpp 3330 2012-05-28 10:57:50Z karijes $
+ *
+ * Copyright (C) 2012 Sanel Zukan
+ * 
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+ 
 #ifndef __NOTIFYWINDOW_H__
 #define __NOTIFYWINDOW_H__
 
@@ -11,11 +31,13 @@
 
 class NotifyWindow : public Fl_Window {
 private:
-	int       id, exp;
+	int       id, exp, timer_set;
 	Fl_Button *closeb;
 	Fl_Box    *imgbox;
 	Fl_Multiline_Output *summary, *body;
 
+	void add_timeout(void);
+	void remove_timeout(void);
 public:
 	NotifyWindow();
 
@@ -34,6 +56,7 @@ public:
 	void show(void);
 
 	virtual void resize(int X, int Y, int W, int H);
+	virtual int handle(int event);
 };
 
 #endif

ede-notify-daemon/ede-notify-daemon.cpp

@@ -1,3 +1,23 @@
+/*
+ * $Id: ede-panel.cpp 3330 2012-05-28 10:57:50Z karijes $
+ *
+ * Copyright (C) 2012 Sanel Zukan
+ * 
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+ 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -25,7 +45,7 @@
 /* server info sent via GetServerInformation */
 #define EDE_NOTIFY_DAEMON_NAME         "EDE Notification Daemon"
 #define EDE_NOTIFY_DAEMON_VENDOR       "ede"
-#define EDE_NOTIFY_DAEMON_VERSION      "0.1"
+#define EDE_NOTIFY_DAEMON_VERSION      "0.2"
 #define EDE_NOTIFY_DAEMON_SPEC_VERSION "1.2"
 
 #define NOTIFICATIONS_DBUS_PATH         "/org/freedesktop/Notifications"