keyboard modifier state - client implementation
This commit is contained in:
parent
01d6ea5ad0
commit
e01ab240f1
@ -480,16 +480,33 @@
|
|||||||
if (!this.hosting || this.locked) {
|
if (!this.hosting || this.locked) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
this.onMousePos(e)
|
this.onMousePos(e)
|
||||||
}
|
}
|
||||||
|
|
||||||
onMouseEnter(e: MouseEvent) {
|
onMouseEnter(e: MouseEvent) {
|
||||||
|
if(this.hosting) {
|
||||||
|
this.$accessor.remote.syncKeyboardModifierState({
|
||||||
|
capsLock: e.getModifierState("CapsLock"),
|
||||||
|
numLock: e.getModifierState("NumLock"),
|
||||||
|
scrollLock: e.getModifierState("ScrollLock"),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
this._overlay.focus()
|
this._overlay.focus()
|
||||||
this.onFocus()
|
this.onFocus()
|
||||||
this.focused = true
|
this.focused = true
|
||||||
}
|
}
|
||||||
|
|
||||||
onMouseLeave(e: MouseEvent) {
|
onMouseLeave(e: MouseEvent) {
|
||||||
|
if(this.hosting) {
|
||||||
|
this.$accessor.remote.setKeyboardModifierState({
|
||||||
|
capsLock: e.getModifierState("CapsLock"),
|
||||||
|
numLock: e.getModifierState("NumLock"),
|
||||||
|
scrollLock: e.getModifierState("ScrollLock"),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
this.focused = false
|
this.focused = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ export const EVENT = {
|
|||||||
REQUESTING: 'control/requesting',
|
REQUESTING: 'control/requesting',
|
||||||
CLIPBOARD: 'control/clipboard',
|
CLIPBOARD: 'control/clipboard',
|
||||||
GIVE: 'control/give',
|
GIVE: 'control/give',
|
||||||
KEYBOARD: 'control/keyboard'
|
KEYBOARD: 'control/keyboard',
|
||||||
},
|
},
|
||||||
CHAT: {
|
CHAT: {
|
||||||
MESSAGE: 'chat/message',
|
MESSAGE: 'chat/message',
|
||||||
|
@ -122,7 +122,10 @@ export interface ControlClipboardPayload {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface ControlKeyboardPayload {
|
export interface ControlKeyboardPayload {
|
||||||
layout: string
|
layout?: string
|
||||||
|
capsLock?: boolean
|
||||||
|
numLock?: boolean
|
||||||
|
scrollLock?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -3,12 +3,18 @@ import { Member } from '~/neko/types'
|
|||||||
import { EVENT } from '~/neko/events'
|
import { EVENT } from '~/neko/events'
|
||||||
import { accessor } from '~/store'
|
import { accessor } from '~/store'
|
||||||
|
|
||||||
|
const keyboardModifierState =
|
||||||
|
(capsLock: boolean, numLock: boolean, scrollLock: boolean) =>
|
||||||
|
Number(capsLock) + 2*Number(numLock) + 4*Number(scrollLock)
|
||||||
|
|
||||||
export const namespaced = true
|
export const namespaced = true
|
||||||
|
|
||||||
export const state = () => ({
|
export const state = () => ({
|
||||||
id: '',
|
id: '',
|
||||||
clipboard: '',
|
clipboard: '',
|
||||||
locked: false,
|
locked: false,
|
||||||
|
|
||||||
|
keyboardModifierState: -1,
|
||||||
})
|
})
|
||||||
|
|
||||||
export const getters = getterTree(state, {
|
export const getters = getterTree(state, {
|
||||||
@ -36,6 +42,10 @@ export const mutations = mutationTree(state, {
|
|||||||
state.clipboard = clipboard
|
state.clipboard = clipboard
|
||||||
},
|
},
|
||||||
|
|
||||||
|
setKeyboardModifierState(state, { capsLock, numLock, scrollLock }) {
|
||||||
|
state.keyboardModifierState = keyboardModifierState(capsLock, numLock, scrollLock)
|
||||||
|
},
|
||||||
|
|
||||||
setLocked(state, locked: boolean) {
|
setLocked(state, locked: boolean) {
|
||||||
state.locked = locked
|
state.locked = locked
|
||||||
},
|
},
|
||||||
@ -44,6 +54,7 @@ export const mutations = mutationTree(state, {
|
|||||||
state.id = ''
|
state.id = ''
|
||||||
state.clipboard = ''
|
state.clipboard = ''
|
||||||
state.locked = false
|
state.locked = false
|
||||||
|
state.keyboardModifierState = -1
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -140,6 +151,15 @@ export const actions = actionTree(
|
|||||||
}
|
}
|
||||||
|
|
||||||
$client.sendMessage(EVENT.CONTROL.KEYBOARD, { layout: accessor.settings.keyboard_layout })
|
$client.sendMessage(EVENT.CONTROL.KEYBOARD, { layout: accessor.settings.keyboard_layout })
|
||||||
|
},
|
||||||
|
|
||||||
|
syncKeyboardModifierState({ state, getters }, { capsLock, numLock, scrollLock }) {
|
||||||
|
if (state.keyboardModifierState === keyboardModifierState(capsLock, numLock, scrollLock)) {
|
||||||
|
return ;
|
||||||
|
}
|
||||||
|
|
||||||
|
accessor.remote.setKeyboardModifierState({ capsLock, numLock, scrollLock })
|
||||||
|
$client.sendMessage(EVENT.CONTROL.KEYBOARD, { capsLock, numLock, scrollLock })
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
Reference in New Issue
Block a user