Add signal handlers to show menus

Author: apebl

qui/clipboard.py

@@ -31,8 +31,10 @@
 import math
 import os
 import fcntl
+import signal
 import qubesadmin
 import qubesadmin.events
+from functools import partial
 
 import gi
 gi.require_version('Gtk', '3.0')  # isort:skip
@@ -302,6 +304,11 @@ def _convert_to_readable(key: str):
             return key.upper()
         return key
 
+def signal_handler(app, _signum, _frame):
+    event = Gdk.EventButton()
+    event.button = 1
+    app.show_menu(None, event)
+
 def main():
     loop = asyncio.get_event_loop()
     wm = pyinotify.WatchManager()
@@ -314,6 +321,9 @@ def main():
     handler = EventHandler(loop=loop, gtk_app=gtk_app)
     pyinotify.AsyncioNotifier(wm, loop, default_proc_fun=handler)
 
+    signal_handler_wrapper = partial(signal_handler, gtk_app)
+    signal.signal(signal.SIGUSR1, signal_handler_wrapper)
+
     return run_asyncio_and_show_errors(loop, [asyncio.ensure_future(
         dispatcher.listen_for_events())], _("Qubes Clipboard Widget"))
 

qui/devices/device_widget.py

@@ -18,9 +18,11 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with this program; if not, see <http://www.gnu.org/licenses/>.
 from typing import Set, List, Dict
+from functools import partial
 import asyncio
 import sys
 import time
+import signal
 
 import importlib.resources
 
@@ -294,7 +296,7 @@ def load_css(widget) -> str:
 
         return theme
 
-    def show_menu(self, _unused, _event):
+    def show_menu(self, _unused, event):
         """Show menu at mouse pointer."""
         tray_menu = Gtk.Menu()
         theme = self.load_css(tray_menu)
@@ -333,7 +335,8 @@ def show_menu(self, _unused, _event):
             tray_menu.add(item)
 
         tray_menu.show_all()
-        tray_menu.popup_at_pointer(None)  # use current event
+        tray_menu.popup(None, None, None, None, event.button,
+                        Gtk.get_current_event_time())
 
     def emit_notification(self, title, message, priority, error=False,
                           notification_id=None):
