Compare commits
4 Commits
pull-input
...
pull-ui-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
d9d2663c33 | ||
|
4423184376 | ||
|
|
f607867cef | ||
|
cd958edb1f |
612
hw/input/ps2.c
612
hw/input/ps2.c
@@ -22,7 +22,6 @@
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/log.h"
|
||||
#include "hw/hw.h"
|
||||
#include "hw/input/ps2.h"
|
||||
#include "ui/console.h"
|
||||
@@ -95,10 +94,12 @@ typedef struct {
|
||||
typedef struct {
|
||||
PS2State common;
|
||||
int scan_enabled;
|
||||
/* QEMU uses translated PC scancodes internally. To avoid multiple
|
||||
conversions we do the translation (if any) in the PS/2 emulation
|
||||
not the keyboard controller. */
|
||||
int translate;
|
||||
int scancode_set; /* 1=XT, 2=AT, 3=PS/2 */
|
||||
int ledstate;
|
||||
bool need_high_bit;
|
||||
} PS2KbdState;
|
||||
|
||||
typedef struct {
|
||||
@@ -115,430 +116,26 @@ typedef struct {
|
||||
uint8_t mouse_buttons;
|
||||
} PS2MouseState;
|
||||
|
||||
/* Table to convert from QEMU codes to scancodes. */
|
||||
static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE__MAX] = {
|
||||
[0 ... Q_KEY_CODE__MAX - 1] = 0,
|
||||
|
||||
[Q_KEY_CODE_A] = 0x1e,
|
||||
[Q_KEY_CODE_B] = 0x30,
|
||||
[Q_KEY_CODE_C] = 0x2e,
|
||||
[Q_KEY_CODE_D] = 0x20,
|
||||
[Q_KEY_CODE_E] = 0x12,
|
||||
[Q_KEY_CODE_F] = 0x21,
|
||||
[Q_KEY_CODE_G] = 0x22,
|
||||
[Q_KEY_CODE_H] = 0x23,
|
||||
[Q_KEY_CODE_I] = 0x17,
|
||||
[Q_KEY_CODE_J] = 0x24,
|
||||
[Q_KEY_CODE_K] = 0x25,
|
||||
[Q_KEY_CODE_L] = 0x26,
|
||||
[Q_KEY_CODE_M] = 0x32,
|
||||
[Q_KEY_CODE_N] = 0x31,
|
||||
[Q_KEY_CODE_O] = 0x18,
|
||||
[Q_KEY_CODE_P] = 0x19,
|
||||
[Q_KEY_CODE_Q] = 0x10,
|
||||
[Q_KEY_CODE_R] = 0x13,
|
||||
[Q_KEY_CODE_S] = 0x1f,
|
||||
[Q_KEY_CODE_T] = 0x14,
|
||||
[Q_KEY_CODE_U] = 0x16,
|
||||
[Q_KEY_CODE_V] = 0x2f,
|
||||
[Q_KEY_CODE_W] = 0x11,
|
||||
[Q_KEY_CODE_X] = 0x2d,
|
||||
[Q_KEY_CODE_Y] = 0x15,
|
||||
[Q_KEY_CODE_Z] = 0x2c,
|
||||
[Q_KEY_CODE_0] = 0x0b,
|
||||
[Q_KEY_CODE_1] = 0x02,
|
||||
[Q_KEY_CODE_2] = 0x03,
|
||||
[Q_KEY_CODE_3] = 0x04,
|
||||
[Q_KEY_CODE_4] = 0x05,
|
||||
[Q_KEY_CODE_5] = 0x06,
|
||||
[Q_KEY_CODE_6] = 0x07,
|
||||
[Q_KEY_CODE_7] = 0x08,
|
||||
[Q_KEY_CODE_8] = 0x09,
|
||||
[Q_KEY_CODE_9] = 0x0a,
|
||||
[Q_KEY_CODE_GRAVE_ACCENT] = 0x29,
|
||||
[Q_KEY_CODE_MINUS] = 0x0c,
|
||||
[Q_KEY_CODE_EQUAL] = 0x0d,
|
||||
[Q_KEY_CODE_BACKSLASH] = 0x2b,
|
||||
[Q_KEY_CODE_BACKSPACE] = 0x0e,
|
||||
[Q_KEY_CODE_SPC] = 0x39,
|
||||
[Q_KEY_CODE_TAB] = 0x0f,
|
||||
[Q_KEY_CODE_CAPS_LOCK] = 0x3a,
|
||||
[Q_KEY_CODE_SHIFT] = 0x2a,
|
||||
[Q_KEY_CODE_CTRL] = 0x1d,
|
||||
[Q_KEY_CODE_META_L] = 0xe05b,
|
||||
[Q_KEY_CODE_ALT] = 0x38,
|
||||
[Q_KEY_CODE_SHIFT_R] = 0x36,
|
||||
[Q_KEY_CODE_CTRL_R] = 0xe01d,
|
||||
[Q_KEY_CODE_META_R] = 0xe05c,
|
||||
[Q_KEY_CODE_ALT_R] = 0xe038,
|
||||
[Q_KEY_CODE_MENU] = 0xe05d,
|
||||
[Q_KEY_CODE_RET] = 0x1c,
|
||||
[Q_KEY_CODE_ESC] = 0x01,
|
||||
[Q_KEY_CODE_F1] = 0x3b,
|
||||
[Q_KEY_CODE_F2] = 0x3c,
|
||||
[Q_KEY_CODE_F3] = 0x3d,
|
||||
[Q_KEY_CODE_F4] = 0x3e,
|
||||
[Q_KEY_CODE_F5] = 0x3f,
|
||||
[Q_KEY_CODE_F6] = 0x40,
|
||||
[Q_KEY_CODE_F7] = 0x41,
|
||||
[Q_KEY_CODE_F8] = 0x42,
|
||||
[Q_KEY_CODE_F9] = 0x43,
|
||||
[Q_KEY_CODE_F10] = 0x44,
|
||||
[Q_KEY_CODE_F11] = 0x57,
|
||||
[Q_KEY_CODE_F12] = 0x58,
|
||||
/* special handling for Q_KEY_CODE_PRINT */
|
||||
[Q_KEY_CODE_SCROLL_LOCK] = 0x46,
|
||||
/* special handling for Q_KEY_CODE_PAUSE */
|
||||
[Q_KEY_CODE_BRACKET_LEFT] = 0x1a,
|
||||
[Q_KEY_CODE_INSERT] = 0xe052,
|
||||
[Q_KEY_CODE_HOME] = 0xe047,
|
||||
[Q_KEY_CODE_PGUP] = 0xe049,
|
||||
[Q_KEY_CODE_DELETE] = 0xe053,
|
||||
[Q_KEY_CODE_END] = 0xe04f,
|
||||
[Q_KEY_CODE_PGDN] = 0xe051,
|
||||
[Q_KEY_CODE_UP] = 0xe048,
|
||||
[Q_KEY_CODE_LEFT] = 0xe04b,
|
||||
[Q_KEY_CODE_DOWN] = 0xe050,
|
||||
[Q_KEY_CODE_RIGHT] = 0xe04d,
|
||||
[Q_KEY_CODE_NUM_LOCK] = 0x45,
|
||||
[Q_KEY_CODE_KP_DIVIDE] = 0xe035,
|
||||
[Q_KEY_CODE_KP_MULTIPLY] = 0x37,
|
||||
[Q_KEY_CODE_KP_SUBTRACT] = 0x4a,
|
||||
[Q_KEY_CODE_KP_ADD] = 0x4e,
|
||||
[Q_KEY_CODE_KP_ENTER] = 0xe01c,
|
||||
[Q_KEY_CODE_KP_DECIMAL] = 0x53,
|
||||
[Q_KEY_CODE_KP_0] = 0x52,
|
||||
[Q_KEY_CODE_KP_1] = 0x4f,
|
||||
[Q_KEY_CODE_KP_2] = 0x50,
|
||||
[Q_KEY_CODE_KP_3] = 0x51,
|
||||
[Q_KEY_CODE_KP_4] = 0x4b,
|
||||
[Q_KEY_CODE_KP_5] = 0x4c,
|
||||
[Q_KEY_CODE_KP_6] = 0x4d,
|
||||
[Q_KEY_CODE_KP_7] = 0x47,
|
||||
[Q_KEY_CODE_KP_8] = 0x48,
|
||||
[Q_KEY_CODE_KP_9] = 0x49,
|
||||
[Q_KEY_CODE_BRACKET_RIGHT] = 0x1b,
|
||||
[Q_KEY_CODE_SEMICOLON] = 0x27,
|
||||
[Q_KEY_CODE_APOSTROPHE] = 0x28,
|
||||
[Q_KEY_CODE_COMMA] = 0x33,
|
||||
[Q_KEY_CODE_DOT] = 0x34,
|
||||
[Q_KEY_CODE_SLASH] = 0x35,
|
||||
|
||||
#if 0
|
||||
[Q_KEY_CODE_POWER] = 0x0e5e,
|
||||
[Q_KEY_CODE_SLEEP] = 0x0e5f,
|
||||
[Q_KEY_CODE_WAKE] = 0x0e63,
|
||||
|
||||
[Q_KEY_CODE_AUDIONEXT] = 0xe019,
|
||||
[Q_KEY_CODE_AUDIOPREV] = 0xe010,
|
||||
[Q_KEY_CODE_AUDIOSTOP] = 0xe024,
|
||||
[Q_KEY_CODE_AUDIOPLAY] = 0xe022,
|
||||
[Q_KEY_CODE_AUDIOMUTE] = 0xe020,
|
||||
[Q_KEY_CODE_VOLUMEUP] = 0xe030,
|
||||
[Q_KEY_CODE_VOLUMEDOWN] = 0xe02e,
|
||||
[Q_KEY_CODE_MEDIASELECT] = 0xe06d,
|
||||
[Q_KEY_CODE_MAIL] = 0xe06c,
|
||||
[Q_KEY_CODE_CALCULATOR] = 0xe021,
|
||||
[Q_KEY_CODE_COMPUTER] = 0xe06b,
|
||||
[Q_KEY_CODE_AC_SEARCH] = 0xe065,
|
||||
[Q_KEY_CODE_AC_HOME] = 0xe032,
|
||||
[Q_KEY_CODE_AC_BACK] = 0xe06a,
|
||||
[Q_KEY_CODE_AC_FORWARD] = 0xe069,
|
||||
[Q_KEY_CODE_AC_STOP] = 0xe068,
|
||||
[Q_KEY_CODE_AC_REFRESH] = 0xe067,
|
||||
[Q_KEY_CODE_AC_BOOKMARKS] = 0xe066,
|
||||
#endif
|
||||
|
||||
[Q_KEY_CODE_ASTERISK] = 0x37,
|
||||
[Q_KEY_CODE_LESS] = 0x56,
|
||||
[Q_KEY_CODE_RO] = 0x73,
|
||||
[Q_KEY_CODE_KP_COMMA] = 0x7e,
|
||||
/* Table to convert from PC scancodes to raw scancodes. */
|
||||
static const unsigned char ps2_raw_keycode[128] = {
|
||||
0, 118, 22, 30, 38, 37, 46, 54, 61, 62, 70, 69, 78, 85, 102, 13,
|
||||
21, 29, 36, 45, 44, 53, 60, 67, 68, 77, 84, 91, 90, 20, 28, 27,
|
||||
35, 43, 52, 51, 59, 66, 75, 76, 82, 14, 18, 93, 26, 34, 33, 42,
|
||||
50, 49, 58, 65, 73, 74, 89, 124, 17, 41, 88, 5, 6, 4, 12, 3,
|
||||
11, 2, 10, 1, 9, 119, 126, 108, 117, 125, 123, 107, 115, 116, 121, 105,
|
||||
114, 122, 112, 113, 127, 96, 97, 120, 7, 15, 23, 31, 39, 47, 55, 63,
|
||||
71, 79, 86, 94, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 87, 111,
|
||||
19, 25, 57, 81, 83, 92, 95, 98, 99, 100, 101, 103, 104, 106, 109, 110
|
||||
};
|
||||
|
||||
static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] = {
|
||||
[0 ... Q_KEY_CODE__MAX - 1] = 0,
|
||||
|
||||
[Q_KEY_CODE_A] = 0x1c,
|
||||
[Q_KEY_CODE_B] = 0x32,
|
||||
[Q_KEY_CODE_C] = 0x21,
|
||||
[Q_KEY_CODE_D] = 0x23,
|
||||
[Q_KEY_CODE_E] = 0x24,
|
||||
[Q_KEY_CODE_F] = 0x2b,
|
||||
[Q_KEY_CODE_G] = 0x34,
|
||||
[Q_KEY_CODE_H] = 0x33,
|
||||
[Q_KEY_CODE_I] = 0x43,
|
||||
[Q_KEY_CODE_J] = 0x3b,
|
||||
[Q_KEY_CODE_K] = 0x42,
|
||||
[Q_KEY_CODE_L] = 0x4b,
|
||||
[Q_KEY_CODE_M] = 0x3a,
|
||||
[Q_KEY_CODE_N] = 0x31,
|
||||
[Q_KEY_CODE_O] = 0x44,
|
||||
[Q_KEY_CODE_P] = 0x4d,
|
||||
[Q_KEY_CODE_Q] = 0x15,
|
||||
[Q_KEY_CODE_R] = 0x2d,
|
||||
[Q_KEY_CODE_S] = 0x1b,
|
||||
[Q_KEY_CODE_T] = 0x2c,
|
||||
[Q_KEY_CODE_U] = 0x3c,
|
||||
[Q_KEY_CODE_V] = 0x2a,
|
||||
[Q_KEY_CODE_W] = 0x1d,
|
||||
[Q_KEY_CODE_X] = 0x22,
|
||||
[Q_KEY_CODE_Y] = 0x35,
|
||||
[Q_KEY_CODE_Z] = 0x1a,
|
||||
[Q_KEY_CODE_0] = 0x45,
|
||||
[Q_KEY_CODE_1] = 0x16,
|
||||
[Q_KEY_CODE_2] = 0x1e,
|
||||
[Q_KEY_CODE_3] = 0x26,
|
||||
[Q_KEY_CODE_4] = 0x25,
|
||||
[Q_KEY_CODE_5] = 0x2e,
|
||||
[Q_KEY_CODE_6] = 0x36,
|
||||
[Q_KEY_CODE_7] = 0x3d,
|
||||
[Q_KEY_CODE_8] = 0x3e,
|
||||
[Q_KEY_CODE_9] = 0x46,
|
||||
[Q_KEY_CODE_GRAVE_ACCENT] = 0x0e,
|
||||
[Q_KEY_CODE_MINUS] = 0x4e,
|
||||
[Q_KEY_CODE_EQUAL] = 0x55,
|
||||
[Q_KEY_CODE_BACKSLASH] = 0x5d,
|
||||
[Q_KEY_CODE_BACKSPACE] = 0x66,
|
||||
[Q_KEY_CODE_SPC] = 0x29,
|
||||
[Q_KEY_CODE_TAB] = 0x0d,
|
||||
[Q_KEY_CODE_CAPS_LOCK] = 0x58,
|
||||
[Q_KEY_CODE_SHIFT] = 0x12,
|
||||
[Q_KEY_CODE_CTRL] = 0x14,
|
||||
[Q_KEY_CODE_META_L] = 0xe01f,
|
||||
[Q_KEY_CODE_ALT] = 0x11,
|
||||
[Q_KEY_CODE_SHIFT_R] = 0x59,
|
||||
[Q_KEY_CODE_CTRL_R] = 0xe014,
|
||||
[Q_KEY_CODE_META_R] = 0xe027,
|
||||
[Q_KEY_CODE_ALT_R] = 0xe011,
|
||||
[Q_KEY_CODE_MENU] = 0xe02f,
|
||||
[Q_KEY_CODE_RET] = 0x5a,
|
||||
[Q_KEY_CODE_ESC] = 0x76,
|
||||
[Q_KEY_CODE_F1] = 0x05,
|
||||
[Q_KEY_CODE_F2] = 0x06,
|
||||
[Q_KEY_CODE_F3] = 0x04,
|
||||
[Q_KEY_CODE_F4] = 0x0c,
|
||||
[Q_KEY_CODE_F5] = 0x03,
|
||||
[Q_KEY_CODE_F6] = 0x0b,
|
||||
[Q_KEY_CODE_F7] = 0x83,
|
||||
[Q_KEY_CODE_F8] = 0x0a,
|
||||
[Q_KEY_CODE_F9] = 0x01,
|
||||
[Q_KEY_CODE_F10] = 0x09,
|
||||
[Q_KEY_CODE_F11] = 0x78,
|
||||
[Q_KEY_CODE_F12] = 0x07,
|
||||
/* special handling for Q_KEY_CODE_PRINT */
|
||||
[Q_KEY_CODE_SCROLL_LOCK] = 0x7e,
|
||||
/* special handling for Q_KEY_CODE_PAUSE */
|
||||
[Q_KEY_CODE_BRACKET_LEFT] = 0x54,
|
||||
[Q_KEY_CODE_INSERT] = 0xe070,
|
||||
[Q_KEY_CODE_HOME] = 0xe06c,
|
||||
[Q_KEY_CODE_PGUP] = 0xe07d,
|
||||
[Q_KEY_CODE_DELETE] = 0xe071,
|
||||
[Q_KEY_CODE_END] = 0xe069,
|
||||
[Q_KEY_CODE_PGDN] = 0xe07a,
|
||||
[Q_KEY_CODE_UP] = 0xe075,
|
||||
[Q_KEY_CODE_LEFT] = 0xe06b,
|
||||
[Q_KEY_CODE_DOWN] = 0xe072,
|
||||
[Q_KEY_CODE_RIGHT] = 0xe074,
|
||||
[Q_KEY_CODE_NUM_LOCK] = 0x77,
|
||||
[Q_KEY_CODE_KP_DIVIDE] = 0xe04a,
|
||||
[Q_KEY_CODE_KP_MULTIPLY] = 0x7c,
|
||||
[Q_KEY_CODE_KP_SUBTRACT] = 0x7b,
|
||||
[Q_KEY_CODE_KP_ADD] = 0x79,
|
||||
[Q_KEY_CODE_KP_ENTER] = 0xe05a,
|
||||
[Q_KEY_CODE_KP_DECIMAL] = 0x71,
|
||||
[Q_KEY_CODE_KP_0] = 0x70,
|
||||
[Q_KEY_CODE_KP_1] = 0x69,
|
||||
[Q_KEY_CODE_KP_2] = 0x72,
|
||||
[Q_KEY_CODE_KP_3] = 0x7a,
|
||||
[Q_KEY_CODE_KP_4] = 0x6b,
|
||||
[Q_KEY_CODE_KP_5] = 0x73,
|
||||
[Q_KEY_CODE_KP_6] = 0x74,
|
||||
[Q_KEY_CODE_KP_7] = 0x6c,
|
||||
[Q_KEY_CODE_KP_8] = 0x75,
|
||||
[Q_KEY_CODE_KP_9] = 0x7d,
|
||||
[Q_KEY_CODE_BRACKET_RIGHT] = 0x5b,
|
||||
[Q_KEY_CODE_SEMICOLON] = 0x4c,
|
||||
[Q_KEY_CODE_APOSTROPHE] = 0x52,
|
||||
[Q_KEY_CODE_COMMA] = 0x41,
|
||||
[Q_KEY_CODE_DOT] = 0x49,
|
||||
[Q_KEY_CODE_SLASH] = 0x4a,
|
||||
|
||||
#if 0
|
||||
[Q_KEY_CODE_POWER] = 0x0e37,
|
||||
[Q_KEY_CODE_SLEEP] = 0x0e3f,
|
||||
[Q_KEY_CODE_WAKE] = 0x0e5e,
|
||||
|
||||
[Q_KEY_CODE_AUDIONEXT] = 0xe04d,
|
||||
[Q_KEY_CODE_AUDIOPREV] = 0xe015,
|
||||
[Q_KEY_CODE_AUDIOSTOP] = 0xe03b,
|
||||
[Q_KEY_CODE_AUDIOPLAY] = 0xe034,
|
||||
[Q_KEY_CODE_AUDIOMUTE] = 0xe023,
|
||||
[Q_KEY_CODE_VOLUMEUP] = 0xe032,
|
||||
[Q_KEY_CODE_VOLUMEDOWN] = 0xe021,
|
||||
[Q_KEY_CODE_MEDIASELECT] = 0xe050,
|
||||
[Q_KEY_CODE_MAIL] = 0xe048,
|
||||
[Q_KEY_CODE_CALCULATOR] = 0xe02b,
|
||||
[Q_KEY_CODE_COMPUTER] = 0xe040,
|
||||
[Q_KEY_CODE_AC_SEARCH] = 0xe010,
|
||||
[Q_KEY_CODE_AC_HOME] = 0xe03a,
|
||||
[Q_KEY_CODE_AC_BACK] = 0xe038,
|
||||
[Q_KEY_CODE_AC_FORWARD] = 0xe030,
|
||||
[Q_KEY_CODE_AC_STOP] = 0xe028,
|
||||
[Q_KEY_CODE_AC_REFRESH] = 0xe020,
|
||||
[Q_KEY_CODE_AC_BOOKMARKS] = 0xe018,
|
||||
#endif
|
||||
|
||||
[Q_KEY_CODE_ALTGR] = 0x08,
|
||||
[Q_KEY_CODE_ALTGR_R] = 0xe008,
|
||||
[Q_KEY_CODE_ASTERISK] = 0x7c,
|
||||
[Q_KEY_CODE_LESS] = 0x61,
|
||||
[Q_KEY_CODE_SYSRQ] = 0x7f,
|
||||
[Q_KEY_CODE_RO] = 0x51,
|
||||
[Q_KEY_CODE_KP_COMMA] = 0x6d,
|
||||
};
|
||||
|
||||
static const uint16_t qcode_to_keycode_set3[Q_KEY_CODE__MAX] = {
|
||||
[0 ... Q_KEY_CODE__MAX - 1] = 0,
|
||||
|
||||
[Q_KEY_CODE_A] = 0x1c,
|
||||
[Q_KEY_CODE_B] = 0x32,
|
||||
[Q_KEY_CODE_C] = 0x21,
|
||||
[Q_KEY_CODE_D] = 0x23,
|
||||
[Q_KEY_CODE_E] = 0x24,
|
||||
[Q_KEY_CODE_F] = 0x2b,
|
||||
[Q_KEY_CODE_G] = 0x34,
|
||||
[Q_KEY_CODE_H] = 0x33,
|
||||
[Q_KEY_CODE_I] = 0x43,
|
||||
[Q_KEY_CODE_J] = 0x3b,
|
||||
[Q_KEY_CODE_K] = 0x42,
|
||||
[Q_KEY_CODE_L] = 0x4b,
|
||||
[Q_KEY_CODE_M] = 0x3a,
|
||||
[Q_KEY_CODE_N] = 0x31,
|
||||
[Q_KEY_CODE_O] = 0x44,
|
||||
[Q_KEY_CODE_P] = 0x4d,
|
||||
[Q_KEY_CODE_Q] = 0x15,
|
||||
[Q_KEY_CODE_R] = 0x2d,
|
||||
[Q_KEY_CODE_S] = 0x1b,
|
||||
[Q_KEY_CODE_T] = 0x2c,
|
||||
[Q_KEY_CODE_U] = 0x3c,
|
||||
[Q_KEY_CODE_V] = 0x2a,
|
||||
[Q_KEY_CODE_W] = 0x1d,
|
||||
[Q_KEY_CODE_X] = 0x22,
|
||||
[Q_KEY_CODE_Y] = 0x35,
|
||||
[Q_KEY_CODE_Z] = 0x1a,
|
||||
[Q_KEY_CODE_0] = 0x45,
|
||||
[Q_KEY_CODE_1] = 0x16,
|
||||
[Q_KEY_CODE_2] = 0x1e,
|
||||
[Q_KEY_CODE_3] = 0x26,
|
||||
[Q_KEY_CODE_4] = 0x25,
|
||||
[Q_KEY_CODE_5] = 0x2e,
|
||||
[Q_KEY_CODE_6] = 0x36,
|
||||
[Q_KEY_CODE_7] = 0x3d,
|
||||
[Q_KEY_CODE_8] = 0x3e,
|
||||
[Q_KEY_CODE_9] = 0x46,
|
||||
[Q_KEY_CODE_GRAVE_ACCENT] = 0x0e,
|
||||
[Q_KEY_CODE_MINUS] = 0x4e,
|
||||
[Q_KEY_CODE_EQUAL] = 0x55,
|
||||
[Q_KEY_CODE_BACKSLASH] = 0x5c,
|
||||
[Q_KEY_CODE_BACKSPACE] = 0x66,
|
||||
[Q_KEY_CODE_SPC] = 0x29,
|
||||
[Q_KEY_CODE_TAB] = 0x0d,
|
||||
[Q_KEY_CODE_CAPS_LOCK] = 0x14,
|
||||
[Q_KEY_CODE_SHIFT] = 0x12,
|
||||
[Q_KEY_CODE_CTRL] = 0x11,
|
||||
[Q_KEY_CODE_META_L] = 0x8b,
|
||||
[Q_KEY_CODE_ALT] = 0x19,
|
||||
[Q_KEY_CODE_SHIFT_R] = 0x59,
|
||||
[Q_KEY_CODE_CTRL_R] = 0x58,
|
||||
[Q_KEY_CODE_META_R] = 0x8c,
|
||||
[Q_KEY_CODE_ALT_R] = 0x39,
|
||||
[Q_KEY_CODE_MENU] = 0x8d,
|
||||
[Q_KEY_CODE_RET] = 0x5a,
|
||||
[Q_KEY_CODE_ESC] = 0x08,
|
||||
[Q_KEY_CODE_F1] = 0x07,
|
||||
[Q_KEY_CODE_F2] = 0x0f,
|
||||
[Q_KEY_CODE_F3] = 0x17,
|
||||
[Q_KEY_CODE_F4] = 0x1f,
|
||||
[Q_KEY_CODE_F5] = 0x27,
|
||||
[Q_KEY_CODE_F6] = 0x2f,
|
||||
[Q_KEY_CODE_F7] = 0x37,
|
||||
[Q_KEY_CODE_F8] = 0x3f,
|
||||
[Q_KEY_CODE_F9] = 0x47,
|
||||
[Q_KEY_CODE_F10] = 0x4f,
|
||||
[Q_KEY_CODE_F11] = 0x56,
|
||||
[Q_KEY_CODE_F12] = 0x5e,
|
||||
[Q_KEY_CODE_PRINT] = 0x57,
|
||||
[Q_KEY_CODE_SCROLL_LOCK] = 0x5f,
|
||||
[Q_KEY_CODE_PAUSE] = 0x62,
|
||||
[Q_KEY_CODE_BRACKET_LEFT] = 0x54,
|
||||
[Q_KEY_CODE_INSERT] = 0x67,
|
||||
[Q_KEY_CODE_HOME] = 0x6e,
|
||||
[Q_KEY_CODE_PGUP] = 0x6f,
|
||||
[Q_KEY_CODE_DELETE] = 0x64,
|
||||
[Q_KEY_CODE_END] = 0x65,
|
||||
[Q_KEY_CODE_PGDN] = 0x6d,
|
||||
[Q_KEY_CODE_UP] = 0x63,
|
||||
[Q_KEY_CODE_LEFT] = 0x61,
|
||||
[Q_KEY_CODE_DOWN] = 0x60,
|
||||
[Q_KEY_CODE_RIGHT] = 0x6a,
|
||||
[Q_KEY_CODE_NUM_LOCK] = 0x76,
|
||||
[Q_KEY_CODE_KP_DIVIDE] = 0x4a,
|
||||
[Q_KEY_CODE_KP_MULTIPLY] = 0x7e,
|
||||
[Q_KEY_CODE_KP_SUBTRACT] = 0x4e,
|
||||
[Q_KEY_CODE_KP_ADD] = 0x7c,
|
||||
[Q_KEY_CODE_KP_ENTER] = 0x79,
|
||||
[Q_KEY_CODE_KP_DECIMAL] = 0x71,
|
||||
[Q_KEY_CODE_KP_0] = 0x70,
|
||||
[Q_KEY_CODE_KP_1] = 0x69,
|
||||
[Q_KEY_CODE_KP_2] = 0x72,
|
||||
[Q_KEY_CODE_KP_3] = 0x7a,
|
||||
[Q_KEY_CODE_KP_4] = 0x6b,
|
||||
[Q_KEY_CODE_KP_5] = 0x73,
|
||||
[Q_KEY_CODE_KP_6] = 0x74,
|
||||
[Q_KEY_CODE_KP_7] = 0x6c,
|
||||
[Q_KEY_CODE_KP_8] = 0x75,
|
||||
[Q_KEY_CODE_KP_9] = 0x7d,
|
||||
[Q_KEY_CODE_BRACKET_RIGHT] = 0x5b,
|
||||
[Q_KEY_CODE_SEMICOLON] = 0x4c,
|
||||
[Q_KEY_CODE_APOSTROPHE] = 0x52,
|
||||
[Q_KEY_CODE_COMMA] = 0x41,
|
||||
[Q_KEY_CODE_DOT] = 0x49,
|
||||
[Q_KEY_CODE_SLASH] = 0x4a,
|
||||
};
|
||||
|
||||
static uint8_t translate_table[256] = {
|
||||
0xff, 0x43, 0x41, 0x3f, 0x3d, 0x3b, 0x3c, 0x58,
|
||||
0x64, 0x44, 0x42, 0x40, 0x3e, 0x0f, 0x29, 0x59,
|
||||
0x65, 0x38, 0x2a, 0x70, 0x1d, 0x10, 0x02, 0x5a,
|
||||
0x66, 0x71, 0x2c, 0x1f, 0x1e, 0x11, 0x03, 0x5b,
|
||||
0x67, 0x2e, 0x2d, 0x20, 0x12, 0x05, 0x04, 0x5c,
|
||||
0x68, 0x39, 0x2f, 0x21, 0x14, 0x13, 0x06, 0x5d,
|
||||
0x69, 0x31, 0x30, 0x23, 0x22, 0x15, 0x07, 0x5e,
|
||||
0x6a, 0x72, 0x32, 0x24, 0x16, 0x08, 0x09, 0x5f,
|
||||
0x6b, 0x33, 0x25, 0x17, 0x18, 0x0b, 0x0a, 0x60,
|
||||
0x6c, 0x34, 0x35, 0x26, 0x27, 0x19, 0x0c, 0x61,
|
||||
0x6d, 0x73, 0x28, 0x74, 0x1a, 0x0d, 0x62, 0x6e,
|
||||
0x3a, 0x36, 0x1c, 0x1b, 0x75, 0x2b, 0x63, 0x76,
|
||||
0x55, 0x56, 0x77, 0x78, 0x79, 0x7a, 0x0e, 0x7b,
|
||||
0x7c, 0x4f, 0x7d, 0x4b, 0x47, 0x7e, 0x7f, 0x6f,
|
||||
0x52, 0x53, 0x50, 0x4c, 0x4d, 0x48, 0x01, 0x45,
|
||||
0x57, 0x4e, 0x51, 0x4a, 0x37, 0x49, 0x46, 0x54,
|
||||
0x80, 0x81, 0x82, 0x41, 0x54, 0x85, 0x86, 0x87,
|
||||
0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
|
||||
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
|
||||
0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
|
||||
0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
|
||||
0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
|
||||
0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
|
||||
0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
|
||||
0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
|
||||
0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
|
||||
0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
|
||||
0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
|
||||
0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
|
||||
0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
|
||||
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
|
||||
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
|
||||
static const unsigned char ps2_raw_keycode_set3[128] = {
|
||||
0, 8, 22, 30, 38, 37, 46, 54, 61, 62, 70, 69, 78, 85, 102, 13,
|
||||
21, 29, 36, 45, 44, 53, 60, 67, 68, 77, 84, 91, 90, 17, 28, 27,
|
||||
35, 43, 52, 51, 59, 66, 75, 76, 82, 14, 18, 92, 26, 34, 33, 42,
|
||||
50, 49, 58, 65, 73, 74, 89, 126, 25, 41, 20, 7, 15, 23, 31, 39,
|
||||
47, 2, 63, 71, 79, 118, 95, 108, 117, 125, 132, 107, 115, 116, 124, 105,
|
||||
114, 122, 112, 113, 127, 96, 97, 86, 94, 15, 23, 31, 39, 47, 55, 63,
|
||||
71, 79, 86, 94, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 87, 111,
|
||||
19, 25, 57, 81, 83, 92, 95, 98, 99, 100, 101, 103, 104, 106, 109, 110
|
||||
};
|
||||
|
||||
void ps2_queue(void *opaque, int b)
|
||||
@@ -555,130 +152,44 @@ void ps2_queue(void *opaque, int b)
|
||||
s->update_irq(s->update_arg, 1);
|
||||
}
|
||||
|
||||
/* keycode is the untranslated scancode in the current scancode set. */
|
||||
/*
|
||||
keycode is expressed as follow:
|
||||
bit 7 - 0 key pressed, 1 = key released
|
||||
bits 6-0 - translated scancode set 2
|
||||
*/
|
||||
static void ps2_put_keycode(void *opaque, int keycode)
|
||||
{
|
||||
PS2KbdState *s = opaque;
|
||||
|
||||
trace_ps2_put_keycode(opaque, keycode);
|
||||
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
|
||||
|
||||
if (s->translate) {
|
||||
if (keycode == 0xf0) {
|
||||
s->need_high_bit = true;
|
||||
} else if (s->need_high_bit) {
|
||||
ps2_queue(&s->common, translate_table[keycode] | 0x80);
|
||||
s->need_high_bit = false;
|
||||
} else {
|
||||
ps2_queue(&s->common, translate_table[keycode]);
|
||||
/* XXX: add support for scancode set 1 */
|
||||
if (!s->translate && keycode < 0xe0 && s->scancode_set > 1) {
|
||||
if (keycode & 0x80) {
|
||||
ps2_queue(&s->common, 0xf0);
|
||||
}
|
||||
} else {
|
||||
ps2_queue(&s->common, keycode);
|
||||
}
|
||||
if (s->scancode_set == 2) {
|
||||
keycode = ps2_raw_keycode[keycode & 0x7f];
|
||||
} else if (s->scancode_set == 3) {
|
||||
keycode = ps2_raw_keycode_set3[keycode & 0x7f];
|
||||
}
|
||||
}
|
||||
ps2_queue(&s->common, keycode);
|
||||
}
|
||||
|
||||
static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
|
||||
InputEvent *evt)
|
||||
{
|
||||
PS2KbdState *s = (PS2KbdState *)dev;
|
||||
int scancodes[3], i, count;
|
||||
InputKeyEvent *key = evt->u.key.data;
|
||||
int qcode;
|
||||
uint16_t keycode;
|
||||
|
||||
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
|
||||
assert(evt->type == INPUT_EVENT_KIND_KEY);
|
||||
qcode = qemu_input_key_value_to_qcode(key->key);
|
||||
|
||||
if (s->scancode_set == 1) {
|
||||
if (qcode == Q_KEY_CODE_PAUSE) {
|
||||
if (key->down) {
|
||||
ps2_put_keycode(s, 0xe1);
|
||||
ps2_put_keycode(s, 0x1d);
|
||||
ps2_put_keycode(s, 0x45);
|
||||
ps2_put_keycode(s, 0x91);
|
||||
ps2_put_keycode(s, 0x9d);
|
||||
ps2_put_keycode(s, 0xc5);
|
||||
}
|
||||
} else if (qcode == Q_KEY_CODE_PRINT) {
|
||||
if (key->down) {
|
||||
ps2_put_keycode(s, 0xe0);
|
||||
ps2_put_keycode(s, 0x2a);
|
||||
ps2_put_keycode(s, 0xe0);
|
||||
ps2_put_keycode(s, 0x37);
|
||||
} else {
|
||||
ps2_put_keycode(s, 0xe0);
|
||||
ps2_put_keycode(s, 0xb7);
|
||||
ps2_put_keycode(s, 0xe0);
|
||||
ps2_put_keycode(s, 0xaa);
|
||||
}
|
||||
} else {
|
||||
keycode = qcode_to_keycode_set1[qcode];
|
||||
if (keycode) {
|
||||
if (keycode & 0xff00) {
|
||||
ps2_put_keycode(s, keycode >> 8);
|
||||
}
|
||||
if (!key->down) {
|
||||
keycode |= 0x80;
|
||||
}
|
||||
ps2_put_keycode(s, keycode & 0xff);
|
||||
} else {
|
||||
qemu_log_mask(LOG_UNIMP,
|
||||
"ps2: ignoring key with qcode %d\n", qcode);
|
||||
}
|
||||
}
|
||||
} else if (s->scancode_set == 2) {
|
||||
if (qcode == Q_KEY_CODE_PAUSE) {
|
||||
if (key->down) {
|
||||
ps2_put_keycode(s, 0xe1);
|
||||
ps2_put_keycode(s, 0x14);
|
||||
ps2_put_keycode(s, 0x77);
|
||||
ps2_put_keycode(s, 0xe1);
|
||||
ps2_put_keycode(s, 0xf0);
|
||||
ps2_put_keycode(s, 0x14);
|
||||
ps2_put_keycode(s, 0xf0);
|
||||
ps2_put_keycode(s, 0x77);
|
||||
}
|
||||
} else if (qcode == Q_KEY_CODE_PRINT) {
|
||||
if (key->down) {
|
||||
ps2_put_keycode(s, 0xe0);
|
||||
ps2_put_keycode(s, 0x12);
|
||||
ps2_put_keycode(s, 0xe0);
|
||||
ps2_put_keycode(s, 0x7c);
|
||||
} else {
|
||||
ps2_put_keycode(s, 0xe0);
|
||||
ps2_put_keycode(s, 0xf0);
|
||||
ps2_put_keycode(s, 0x7c);
|
||||
ps2_put_keycode(s, 0xe0);
|
||||
ps2_put_keycode(s, 0xf0);
|
||||
ps2_put_keycode(s, 0x12);
|
||||
}
|
||||
} else {
|
||||
keycode = qcode_to_keycode_set2[qcode];
|
||||
if (keycode) {
|
||||
if (keycode & 0xff00) {
|
||||
ps2_put_keycode(s, keycode >> 8);
|
||||
}
|
||||
if (!key->down) {
|
||||
ps2_put_keycode(s, 0xf0);
|
||||
}
|
||||
ps2_put_keycode(s, keycode & 0xff);
|
||||
} else {
|
||||
qemu_log_mask(LOG_UNIMP,
|
||||
"ps2: ignoring key with qcode %d\n", qcode);
|
||||
}
|
||||
}
|
||||
} else if (s->scancode_set == 3) {
|
||||
keycode = qcode_to_keycode_set3[qcode];
|
||||
if (keycode) {
|
||||
/* FIXME: break code should be configured on a key by key basis */
|
||||
if (!key->down) {
|
||||
ps2_put_keycode(s, 0xf0);
|
||||
}
|
||||
ps2_put_keycode(s, keycode);
|
||||
} else {
|
||||
qemu_log_mask(LOG_UNIMP,
|
||||
"ps2: ignoring key with qcode %d\n", qcode);
|
||||
}
|
||||
count = qemu_input_key_value_to_scancode(key->key,
|
||||
key->down,
|
||||
scancodes);
|
||||
for (i = 0; i < count; i++) {
|
||||
ps2_put_keycode(s, scancodes[i]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -779,19 +290,22 @@ void ps2_write_keyboard(void *opaque, int val)
|
||||
ps2_queue(&s->common, KBD_REPLY_POR);
|
||||
break;
|
||||
default:
|
||||
ps2_queue(&s->common, KBD_REPLY_RESEND);
|
||||
ps2_queue(&s->common, KBD_REPLY_ACK);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case KBD_CMD_SCANCODE:
|
||||
if (val == 0) {
|
||||
ps2_queue(&s->common, KBD_REPLY_ACK);
|
||||
ps2_put_keycode(s, s->scancode_set);
|
||||
} else if (val >= 1 && val <= 3) {
|
||||
s->scancode_set = val;
|
||||
ps2_queue(&s->common, KBD_REPLY_ACK);
|
||||
if (s->scancode_set == 1)
|
||||
ps2_put_keycode(s, 0x43);
|
||||
else if (s->scancode_set == 2)
|
||||
ps2_put_keycode(s, 0x41);
|
||||
else if (s->scancode_set == 3)
|
||||
ps2_put_keycode(s, 0x3f);
|
||||
} else {
|
||||
ps2_queue(&s->common, KBD_REPLY_RESEND);
|
||||
if (val >= 1 && val <= 3)
|
||||
s->scancode_set = val;
|
||||
ps2_queue(&s->common, KBD_REPLY_ACK);
|
||||
}
|
||||
s->common.write_cmd = -1;
|
||||
break;
|
||||
@@ -1176,23 +690,6 @@ static const VMStateDescription vmstate_ps2_keyboard_ledstate = {
|
||||
}
|
||||
};
|
||||
|
||||
static bool ps2_keyboard_need_high_bit_needed(void *opaque)
|
||||
{
|
||||
PS2KbdState *s = opaque;
|
||||
return s->need_high_bit != 0; /* 0 is the usual state */
|
||||
}
|
||||
|
||||
static const VMStateDescription vmstate_ps2_keyboard_need_high_bit = {
|
||||
.name = "ps2kbd/need_high_bit",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = ps2_keyboard_need_high_bit_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_BOOL(need_high_bit, PS2KbdState),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
};
|
||||
|
||||
static int ps2_kbd_post_load(void* opaque, int version_id)
|
||||
{
|
||||
PS2KbdState *s = (PS2KbdState*)opaque;
|
||||
@@ -1229,7 +726,6 @@ static const VMStateDescription vmstate_ps2_keyboard = {
|
||||
},
|
||||
.subsections = (const VMStateDescription*[]) {
|
||||
&vmstate_ps2_keyboard_ledstate,
|
||||
&vmstate_ps2_keyboard_need_high_bit,
|
||||
NULL
|
||||
}
|
||||
};
|
||||
|
||||
@@ -387,6 +387,7 @@ QemuConsole *qemu_console_lookup_by_device_name(const char *device_id,
|
||||
bool qemu_console_is_visible(QemuConsole *con);
|
||||
bool qemu_console_is_graphic(QemuConsole *con);
|
||||
bool qemu_console_is_fixedsize(QemuConsole *con);
|
||||
bool qemu_console_is_gl_blocked(QemuConsole *con);
|
||||
char *qemu_console_get_label(QemuConsole *con);
|
||||
int qemu_console_get_index(QemuConsole *con);
|
||||
uint32_t qemu_console_get_head(QemuConsole *con);
|
||||
|
||||
@@ -119,7 +119,10 @@ struct SimpleSpiceDisplay {
|
||||
/* opengl rendering */
|
||||
QEMUBH *gl_unblock_bh;
|
||||
QEMUTimer *gl_unblock_timer;
|
||||
int dmabuf_fd;
|
||||
ConsoleGLState *gls;
|
||||
int gl_updates;
|
||||
bool have_scanout;
|
||||
bool have_surface;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
22
ui/console.c
22
ui/console.c
@@ -123,6 +123,7 @@ struct QemuConsole {
|
||||
DisplaySurface *surface;
|
||||
int dcls;
|
||||
DisplayChangeListener *gl;
|
||||
bool gl_block;
|
||||
|
||||
/* Graphic console state. */
|
||||
Object *device;
|
||||
@@ -264,10 +265,10 @@ void graphic_hw_update(QemuConsole *con)
|
||||
|
||||
void graphic_hw_gl_block(QemuConsole *con, bool block)
|
||||
{
|
||||
if (!con) {
|
||||
con = active_console;
|
||||
}
|
||||
if (con && con->hw_ops->gl_block) {
|
||||
assert(con != NULL);
|
||||
|
||||
con->gl_block = block;
|
||||
if (con->hw_ops->gl_block) {
|
||||
con->hw_ops->gl_block(con->hw, block);
|
||||
}
|
||||
}
|
||||
@@ -1879,6 +1880,12 @@ bool qemu_console_is_fixedsize(QemuConsole *con)
|
||||
return con && (con->console_type != TEXT_CONSOLE);
|
||||
}
|
||||
|
||||
bool qemu_console_is_gl_blocked(QemuConsole *con)
|
||||
{
|
||||
assert(con != NULL);
|
||||
return con->gl_block;
|
||||
}
|
||||
|
||||
char *qemu_console_get_label(QemuConsole *con)
|
||||
{
|
||||
if (con->console_type == GRAPHIC_CONSOLE) {
|
||||
@@ -2101,6 +2108,13 @@ void qemu_console_resize(QemuConsole *s, int width, int height)
|
||||
DisplaySurface *surface;
|
||||
|
||||
assert(s->console_type == GRAPHIC_CONSOLE);
|
||||
|
||||
if (s->surface &&
|
||||
pixman_image_get_width(s->surface->image) == width &&
|
||||
pixman_image_get_height(s->surface->image) == height) {
|
||||
return;
|
||||
}
|
||||
|
||||
surface = qemu_create_displaysurface(width, height);
|
||||
dpy_gfx_replace_surface(s, surface);
|
||||
}
|
||||
|
||||
@@ -850,6 +850,74 @@ static void qemu_spice_gl_block_timer(void *opaque)
|
||||
fprintf(stderr, "WARNING: spice: no gl-draw-done within one second\n");
|
||||
}
|
||||
|
||||
static void spice_gl_refresh(DisplayChangeListener *dcl)
|
||||
{
|
||||
SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
|
||||
uint64_t cookie;
|
||||
|
||||
if (!ssd->ds || qemu_console_is_gl_blocked(ssd->dcl.con)) {
|
||||
return;
|
||||
}
|
||||
|
||||
graphic_hw_update(dcl->con);
|
||||
if (ssd->gl_updates && ssd->have_surface) {
|
||||
qemu_spice_gl_block(ssd, true);
|
||||
cookie = (uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_GL_DRAW_DONE, 0);
|
||||
spice_qxl_gl_draw_async(&ssd->qxl, 0, 0,
|
||||
surface_width(ssd->ds),
|
||||
surface_height(ssd->ds),
|
||||
cookie);
|
||||
ssd->gl_updates = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static void spice_gl_update(DisplayChangeListener *dcl,
|
||||
int x, int y, int w, int h)
|
||||
{
|
||||
SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
|
||||
|
||||
surface_gl_update_texture(ssd->gls, ssd->ds, x, y, w, h);
|
||||
ssd->gl_updates++;
|
||||
}
|
||||
|
||||
static void spice_gl_switch(DisplayChangeListener *dcl,
|
||||
struct DisplaySurface *new_surface)
|
||||
{
|
||||
SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
|
||||
EGLint stride, fourcc;
|
||||
int fd;
|
||||
|
||||
if (ssd->ds) {
|
||||
surface_gl_destroy_texture(ssd->gls, ssd->ds);
|
||||
}
|
||||
ssd->ds = new_surface;
|
||||
if (ssd->ds) {
|
||||
surface_gl_create_texture(ssd->gls, ssd->ds);
|
||||
fd = egl_get_fd_for_texture(ssd->ds->texture,
|
||||
&stride, &fourcc);
|
||||
if (fd < 0) {
|
||||
surface_gl_destroy_texture(ssd->gls, ssd->ds);
|
||||
return;
|
||||
}
|
||||
|
||||
dprint(1, "%s: %dx%d (stride %d/%d, fourcc 0x%x)\n", __func__,
|
||||
surface_width(ssd->ds), surface_height(ssd->ds),
|
||||
surface_stride(ssd->ds), stride, fourcc);
|
||||
|
||||
/* note: spice server will close the fd */
|
||||
spice_qxl_gl_scanout(&ssd->qxl, fd,
|
||||
surface_width(ssd->ds),
|
||||
surface_height(ssd->ds),
|
||||
stride, fourcc, false);
|
||||
ssd->have_surface = true;
|
||||
ssd->have_scanout = false;
|
||||
|
||||
qemu_spice_gl_monitor_config(ssd, 0, 0,
|
||||
surface_width(ssd->ds),
|
||||
surface_height(ssd->ds));
|
||||
}
|
||||
}
|
||||
|
||||
static QEMUGLContext qemu_spice_gl_create_context(DisplayChangeListener *dcl,
|
||||
QEMUGLParams *params)
|
||||
{
|
||||
@@ -887,6 +955,8 @@ static void qemu_spice_gl_scanout(DisplayChangeListener *dcl,
|
||||
/* note: spice server will close the fd */
|
||||
spice_qxl_gl_scanout(&ssd->qxl, fd, backing_width, backing_height,
|
||||
stride, fourcc, y_0_top);
|
||||
ssd->have_surface = false;
|
||||
ssd->have_scanout = (tex_id != 0);
|
||||
|
||||
qemu_spice_gl_monitor_config(ssd, x, y, w, h);
|
||||
}
|
||||
@@ -897,6 +967,10 @@ static void qemu_spice_gl_update(DisplayChangeListener *dcl,
|
||||
SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
|
||||
uint64_t cookie;
|
||||
|
||||
if (!ssd->have_scanout) {
|
||||
return;
|
||||
}
|
||||
|
||||
dprint(2, "%s: %dx%d+%d+%d\n", __func__, w, h, x, y);
|
||||
qemu_spice_gl_block(ssd, true);
|
||||
cookie = (uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_GL_DRAW_DONE, 0);
|
||||
@@ -904,13 +978,13 @@ static void qemu_spice_gl_update(DisplayChangeListener *dcl,
|
||||
}
|
||||
|
||||
static const DisplayChangeListenerOps display_listener_gl_ops = {
|
||||
.dpy_name = "spice-egl",
|
||||
.dpy_gfx_update = display_update,
|
||||
.dpy_gfx_switch = display_switch,
|
||||
.dpy_gfx_check_format = qemu_pixman_check_format,
|
||||
.dpy_refresh = display_refresh,
|
||||
.dpy_mouse_set = display_mouse_set,
|
||||
.dpy_cursor_define = display_mouse_define,
|
||||
.dpy_name = "spice-egl",
|
||||
.dpy_gfx_update = spice_gl_update,
|
||||
.dpy_gfx_switch = spice_gl_switch,
|
||||
.dpy_gfx_check_format = console_gl_check_format,
|
||||
.dpy_refresh = spice_gl_refresh,
|
||||
.dpy_mouse_set = display_mouse_set,
|
||||
.dpy_cursor_define = display_mouse_define,
|
||||
|
||||
.dpy_gl_ctx_create = qemu_spice_gl_create_context,
|
||||
.dpy_gl_ctx_destroy = qemu_egl_destroy_context,
|
||||
@@ -933,10 +1007,12 @@ static void qemu_spice_display_init_one(QemuConsole *con)
|
||||
#ifdef HAVE_SPICE_GL
|
||||
if (display_opengl) {
|
||||
ssd->dcl.ops = &display_listener_gl_ops;
|
||||
ssd->dmabuf_fd = -1;
|
||||
ssd->gl_unblock_bh = qemu_bh_new(qemu_spice_gl_unblock_bh, ssd);
|
||||
ssd->gl_unblock_timer = timer_new_ms(QEMU_CLOCK_REALTIME,
|
||||
qemu_spice_gl_block_timer, ssd);
|
||||
ssd->gls = console_gl_init_context();
|
||||
ssd->have_surface = false;
|
||||
ssd->have_scanout = false;
|
||||
}
|
||||
#endif
|
||||
ssd->dcl.con = con;
|
||||
|
||||
@@ -707,10 +707,8 @@ check_solid_tile32(VncState *vs, int x, int y, int w, int h,
|
||||
static bool check_solid_tile(VncState *vs, int x, int y, int w, int h,
|
||||
uint32_t* color, bool samecolor)
|
||||
{
|
||||
switch (VNC_SERVER_FB_BYTES) {
|
||||
case 4:
|
||||
return check_solid_tile32(vs, x, y, w, h, color, samecolor);
|
||||
}
|
||||
QEMU_BUILD_BUG_ON(VNC_SERVER_FB_BYTES != 4);
|
||||
return check_solid_tile32(vs, x, y, w, h, color, samecolor);
|
||||
}
|
||||
|
||||
static void find_best_solid_area(VncState *vs, int x, int y, int w, int h,
|
||||
|
||||
Reference in New Issue
Block a user