added basic text rendering
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 11 Jul 2008 08:49:27 +0000
changeset 5 65635e9ef3e8
parent 4 0bf0d8b6f4c5
child 6 c1f387b40e3a
added basic text rendering
Cairo__Antialias.st
Cairo__Content.st
Cairo__Extend.st
Cairo__FillRule.st
Cairo__Filter.st
Cairo__FontExtents.st
Cairo__FontFace.st
Cairo__FontOptions.st
Cairo__FontSlant.st
Cairo__FontType.st
Cairo__FontWeight.st
Cairo__Format.st
Cairo__Glyph.st
Cairo__GraphicsContext.st
Cairo__HintMetrics.st
Cairo__HintStyle.st
Cairo__LineCap.st
Cairo__LineJoin.st
Cairo__Matrix.st
Cairo__Operator.st
Cairo__Path.st
Cairo__PathData.st
Cairo__PathDataType.st
Cairo__Pattern.st
Cairo__PatternType.st
Cairo__Rectangle.st
Cairo__RectangleList.st
Cairo__ScaledFont.st
Cairo__Status.st
Cairo__SubpixelOrder.st
Cairo__Surface.st
Cairo__SurfaceType.st
Cairo__SvgVersion.st
Cairo__TextExtents.st
Cairo__UserDataKey.st
extensions.st
stx_goodies_libcairo.st
--- a/Cairo__Antialias.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__Antialias.st	Fri Jul 11 08:49:27 2008 +0000
@@ -10,6 +10,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !Antialias class methodsFor:'initialization'!
 
 initialize
@@ -52,5 +53,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!Antialias class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 Antialias initialize!
--- a/Cairo__Content.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__Content.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !Content class methodsFor:'initialization'!
 
 initialize
@@ -43,5 +44,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!Content class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 Content initialize!
--- a/Cairo__Extend.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__Extend.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !Extend class methodsFor:'initialization'!
 
 initialize
@@ -51,5 +52,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!Extend class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 Extend initialize!
--- a/Cairo__FillRule.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__FillRule.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !FillRule class methodsFor:'initialization'!
 
 initialize
@@ -35,5 +36,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!FillRule class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 FillRule initialize!
--- a/Cairo__Filter.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__Filter.st	Fri Jul 11 08:49:27 2008 +0000
@@ -10,6 +10,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !Filter class methodsFor:'initialization'!
 
 initialize
@@ -68,5 +69,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!Filter class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 Filter initialize!
--- a/Cairo__FontExtents.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__FontExtents.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - C Types'
 !
 
+
 !FontExtents class methodsFor:'accessing'!
 
 libraryName
@@ -94,3 +95,8 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!FontExtents class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
--- a/Cairo__FontFace.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__FontFace.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - C Types'
 !
 
+
 !FontFace class methodsFor:'accessing'!
 
 libraryName
@@ -96,3 +97,8 @@
     "Modified: / 10-07-2008 / 23:05:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!FontFace class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
--- a/Cairo__FontOptions.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__FontOptions.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - C Types'
 !
 
+
 !FontOptions class methodsFor:'accessing'!
 
 libraryName
@@ -152,3 +153,8 @@
     "Modified: / 10-07-2008 / 23:05:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!FontOptions class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
--- a/Cairo__FontSlant.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__FontSlant.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !FontSlant class methodsFor:'initialization'!
 
 initialize
@@ -43,5 +44,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!FontSlant class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 FontSlant initialize!
--- a/Cairo__FontType.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__FontType.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !FontType class methodsFor:'initialization'!
 
 initialize
@@ -51,5 +52,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!FontType class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 FontType initialize!
--- a/Cairo__FontWeight.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__FontWeight.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !FontWeight class methodsFor:'initialization'!
 
 initialize
@@ -35,5 +36,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!FontWeight class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 FontWeight initialize!
--- a/Cairo__Format.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__Format.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !Format class methodsFor:'initialization'!
 
 initialize
