-
-
Notifications
You must be signed in to change notification settings - Fork 48
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add quake mode terminal module #256
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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,7 @@ | ||
| package launcher | ||
|
|
||
| import "fyshos.com/fynedesk" | ||
|
|
||
| func init() { | ||
| fynedesk.RegisterModule(termMeta) | ||
| } |
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,167 @@ | ||
| package launcher | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| "fyshos.com/fynedesk" | ||
| "fyshos.com/fynedesk/internal/ui" | ||
| wmTheme "fyshos.com/fynedesk/theme" | ||
| "github.com/fyne-io/terminal" | ||
|
|
||
| "fyne.io/fyne/v2" | ||
| "fyne.io/fyne/v2/canvas" | ||
| "fyne.io/fyne/v2/container" | ||
| "fyne.io/fyne/v2/driver/desktop" | ||
| "fyne.io/fyne/v2/theme" | ||
| ) | ||
|
|
||
| const ( | ||
| delay = time.Second / 25 | ||
| termTitle = "Quake Terminal " + ui.SkipTaskbarHint | ||
| height = 240 | ||
| step = 40 | ||
| ) | ||
|
|
||
| var termMeta = fynedesk.ModuleMetadata{ | ||
| Name: "\"Quake\" (hover) terminal", | ||
| NewInstance: newTerm, | ||
| } | ||
|
|
||
| type term struct { | ||
| shown bool | ||
| win fynedesk.Window | ||
| ui fyne.Window | ||
| } | ||
|
|
||
| func (t *term) Destroy() { | ||
| } | ||
|
|
||
| func (t *term) Metadata() fynedesk.ModuleMetadata { | ||
| return termMeta | ||
| } | ||
|
|
||
| func (t *term) Shortcuts() map[*fynedesk.Shortcut]func() { | ||
| return map[*fynedesk.Shortcut]func(){ | ||
| &fynedesk.Shortcut{Name: "Open Quake Terminal", KeyName: fyne.KeyBackTick, Modifier: fynedesk.UserModifier}: func() { | ||
| t.toggle() | ||
| }} | ||
| } | ||
|
|
||
| func (t *term) createTerm() { | ||
| win := fyne.CurrentApp().Driver().(desktop.Driver).CreateSplashWindow() | ||
| win.SetTitle(termTitle) | ||
|
|
||
| bg := canvas.NewRectangle(theme.BackgroundColor()) | ||
| img := canvas.NewImageFromResource(theme.NewDisabledResource(theme.ComputerIcon())) | ||
| img.FillMode = canvas.ImageFillContain | ||
| img.SetMinSize(fyne.NewSize(200, 200)) | ||
| over := canvas.NewRectangle(wmTheme.WidgetPanelBackground()) | ||
| matchTheme(bg, over) | ||
|
|
||
| console := terminal.New() | ||
| win.SetContent(container.NewStack(bg, img, over, console)) | ||
| win.Canvas().Focus(console) | ||
| t.ui = win | ||
|
|
||
| go func() { | ||
| err := console.RunLocalShell() | ||
| if err != nil { | ||
| fyne.LogError("Failed to open terminal", err) | ||
| } | ||
| t.hide() // terminal exited | ||
|
|
||
| t.createTerm() // reset for next usage | ||
| }() | ||
| } | ||
|
|
||
| func (t *term) getHandle() fynedesk.Window { | ||
| // TODO a better way to capture window frame without showing it and waiting... | ||
| //t.ui.Resize(fyne.NewSize(0, 0)) | ||
| t.ui.Show() | ||
|
|
||
| i := 0 | ||
| for { | ||
| time.Sleep(time.Second / 50) | ||
|
|
||
| for _, w := range fynedesk.Instance().WindowManager().Windows() { | ||
| if w.Properties().Title() == termTitle { | ||
| return w | ||
| } | ||
| } | ||
|
|
||
| i++ | ||
| if i > 50 { | ||
| return nil // something went wrong | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (t *term) hide() { | ||
| screen := fynedesk.Instance().Screens().Primary() | ||
| left := float32(screen.X) / screen.Scale | ||
| y := float32(screen.Y) / screen.Scale | ||
| end := float32(screen.Y)/screen.Scale - height | ||
| for y > end { | ||
| t.win.Move(fyne.NewPos(left, y)) | ||
| time.Sleep(delay) | ||
| y -= step | ||
| } | ||
| t.win.Move(fyne.NewPos(left, end)) | ||
|
|
||
| t.ui.Hide() | ||
| t.shown = false | ||
| } | ||
|
|
||
| func (t *term) show() { | ||
| screen := fynedesk.Instance().Screens().Primary() | ||
| t.win.Resize(fyne.NewSize(float32(screen.Width)/screen.Scale, height)) | ||
| // t.ui.Show() | ||
| t.win.RaiseToTop() | ||
|
|
||
| left := float32(screen.X) / screen.Scale | ||
| y := float32(screen.Y)/screen.Scale - height | ||
| end := float32(screen.Y) / screen.Scale | ||
| for y < end { | ||
| t.win.Resize(fyne.NewSize(float32(screen.Width)/screen.Scale, height)) // force it ASAP | ||
| t.win.Move(fyne.NewPos(left, y)) | ||
| time.Sleep(delay) | ||
| y += step | ||
| } | ||
| t.win.Move(fyne.NewPos(left, end)) | ||
| t.shown = true | ||
| } | ||
|
|
||
| func (t *term) toggle() { | ||
| if t.ui == nil { | ||
| t.createTerm() // lazy load UI | ||
| } | ||
|
|
||
| if !t.shown { | ||
| t.win = t.getHandle() | ||
|
|
||
| t.show() | ||
| } else { | ||
| t.hide() | ||
| t.win = nil | ||
| } | ||
| } | ||
|
|
||
| func matchTheme(bg, over *canvas.Rectangle) { | ||
| ch := make(chan fyne.Settings) | ||
| go func() { | ||
| for { | ||
| <-ch | ||
|
|
||
| bg.FillColor = theme.BackgroundColor() | ||
| bg.Refresh() | ||
| over.FillColor = wmTheme.WidgetPanelBackground() | ||
| over.Refresh() | ||
| } | ||
| }() | ||
| fyne.CurrentApp().Settings().AddChangeListener(ch) | ||
| } | ||
|
|
||
| func newTerm() fynedesk.Module { | ||
| // don't load UI until it is first called on | ||
| return &term{} | ||
| } | ||
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have tmux auto-launch from my .bashrc (with a check to make sure it isn't already running.) The way this is written here will cause my tmux sessions to pile up rather quickly, if I'm understanding it correctly.
Looks like this behavior might not play nicely with pinentry-ncurses for Yubikey users. Is there a way to only spawn the shell JIT, right before the user actually sees it, rather than optimistically spawning it and leaving it open in the background 24/7 if the module is enabled?