From 7f0d08d4d394bd3951c0f2a5d42288795743c880 Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Thu, 6 Oct 2022 18:54:12 +1300 Subject: [PATCH] Refactor: extract XVNC_BUTTONS --- app/ui.js | 6 +++--- core/mousebuttonmapper.js | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/ui.js b/app/ui.js index d8b77eee..48d9af8e 100644 --- a/app/ui.js +++ b/app/ui.js @@ -41,7 +41,7 @@ import KeyTable from "../core/input/keysym.js"; import keysyms from "../core/input/keysymdef.js"; import Keyboard from "../core/input/keyboard.js"; import RFB from "../core/rfb.js"; -import MouseButtonMapper from "../core/mousebuttonmapper.js"; +import { MouseButtonMapper, XVNC_BUTTONS } from "../core/mousebuttonmapper.js"; import * as WebUtil from "./webutil.js"; const PAGE_TITLE = "KasmVNC"; @@ -274,8 +274,8 @@ const UI = { return mouseButtonMapper; } - mouseButtonMapper.set(3, 7); - mouseButtonMapper.set(4, 8); + mouseButtonMapper.set(3, XVNC_BUTTONS.BACK_BUTTON); + mouseButtonMapper.set(4, XVNC_BUTTONS.FORWARD_BUTTON); WebUtil.writeSetting("mouseButtonMapper", mouseButtonMapper.dump()); return mouseButtonMapper; diff --git a/core/mousebuttonmapper.js b/core/mousebuttonmapper.js index 6b7fe1ee..565e813b 100644 --- a/core/mousebuttonmapper.js +++ b/core/mousebuttonmapper.js @@ -1,3 +1,15 @@ +export const XVNC_BUTTONS = { + LEFT_BUTTON: 0, + MIDDLE_BUTTON: 1, + RIGHT_BUTTON: 2, + TURN_SCROLL_WHEEL_UP: 3, + TURN_SCROLL_WHEEL_DOWN: 4, + PUSH_SCROLL_WHEEL_LEFT: 5, + PUSH_SCROLL_WHEEL_RIGHT: 6, + BACK_BUTTON: 7, + FORWARD_BUTTON: 8 +}; + export default class MouseButtonMapper { constructor() { this.map = new Map(); @@ -47,3 +59,5 @@ export default class MouseButtonMapper { return value; } } + +export { MouseButtonMapper };