gtk-screen: Update refs to new internals packages.

diff --git a/src/gtk-screen/gtk-screen.pkg b/src/gtk-screen/gtk-screen.pkg
index d9716663774a2cb854938c6e3184430f65b587f3..f1f1d96f3d25d5006596e25b4805f6342ad06ec1 100644 (file)
--- a/src/gtk-screen/gtk-screen.pkg
+++ b/src/gtk-screen/gtk-screen.pkg
@@ -36,23 +36,6 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
   (parent (edwin screen))
   (export ()
          spawn-edit)
-  (export (edwin)
-         ;; edwin-variable$x-cut-to-clipboard
-         ;; edwin-variable$x-paste-from-clipboard
-         ;; os/interprogram-cut
-         ;; os/interprogram-paste
-         ;; x-root-window-size
-         ;; x-screen-ignore-focus-button?
-         ;; x-selection-timeout
-         ;; xterm-screen/flush!
-         ;; xterm-screen/grab-focus!
-         )
-  (export (edwin x-commands)
-         ;; screen-display
-         ;; screen-xterm
-         ;; xterm-screen/set-icon-name
-         ;; xterm-screen/set-name
-         )
   (import (edwin process)
          register-process-output-events)
   (import (edwin window)
@@ -82,32 +65,27 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
          %window-start-mark
          %set-window-start-mark!
          %window-tab-width)
-  (import (pango)
-         pangos->pixels)
-  (import (gtk gtk-widget)
-         gtk-widget-destroy-callback
-         gtk-container-reverse-children
-         gtk-paned-view-init)
-  (import (gtk fix-layout)
-         fix-widget-geometry
-         fix-layout-adjustment-parameters
-
-         drawing-damage
-         fix-drawing-display-list
-         fix-drawing-extent
-         fix-ink-extent
-         text-ink-pango-layout
-         simple-text-ink-pango-layout
-
-         make-fix-rect copy-fix-rect fix-rect-string
-         fix-rect-x fix-rect-y fix-rect-width fix-rect-height
-         fix-rect-min-x fix-rect-max-x fix-rect-min-y fix-rect-max-y
-         set-fix-rect-size! set-fix-rect-position!
-         fix-rect-intersect? fix-rect-union!)
   (import (glib)
          with-glib-lock without-glib-lock
          assert-glib-locked assert-without-interruption
          gobject-alien gobject-unref!)
+  (import (pango)
+         make-rgba-color
+         pango-context-get-metrics
+         pango-context-spacing
+         pango-font-description-free
+         pango-font-description-from-string
+         pango-font-metrics-get-approximate-char-width
+         pango-font-metrics-get-ascent
+         pango-font-metrics-get-descent
+         pango-font-metrics-unref
+         pango-layout-get-pixel-extents
+         pango-layout-index-to-pos
+         pango-layout-set-font-description
+         pango-layout-set-markup
+         pango-layout-set-text)
+  (import (pango internal)
+         pangos->pixels)
   (import (gtk)
          gtk-css-provider-load-from-data
          gtk-css-provider-new
@@ -192,4 +170,24 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
          <rectangle-ink> set-rectangle-ink! set-rectangle-ink-position!
          set-rectangle-ink-color! set-rectangle-ink-fill-color!
-         set-rectangle-ink-width! make-rgba-color))
\ No newline at end of file
+         set-rectangle-ink-width!)
+  (import (gtk gtk-widget)
+         gtk-widget-destroy-callback
+         gtk-container-reverse-children
+         gtk-paned-view-init)
+  (import (gtk fix-layout)
+         fix-widget-geometry
+         fix-layout-adjustment-parameters
+
+         drawing-damage
+         fix-drawing-display-list
+         fix-drawing-extent
+         fix-ink-extent
+         text-ink-pango-layout
+         simple-text-ink-pango-layout
+
+         make-fix-rect copy-fix-rect fix-rect-string
+         fix-rect-x fix-rect-y fix-rect-width fix-rect-height
+         fix-rect-min-x fix-rect-max-x fix-rect-min-y fix-rect-max-y
+         set-fix-rect-size! set-fix-rect-position!
+         fix-rect-intersect? fix-rect-union!))
\ No newline at end of file