evan/zenity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle invalid window ids (macOS).

Browse source
This commit is contained in:
Nuno Cruces 2022-06-27 16:56:24 +01:00
parent c1b80b310e
commit 1c43756a6c
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -9,7 +9,7 @@ require (
github.com/randall77/makefat v0.0.0-20210315173500-7ddd0e42c844 github.com/randall77/makefat v0.0.0-20210315173500-7ddd0e42c844
go.uber.org/goleak v1.1.12 // test go.uber.org/goleak v1.1.12 // test
golang.org/x/image v0.0.0-20220617043117-41969df76e82 golang.org/x/image v0.0.0-20220617043117-41969df76e82
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b
) )
require ( require (

4
go.sum
View file

@ -42,8 +42,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c h1:aFV+BgZ4svzjfabn8ERpuB4JI4N6/rdy1iusx77G3oU= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b h1:2n253B2r0pYSmEV+UNCQoPfU/FiaizQEK5Gu4Bq4JE8=
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

5
internal/zenutil/osa_generated.go
View file

@ -24,17 +24,16 @@ $.exit(-1)}
{{- end}} {{- end}}
{{define "common" -}} {{define "common" -}}
{{- if .Application}} {{- if .Application}}
var app=Application({{json .Application}}) try{var app=Application({{json .Application}})}catch{var app=Application.currentApplication()}
{{- else}} {{- else}}
var app=Application.currentApplication() var app=Application.currentApplication()
{{- end}} {{- end}}
app.includeStandardAdditions=true
{{if .WindowIcon}}{ObjC.import('Cocoa') {{if .WindowIcon}}{ObjC.import('Cocoa')
let nsapp=$.NSApplication.sharedApplication let nsapp=$.NSApplication.sharedApplication
let nsimg=$.NSImage.alloc.initWithContentsOfFile({{json .WindowIcon}}) let nsimg=$.NSImage.alloc.initWithContentsOfFile({{json .WindowIcon}})
nsapp.setActivationPolicy($.NSApplicationActivationPolicyRegular) nsapp.setActivationPolicy($.NSApplicationActivationPolicyRegular)
nsapp.setApplicationIconImage(nsimg)}{{end}} nsapp.setApplicationIconImage(nsimg)}{{end}}
app.includeStandardAdditions=true
app.activate()
{{- end}} {{- end}}
{{define "date" -}} {{define "date" -}}
ObjC.import('Cocoa') ObjC.import('Cocoa')

8
internal/zenutil/osascripts/common.gojs
View file

@ -1,8 +1,13 @@
{{- if .Application}} {{- if .Application}}
try {
var app = Application({{json .Application}}) var app = Application({{json .Application}})
} catch {
var app = Application.currentApplication()
}
{{- else}} {{- else}}
var app = Application.currentApplication() var app = Application.currentApplication()
{{- end}} {{- end}}
app.includeStandardAdditions = true
{{if .WindowIcon}}{ {{if .WindowIcon}}{
ObjC.import('Cocoa') ObjC.import('Cocoa')
@ -11,6 +16,3 @@
nsapp.setActivationPolicy($.NSApplicationActivationPolicyRegular) nsapp.setActivationPolicy($.NSApplicationActivationPolicyRegular)
nsapp.setApplicationIconImage(nsimg) nsapp.setApplicationIconImage(nsimg)
}{{end}} }{{end}}
app.includeStandardAdditions = true
app.activate()