From 96ab838f4ebd8b4b36cadffa4cfa0af7797fe834 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Fri, 27 Feb 2026 09:28:20 +0200 Subject: [PATCH] Update gtk-webview to use new (foreing c) --- retropikzel/gtk-server.scm | 9 +- retropikzel/gtk-webview.scm | 24 ++--- retropikzel/gtk-webview/LICENSE | 165 ++++++++++++++++++++++++++++++++ retropikzel/gtk-webview/VERSION | 1 + 4 files changed, 181 insertions(+), 18 deletions(-) create mode 100644 retropikzel/gtk-webview/LICENSE create mode 100644 retropikzel/gtk-webview/VERSION diff --git a/retropikzel/gtk-server.scm b/retropikzel/gtk-server.scm index 764bf5d..5384def 100644 --- a/retropikzel/gtk-server.scm +++ b/retropikzel/gtk-server.scm @@ -1,10 +1,7 @@ -(define-c-library libc - '("stdlib.h" "stdio.h" "unistd.h") - libc-name - '((additional-versions ("0" "6")))) +(define-c-library libc '("stdlib.h" "stdio.h" "unistd.h") #f '()) (define-c-procedure c-tempnam libc 'tempnam 'pointer '(pointer pointer)) -(define temp-prefix (string->c-utf8 "scmgtk")) -(define (temp-name) (c-utf8->string (c-tempnam (make-c-null) temp-prefix))) +(define temp-prefix (string->c-bytevector "scmgtk")) +(define (temp-name) (c-bytevector->string (c-tempnam (c-bytevector-null) temp-prefix))) (define gtk-server-display pipe-write-string) (define gtk-server-newline (lambda (pipe) (pipe-write-char #\newline pipe))) (define (gtk-server-read-line pipe) diff --git a/retropikzel/gtk-webview.scm b/retropikzel/gtk-webview.scm index 048a765..dbca4da 100644 --- a/retropikzel/gtk-webview.scm +++ b/retropikzel/gtk-webview.scm @@ -2,10 +2,10 @@ (define-c-library webkit '("webkit/webkit.h") "webkitgtk-6.0" '((additional-versions (4)))) (define G-APPLICATION-DEFAULT-FLAGS 0) (define G-PRIORITY-HIGH -100) -(define window (make-c-null)) -(define window-title (make-c-null)) -(define webview (make-c-null)) -(define webview-url (make-c-null)) +(define window (c-bytevector-null)) +(define window-title (c-bytevector-null)) +(define webview (c-bytevector-null)) +(define webview-url (c-bytevector-null)) (define main-interval 1000) (define main #f) (define-c-callback main-callback 'int '() (lambda () (when main (main)) 1)) @@ -34,19 +34,19 @@ (gtk-window-set-title window window-title) (gtk-window-set-default-size window 200 200) (gtk-window-present window) - (g-timeout-add main-interval main-callback (make-c-null)))) + (g-timeout-add main-interval main-callback (c-bytevector-null)))) (define (gtk-webview title url . options) (when (and (not (null? options)) (assoc 'main (car options))) (set! main (cdr (assoc 'main (car options))))) - (set! window-title (string->c-utf8 title)) - (set! webview-url (string->c-utf8 url)) - (let* ((app (gtk-application-new (make-c-null) G-APPLICATION-DEFAULT-FLAGS))) + (set! window-title (string->c-bytevector title)) + (set! webview-url (string->c-bytevector url)) + (let* ((app (gtk-application-new (c-bytevector-null) G-APPLICATION-DEFAULT-FLAGS))) (g-signal-connect-data app - (string->c-utf8 "activate") + (string->c-bytevector "activate") activate - (make-c-null) - (make-c-null) + (c-bytevector-null) + (c-bytevector-null) 0) - (g-application-run app 0 (make-c-null)))) + (g-application-run app 0 (c-bytevector-null)))) diff --git a/retropikzel/gtk-webview/LICENSE b/retropikzel/gtk-webview/LICENSE new file mode 100644 index 0000000..0a04128 --- /dev/null +++ b/retropikzel/gtk-webview/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/retropikzel/gtk-webview/VERSION b/retropikzel/gtk-webview/VERSION new file mode 100644 index 0000000..3eefcb9 --- /dev/null +++ b/retropikzel/gtk-webview/VERSION @@ -0,0 +1 @@ +1.0.0