@@ -51,5 +52,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!Format class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 Format initialize!
--- a/Cairo__Glyph.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__Glyph.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - C Types'
 !
 
+
 !Glyph class methodsFor:'accessing'!
 
 libraryName
@@ -59,3 +60,8 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!Glyph class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
--- a/Cairo__GraphicsContext.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__GraphicsContext.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - C Types'
 !
 
+
 !GraphicsContext class methodsFor:'instance creation'!
 
 on: surface
@@ -900,6 +901,25 @@
 
 !GraphicsContext methodsFor:'cairo - paints'!
 
+fontFaceFamily: family slant: slant weight: weight
+
+    ^self class 
+        primSelectFontFace: self 
+        family: family 
+        slant: slant 
+        weight: weight
+
+    "Created: / 11-07-2008 / 07:45:00 / Jan Vrany <vranyj1@fel.cvut.cz>"
+!
+
+fontSize: fontSize 
+
+    self class
+        primSetFontSize: self size: fontSize
+
+    "Created: / 11-07-2008 / 07:45:46 / Jan Vrany <vranyj1@fel.cvut.cz>"
+!
+
 paintRed: red green: green blue: blue alpha: alpha
 
     ^self class 
@@ -910,6 +930,14 @@
 
 !GraphicsContext methodsFor:'cairo - paths'!
 
+moveToX:x y:y
+
+    ^self class
+        primMoveTo: self x: x y: y
+
+    "Created: / 11-07-2008 / 07:53:14 / Jan Vrany <vranyj1@fel.cvut.cz>"
+!
+
 rectangleX: x y: y width: width height: height 
 
     ^self class 
@@ -920,6 +948,15 @@
         height: height asDouble
 
     "Created: / 10-07-2008 / 09:41:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
+!
+
+showText: aString
+
+    self class 
+        primShowText: self 
+        utf8: aString asString utf8Encoded
+
+    "Created: / 11-07-2008 / 07:46:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
 !GraphicsContext methodsFor:'cairo - stroke & fill'!
@@ -956,3 +993,8 @@
     "Created: / 10-07-2008 / 10:27:53 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!GraphicsContext class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
--- a/Cairo__HintMetrics.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__HintMetrics.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !HintMetrics class methodsFor:'initialization'!
 
 initialize
@@ -43,5 +44,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!HintMetrics class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 HintMetrics initialize!
--- a/Cairo__HintStyle.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__HintStyle.st	Fri Jul 11 08:49:27 2008 +0000
@@ -10,6 +10,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !HintStyle class methodsFor:'initialization'!
 
 initialize
@@ -60,5 +61,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!HintStyle class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 HintStyle initialize!
--- a/Cairo__LineCap.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__LineCap.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !LineCap class methodsFor:'initialization'!
 
 initialize
@@ -43,5 +44,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!LineCap class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 LineCap initialize!
--- a/Cairo__LineJoin.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__LineJoin.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !LineJoin class methodsFor:'initialization'!
 
 initialize
@@ -43,5 +44,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!LineJoin class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 LineJoin initialize!
--- a/Cairo__Matrix.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__Matrix.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - C Types'
 !
 
+
 !Matrix class methodsFor:'accessing'!
 
 libraryName
@@ -206,3 +207,8 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!Matrix class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
--- a/Cairo__Operator.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__Operator.st	Fri Jul 11 08:49:27 2008 +0000
@@ -12,6 +12,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !Operator class methodsFor:'initialization'!
 
 initialize
@@ -134,5 +135,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!Operator class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 Operator initialize!
--- a/Cairo__Path.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__Path.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - C Types'
 !
 
+
 !Path class methodsFor:'accessing'!
 
 libraryName
@@ -76,3 +77,8 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!Path class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
--- a/Cairo__PathData.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__PathData.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - C Types'
 !
 
+
 !PathData class methodsFor:'accessing'!
 
 libraryName
@@ -52,3 +53,8 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!PathData class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
--- a/Cairo__PathDataType.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__PathDataType.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !PathDataType class methodsFor:'initialization'!
 
 initialize
