iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/nurdism/neko into kbd-modifier-state-sync

Browse Source
This commit is contained in:
m1k1o 2020-06-21 03:11:36 +02:00
commit 55e2f93e52
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/settings.vue
View File

@ -4,7 +4,7 @@
<li> <li>
<span>{{ $t('setting.scroll') }}</span> <span>{{ $t('setting.scroll') }}</span>
<label class="slider"> <label class="slider">
<input type="range" min="5" max="100" v-model="scroll" /> <input type="range" min="1" max="100" v-model="scroll" />
</label> </label>
</li> </li>
<li> <li>

6
server/internal/remote/manager.go
View File

@ -102,10 +102,8 @@ func (manager *RemoteManager) StartStream() {
if !xorg.ValidScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) { if !xorg.ValidScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) {
manager.logger.Warn().Msgf("invalid screen option %dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate) manager.logger.Warn().Msgf("invalid screen option %dx%d@%d", manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate)
} else { } else if err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate); err != nil {
if err := xorg.ChangeScreenSize(manager.config.ScreenWidth, manager.config.ScreenHeight, manager.config.ScreenRate); err != nil { manager.logger.Warn().Err(err).Msg("unable to change screen size")
manager.logger.Warn().Err(err).Msg("unable to change screen size")
}
} }
manager.createPipelines() manager.createPipelines()

10
server/internal/websocket/session.go
View File

@ -12,11 +12,6 @@ func (h *MessageHandler) SessionCreated(id string, session types.Session) error
return err return err
} }
// send screen current resolution
if err := h.screenResolution(id, session); err != nil {
return err
}
if session.Admin() { if session.Admin() {
// send screen configurations if admin // send screen configurations if admin
if err := h.screenConfigurations(id, session); err != nil { if err := h.screenConfigurations(id, session); err != nil {
@ -37,6 +32,11 @@ func (h *MessageHandler) SessionConnected(id string, session types.Session) erro
return err return err
} }
// send screen current resolution
if err := h.screenResolution(id, session); err != nil {
return err
}
// tell session there is a host // tell session there is a host
host, ok := h.sessions.GetHost() host, ok := h.sessions.GetHost()
if ok { if ok {