X11 urgency hint on new notification

mkiol · Mar 28, 2018 · 4f98f83 · 4f98f83
1 parent c270272
commit 4f98f83
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/source/lib/download_complete.js b/source/lib/download_complete.js
@@ -141,11 +141,16 @@ function showDownloadCompleteNotification(path) {
         }
       }];
     }
+
+    const icon = utils.getIcon();
+
+    // Engine 3 - GNotifier + custom command
+    if (sps.engine === 3)
+      utils.executeCustomCommand(title, text, icon);
+
     /* eslint-disable no-unused-vars */
-    id = notifApi.notifyWithActions(utils.getIcon(), title, text,
+    id = notifApi.notifyWithActions(icon, title, text,
       system.name, reason=>{}, actions);
-    if (id)
-      return;
     /* eslint-enable no-unused-vars */
   }
 

diff --git a/source/lib/linux.js b/source/lib/linux.js
@@ -402,6 +402,9 @@ exports.notify = (iconURL, title, text, notifier, closeHandler, clickHandler)=>{
 };
 
 exports.notifyWithActions = (iconURL, title, text, notifier, closeHandler, actionsList)=>{
+  if (sps.urgencyHint)
+    utils.setUrgencyHint();
+
   // Escape unsupported tags
   text = escapeUnsupportedTags(text);
 

diff --git a/source/lib/thunderbird.js b/source/lib/thunderbird.js
@@ -204,9 +204,6 @@ function selectMessage(message) {
 function showNotification(title, text, message, agregated = false){
   const notifications = require("sdk/notifications");
 
-  if (sps.alwaysFocus)
-    focusWindow(false);
-
   // Current implementation of click action doesn't support SeaMonkey,
   // so doing not clickable notification if SeaMonkey
   if (system.name === "SeaMonkey") {

diff --git a/source/lib/utils.js b/source/lib/utils.js
@@ -210,8 +210,6 @@ exports.getFileExtension = (filename)=>{
 exports.executeCustomCommand = (title = "", text = "", imageUrl = "")=>{
   let command = sps.command;
 
-  console.log("executeCustomCommand1: " + command);
-
   if (command !== "") {
     imageUrl = exports.escapeShell(imageUrl);
     title = exports.escapeShell(title);
@@ -221,13 +219,17 @@ exports.executeCustomCommand = (title = "", text = "", imageUrl = "")=>{
     command = command.replace("%title",title);
     command = command.replace("%text",text);
 
-    console.log("executeCustomCommand2: " + command);
-
     exports.execute(command);
   }
 };
 
+exports.setUrgencyHint = ()=> {
+  let command = "wmctrl -r '" + system.name + "' -b add,demands_attention";
+  exports.execute(command);
+};
+
 exports.execute = function(command) {
+  console.log("execute: " + command);
   const child_process = require("sdk/system/child_process");
   const { env } = require("sdk/system/environment");
   let c;

diff --git a/source/package.json b/source/package.json
@@ -7,7 +7,7 @@
         "Joe Simpson <headbangerkenny@gmail.com>",
         "Andrew Nagle <kabili@zyrenth.com>"
     ],
-    "version": "1.13.1",
+    "version": "1.13.2",
     "title": "GNotifier",
     "fullName": "GNotifier",
     "id": "jid1-OoNOA6XBjznvLQ@jetpack",
@@ -368,11 +368,11 @@
             "value": ""
         },
         {
-            "name": "alwaysFocus",
-            "title": "New message notification - Set focus on Thunderbird window on new notification",
-            "description": "When enabled, fucus on Thunderbird window is set when new notification appears.",
+            "name": "urgencyHint",
+            "title": "Set urgency hint on new notification (Linux only)",
+            "description": "When enabled, X11 urgency hint on Thunderbird window is set when new notification appears.",
             "type": "bool",
-            "value": false
+            "value": true
         },
         {
             "name": "test",

diff --git a/xpi/gnotifier-1.13.2-dev.xpi b/xpi/gnotifier-1.13.2-dev.xpi