gtk-stream 0.11.1__py3-none-any.whl → 0.11.3__py3-none-any.whl

gtk_stream/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.11.1'
-__version_tuple__ = version_tuple = (0, 11, 1)
+__version__ = version = '0.11.3'
+__version_tuple__ = version_tuple = (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/command_line.py

@@ -14,33 +14,74 @@
 # 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
+def main():
+    parser = argparse.ArgumentParser(
+        prog='gtk-stream',
+        description='A stream-based GUI tool',
+        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()
 
-logLevel = LogLevel.__dict__.get(os.environ.get('GTK_STREAM_LOGLEVEL', 'WARN'), LogLevel.WARN)
+    if args.help:
+        parser.print_help()
 
-logger = Logger(logLevel)
+    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)
 
-class GtkStreamErrorHandler(sax.handler.ErrorHandler):
-    def error(self, exc):
-        raise exc
-    def fatalError(self, exc):
-        raise exc
+    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:
+        import io
+        import sys
+        import os
+        import xml.sax as sax
+        from .parser import GtkStreamXMLHandler
+        from .application import GtkStreamApp
+        from .common import Logger, LogLevel
 
-def main():
-    handler = GtkStreamXMLHandler(logger)
-    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()
+        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)
+        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()

gtk_stream/documents/classes/Picture.py

@@ -20,16 +20,15 @@ from .. import Document
 
 class Picture(Document):
     __g_class__ = Gtk.Picture
-    def __init__(self, app, src, **kwargs):
+    def __init__(self, app, **kwargs):
         super().__init__(app, **kwargs)
-        self.src = src
     def render_raw(self):
-        return Gtk.Picture.new_for_filename(self.src)
+        return Gtk.Picture()
 
 class Icon(Document):
     __g_class__ = Gtk.Image
-    def __init__(self, app, src, **kwargs):
+    def __init__(self, app, **kwargs):
         super().__init__(app, **kwargs)
-        self.src = src
     def render_raw(self):
-        return Gtk.Image.new_from_file(self.src)
+        return Gtk.Image()
+    

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/properties.py

@@ -16,7 +16,7 @@
 
 import sys
 
-from . import Gtk
+from . import Gtk, Gio
 
 def _const(x):
     return lambda _: x
@@ -53,6 +53,16 @@ def _parse_widget_property(val):
     return lambda app: app.namedWidgets[val]
 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,
@@ -66,6 +76,8 @@ _PARSE_TYPE_PROPERTY = {
     'GtkWindow'                : _parse_window_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.1.dist-info → gtk_stream-0.11.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gtk-stream
-Version: 0.11.1
+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.1.dist-info → gtk_stream-0.11.3.dist-info}/RECORD

@@ -1,10 +1,10 @@
 gtk_stream/__init__.py,sha256=y6JLknVFexWrSo_Zl7-TXrPR6EQ5XVMeFO1bUzLN9Lg,98
-gtk_stream/_version.py,sha256=GfnRHfD9z98AbNAoXaNE50CPUnbpEikyDWn-_mn0J2Q,413
-gtk_stream/application.py,sha256=uFquTXCV0fbGlSURBmjrg9BK3Enf9N0_WKX6Lv-5Fko,4993
-gtk_stream/command_line.py,sha256=Ej4mmPiuYjr5-1JrvjGK0BDitKUCfVEI9uHp1p_FAr4,1520
+gtk_stream/_version.py,sha256=OkAeaAqw1G6xdcg59fk8Mamyqb2RLX_cARtBOHOICIM,413
+gtk_stream/application.py,sha256=Au4MngStEIKQdGnl-H6eGWDt923onqRDjW1mPFB9M8I,4911
+gtk_stream/command_line.py,sha256=aagZJ6kyQxbIcx818jU8XPHddC68q7qtkJRNpk5IvJk,2833
 gtk_stream/common.py,sha256=xdscxYgBg_Ux6iyk26gB-AMSgoUIqlZUPgso5YS_gKE,2106
