From 035ba3bc93b6986e7de946174f67877dc34e2862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Br=C3=BCschweiler?= <blei42@gmail.com>
Date: Thu, 22 Jul 2010 12:39:16 +0200
Subject: [PATCH] ui.backend.gtk, tools.deploy.unix: support for icons

---
 basis/glib/ffi/ffi.factor             |  18 ++++++++++++++--
 basis/images/gtk/gtk.factor           |  15 -------------
 basis/tools/deploy/unix/unix.factor   |  23 +++++++++++++-------
 basis/ui/backend/gtk/gtk.factor       |  29 +++++++++++++++++++-------
 basis/ui/backend/gtk/icon.ico         | Bin 0 -> 15086 bytes
 core/vocabs/loader/loader-docs.factor |   2 +-
 6 files changed, 54 insertions(+), 33 deletions(-)
 create mode 100644 basis/ui/backend/gtk/icon.ico

diff --git a/basis/glib/ffi/ffi.factor b/basis/glib/ffi/ffi.factor
index 7724cf5698..a0dc3a3fdb 100644
--- a/basis/glib/ffi/ffi.factor
+++ b/basis/glib/ffi/ffi.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.destructors
-alien.libraries alien.syntax combinators compiler.units gir
-kernel system vocabs.parser words ;
+alien.libraries alien.strings alien.syntax combinators gir
+io.encodings.utf8 kernel system vocabs.parser words ;
 IN: glib.ffi
 
 <<
@@ -78,3 +78,17 @@ CALLBACK: gboolean GSourceFuncsPrepareFunc ( GSource* source, gint* timeout_ ) ;
 CALLBACK: gboolean GSourceFuncsCheckFunc ( GSource* source ) ;
 CALLBACK: gboolean GSourceFuncsDispatchFunc ( GSource* source, GSourceFunc callback, gpointer user_data ) ;
 
+ERROR: g-error domain code message ;
+
+: GError>g-error ( GError -- g-error )
+    [ domain>> g_quark_to_string utf8 alien>string ]
+    [ code>> ]
+    [ message>> utf8 alien>string ] tri
+    \ g-error boa ;
+
+: handle-GError ( GError/f -- )
+    [
+        [ GError>g-error ]
+        [ g_error_free ] bi
+        throw
+    ] when* ;
diff --git a/basis/images/gtk/gtk.factor b/basis/images/gtk/gtk.factor
index 9b50bf6a62..e08ac996ad 100644
--- a/basis/images/gtk/gtk.factor
+++ b/basis/images/gtk/gtk.factor
@@ -18,27 +18,12 @@ SINGLETON: gtk-image
 "bmp"  gtk-image register-image-class
 "ico"  gtk-image register-image-class
 
-ERROR: g-error domain code message ;
-
 <PRIVATE
 
 : data>GInputStream ( data -- GInputStream )
     [ malloc-byte-array &free ] [ length ] bi
     f g_memory_input_stream_new_from_data &g_object_unref ;
 
-: GError>g-error ( GError -- g-error )
-    [ domain>> g_quark_to_string utf8 alien>string ]
-    [ code>> ]
-    [ message>> utf8 alien>string ] tri
-    \ g-error boa ;
-
-: handle-GError ( GError/f -- )
-    [
-        [ GError>g-error ]
-        [ g_error_free ] bi
-        throw
-    ] when* ;
-
 : GInputStream>GdkPixbuf ( GInputStream -- GdkPixbuf )
     f { { pointer: GError initial: f } }
     [ gdk_pixbuf_new_from_stream ] with-out-parameters
diff --git a/basis/tools/deploy/unix/unix.factor b/basis/tools/deploy/unix/unix.factor
index 1b6b8596e2..2fba79ad1e 100644
--- a/basis/tools/deploy/unix/unix.factor
+++ b/basis/tools/deploy/unix/unix.factor
@@ -1,25 +1,34 @@
 ! Copyright (C) 2008 James Cash
 ! See http://factorcode.org/license.txt for BSD license.
-USING: io io.pathnames io.directories io.files
-io.files.info.unix io.backend kernel namespaces make sequences
-system tools.deploy.backend tools.deploy.config
-tools.deploy.config.editor assocs hashtables prettyprint ;
+USING: io io.backend io.directories io.files io.files.info.unix
+io.pathnames kernel namespaces sequences system
+tools.deploy.backend tools.deploy.config
+tools.deploy.config.editor vocabs.loader vocabs.metadata ;
 IN: tools.deploy.unix
 
+: used-ico ( vocab -- ico )
+    dup vocab-windows-icon-path vocab-append-path
+    [ exists? ] keep "vocab:ui/backend/gtk/icon.ico" ? ;
+
+: copy-ico ( vocab bundle-name -- )
+    [ used-ico ]
+    [ "ui/backend/gtk/icon.ico" append-path ] bi*
+    copy-file ;
+
 : create-app-dir ( vocab bundle-name -- vm )
