Fix a typo in sqUnixExtendedClipboard.c. Add ClipboardExtendedPlugin …

…to the non-newspeak linux builds.
OpenSmalltalk · Mar 27, 2023 · 06e0b0b · 06e0b0b
1 parent 2058007
commit 06e0b0b
Show file tree

Hide file tree

Showing 23 changed files with 39 additions and 21 deletions.
diff --git a/building/linux32/squeak.stack.spur/plugins.ext b/building/linux32/squeak.stack.spur/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 FileAttributesPlugin \
 Squeak3D \
 SqueakFFIPrims \
@@ -15,4 +16,4 @@ XDisplayControlPlugin \
 DESPlugin \
 MD5Plugin \
 SHA2Plugin \
-VectorEnginePlugin \
+VectorEnginePlugin 
diff --git a/building/linux32ARMv6/squeak.cog.spur/plugins.ext b/building/linux32ARMv6/squeak.cog.spur/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 FileAttributesPlugin \
 Squeak3D \
 SqueakFFIPrims \

diff --git a/building/linux32ARMv6/squeak.cog.v3/plugins.ext b/building/linux32ARMv6/squeak.cog.v3/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 FileAttributesPlugin \
 Squeak3D \
 SqueakFFIPrims \

diff --git a/building/linux32ARMv6/squeak.stack.spur/plugins.ext b/building/linux32ARMv6/squeak.stack.spur/plugins.ext
@@ -1,6 +1,7 @@
 # Copied, perhaps edited, from ../../../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
+ClipboardExtendedPlugin \
 FileAttributesPlugin \
 LocalePlugin \
 Squeak3D \
@@ -14,4 +15,4 @@ XDisplayControlPlugin \
 DESPlugin \
 MD5Plugin \
 SHA2Plugin \
-VectorEnginePlugin \
+VectorEnginePlugin
diff --git a/building/linux32ARMv6/squeak.stack.v3/plugins.ext b/building/linux32ARMv6/squeak.stack.v3/plugins.ext
@@ -1,6 +1,7 @@
 # Copied, perhaps edited, from ../../../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
+ClipboardExtendedPlugin \
 FileAttributesPlugin \
 LocalePlugin \
 Squeak3D \
@@ -14,4 +15,4 @@ XDisplayControlPlugin \
 DESPlugin \
 MD5Plugin \
 SHA2Plugin \
-VectorEnginePlugin \
+VectorEnginePlugin
diff --git a/building/linux32x86/pharo.cog.spur.lowcode/plugins.ext b/building/linux32x86/pharo.cog.spur.lowcode/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 FT2Plugin \
 JPEGReaderPlugin \
 JPEGReadWriter2Plugin \
@@ -11,5 +12,4 @@ SurfacePlugin \
 EventsHandlerPlugin \
 FileAttributesPlugin \
 VectorEnginePlugin \
-# SDL2DisplayPlugin \
-
+# SDL2DisplayPlugin
diff --git a/building/linux32x86/pharo.cog.spur/plugins.ext b/building/linux32x86/pharo.cog.spur/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 FT2Plugin \
 JPEGReaderPlugin \
 JPEGReadWriter2Plugin \

diff --git a/building/linux32x86/pharo.sista.spur/plugins.ext b/building/linux32x86/pharo.sista.spur/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 FT2Plugin \
 JPEGReaderPlugin \
 JPEGReadWriter2Plugin \
@@ -13,5 +14,4 @@ SqueakSSL \
 FileAttributesPlugin \
 AioPlugin \
 VectorEnginePlugin \
-# SDL2DisplayPlugin \
-
+# SDL2DisplayPlugin 
diff --git a/building/linux32x86/pharo.stack.spur.lowcode/plugins.ext b/building/linux32x86/pharo.stack.spur.lowcode/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 FT2Plugin \
 JPEGReaderPlugin \
 JPEGReadWriter2Plugin \
@@ -11,5 +12,4 @@ SurfacePlugin \
 EventsHandlerPlugin \
 FileAttributesPlugin \
 VectorEnginePlugin \
-# SDL2DisplayPlugin \
-
+# SDL2DisplayPlugin
diff --git a/building/linux32x86/squeak.cog.spur/plugins.ext b/building/linux32x86/squeak.cog.spur/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 BochsIA32Plugin \
 BochsX64Plugin \
 GdbARMPlugin \

diff --git a/building/linux32x86/squeak.cog.v3/plugins.ext b/building/linux32x86/squeak.cog.v3/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 FileAttributesPlugin \
 Squeak3D \
 SqueakFFIPrims \

diff --git a/building/linux32x86/squeak.sista.spur/plugins.ext b/building/linux32x86/squeak.sista.spur/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 FileAttributesPlugin \
 Squeak3D \
 SqueakFFIPrims \

diff --git a/building/linux32x86/squeak.stack.spur/plugins.ext b/building/linux32x86/squeak.stack.spur/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 FileAttributesPlugin \
 Squeak3D \
 SqueakFFIPrims \

diff --git a/building/linux32x86/squeak.stack.v3/plugins.ext b/building/linux32x86/squeak.stack.v3/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 FileAttributesPlugin \
 Squeak3D \
 SqueakFFIPrims \
