-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[linux] Add support for WebKit2GTK 2.36+ features
- Loading branch information
Showing
9 changed files
with
223 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
//go:build linux | ||
|
||
package linux | ||
|
||
/* | ||
#cgo linux pkg-config: webkit2gtk-4.0 | ||
#include "webkit2/webkit2.h" | ||
*/ | ||
import "C" | ||
import ( | ||
"fmt" | ||
|
||
"github.com/wailsapp/wails/v2/pkg/options" | ||
"github.com/wailsapp/wails/v2/pkg/options/linux" | ||
) | ||
|
||
func validateWebKit2Version(options *options.App) { | ||
if C.webkit_get_major_version() == 2 && C.webkit_get_minor_version() >= webkit2MinMinorVersion { | ||
return | ||
} | ||
|
||
msg := linux.DefaultMessages() | ||
if options.Linux != nil && options.Linux.Messages != nil { | ||
msg = options.Linux.Messages | ||
} | ||
|
||
v := fmt.Sprintf("2.%d.0", webkit2MinMinorVersion) | ||
showModalDialogAndExit("WebKit2GTK", fmt.Sprintf(msg.WebKit2GTKMinRequired, v)) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
//go:build linux && webkit2_36 | ||
|
||
package linux | ||
|
||
/* | ||
#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0 libsoup-2.4 | ||
#include "gtk/gtk.h" | ||
#include "webkit2/webkit2.h" | ||
#include "libsoup/soup.h" | ||
*/ | ||
import "C" | ||
|
||
import ( | ||
"net/http" | ||
"strings" | ||
"unsafe" | ||
|
||
"github.com/wailsapp/wails/v2/internal/frontend/assetserver" | ||
) | ||
|
||
const webkit2MinMinorVersion = 36 | ||
|
||
func webkit_uri_scheme_request_get_http_method(req *C.WebKitURISchemeRequest) string { | ||
method := C.GoString(C.webkit_uri_scheme_request_get_http_method(req)) | ||
return strings.ToUpper(method) | ||
} | ||
|
||
func webkit_uri_scheme_request_get_http_headers(req *C.WebKitURISchemeRequest) http.Header { | ||
hdrs := C.webkit_uri_scheme_request_get_http_headers(req) | ||
|
||
var iter C.SoupMessageHeadersIter | ||
C.soup_message_headers_iter_init(&iter, hdrs) | ||
|
||
var name *C.char | ||
var value *C.char | ||
|
||
h := http.Header{} | ||
for C.soup_message_headers_iter_next(&iter, &name, &value) != 0 { | ||
h.Add(C.GoString(name), C.GoString(value)) | ||
} | ||
|
||
return h | ||
} | ||
|
||
func webkit_uri_scheme_request_finish(req *C.WebKitURISchemeRequest, code int, header http.Header, stream *C.GInputStream, streamLength int64) error { | ||
resp := C.webkit_uri_scheme_response_new(stream, C.gint64(streamLength)) | ||
defer C.g_object_unref(C.gpointer(resp)) | ||
|
||
cReason := C.CString(http.StatusText(code)) | ||
C.webkit_uri_scheme_response_set_status(resp, C.guint(code), cReason) | ||
C.free(unsafe.Pointer(cReason)) | ||
|
||
cMimeType := C.CString(header.Get(assetserver.HeaderContentType)) | ||
C.webkit_uri_scheme_response_set_content_type(resp, cMimeType) | ||
C.free(unsafe.Pointer(cMimeType)) | ||
|
||
hdrs := C.soup_message_headers_new(C.SOUP_MESSAGE_HEADERS_RESPONSE) | ||
for name, values := range header { | ||
cName := C.CString(name) | ||
for _, value := range values { | ||
cValue := C.CString(value) | ||
C.soup_message_headers_append(hdrs, cName, cValue) | ||
C.free(unsafe.Pointer(cValue)) | ||
} | ||
C.free(unsafe.Pointer(cName)) | ||
} | ||
|
||
C.webkit_uri_scheme_response_set_http_headers(resp, hdrs) | ||
|
||
C.webkit_uri_scheme_request_finish_with_response(req, resp) | ||
return nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
//go:build linux && !webkit2_36 | ||
|
||
package linux | ||
|
||
/* | ||
#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0 | ||
#include "gtk/gtk.h" | ||
#include "webkit2/webkit2.h" | ||
*/ | ||
import "C" | ||
|
||
import ( | ||
"fmt" | ||
"net/http" | ||
"unsafe" | ||
|
||
"github.com/wailsapp/wails/v2/internal/frontend/assetserver" | ||
) | ||
|
||
const webkit2MinMinorVersion = 0 | ||
|
||
func webkit_uri_scheme_request_get_http_method(_ *C.WebKitURISchemeRequest) string { | ||
return http.MethodGet | ||
} | ||
|
||
func webkit_uri_scheme_request_get_http_headers(_ *C.WebKitURISchemeRequest) http.Header { | ||
return http.Header{} | ||
} | ||
|
||
func webkit_uri_scheme_request_finish(req *C.WebKitURISchemeRequest, code int, header http.Header, stream *C.GInputStream, streamLength int64) error { | ||
if code != http.StatusOK { | ||
return fmt.Errorf("StatusCodes not supported: %d - %s", code, http.StatusText(code)) | ||
} | ||
|
||
cMimeType := C.CString(header.Get(assetserver.HeaderContentType)) | ||
C.webkit_uri_scheme_request_finish(req, stream, C.gint64(streamLength), cMimeType) | ||
C.free(unsafe.Pointer(cMimeType)) | ||
return nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters