diff options
| author | Koichiro IWAO <meta@vmeta.jp> | 2017-09-29 14:16:10 +0900 |
|---|---|---|
| committer | metalefty <meta@vmeta.jp> | 2017-10-02 09:39:48 +0900 |
| commit | ced3a4817fb4303e4575e45354f3914f7ec89cbb (patch) | |
| tree | fbb1c86854973d70d3e37d88218593c5d35a0cff | |
| parent | c295dd61b882e8b56677cf12791f43634f9190b5 (diff) | |
| download | xrdp-proprietary-ced3a4817fb4303e4575e45354f3914f7ec89cbb.tar.gz xrdp-proprietary-ced3a4817fb4303e4575e45354f3914f7ec89cbb.zip | |
xrdp: constify input event type
| -rw-r--r-- | common/xrdp_constants.h | 1 | ||||
| -rw-r--r-- | xrdp/xrdp_wm.c | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/common/xrdp_constants.h b/common/xrdp_constants.h index f1b13234..14028032 100644 --- a/common/xrdp_constants.h +++ b/common/xrdp_constants.h @@ -165,6 +165,7 @@ #define RDP_NULL_POINTER 0 #define RDP_DEFAULT_POINTER 0x7F00 +/* Input event type (MS-RDPBCGR 2.2.8.1.1.3.1.1) */ #define RDP_INPUT_SYNCHRONIZE 0 #define RDP_INPUT_CODEPOINT 1 #define RDP_INPUT_VIRTKEY 2 diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c index aefb412c..7f2ccfd4 100644 --- a/xrdp/xrdp_wm.c +++ b/xrdp/xrdp_wm.c @@ -1789,19 +1789,19 @@ callback(intptr_t id, int msg, intptr_t param1, intptr_t param2, switch (msg) { - case 0: /* RDP_INPUT_SYNCHRONIZE */ + case RDP_INPUT_SYNCHRONIZE: rv = xrdp_wm_key_sync(wm, param3, param1); break; - case 4: /* RDP_INPUT_SCANCODE */ + case RDP_INPUT_SCANCODE: rv = xrdp_wm_key(wm, param3, param1); break; - case 5: /* RDP_INPUT_UNICODE */ + case RDP_INPUT_UNICODE: rv = xrdp_wm_key_unicode(wm, param3, param1); break; - case 0x8001: /* RDP_INPUT_MOUSE */ + case RDP_INPUT_MOUSE: rv = xrdp_wm_process_input_mouse(wm, param3, param1, param2); break; - case 0x8002: /* RDP_INPUT_MOUSEX (INPUT_EVENT_MOUSEX) */ + case RDP_INPUT_MOUSEX: rv = xrdp_wm_process_input_mousex(wm, param3, param1, param2); break; case 0x4444: /* invalidate, this is not from RDP_DATA_PDU_INPUT */ |