# HG changeset patch # User Olaf Wintermann # Date 1739128912 -3600 # Node ID e8ee57cc052ee4a3de3f74e783ab1625597220ee # Parent 9e499276136a6aaa3cafaaba6a19044a5c6d3578 prepare webview diff -r 9e499276136a -r e8ee57cc052e application/main.c --- a/application/main.c Sat Feb 08 21:42:56 2025 +0100 +++ b/application/main.c Sun Feb 09 20:21:52 2025 +0100 @@ -478,6 +478,13 @@ ui_button(obj, .label = "Button 2"); } } + ui_tab(obj, "Tab 9") { +#ifdef UI_WEBVIEW + ui_webview(obj, .fill = UI_ON); +#else + ui_label(obj, "Webview is not supported"); +#endif + } } /* diff -r 9e499276136a -r e8ee57cc052e configure --- a/configure Sat Feb 08 21:42:56 2025 +0100 +++ b/configure Sun Feb 09 20:21:52 2025 +0100 @@ -408,6 +408,39 @@ dep_checked_libadwaita=1 return 0 } +dependency_error_webkitgtk6() +{ + print_check_msg "$dep_checked_webkitgtk6" "checking for webkitgtk6... " + # dependency webkitgtk6 + while true + do + if [ -z "$PKG_CONFIG" ]; then + break + fi + if test_pkg_config "webkitgtk-6.0" "" "" "" ; then + TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags webkitgtk-6.0`" + TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs webkitgtk-6.0`" + else + break + fi + TEMP_CFLAGS="$TEMP_CFLAGS -DUI_WEBVIEW" + print_check_msg "$dep_checked_webkitgtk6" "yes\n" + dep_checked_webkitgtk6=1 + return 1 + done + + # dependency webkitgtk6 + while true + do + print_check_msg "$dep_checked_webkitgtk6" "yes\n" + dep_checked_webkitgtk6=1 + return 1 + done + + print_check_msg "$dep_checked_webkitgtk6" "no\n" + dep_checked_webkitgtk6=1 + return 0 +} dependency_error_motif() { print_check_msg "$dep_checked_motif" "checking for motif... " @@ -438,6 +471,57 @@ dep_checked_motif=1 return 0 } +dependency_error_webkit2gtk4() +{ + print_check_msg "$dep_checked_webkit2gtk4" "checking for webkit2gtk4... " + # dependency webkit2gtk4 + while true + do + if [ -z "$PKG_CONFIG" ]; then + break + fi + if test_pkg_config "webkit2gtk-4.1" "" "" "" ; then + TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags webkit2gtk-4.1`" + TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs webkit2gtk-4.1`" + else + break + fi + TEMP_CFLAGS="$TEMP_CFLAGS -DUI_WEBVIEW" + print_check_msg "$dep_checked_webkit2gtk4" "yes\n" + dep_checked_webkit2gtk4=1 + return 1 + done + + # dependency webkit2gtk4 + while true + do + if [ -z "$PKG_CONFIG" ]; then + break + fi + if test_pkg_config "webkit2gtk-4.0" "" "" "" ; then + TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags webkit2gtk-4.0`" + TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs webkit2gtk-4.0`" + else + break + fi + TEMP_CFLAGS="$TEMP_CFLAGS -DUI_WEBVIEW" + print_check_msg "$dep_checked_webkit2gtk4" "yes\n" + dep_checked_webkit2gtk4=1 + return 1 + done + + # dependency webkit2gtk4 + while true + do + print_check_msg "$dep_checked_webkit2gtk4" "yes\n" + dep_checked_webkit2gtk4=1 + return 1 + done + + print_check_msg "$dep_checked_webkit2gtk4" "no\n" + dep_checked_webkit2gtk4=1 + return 0 +} dependency_error_cocoa() { print_check_msg "$dep_checked_cocoa" "checking for cocoa... " @@ -573,6 +657,9 @@ if dependency_error_libadwaita ; then VERR=1 fi + if dependency_error_webkitgtk6 ; then + VERR=1 + fi if [ $VERR -ne 0 ]; then return 1 fi @@ -588,6 +675,9 @@ if dependency_error_gtk4 ; then VERR=1 fi + if dependency_error_webkitgtk6 ; then + VERR=1 + fi if [ $VERR -ne 0 ]; then return 1 fi @@ -603,6 +693,9 @@ if dependency_error_gtk3 ; then VERR=1 fi + if dependency_error_webkit2gtk4 ; then + VERR=1 + fi if [ $VERR -ne 0 ]; then return 1 fi diff -r 9e499276136a -r e8ee57cc052e make/project.xml --- a/make/project.xml Sat Feb 08 21:42:56 2025 +0100 +++ b/make/project.xml Sun Feb 09 20:21:52 2025 +0100 @@ -62,6 +62,29 @@ -lXm -lXt -lX11 -lpthread + + webkitgtk-6.0 + -DUI_WEBVIEW + + + + + + + + webkit2gtk-4.1 + -DUI_WEBVIEW + + + + webkit2gtk-4.0 + -DUI_WEBVIEW + + + + + + OBJ_EXT = .o LIB_EXT = .a @@ -81,17 +104,17 @@