@@ -51,5 +52,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!PathDataType class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 PathDataType initialize!
--- a/Cairo__Pattern.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__Pattern.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - C Types'
 !
 
+
 !Pattern class methodsFor:'accessing'!
 
 libraryName
@@ -232,3 +233,8 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!Pattern class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
--- a/Cairo__PatternType.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__PatternType.st	Fri Jul 11 08:49:27 2008 +0000
@@ -10,6 +10,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !PatternType class methodsFor:'initialization'!
 
 initialize
@@ -52,5 +53,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!PatternType class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 PatternType initialize!
--- a/Cairo__Rectangle.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__Rectangle.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - C Types'
 !
 
+
 !Rectangle class methodsFor:'accessing'!
 
 libraryName
@@ -80,3 +81,8 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!Rectangle class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
--- a/Cairo__RectangleList.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__RectangleList.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - C Types'
 !
 
+
 !RectangleList class methodsFor:'accessing'!
 
 libraryName
@@ -76,3 +77,8 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!RectangleList class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
--- a/Cairo__ScaledFont.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__ScaledFont.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - C Types'
 !
 
+
 !ScaledFont class methodsFor:'accessing'!
 
 libraryName
@@ -160,3 +161,8 @@
     "Modified: / 10-07-2008 / 23:05:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!ScaledFont class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
--- a/Cairo__Status.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__Status.st	Fri Jul 11 08:49:27 2008 +0000
@@ -19,6 +19,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !Status class methodsFor:'initialization'!
 
 initialize
@@ -229,5 +230,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!Status class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 Status initialize!
--- a/Cairo__SubpixelOrder.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__SubpixelOrder.st	Fri Jul 11 08:49:27 2008 +0000
@@ -10,6 +10,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !SubpixelOrder class methodsFor:'initialization'!
 
 initialize
@@ -60,5 +61,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!SubpixelOrder class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 SubpixelOrder initialize!
--- a/Cairo__Surface.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__Surface.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - C Types'
 !
 
+
 !Surface class methodsFor:'instance creation'!
 
 forPdfFile: aStringOrFilename width: w height: h
@@ -494,3 +495,8 @@
     "Created: / 10-07-2008 / 10:28:03 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!Surface class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
--- a/Cairo__SurfaceType.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__SurfaceType.st	Fri Jul 11 08:49:27 2008 +0000
@@ -13,6 +13,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !SurfaceType class methodsFor:'initialization'!
 
 initialize
@@ -135,5 +136,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!SurfaceType class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 SurfaceType initialize!
--- a/Cairo__SvgVersion.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__SvgVersion.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - Constants'
 !
 
+
 !SvgVersion class methodsFor:'initialization'!
 
 initialize
@@ -35,5 +36,10 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!SvgVersion class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
 
 SvgVersion initialize!
--- a/Cairo__TextExtents.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__TextExtents.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - C Types'
 !
 
+
 !TextExtents class methodsFor:'accessing'!
 
 libraryName
@@ -108,3 +109,8 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!TextExtents class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
--- a/Cairo__UserDataKey.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/Cairo__UserDataKey.st	Fri Jul 11 08:49:27 2008 +0000
@@ -9,6 +9,7 @@
 	category:'Cairo - C Types'
 !
 
+
 !UserDataKey class methodsFor:'accessing'!
 
 libraryName
@@ -38,3 +39,8 @@
     "Modified: / 10-07-2008 / 23:05:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!UserDataKey class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
--- a/extensions.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/extensions.st	Fri Jul 11 08:49:27 2008 +0000
@@ -60,71 +60,35 @@
 
 cairoSurfaceFor: view
 
-    | surface |
+    | visual surface |
+    visual := self defaultVisual.
     surface := Cairo::Surface 
                 forXlib: displayId
                 drawable: view drawableId address 