@@ -347,6 +350,11 @@ def emit_notification(self, title, message, priority, error=False,
         self.send_notification(notification_id, notification)
 
 
+def signal_handler(app, _signum, _frame):
+    event = Gdk.EventButton()
+    event.button = 1
+    app.show_menu(None, event)
+
 def main():
     qapp = qubesadmin.Qubes()
     # qapp = qubesadmin.tests.mock_app.MockQubesComplete()
@@ -355,6 +363,9 @@ def main():
     app = DevicesTray(
         'org.qubes.qui.tray.Devices', qapp, dispatcher)
 
+    signal_handler_wrapper = partial(signal_handler, app)
+    signal.signal(signal.SIGUSR1, signal_handler_wrapper)
+
     loop = asyncio.get_event_loop()
     return_code = qui.utils.run_asyncio_and_show_errors(
         loop, [asyncio.ensure_future(dispatcher.listen_for_events())],

qui/tray/disk_space.py

@@ -1,11 +1,13 @@
 # pylint: disable=wrong-import-position,import-error
 import sys
 import subprocess
+import signal
 from typing import List
+from functools import partial
 
 import gi
 gi.require_version('Gtk', '3.0')  # isort:skip
-from gi.repository import Gtk, GObject, Gio, GLib  # isort:skip
+from gi.repository import Gtk, GObject, Gio, GLib, Gdk  # isort:skip
 from qubesadmin import Qubes
 from qubesadmin.utils import size_to_human
 from qubesadmin import exc
@@ -358,8 +360,16 @@ def __init__(self, **properties):
 
         GObject.timeout_add_seconds(120, self.refresh_icon)
 
+        signal_handler_wrapper = partial(self.__signal_handler)
+        signal.signal(signal.SIGUSR1, signal_handler_wrapper)
+
         Gtk.main()
 
+    def __signal_handler(self, _signum, _frame):
+        event = Gdk.EventButton()
+        event.button = 1
+        self.make_menu(None, event)
+
     def refresh_icon(self):
         pool_data = PoolUsageData(self.qubes_app)
         vm_data = VMUsageData(self.qubes_app)
@@ -418,7 +428,7 @@ def set_icon_state(self, pool_warning=None, vm_warning=None):
             self.icon.set_tooltip_markup(
                 _('<b>Qubes Disk Space Monitor</b>\nView free disk space.'))
 
-    def make_menu(self, _unused, _event):
+    def make_menu(self, _unused, event):
         pool_data = PoolUsageData(self.qubes_app)
         vm_data = VMUsageData(self.qubes_app)
 
@@ -460,7 +470,8 @@ def make_menu(self, _unused, _event):
         menu.set_reserve_toggle_size(False)
 
         menu.show_all()
-        menu.popup_at_pointer(None)  # use current event
+        menu.popup(None, None, None, None, event.button,
+                   Gtk.get_current_event_time())
 
     @staticmethod
     def make_title_item(text):

qui/tray/domains.py

@@ -9,6 +9,8 @@
 import os
 import threading
 import traceback
+import signal
+from functools import partial
 
 import qubesadmin
 import qubesadmin.events
@@ -19,7 +21,7 @@
 
 import gi  # isort:skip
 gi.require_version('Gtk', '3.0')  # isort:skip
-from gi.repository import Gio, Gtk, GObject, GLib, GdkPixbuf  # isort:skip
+from gi.repository import Gio, Gtk, GObject, GLib, GdkPixbuf, Gdk  # isort:skip
 
 import gbulb
 gbulb.install()
@@ -596,7 +598,8 @@ def register_events(self):
         self.stats_dispatcher.add_handler('vm-stats', self.update_stats)
 
     def show_menu(self, _unused, event):
-        self.tray_menu.popup_at_pointer(event)  # None means current event
+        self.tray_menu.popup(None, None, None, None, event.button,
+                             Gtk.get_current_event_time())
 
     def emit_notification(self, vm, event, **kwargs):
         notification = Gio.Notification.new(_(
@@ -913,6 +916,11 @@ def _disconnect_signals(self, _event):
         self.stats_dispatcher.remove_handler('vm-stats', self.update_stats)
 
 
+def signal_handler(app, _signum, _frame):
+    event = Gdk.EventButton()
+    event.button = 1
+    app.show_menu(None, event)
+
 def main():
     ''' main function '''
     qapp = qubesadmin.Qubes()
@@ -923,6 +931,9 @@ def main():
         'org.qubes.qui.tray.Domains', qapp, dispatcher, stats_dispatcher)
     app.run()
 
+    signal_handler_wrapper = partial(signal_handler, app)
+    signal.signal(signal.SIGUSR1, signal_handler_wrapper)
+
     loop = asyncio.get_event_loop()
     tasks = [
         asyncio.ensure_future(dispatcher.listen_for_events()),

qui/tray/updates.py

@@ -6,6 +6,8 @@
 import asyncio
 import sys
 import subprocess
+import signal
+from functools import partial
 
 import qubesadmin
 import qubesadmin.events
@@ -14,7 +16,7 @@
 
 import gi  # isort:skip
 gi.require_version('Gtk', '3.0')  # isort:skip
-from gi.repository import Gtk, Gio  # isort:skip
+from gi.repository import Gtk, Gio, Gdk  # isort:skip
 
 import gbulb
 gbulb.install()
@@ -105,12 +107,13 @@ def setup_menu(self):
 
         self.tray_menu.show_all()
 
-    def show_menu(self, _unused, _event):
+    def show_menu(self, _unused, event):
         self.tray_menu = Gtk.Menu()
 
         self.setup_menu()
 
-        self.tray_menu.popup_at_pointer(None)  # use current event
+        self.tray_menu.popup(None, None, None, None, event.button,
+                             Gtk.get_current_event_time())
 
     @staticmethod
     def launch_updater(*_args, **_kwargs):
@@ -212,13 +215,21 @@ def update_indicator_state(self):
             self.widget_icon.set_visible(False)
 
 
+def signal_handler(app, _signum, _frame):
+    event = Gdk.EventButton()
+    event.button = 1
+    app.show_menu(None, event)
+
 def main():
     qapp = qubesadmin.Qubes()
     dispatcher = qubesadmin.events.EventsDispatcher(qapp)
     app = UpdatesTray(
         'org.qubes.qui.tray.Updates', qapp, dispatcher)
     app.run()
 
+    signal_handler_wrapper = partial(signal_handler, app)
+    signal.signal(signal.SIGUSR1, signal_handler_wrapper)
+
     loop = asyncio.get_event_loop()
 
     return qui.utils.run_asyncio_and_show_errors(loop, [asyncio.ensure_future(