-    copy-vm
+    [ copy-vm ] [ copy-ico ] 2bi
     dup OCT: 755 set-file-permissions ;
 
 : bundle-name ( -- str )
     deploy-name get ;
 
 M: unix deploy* ( vocab -- )
-    "." resource-path [
+    "resource:" [
         dup deploy-config [
             [ bundle-name create-app-dir ] keep
             [ bundle-name image-name ] keep
             namespace make-deploy-image
             bundle-name "" [ copy-resources ] [ copy-libraries ] 3bi
-            bundle-name normalize-path [ "Binary deployed to " % % "." % ] "" make print
+            bundle-name normalize-path "Binary deployed to " "." surround print
         ] bind
     ] with-directory ;
diff --git a/basis/ui/backend/gtk/gtk.factor b/basis/ui/backend/gtk/gtk.factor
index 4d72abdd5e..2e0a776dfe 100644
--- a/basis/ui/backend/gtk/gtk.factor
+++ b/basis/ui/backend/gtk/gtk.factor
@@ -1,14 +1,16 @@
 ! Copyright (C) 2010 Anton Gorenko, Philipp Brüschweiler.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.accessors alien.c-types alien.data
-alien.strings arrays assocs classes.struct command-line destructors
-gdk.ffi gdk.gl.ffi glib.ffi gobject.ffi gtk.ffi gtk.gl.ffi
-io.backend.unix.multiplexers io.encodings.utf8 io.thread kernel libc
-literals locals math math.bitwise math.order math.vectors namespaces
-sequences strings system threads ui ui.backend ui.clipboards
-ui.commands ui.event-loop ui.gadgets ui.gadgets.menus
-ui.gadgets.private ui.gadgets.worlds ui.gestures ui.pixel-formats
-ui.pixel-formats.private ui.private ;
+alien.strings alien.syntax arrays assocs classes.struct
+command-line destructors gdk.ffi gdk.gl.ffi glib.ffi
+gobject.ffi gtk.ffi gtk.gl.ffi io.backend
+io.backend.unix.multiplexers io.encodings.utf8 io.thread kernel
+libc literals locals math math.bitwise math.order math.vectors
+namespaces sequences strings system threads ui ui.backend
+ui.clipboards ui.commands ui.event-loop ui.gadgets
+ui.gadgets.menus ui.gadgets.private ui.gadgets.worlds
+ui.gestures ui.pixel-formats ui.pixel-formats.private
+ui.private ;
 RENAME: windows ui.private => ui:windows
 EXCLUDE: ui.gadgets.editors => change-caret ;
 RENAME: change-caret ui.gadgets.editors => editors:change-caret
@@ -264,10 +266,21 @@ SYMBOL: next-timeout
     f g_source_attach drop
     nano-count next-timeout set-global ;
 
+: load-icon ( -- )
+    ! This file is not in a resource.txt because it can be
+    ! overwritten when deploying. See 'Vocabulary icons'
+    ! in the docs.
+    "vocab:ui/backend/gtk/icon.ico"
+    normalize-path utf8 string>alien
+    { { pointer: GError initial: f } }
+    [ gtk_window_set_default_icon_from_file ] with-out-parameters
+    handle-GError drop ;
+
 M: gtk-ui-backend (with-ui)
     [
         f f gtk_init
         f f gtk_gl_init
+        load-icon
         init-clipboard
         start-ui
         stop-io-thread
diff --git a/basis/ui/backend/gtk/icon.ico b/basis/ui/backend/gtk/icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..1df40e3d4e21f4bc3c5f202140f72c17077d0857
GIT binary patch
literal 15086
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
Jjrb1b{{YY9Rd@gZ

literal 0
HcmV?d00001

diff --git a/core/vocabs/loader/loader-docs.factor b/core/vocabs/loader/loader-docs.factor
index d3736db9bf..0224ec9450 100755
--- a/core/vocabs/loader/loader-docs.factor
+++ b/core/vocabs/loader/loader-docs.factor
@@ -28,7 +28,7 @@ ARTICLE: "vocabs.roots" "Vocabulary roots"
 { $subsections "add-vocab-roots" } ;
 
 ARTICLE: "vocabs.icons" "Vocabulary icons"
-"An icon file representing the vocabulary can be provided for use by " { $link "tools.deploy" } ". A file named " { $snippet "icon.ico" } " will be used as the application icon when the application is deployed on Windows. A file named " { $snippet "icon.icns" } " will be used when the application is deployed on MacOS X." ;
+"An icon file representing the vocabulary can be provided for use by " { $link "tools.deploy" } ". A file named " { $snippet "icon.ico" } " will be used as the application icon when the application is deployed on Windows, Linux or the *BSD. A file named " { $snippet "icon.icns" } " will be used when the application is deployed on MacOS X." ;
 
 ARTICLE: "vocabs.loader" "Vocabulary loader"
 "The " { $link POSTPONE: USE: } " and " { $link POSTPONE: USING: } " words load vocabularies using the vocabulary loader. The vocabulary loader is implemented in the " { $vocab-link "vocabs.loader" } " vocabulary."