-gtk_stream/parser.py,sha256=LOCGoTT_L5Qf29YJ2wFfTYLHtH0al-QjpFWf9HEHYxU,6561
-gtk_stream/properties.py,sha256=Pgu59t3K-SkHXCZzkrk2DU8ODtjOhkZmf7dLqDYiDqc,3116
+gtk_stream/parser.py,sha256=kyZtHxB4yz_gr0kc6akBMZfFouHZP6XnXF0BZzO_adA,6494
+gtk_stream/properties.py,sha256=RjdRgKUSldIK4Nsij8leBANJicf6oP-Nr53tYI4uEE8,3551
 gtk_stream/documents/__init__.py,sha256=T9mIonSi9DWrpXQzbjq0s0TPU0hB7HylfhMA20OfWIg,831
 gtk_stream/documents/classes/Box.py,sha256=d01o2-JQ3-k0VjvvY8E7mly-u_f1v1NqYz1IDjHZLUo,1381
 gtk_stream/documents/classes/Button.py,sha256=21bVI7DUWmiusboxdsimTgcqKtLqzQydhS9ifIt4R64,1512
@@ -16,7 +16,7 @@ gtk_stream/documents/classes/Frame.py,sha256=zAZvsT-YTZMijsgk7p0YVf6siAmFoCCSXou
 gtk_stream/documents/classes/Grid.py,sha256=jDJ9U1GJZ45hi1VvPsCwFILN7CwEkgjqYqhTzMdtX9o,1249
 gtk_stream/documents/classes/Label.py,sha256=bBNBTvGs6fM8uLf4EDb2Ro8FmCeS27cnU1Ao-44nRYs,1023
 gtk_stream/documents/classes/Paned.py,sha256=q1goKJMWBg1d3hS0eanPBxzBqLB-Pz5hUnH9N-RXXh8,1392
-gtk_stream/documents/classes/Picture.py,sha256=QCLQNuQxfXmaasd-bPgXxJZYyc1e1DQkLdxCZ39gvlI,1251
+gtk_stream/documents/classes/Picture.py,sha256=p84N1ntCHu47O84m48zC8uKFgso3-38yXpPlAjr4IKU,1153
 gtk_stream/documents/classes/ProgressBar.py,sha256=NPJtP3qaKiZUEAYEHZk4FEoWSFn2KVorI2SVb8cDnW0,966
 gtk_stream/documents/classes/Scale.py,sha256=6rW6sBCdpPaqgDEGUPZi5UR8CT3bPmaZQqXXhnl-oaw,1124
 gtk_stream/documents/classes/ScrolledWindow.py,sha256=WaTPgz6GBC-hjH83SQT2OGUdCapHAgO3xEmSMJZ8q70,1041
@@ -24,8 +24,8 @@ gtk_stream/documents/classes/Separator.py,sha256=uw_EgAKs_6pNA8nrOLzruIlJfk4uaog
 gtk_stream/documents/classes/Stack.py,sha256=YA6NDzZL2u4Ko8GXtx8Or-jEWGMCEw2cC1HNkAMRw-8,1030
 gtk_stream/documents/classes/Switch.py,sha256=jQVuxqS9Pmpp1ymB_dbJPxasJNpm4e35ry0JYPHdAsk,1275
 gtk_stream/documents/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gtk_stream-0.11.1.dist-info/METADATA,sha256=iwqbihyKY2PV24joIWUqAAt6D8npjUmm6T4GVOFCD4I,807
-gtk_stream-0.11.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-gtk_stream-0.11.1.dist-info/entry_points.txt,sha256=PmhKTb4MMQM6dN2HJcoDSMI8L0lZIFIlFn-BgdfPDpo,60
-gtk_stream-0.11.1.dist-info/top_level.txt,sha256=vE9zfHGe9Ke7FSe0wBK2WYJI-BpcQNu6xDC3Cu5O8rQ,11
-gtk_stream-0.11.1.dist-info/RECORD,,
+gtk_stream-0.11.3.dist-info/METADATA,sha256=KVLg05oiD8yi-hsNSWs9Zc_DNEZv6BOAwonyhImOYcs,807
+gtk_stream-0.11.3.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+gtk_stream-0.11.3.dist-info/entry_points.txt,sha256=PmhKTb4MMQM6dN2HJcoDSMI8L0lZIFIlFn-BgdfPDpo,60
+gtk_stream-0.11.3.dist-info/top_level.txt,sha256=vE9zfHGe9Ke7FSe0wBK2WYJI-BpcQNu6xDC3Cu5O8rQ,11
+gtk_stream-0.11.3.dist-info/RECORD,,

{gtk_stream-0.11.1.dist-info → gtk_stream-0.11.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.7.0)
 Root-Is-Purelib: true
 Tag: py3-none-any