gtk-stream 0.11.5__tar.gz → 0.12__tar.gz

{gtk_stream-0.11.5 → gtk_stream-0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gtk-stream
-Version: 0.11.5
+Version: 0.12
 Summary: A simple stream-oriented GUI protocol
 Author-email: Marc Coiffier <marc.coiffier@univ-grenoble-alpes.fr>
 Project-URL: Homepage, https://coiffier.net/projects/gtk-stream/

{gtk_stream-0.11.5 → gtk_stream-0.12}/gtk_stream/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.11.5'
-__version_tuple__ = version_tuple = (0, 11, 5)
+__version__ = version = '0.12'
+__version_tuple__ = version_tuple = (0, 12)

{gtk_stream-0.11.5 → gtk_stream-0.12}/gtk_stream/application.py

@@ -15,6 +15,9 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import sys
+import threading
+import signal
+
 from . import Gtk, GLib, Gdk
 from .common import printEvent
 from .properties import parse_property, get_prop_type, set_parse_prop
@@ -68,14 +71,31 @@ class GtkStreamApp(Gtk.Application):
             for cb in callback_queue:
                 GLib.idle_add(cb)
             self.run_when_idle = GLib.idle_add
+
+            def on_sigint(a,b):
+                self.logger.info("SIGINT received, quitting application")
+                self.quit()
+            signal.signal(signal.SIGINT, on_sigint)
         self.connect('startup', on_startup)
+
+        def on_activate(a):
+            a.hold()
+        self.connect('activate', on_activate)
+
+        self.attrs_set = threading.Semaphore()
+        self.attrs_set.acquire()
         
-    def nameWidget(self, id, w):
+    def name_widget(self, id, w):
         if id is not None:
             self.namedWidgets[id] = w
 
+    def set_attrs(self, attrs):
+        for name, val in attrs.items():
+            set_parse_prop(self, self, name, val)
+        self.attrs_set.release()
+            
     @app_message('file-dialog')
-    def openFileDialog(self, id, parent):
+    def open_file_dialog(self, id, parent):
         dialog = Gtk.FileDialog()
         dialog.props.modal = True
         def on_choose(_, b):
@@ -90,7 +110,7 @@ class GtkStreamApp(Gtk.Application):
         dialog.open(parent = self.namedWindows[parent], callback = on_choose)
 
     @app_message('window', single_store)
-    def newWindow(self, document, id, **attrs):
+    def new_window(self, document, id, **attrs):
         win = Gtk.Window(application=self)
         for (attr_name, attr_val) in attrs.items():
             self.logger.debug("Setting attr '%s' on window", attr_name)
@@ -101,31 +121,31 @@ class GtkStreamApp(Gtk.Application):
         win.present()
 
     @app_message('style', style_store)
-    def addStyle(self, style):
+    def add_style(self, style):
         provider = Gtk.CssProvider()
         provider.load_from_data(style)
         Gtk.StyleContext.add_provider_for_display(Gdk.Display.get_default(), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
 
     @app_message('add-icon-path')
-    def addIconPath(self, path):
+    def add_icon_path(self, path):
         theme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default())
         theme.add_search_path(path)
         
     @app_message('close-window')
-    def closeWindow(self, id):
+    def close_window(self, id):
         self.namedWindows[id].close()
 
     @app_message('remove')
-    def removeWidget(self, id):
+    def remove_widget(self, id):
         w = self.namedWidgets[id]
         w.get_parent().remove(w)
 
     @app_message('insert', multiple_store)
-    def insertWidgets(self, documents, into):
+    def insert_widgets(self, documents, into):
         for doc in documents:
-            self.insertWidget(doc, into)
+            self.insert_widget(doc, into)
 
-    def insertWidget(self, document, into):
+    def insert_widget(self, document, into):
         if into in self.namedWidgets:
             w = self.namedWidgets[into]
             w.insert_child(document)
@@ -133,7 +153,7 @@ class GtkStreamApp(Gtk.Application):
             raise Exception(f"Error: unknown widget id '{into}'")
     
     @app_message('set-prop')
-    def setProp(self, id, name, value):
+    def set_prop(self, id, name, value):
         w = self.namedWidgets[id]
         w.set_property(name, parse_property(get_prop_type(w.__class__, name), value)(self))
 

{gtk_stream-0.11.5 → gtk_stream-0.12}/gtk_stream/command_line.py

@@ -59,7 +59,9 @@ function GTK.receive() {
         import io
         import sys
         import os
+        import threading
         import xml.sax as sax
+        
         from .parser import GtkStreamXMLHandler
         from .application import GtkStreamApp
         from .common import Logger, LogLevel
@@ -75,13 +77,24 @@ function GTK.receive() {
         logger = Logger(logLevel)
         
         app = GtkStreamApp(logger)
-        handler = GtkStreamXMLHandler(logger,app)
-        errHandler = GtkStreamErrorHandler()
-        parser = sax.make_parser()
-        parser.setContentHandler(handler)
-        parser.setErrorHandler(errHandler)
-        try:
-            parser.parse(io.FileIO(0, 'r', closefd=False))
-        except Exception as e:
-            logger.error("Done with exception : %s", e)
-        handler.quit_application()
+
+        def parser_main():
+            handler = GtkStreamXMLHandler(app)
+            errHandler = GtkStreamErrorHandler()
+            parser = sax.make_parser()
+            parser.setContentHandler(handler)
+            parser.setErrorHandler(errHandler)
+            try:
+                parser.parse(io.FileIO(0, 'r', closefd=False))
+            except Exception as e:
+                logger.error("Done with exception : %s", e)
+            handler.quit_application()
+
+        parser_thread = threading.Thread(target = parser_main, daemon = True)
+        parser_thread.start()
+
+        # When the parser parses the 'application' tag, it sets the
+        # application attributes, and releases the semaphore so the
+        # application can start
+        app.attrs_set.acquire() 
+        app.run()

{gtk_stream-0.11.5 → gtk_stream-0.12}/gtk_stream/documents/classes/Document.py

@@ -37,7 +37,7 @@ class Document:
         """Method to render the document to a widet"""
         raise Exception("Method 'render' not implemented")
     def set_properties(self, w):
-        self.app.nameWidget(self.id, w)
+        self.app.name_widget(self.id, w)
         for (p,v) in self.props.items():
             val = v(self.app)
             self.app.logger.debug("Setting property '%s' to '%s' in widget %s", p, val, self.__class__)

{gtk_stream-0.11.5 → gtk_stream-0.12}/gtk_stream/parser.py

@@ -22,6 +22,7 @@ import xml.sax as sax
 
 from . import GLib
 from . import documents as docs
+from .properties import set_parse_prop
 
 WIDGET_DOCUMENTS = {
     'progress-bar'    : docs.ProgressBar,
@@ -51,28 +52,29 @@ WIDGET_DOCUMENTS = {
 }
 
 class GtkStreamXMLHandler(sax.ContentHandler):
-    def __init__(self, logger, app):
-        self.logger = logger
+    def __init__(self, app):
         self.app = app
+        self.logger = app.logger
+
         self.transition_enter = self.transE_conn
         self.transition_leave = self.transL_final
         self.transition_chars = self.ignore_chars
-        self.namedWidgets = { }
-        self.windows = { }
+
+        # Get all messages directly from the application
+        # class. This allows defining new messages without
+        # touching the parser
+        self.messages = {
+            f.__tag_name__: self.startMessage(functools.partial(f,self.app), f.__store__)
+            for f in self.app.__class__.__dict__.values()
+            if hasattr(f, '__tag_name__')
+        }
 
     def quit_application(self):
         def cb():
             self.logger.info("Quitting app")
             self.app.quit()
         GLib.idle_add(cb)
-        self.logger.info("Waiting for app to terminate")
-        self.app_thread.join()
-        self.logger.info("App terminated")
-        sys.exit(0)
 
-    def setNamed(self, attrs, ):
-        if 'id' in attrs:
-            self.namedWidgets[attrs['id']] = widget
     def ignore_chars(self, s):
         pass
         
@@ -94,29 +96,7 @@ class GtkStreamXMLHandler(sax.ContentHandler):
     def transE_conn(self, name, attrs):
         match name:
             case 'application':
-                def on_activate(a):
-                    a.hold()
-                self.app.connect('activate', on_activate)
-                def appMain():
-                    self.app.run([])
-                self.app_thread = threading.Thread(target = appMain)
-                self.app_thread.start()
-
-                def on_sigint(a,b):
-                    self.logger.info("SIGINT received")
-                    self.quit_application()
-                signal.signal(signal.SIGINT, on_sigint)
-
-                # Get all messages directly from the application
-                # class. This allows defining new messages without
-                # touching the parser
-                self.messages = {
-                    f.__tag_name__: self.startMessage(functools.partial(f,self.app), f.__store__)
-                    for f in self.app.__class__.__dict__.values()
-                    if hasattr(f, '__tag_name__')
-                }
-                self.logger.debug("Messages: %s", self.messages)
-
+                self.app.set_attrs(attrs)
                 self.transition_enter = self.transE_message
                 self.transition_leave = self.transL_tag('application', self.transE_final, self.transL_final)
             case _:

{gtk_stream-0.11.5 → gtk_stream-0.12}/gtk_stream.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gtk-stream
-Version: 0.11.5
+Version: 0.12
 Summary: A simple stream-oriented GUI protocol
 Author-email: Marc Coiffier <marc.coiffier@univ-grenoble-alpes.fr>
 Project-URL: Homepage, https://coiffier.net/projects/gtk-stream/