extensions.st
changeset 21 34bf952f3f60
parent 20 18a3e6b5f310
child 22 834ae4dd6815
--- a/extensions.st	Sun Sep 21 00:44:10 2014 +0100
+++ b/extensions.st	Sun Sep 21 01:08:15 2014 +0100
@@ -1,95 +1,5 @@
 "{ Package: 'stx:goodies/libcairo' }"!
 
-!Cairo::GraphicsContext class methodsFor:'x-accessing'!
-
-libraryName
-
-	OperatingSystem isUNIXlike ifTrue:[^'libcairo.so.2'].
-
-	OperatingSystem isMSWINDOWSlike ifTrue:[^'cairo.dll'].
-
-	self error:'Library name for host OS is not known'
-
-    "Created: / 10-09-2008 / 19:29:18 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-
-!Cairo::GraphicsContext class methodsFor:'x-primitives'!
-
-primDebugResetStaticData
-
-	<cdecl: const void "cairo_debug_reset_static_data" ( ) >
-	self primitiveFailed
-
-    "Created: / 10-09-2008 / 19:08:49 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-
-!Cairo::GraphicsContext class methodsFor:'x-primitives'!
-
-primFormatStrideForWidth: format width: width
-
-	<cdecl: const int32 "cairo_format_stride_for_width" ( int32 int32 ) >
-	self primitiveFailed
-
-    "Created: / 10-09-2008 / 19:08:49 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-
-!Cairo::GraphicsContext class methodsFor:'x-primitives'!
-
-primStatusToString: status
-
-	<cdecl: const charPointer "cairo_status_to_string" ( int32 ) >
-	self primitiveFailed
-
-    "Created: / 10-09-2008 / 19:08:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-
-!Cairo::GraphicsContext class methodsFor:'x-primitives'!
-
-primVersion
-
-	<cdecl: const int32 "cairo_version" ( ) >
-	self primitiveFailed
-
-    "Created: / 10-09-2008 / 19:08:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-
-!Cairo::GraphicsContext class methodsFor:'x-primitives'!
-
-primVersionString
-
-	<cdecl: const charPointer "cairo_version_string" ( ) >
-	self primitiveFailed
-
-    "Created: / 10-09-2008 / 19:08:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-
-!Cairo::GraphicsContext class methodsFor:'x-accessing'!
-
-statusToString: status
-
-    ^self primStatusToString: status
-
-    "Created: / 10-09-2008 / 19:33:31 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-
-!Cairo::GraphicsContext class methodsFor:'x-accessing'!
-
-version
-
-    ^self primVersion
-
-    "Created: / 10-09-2008 / 19:32:34 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-
-!Cairo::GraphicsContext class methodsFor:'x-accessing'!
-
-versionString
-
-    ^self primVersionString
-
-    "Created: / 10-09-2008 / 19:32:48 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-
 !DeviceGraphicsContext methodsFor:'cairo support'!
 
 drawableId
@@ -141,7 +51,7 @@
     surface := Cairo::Surface
                 forXlib: displayId
                 drawable: view drawableId address
-                visual: self defaultVisual
+                visual: self queryDefaultVisual
                 width: view width
                 height: view height.
     surface setView: view.
@@ -150,11 +60,35 @@
 
     "Created: / 10-07-2008 / 10:16:36 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 09-09-2008 / 22:57:22 / Jan Vrany <vranyj1@fel.cvut.cz>"
-    "Modified: / 17-06-2012 / 15:05:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 21-09-2014 / 00:54:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!XWorkstation methodsFor:'initialization & release'!
+
+queryDefaultVisual
+%{  /* NOCONTEXT */
+
+    if (ISCONNECTED) {
+        Display *dpy;
+        Visual *visual;
+
+        dpy = myDpy;
+        visual = DefaultVisualOfScreen(DefaultScreenOfDisplay(dpy));
+        RETURN ( __MKEXTERNALADDRESS( visual ) );
+    }
+%}.
+    ^ nil
+
+    "
+     Display queryDefaultVisualType
+    "
+
+    "Created: / 21-09-2014 / 00:53:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !stx_goodies_libcairo class methodsFor:'documentation'!
 
-extensionsVersion_SVN
-    ^ '$Id::                                                                                                                        $'
+extensionsVersion_HG
+
+    ^ '$Changeset: <not expanded> $'
 ! !