@@ -15,4 +16,4 @@ XDisplayControlPlugin \
 DESPlugin \
 MD5Plugin \
 SHA2Plugin \
-VectorEnginePlugin \
+VectorEnginePlugin
diff --git a/building/linux64/squeak.stack.spur/plugins.ext b/building/linux64/squeak.stack.spur/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 FileAttributesPlugin \
 Squeak3D \
 SqueakFFIPrims \
@@ -15,4 +16,4 @@ XDisplayControlPlugin \
 DESPlugin \
 MD5Plugin \
 SHA2Plugin \
-VectorEnginePlugin \
+VectorEnginePlugin
diff --git a/building/linux64ARMv8/squeak.cog.spur/plugins.ext b/building/linux64ARMv8/squeak.cog.spur/plugins.ext
@@ -4,6 +4,7 @@ B3DAcceleratorPlugin \
 BochsIA32Plugin \
 BochsX64Plugin \
 CameraPlugin \
+ClipboardExtendedPlugin \
 FileAttributesPlugin \
 MIDIPlugin \
 Squeak3D \

diff --git a/building/linux64ARMv8/squeak.cogmt.spur/plugins.ext b/building/linux64ARMv8/squeak.cogmt.spur/plugins.ext
@@ -3,9 +3,8 @@ EXTERNAL_PLUGINS = \
 B3DAcceleratorPlugin \
 BochsIA32Plugin \
 BochsX64Plugin \
-GdbARMPlugin \
-GdbARMv8Plugin \
 CameraPlugin \
+ClipboardExtendedPlugin \
 FileAttributesPlugin \
 MIDIPlugin \
 Squeak3D \
@@ -21,3 +20,5 @@ DESPlugin \
 MD5Plugin \
 SHA2Plugin \
 VectorEnginePlugin \
+# GdbARMPlugin # fails to compile
+# GdbARMv8Plugin # ditto
diff --git a/building/linux64ARMv8/squeak.stack.spur/plugins.ext b/building/linux64ARMv8/squeak.stack.spur/plugins.ext
@@ -1,8 +1,10 @@
 # Copied, perhaps edited, from ../../../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
-MIDIPlugin \
 B3DAcceleratorPlugin \
+CameraPlugin \
+ClipboardExtendedPlugin \
 FileAttributesPlugin \
+MIDIPlugin \
 Squeak3D \
 SqueakFFIPrims \
 SqueakSSL \
@@ -15,4 +17,4 @@ XDisplayControlPlugin \
 DESPlugin \
 MD5Plugin \
 SHA2Plugin \
-VectorEnginePlugin \
+VectorEnginePlugin 
diff --git a/building/linux64riscv/squeak.stack.spur/plugins.ext b/building/linux64riscv/squeak.stack.spur/plugins.ext
@@ -1,6 +1,7 @@
 # Copied, perhaps edited, from ../../../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
+ClipboardExtendedPlugin \
 FileAttributesPlugin \
 Squeak3D \
 SqueakFFIPrims \
@@ -16,5 +17,3 @@ MD5Plugin \
 SHA2Plugin \
 VectorEnginePlugin \
 ZipPlugin
-
-#B3DAcceleratorPlugin \
diff --git a/building/linux64x64/pharo.cog.spur/plugins.ext b/building/linux64x64/pharo.cog.spur/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 FT2Plugin \
 JPEGReaderPlugin \
 JPEGReadWriter2Plugin \
@@ -17,4 +18,4 @@ BochsX64Plugin \
 GdbARMPlugin \
 GdbARMv8Plugin \
 VectorEnginePlugin \
-#SDL2DisplayPlugin \
+#SDL2DisplayPlugin
diff --git a/building/linux64x64/squeak.cog.spur/plugins.ext b/building/linux64x64/squeak.cog.spur/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 BochsIA32Plugin \
 BochsX64Plugin \
 GdbARMPlugin \

diff --git a/building/linux64x64/squeak.stack.spur/plugins.ext b/building/linux64x64/squeak.stack.spur/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 MIDIPlugin \
 B3DAcceleratorPlugin \
+ClipboardExtendedPlugin \
 FileAttributesPlugin \
 Squeak3D \
 SqueakFFIPrims \
@@ -15,4 +16,4 @@ XDisplayControlPlugin \
 DESPlugin \
 MD5Plugin \
 SHA2Plugin \
-VectorEnginePlugin \
+VectorEnginePlugin
diff --git a/platforms/unix/plugins/ClipboardExtendedPlugin/sqUnixExtendedClipboard.c b/platforms/unix/plugins/ClipboardExtendedPlugin/sqUnixExtendedClipboard.c
@@ -91,11 +91,11 @@ sqPasteboardCopyItemFlavorsitemNumber(sqInt inPasteboard, sqInt formatNumber)
 		return 0;
 	for (i = 0; types[i]; i++) {
 		if (i + 1 == formatNumber) {
-			int length = strlen(type);
+			int length = strlen(types[i]);
 			outData = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classString(), length);
 
 			memcpy(	interpreterProxy->firstIndexableField(outData),
-					type,
+					types[i],
 					length);
 		}
 		free(types[i]); /* XFree() is better */