gtk-stream 0.11.2__tar.gz → 0.11.3__tar.gz

{gtk_stream-0.11.2 → gtk_stream-0.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gtk-stream
-Version: 0.11.2
+Version: 0.11.3
 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.2 → gtk_stream-0.11.3}/gtk_stream/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.11.2'
-__version_tuple__ = version_tuple = (0, 11, 2)
+__version__ = version = '0.11.3'
+__version_tuple__ = version_tuple = (0, 11, 3)

{gtk_stream-0.11.2 → gtk_stream-0.11.3}/gtk_stream/application.py

@@ -48,11 +48,9 @@ def style_store():
     return (lambda: " ".join(style),None, style.append)
 
 class GtkStreamApp(Gtk.Application):
-    def __init__(self, logger, name = None, **kwargs):
+    def __init__(self, logger, **kwargs):
         super().__init__(**kwargs)
         self.logger = logger
-        if name != None:
-            GLib.set_application_name(name)
         self.namedWidgets = { }
         self.namedWindows = { }
         

{gtk_stream-0.11.2 → gtk_stream-0.11.3}/gtk_stream/command_line.py

@@ -14,26 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import io
-import xml.sax as sax
-import sys
-import os
 import argparse
 
-from .parser import GtkStreamXMLHandler
-from .common import Logger, LogLevel
-from . import GLib, Gtk, Gdk
-
-logLevel = LogLevel.__dict__.get(os.environ.get('GTK_STREAM_LOGLEVEL', 'WARN'), LogLevel.WARN)
-
-logger = Logger(logLevel)
-
-class GtkStreamErrorHandler(sax.handler.ErrorHandler):
-    def error(self, exc):
-        raise exc
-    def fatalError(self, exc):
-        raise exc
-
 def main():
     parser = argparse.ArgumentParser(
         prog='gtk-stream',
@@ -41,17 +23,59 @@ def main():
         add_help=False
     )
     parser.add_argument('--list-icons', action='store_true')
+    parser.add_argument('--hook')
     parser.add_argument('-h', '--help', action='store_true')
     args = parser.parse_args()
 
     if args.help:
         parser.print_help()
+
     elif args.list_icons:
+        from . import Gtk, Gdk
         theme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default())
         for name in theme.get_icon_names():
             print(name)
+
+    elif args.hook:
+        match args.hook:
+            case "bash":
+                print('''
+coproc GTK_STREAM { exec gtk-stream; }
+trap 'kill -INT "$GTK_STREAM_PID"; wait' EXIT
+exec {GTK_STREAM_EVENTS}<&"${GTK_STREAM[0]}"
+exec {GTK_STREAM_MESSAGES}>&"${GTK_STREAM[1]}"
+function GTK.send() {
+    if (($# > 0)); then
+        printf "$@" >&"$GTK_STREAM_MESSAGES"
+    else
+        cat >&"$GTK_STREAM_MESSAGES"
+    fi
+}
+function GTK.recv() {
+    read -u "$GTK_STREAM_EVENTS" "$@"
+}
+''')
     else:
-        handler = GtkStreamXMLHandler(logger)
+        import io
+        import sys
+        import os
+        import xml.sax as sax
+        from .parser import GtkStreamXMLHandler
+        from .application import GtkStreamApp
+        from .common import Logger, LogLevel
+
+        class GtkStreamErrorHandler(sax.handler.ErrorHandler):
+            def error(self, exc):
+                raise exc
+            def fatalError(self, exc):
+                raise exc
+
+        logLevel = LogLevel.__dict__.get(os.environ.get('GTK_STREAM_LOGLEVEL', 'WARN'), LogLevel.WARN)
+        
+        logger = Logger(logLevel)
+        
+        app = GtkStreamApp(logger)
+        handler = GtkStreamXMLHandler(logger,app)
         errHandler = GtkStreamErrorHandler()
         parser = sax.make_parser()
         parser.setContentHandler(handler)

{gtk_stream-0.11.2 → gtk_stream-0.11.3}/gtk_stream/parser.py

@@ -23,8 +23,6 @@ import xml.sax as sax
 from . import GLib
 from . import documents as docs
 
-from .application import GtkStreamApp
-
 WIDGET_DOCUMENTS = {
     'progress-bar'    : docs.ProgressBar,
     'label'           : docs.Label,
@@ -53,8 +51,9 @@ WIDGET_DOCUMENTS = {
 }
 
 class GtkStreamXMLHandler(sax.ContentHandler):
-    def __init__(self, logger):
+    def __init__(self, logger, app):
         self.logger = logger
+        self.app = app
         self.transition_enter = self.transE_conn
         self.transition_leave = self.transL_final
         self.transition_chars = self.ignore_chars
@@ -95,7 +94,6 @@ class GtkStreamXMLHandler(sax.ContentHandler):
     def transE_conn(self, name, attrs):
         match name:
             case 'application':
-                self.app = GtkStreamApp(self.logger, **attrs)
                 def on_activate(a):
                     a.hold()
                 self.app.connect('activate', on_activate)
@@ -114,7 +112,7 @@ class GtkStreamXMLHandler(sax.ContentHandler):
                 # touching the parser
                 self.messages = {
                     f.__tag_name__: self.startMessage(functools.partial(f,self.app), f.__store__)
-                    for f in GtkStreamApp.__dict__.values()
+                    for f in self.app.__class__.__dict__.values()
                     if hasattr(f, '__tag_name__')
                 }
                 self.logger.debug("Messages: %s", self.messages)

{gtk_stream-0.11.2 → gtk_stream-0.11.3}/gtk_stream/properties.py

@@ -55,6 +55,14 @@ def _parse_window_property(val):
     return lambda app: app.namedWindows[val]
 def _parse_gfile_property(val):
     return _const(Gio.File.new_for_path(val))
+def _parse_align_property(val):
+    match val:
+        case "start":
+            return _const(Gtk.Align.START)
+        case "center":
+            return _const(Gtk.Align.CENTER)
+        case "end":
+            return _const(Gtk.Align.END)
 
 _PARSE_TYPE_PROPERTY = {
     'GStrv'                    : _parse_css_classes_property,
@@ -69,6 +77,7 @@ _PARSE_TYPE_PROPERTY = {
     'GtkAdjustment'            : _parse_adjustment_property,
     'gchararray'               : _const,
     'GFile'                    : _parse_gfile_property,
+    'GtkAlign'                 : _parse_align_property,
 }
 
 def parse_property(prop_type, val):

{gtk_stream-0.11.2 → gtk_stream-0.11.3}/gtk_stream.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gtk-stream
-Version: 0.11.2
+Version: 0.11.3
 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/