all: use runtime/cgo and require go1.17

Author: changkun

.github/workflows/clipboard.yml

@@ -33,7 +33,7 @@ jobs:
     - uses: actions/setup-go@v2
       with:
         stable: 'false'
-        go-version: '1.16.0'
+        go-version: '1.17.0'
 
     - name: TestLinux
       run: |

clipboard_linux.c

@@ -6,12 +6,13 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <string.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
 // syncStatus is a function from the Go side.
-extern void syncStatus(unsigned long long handle, int status);
+extern void syncStatus(uintptr_t handle, int status);
 
 int clipboard_test() {
     Display *d = XOpenDisplay(0);
@@ -25,7 +26,7 @@ int clipboard_test() {
 // clipboard_write writes the given buf of size n as type typ.
 // if start is provided, the value of start will be changed to 1 to indicate
 // if the write is availiable for reading.
-int clipboard_write(char *typ, unsigned char *buf, size_t n, unsigned long long handle) {
+int clipboard_write(char *typ, unsigned char *buf, size_t n, uintptr_t handle) {
     Display* d = XOpenDisplay(0);
     if (d == NULL) {
         if (handle != 0) syncStatus(handle, -1);

clipboard_linux.go

@@ -13,6 +13,7 @@ package clipboard
 #cgo LDFLAGS: -lX11
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <string.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -23,7 +24,7 @@ int clipboard_write(
 	char*          typ,
 	unsigned char* buf,
 	size_t         n,
-	unsigned long long handle
+	uintptr_t      handle
 );
 unsigned long clipboard_read(char* typ, char **out);
 */
@@ -34,10 +35,9 @@ import (
 	"fmt"
 	"os"
 	"runtime"
+	"runtime/cgo"
 	"time"
 	"unsafe"
-
-	"golang.design/x/clipboard/internal/cgo"
 )
 
 func init() {
@@ -105,9 +105,9 @@ func write(t Format, buf []byte) (<-chan struct{}, error) {
 		h := cgo.NewHandle(start)
 		var ok C.int
 		if len(buf) == 0 {
-			ok = C.clipboard_write(cs, nil, 0, C.ulonglong(h))
+			ok = C.clipboard_write(cs, nil, 0, C.uintptr_t(h))
 		} else {
-			ok = C.clipboard_write(cs, (*C.uchar)(unsafe.Pointer(&(buf[0]))), C.size_t(len(buf)), C.ulonglong(h))
+			ok = C.clipboard_write(cs, (*C.uchar)(unsafe.Pointer(&(buf[0]))), C.size_t(len(buf)), C.uintptr_t(h))
 		}
 		if ok != C.int(0) {
 			fmt.Fprintf(os.Stderr, "write failed with status: %d\n", int(ok))

go.mod

@@ -1,3 +1,3 @@
 module golang.design/x/clipboard
 
-go 1.16
+go 1.17