-                visual: self visualStructure 
+                visual: visual
                 width: view width 
                 height: view height.
     view addDependent: surface.
     ^surface
 
     "Created: / 10-07-2008 / 10:16:36 / Jan Vrany <vranyj1@fel.cvut.cz>"
-    "Modified: / 10-07-2008 / 19:32:15 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-!XWorkstation methodsFor:'cairo support'!
-
-primScreenStructure
-
-    | screenNumber |
-    screenNumber := screen.
-
-    %{
-        return __MKEXTERNALADDRESS( ScreenOfDisplay( myDpy , __intVal ( screenNumber ) ) );
-    %}.
-    ^nil
-
-    "
-        Screen current screenStructure  
-    "
-
-    "Created: / 10-07-2008 / 10:04:38 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 10-07-2008 / 23:25:01 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 !XWorkstation methodsFor:'cairo support'!
 
-screenStructure
+defaultVisual
 
-    | screenNumber |
+    | screenNumber visual |
     screenNumber := screen.
 
     %{
-        return __MKEXTERNALADDRESS( ScreenOfDisplay( myDpy , __intVal ( screenNumber ) ) );
+        visual = __MKEXTERNALADDRESS( DefaultVisual( myDpy , __intVal ( screenNumber ) ) );
     %}.
-    ^nil
-
-    "
-        Screen current screenStructure  
-    "
-
-    "Created: / 10-07-2008 / 10:04:38 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-!XWorkstation methodsFor:'cairo support'!
-
-visualStructure
-
-    | screenNumber |
-    screenNumber := screen.
-
-    %{
-        return __MKEXTERNALADDRESS( DefaultVisual( myDpy , __intVal ( screenNumber ) ) );
-    %}.
-    ^self primitiveFailed
+    ^visual
 
     "
         Screen current visualStructure    
     "
 
-    "Created: / 10-07-2008 / 11:03:01 / Jan Vrany <vranyj1@fel.cvut.cz>"
-    "Modified: / 10-07-2008 / 19:49:28 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Created: / 10-07-2008 / 23:24:53 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
--- a/stx_goodies_libcairo.st	Thu Jul 10 21:14:16 2008 +0000
+++ b/stx_goodies_libcairo.st	Fri Jul 11 08:49:27 2008 +0000
@@ -7,14 +7,30 @@
 	category:'* Projects & Packages *'
 !
 
+
 !stx_goodies_libcairo class methodsFor:'description'!
 
+postLoadAction
+
+    "
+        self postLoadAction
+    "
+
+    OperatingSystem isUNIXlike ifTrue:
+        [ExternalLibraryFunction dllPath:
+            (ExternalLibraryFunction dllPath asOrderedCollection
+                add:'/usr/lib';
+                yourself)]
+
+    "Created: / 10-07-2008 / 23:27:14 / Jan Vrany <vranyj1@fel.cvut.cz>"
+!
+
 preRequisites
     ^ #(
         #'stx:libbasic'    "SharedPool - superclass of Cairo::Antialias "
     )
 
-    "Modified: / 10-07-2008 / 23:13:24 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 11-07-2008 / 10:48:20 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
 !stx_goodies_libcairo class methodsFor:'description - contents'!
@@ -60,7 +76,7 @@
         #'stx_goodies_libcairo'
     )
 
-    "Modified: / 10-07-2008 / 23:13:23 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 11-07-2008 / 10:48:19 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
 extensionMethodNames
@@ -73,12 +89,10 @@
         SimpleView cairoGraphicsContext
         SimpleView cairoSurface
         XWorkstation cairoSurfaceFor:
-        XWorkstation primScreenStructure
-        XWorkstation screenStructure
-        XWorkstation visualStructure
+        XWorkstation defaultVisual
     )
 
-    "Modified: / 10-07-2008 / 23:13:23 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 11-07-2008 / 10:48:19 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
 !stx_goodies_libcairo class methodsFor:'description - project information'!
@@ -115,3 +129,8 @@
     "Created: / 10-07-2008 / 23:11:59 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!stx_goodies_libcairo class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !