diff options
author | Vivien Kraus <vivien@planete-kraus.eu> | 2021-09-15 18:20:39 +0200 |
---|---|---|
committer | Vivien Kraus <vivien@planete-kraus.eu> | 2021-09-15 23:05:17 +0200 |
commit | 36d5fb1a4c299b5933ec2e0ed8f903c0e4ad39c3 (patch) | |
tree | a7d0e9406b2047ca6356d1d42af68a4723c9a1fb /src | |
parent | 244f18a9ebc1d5ed09248f9a2ce25fcdd10da484 (diff) |
Start a GUI
Diffstat (limited to 'src')
-rw-r--r-- | src/scm/webid-oidc/client/Makefile.am | 6 | ||||
-rw-r--r-- | src/scm/webid-oidc/client/gui.scm | 74 | ||||
-rw-r--r-- | src/scm/webid-oidc/program.scm | 14 |
3 files changed, 86 insertions, 8 deletions
diff --git a/src/scm/webid-oidc/client/Makefile.am b/src/scm/webid-oidc/client/Makefile.am index 313efcb..bf9feb7 100644 --- a/src/scm/webid-oidc/client/Makefile.am +++ b/src/scm/webid-oidc/client/Makefile.am @@ -17,9 +17,11 @@ dist_clientwebidoidcmod_DATA += \ %reldir%/accounts.scm \ %reldir%/client.scm \ - %reldir%/application.scm + %reldir%/application.scm \ + %reldir%/gui.scm clientwebidoidcgo_DATA += \ %reldir%/accounts.go \ %reldir%/client.go \ - %reldir%/application.go + %reldir%/application.go \ + %reldir%/gui.go diff --git a/src/scm/webid-oidc/client/gui.scm b/src/scm/webid-oidc/client/gui.scm new file mode 100644 index 0000000..3bfaf6a --- /dev/null +++ b/src/scm/webid-oidc/client/gui.scm @@ -0,0 +1,74 @@ +;; disfluid, implementation of the Solid specification +;; Copyright (C) 2021 Vivien Kraus + +;; This program is free software: you can redistribute it and/or modify +;; it under the terms of the GNU Affero General Public License as +;; published by the Free Software Foundation, either version 3 of the +;; License, or (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU Affero General Public License for more details. + +;; You should have received a copy of the GNU Affero General Public License +;; along with this program. If not, see <https://www.gnu.org/licenses/>. + +(define-module (webid-oidc client gui) + #:use-module (gi) + #:use-module (gi types) + #:use-module (gi util) + #:use-module (ice-9 match) + #:use-module (ice-9 exceptions) + #:use-module (ice-9 i18n) + #:use-module (ice-9 receive) + #:use-module (ice-9 optargs) + #:use-module (ice-9 pretty-print) + #:use-module (srfi srfi-9) + #:use-module (srfi srfi-19) + #:use-module (webid-oidc errors) + #:use-module (webid-oidc web-i18n) + #:use-module ((webid-oidc parameters) #:prefix p:) + #:use-module ((webid-oidc stubs) #:prefix stubs:) + #:use-module ((webid-oidc oidc-id-token) #:prefix id:) + #:use-module ((webid-oidc oidc-configuration) #:prefix cfg:) + #:use-module ((webid-oidc jwk) #:prefix jwk:) + #:use-module ((webid-oidc dpop-proof) #:prefix dpop:) + #:use-module ((webid-oidc client client) #:prefix client:) + #:use-module (web uri) + #:use-module (web response) + #:use-module (web client) + #:use-module (rnrs bytevectors) + #:use-module (oop goops) + #:declarative? #t + #:export + ( + main + ) + #:declarative? #t) + +(push-duplicate-handler! 'merge-generics) + +;; This avoids a crash when compiling the module +(use-typelibs ("GdkPixbuf" "2.0")) + +(use-typelibs (("Gio" "2.0") #:renamer (protect 'application:new)) + ("Gtk" "3.0")) + +(define (print-hello button) + (format #t (G_ "Hello, world!\n"))) + +(define (on-activate application) + (let ((window (make <GtkApplicationWindow> + #:application application)) + (button (make <GtkButton> #:label (G_ "Hello, world!")))) + (connect button clicked print-hello) + (add window button) + (show-all window))) + +(define (main) + (let ((app (application:new + "eu.planete_kraus.Disfluid" + (list->application-flags '(flags-none))))) + (connect app activate on-activate) + (run app (command-line)))) diff --git a/src/scm/webid-oidc/program.scm b/src/scm/webid-oidc/program.scm index 6af3665..760734e 100644 --- a/src/scm/webid-oidc/program.scm +++ b/src/scm/webid-oidc/program.scm @@ -328,6 +328,9 @@ Available commands:")) (G_ "command-line|command|server")) (format #t "\n") (format #t (G_ " +If no command is specified, run the browser.")) + (format #t "\n") + (format #t (G_ " General options:")) (format #t (G_ " -S MEANS, --~a=MEANS: @@ -620,7 +623,7 @@ Rreleased ~a\n") (let ((rest (option-ref options '() '())) (complete-corresponding-source (let ((str (option-ref options complete-corresponding-source-sym #f))) - (unless str + (unless (or (null? (option-ref options '() '())) str) (format (current-error-port) (G_ "You are legally required to link to the complete corresponding source code.\n")) (exit 1)) @@ -697,11 +700,10 @@ Rreleased ~a\n") (client-uri (option-ref options client-uri-sym #f))) (when (null? rest) - (format (current-error-port) - (G_ "Usage: ~a COMMAND [OPTIONS]...\nSee --~a (-h).\n") - (car (command-line)) - help-sym) - (exit 1)) + (eval + '(main) + (resolve-module '(webid-oidc client gui))) + (exit 0)) (let ((command (car rest)) (non-options (cdr rest))) (cond |