Make bpython-gtk embeddable.

Trundle · Trundle · commit 00e7cd6b9fed · 2009-12-30T00:40:14.000+01:00
This closes bpython#73.
diff --git a/bpython/args.py b/bpython/args.py
@@ -28,7 +28,7 @@ def parse(args, extras=None):
           'A full description of what these options are for',
           [optparse.Option('-f', action='store_true', dest='f', help='Explode'),
            optparse.Option('-l', action='store_true', dest='l', help='Love')]))
-            
+
 
     Return a tuple of (config, options, exec_args) wherein "config" is the
     config object either parsed from a default/specified config file or default
@@ -56,16 +56,17 @@ def parse(args, extras=None):
     if extras is not None:
         extras_group = OptionGroup(parser, extras[0], extras[1])
         for option in extras[2]:
-            extras_group.option_list.append(option)
+            extras_group.add_option(option)
         parser.add_option_group(extras_group)
 
     all_args = set(parser._short_opt.keys() + parser._long_opt.keys())
-    if args and not all_args.intersection(args):
+    if args and not all_args.intersection(arg.split('=')[0] for arg in args):
         # Just let Python handle this
         os.execv(sys.executable, [sys.executable] + args)
     else:
         # Split args in bpython args and args for the executed file
-        real_args = list(takewhile(lambda arg: arg in all_args, args))
+        real_args = list(takewhile(lambda arg: arg.split('=')[0] in all_args,
+                                   args))
         exec_args = args[len(real_args):]
 
     options, args = parser.parse_args(real_args)
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -29,16 +29,16 @@
 
 from __future__ import with_statement
 import inspect
-import sys
+import optparse
 import os
+import sys
 from locale import LC_ALL, getpreferredencoding, setlocale
 
 import gobject
 import gtk
 import pango
 
 from bpython import importcompletion, repl
-from bpython.config import Struct, loadini
 from bpython.formatter import theme_map
 import bpython.args
 
@@ -623,40 +623,49 @@ def init_import_completion():
 def main(args=None):
 
     setlocale(LC_ALL, '')
-    config = Struct()
 
-    config, options, exec_args = bpython.args.parse(args)
-
-    loadini(config, '~/.bpython/config', options.config)
+    gtk_options = ('gtk-specific options',
+                   "Options specific to bpython's Gtk+ front end",
+                   [optparse.Option('--socket-id', dest='socket_id',
+                                    type='int', help='Embed bpython')])
+    config, options, exec_args = bpython.args.parse(args, gtk_options)
 
     interpreter = repl.Interpreter(None, getpreferredencoding())
     repl_widget = ReplWidget(interpreter, config)
 
-    # sys.stderr = repl_widget
+    sys.stderr = repl_widget
     sys.stdout = repl_widget
 
-    gobject.idle_add(init_import_completion)
+#    repl.startup()
 
-    window = gtk.Window()
+    gobject.idle_add(init_import_completion)
 
-    # branding
+    if not options.socket_id:
+        print options.socket_id
+        parent = gtk.Window()
+        parent.connect('delete-event', lambda widget, event: gtk.main_quit())
 
-    # fix icon to be distributed and loaded from the correct path
-    icon = gtk.gdk.pixbuf_new_from_file(os.path.join(os.path.dirname(__file__),
-                                                     'logo.png'))
+        # branding
+        # fix icon to be distributed and loaded from the correct path
+        icon = gtk.gdk.pixbuf_new_from_file(os.path.join(os.path.dirname(__file__),
+                                                         'logo.png'))
 
-    window.set_title('bpython')
-    window.set_icon(icon)
-    window.resize(600, 300)
+        parent.set_title('bpython')
+        parent.set_icon(icon)
+        parent.resize(600, 300)
+    else:
+        parent = gtk.Plug(options.socket_id)
+        parent.connect('destroy', gtk.main_quit)
 
     # read from config
 
     sw = gtk.ScrolledWindow()
     sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
     sw.add(repl_widget)
-    window.add(sw)
-    window.show_all()
-    window.connect('delete-event', lambda widget, event: gtk.main_quit())
+    parent.add(sw)
+    parent.show_all()
+    parent.connect('delete-event', lambda widget, event: gtk.main_quit())
+
     gtk.main()
 
 
