rework input handling, sdl2 support
Hi,
The input layer moves to a model modeled roughly after the linux event layer. It also uses qapi to create all the data types needed. First, because it is convinient to have all the support code generated, and also to make it easier to integrate with qmp some day.
Porting work has only be done on the UI side so far. Input device emulation is still to be done.
SDL2 consists of dave's original patch with a bunch of cleanups on top. Some of the cleanups depend on the new input layer code, thus the incremental patches are sprinkled all over the patch series for bisectability reasons.
Pull v2 fixes minor issues and adds missing sign-offs.
please pull,
Gerd
The following changes since commit 105a060188dc6fdd4551571a966514d1a5f6815a:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140220' into staging (2014-02-21 15:04:58 +0000)
are available in the git repository at:
git://git.kraxel.org/qemu tags/pull-input-2
for you to fetch changes up to 445b5bad4a72d6f62071a9e9756e2a54c0de0b34:
console: add QemuUIInfo (2014-02-24 10:42:12 +0100)
----------------------------------------------------------------
Rewrite input layer.
Add SDL2 support.
----------------------------------------------------------------
Dave Airlie (1):
ui/sdl2 : initial port to SDL 2.0 (v2.0)
Gerd Hoffmann (43):
sdl2: baum build fix
sdl2: remove text console logic
console: export QemuConsole index,width,height
input: rename file to legacy
input: qapi: define event types
input: qapi: add unmapped key
input: qapi: add pause key
input: add core bits of the new input layer
input: keyboard: add helper functions to core
input: keyboard: switch legacy handlers to new core
input: keyboard: switch qmp_send_key() to new core.
input: keyboard: switch gtk ui to new core
input: keyboard: switch sdl ui to new core
sdl2: switch keyboard handling to new core
input: keyboard: switch vnc ui to new core
input: keyboard: switch spice ui to new core
input: keyboard: switch curses ui to new core
input: mouse: add helpers functions to core
input: mouse: add graphic_rotate support
input: mouse: add qemu_input_is_absolute()
input: mouse: switch legacy handlers to new core
input: mouse: switch gtk ui to new core
input: mouse: switch sdl ui to new core
sdl2: switch mouse handling to new core
input: mouse: switch vnc ui to new core
input: mouse: switch spice ui to new core
input: mouse: switch monitor to new core
input: keyboard: switch cocoa ui to new core
input: mouse: switch cocoa ui to new core
input: trace events
input-legacy: remove kbd_put_keycode
input-legacy: remove kbd_mouse_has_absolute
input-legacy: remove kbd_mouse_is_absolute
input-legacy: remove kbd_mouse_event
input: move mouse mode notifier to new core
input: add input_mouse_mode tracepoint
sdl2: simplify keymap handling
sdl2: codestyle fixups
input: move qmp_query_mice to new core
input: move do_mouse_set to new core
input: remove index_from_keycode (no users)
console: add head to index to qemu consoles.
console: add QemuUIInfo
backends/baum.c | 4 +- configure | 23 +- hw/arm/musicpal.c | 2 +- hw/display/blizzard.c | 2 +- hw/display/cirrus_vga.c | 4 +- hw/display/exynos4210_fimd.c | 2 +- hw/display/g364fb.c | 2 +- hw/display/jazz_led.c | 2 +- hw/display/milkymist-vgafb.c | 2 +- hw/display/omap_lcdc.c | 2 +- hw/display/pl110.c | 2 +- hw/display/pxa2xx_lcd.c | 2 +- hw/display/qxl.c | 4 +- hw/display/sm501.c | 2 +- hw/display/ssd0303.c | 2 +- hw/display/ssd0323.c | 2 +- hw/display/tc6393xb.c | 2 +- hw/display/tcx.c | 4 +- hw/display/vga-isa-mm.c | 2 +- hw/display/vga-isa.c | 2 +- hw/display/vga-pci.c | 2 +- hw/display/vmware_vga.c | 2 +- hw/unicore32/puv3.c | 2 +- include/ui/console.h | 33 +- include/ui/input.h | 56 +++ monitor.c | 31 +- qapi-schema.json | 83 ++++- trace-events | 9 + ui/Makefile.objs | 6 +- ui/cocoa.m | 81 +++-- ui/console.c | 69 +++- ui/curses.c | 47 +-- ui/gtk.c | 77 ++-- ui/input-legacy.c | 453 +++++++++++++++++++++++ ui/input.c | 684 +++++++++++++---------------------- ui/sdl.c | 114 +++--- ui/sdl2-keymap.h | 266 ++++++++++++++ ui/sdl2.c | 829 +++++++++++++++++++++++++++++++++++++++++++ ui/sdl_keysym.h | 3 +- ui/spice-input.c | 84 +++-- ui/vnc.c | 71 ++-- ui/vnc.h | 1 + 42 files changed, 2331 insertions(+), 741 deletions(-) create mode 100644 include/ui/input.h create mode 100644 ui/input-legacy.c create mode 100644 ui/sdl2-keymap.h create mode 100644 ui/sdl2.c
PATCH 1/44 ui/sdl2 : initial port to SDL 2.0 (v2.0)
From: Dave Airlie <[email protected]>
I've ported the SDL1.2 code over, and rewritten it to use the SDL2 interface.
The biggest changes were in the input handling, where SDL2 has done a major overhaul, and I've had to include a generated translation file to get from SDL2 codes back to qemu compatible ones. I'm still not sure how the keyboard layout code works in qemu, so there may be further work if someone can point me a test case that works with SDL1.2 and doesn't with SDL2.
Some SDL env vars we used to set are no longer used by SDL2, Windows, OSX support is untested,
I don't think we can link to SDL1.2 and SDL2 at the same time, so I felt using --with-sdlabi=2.0 to select the new code should be fine, like how gtk does it.
v1.1: fix keys in text console
v1.2: fix shutdown, cleanups a bit of code, support ARGB cursor
v2.0: merge the SDL multihead patch into this, g_new the number of consoles needed, wrap DCL inside per-console structure.
--- configure | 23 +- ui/Makefile.objs | 4 +- ui/sdl.c | 3 + ui/sdl2.c | 981 +++++++++++++++++++++++++++++++++++++++++++ ui/sdl2_scancode_translate.h | 260 ++++++++++++ ui/sdl_keysym.h | 3 +- 6 files changed, 1267 insertions(+), 7 deletions(-) create mode 100644 ui/sdl2.c create mode 100644 ui/sdl2_scancode_translate.h
configure +19 -4
@@ -172,6 +172,7 @@ fdt="" netmap="no" pixman="" sdl="" +sdlabi="1.2" virtfs="" vnc="yes" sparse="no"
@@ -325,6 +326,7 @@ query_pkg_config() { } pkg_config=query_pkg_config sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}" +sdl2_config="${SDL2_CONFIG-${cross_prefix}sdl2-config}" # If the user hasn't specified ARFLAGS, default to 'rv', just as make does. ARFLAGS="${ARFLAGS-rv}"
@@ -731,6 +733,8 @@ for opt do ;; --enable-sdl) sdl="yes" ;; + --with-sdlabi=*) sdlabi="$optarg" + ;; --disable-qom-cast-debug) qom_cast_debug="no" ;; --enable-qom-cast-debug) qom_cast_debug="yes"
@@ -1143,6 +1147,7 @@ Advanced options (experts only): --disable-werror disable compilation abort on warning --disable-sdl disable SDL --enable-sdl enable SDL + --with-sdlabi select preferred SDL ABI 1.2 or 2.0 --disable-gtk disable gtk UI --enable-gtk enable gtk UI --disable-virtfs disable VirtFS
@@ -1804,12 +1809,22 @@ fi # Look for sdl configuration program (pkg-config or sdl-config). Try # sdl-config even without cross prefix, and favour pkg-config over sdl-config. -if test "`basename $sdl_config`" != sdl-config && ! has ${sdl_config}; then - sdl_config=sdl-config + +if test $sdlabi = "2.0"; then + sdl_config=$sdl2_config + sdlname=sdl2 + sdlconfigname=sdl2_config +else + sdlname=sdl + sdlconfigname=sdl_config +fi + +if test "`basename $sdl_config`" != $sdlconfigname && ! has ${sdl_config}; then + sdl_config=$sdlconfigname fi -if $pkg_config sdl --exists; then - sdlconfig="$pkg_config sdl" +if $pkg_config $sdlname --exists; then + sdlconfig="$pkg_config $sdlname" _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'` elif has ${sdl_config}; then sdlconfig="$sdl_config"
ui/Makefile.objs +2 -2
@@ -9,12 +9,12 @@ vnc-obj-y += vnc-jobs.o common-obj-y += keymaps.o console.o cursor.o input.o qemu-pixman.o common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o -common-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o +common-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o sdl2.o common-obj-$(CONFIG_COCOA) += cocoa.o common-obj-$(CONFIG_CURSES) += curses.o common-obj-$(CONFIG_VNC) += $(vnc-obj-y) common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o -$(obj)/sdl.o $(obj)/sdl_zoom.o: QEMU_CFLAGS += $(SDL_CFLAGS) +$(obj)/sdl.o $(obj)/sdl_zoom.o $(obj)/sdl2.o: QEMU_CFLAGS += $(SDL_CFLAGS) $(obj)/gtk.o: QEMU_CFLAGS += $(GTK_CFLAGS) $(VTE_CFLAGS)
ui/sdl.c +3 -0
@@ -26,6 +26,8 @@#undef WIN32_LEAN_AND_MEAN#include <SDL.h> + +#if SDL_MAJOR_VERSION ==1 #include <SDL_syswm.h> #include "qemu-common.h"
@@ -966,3 +968,4 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) atexit(sdl_cleanup); } +#endif
ui/sdl2.c new file +981 -0
981 lines not on this page · raw message
ui/sdl2_scancode_translate.h new file +260 -0
260 lines not on this page · raw message
ui/sdl_keysym.h +2 -1
@@ -200,6 +200,7 @@ static const name2keysym_t name2keysym[]={ { "yacute", 0x0fd}, { "thorn", 0x0fe}, { "ydiaeresis", 0x0ff}, +#if SDL_MAJOR_VERSION == 1 {"EuroSign", SDLK_EURO}, /* modifiers */
@@ -272,6 +273,6 @@ static const name2keysym_t name2keysym[]={ {"Num_Lock", SDLK_NUMLOCK}, {"Pause", SDLK_PAUSE}, {"Escape", SDLK_ESCAPE}, - +#endif {NULL, 0}, };
Signature · 1 line
1.8.3.1
PATCH 2/44 sdl2: baum build fix
In reply to Gerd Hoffmann--- backends/baum.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
backends/baum.c +2 -2
@@ -566,7 +566,7 @@ CharDriverState *chr_baum_init(void)BaumDriverState *baum;CharDriverState *chr;brlapi_handle_t *handle; -#ifdef CONFIG_SDL +#if defined(CONFIG_SDL ) &&SDL_COMPILEDVERSION <SDL_VERSIONNUM (2 ,0 ,0 )SDL_SysWMinfo info;#endif int tty;
@@ -595,7 +595,7 @@ CharDriverState *chr_baum_init(void) goto fail; } -#ifdef CONFIG_SDL +#if defined(CONFIG_SDL ) &&SDL_COMPILEDVERSION <SDL_VERSIONNUM (2 ,0 ,0 )memset (&info,0 ,sizeof (info));SDL_VERSION (&info.version);if (SDL_GetWMInfo (&info))
Signature · 1 line
1.8.3.1
PATCH 3/44 sdl2: remove text console logic
In reply to Gerd Hoffmannsdl2 explicitly binds windows to graphics consoles. No need to handle non-graphic consoles anywhere. Also console switching is pointless. Zap code.
--- ui/sdl2.c | 117 +++++--------------------------------------------------------- 1 file changed, 8 insertions(+), 109 deletions(-)
ui/sdl2.c +8 -109
@@ -345,7 +345,7 @@ static void sdl_show_cursor(void)if (!cursor_hide)return ; -if (!kbd_mouse_is_absolute () || !qemu_console_is_graphic (NULL )) { +if (!kbd_mouse_is_absolute ()) {SDL_ShowCursor (1 );if (guest_cursor && (gui_grab ||kbd_mouse_is_absolute () || absolute_enabled))
@@ -402,9 +402,7 @@ static void sdl_mouse_mode_change(Notifier *notify, void *data)if (kbd_mouse_is_absolute ()) {if (!absolute_enabled) { absolute_enabled =1 ; -if (qemu_console_is_graphic (NULL )) { -absolute_mouse_grab (&sdl2_console[0 ]); - } +absolute_mouse_grab (&sdl2_console[0 ]); } }else if (absolute_enabled) {if (!gui_fullscreen) {
@@ -495,7 +493,7 @@ static void toggle_full_screen(struct sdl2_console_state *scon) }else {do_sdl_resize (scon, width, height,0 ); } -if (!gui_saved_grab || !qemu_console_is_graphic (NULL )) { +if (!gui_saved_grab) {sdl_grab_end (scon); } }
@@ -535,26 +533,6 @@ static void handle_keydown(SDL_Event *ev) } gui_keysym =1 ;break ; - case 0x02 ... 0x0a: /* '1' to '9' keys */ -/* Reset the modifiers sent to the current console */ -reset_keys (); -console_select (keycode -0x02 ); - gui_keysym =1 ; -if (gui_fullscreen) { -break ; - } -if (!qemu_console_is_graphic (NULL )) { -/* release grab if going to a text console */ -if (gui_grab) { -sdl_grab_end (scon); - }else if (absolute_enabled) { -sdl_show_cursor (); - } - }else if (absolute_enabled) { -sdl_hide_cursor (); -absolute_mouse_grab (scon); - } -break ;case 0x1b :/* '+' */ case 0x35 :/* '-' */ if (!gui_fullscreen) {
@@ -575,79 +553,8 @@ static void handle_keydown(SDL_Event *ev)default :break ; } - }else if (!qemu_console_is_graphic (NULL )) { -int keysym = ev->key.keysym.sym; - -if (ev->key.keysym.mod & (KMOD_LCTRL |KMOD_RCTRL )) { -switch (ev->key.keysym.sym) { -case SDLK_UP : - keysym =QEMU_KEY_CTRL_UP ; -break ; -case SDLK_DOWN : - keysym =QEMU_KEY_CTRL_DOWN ; -break ; -case SDLK_LEFT : - keysym =QEMU_KEY_CTRL_LEFT ; -break ; -case SDLK_RIGHT : - keysym =QEMU_KEY_CTRL_RIGHT ; -break ; -case SDLK_HOME : - keysym =QEMU_KEY_CTRL_HOME ; -break ; -case SDLK_END : - keysym =QEMU_KEY_CTRL_END ; -break ; -case SDLK_PAGEUP : - keysym =QEMU_KEY_CTRL_PAGEUP ; -break ; -case SDLK_PAGEDOWN : - keysym =QEMU_KEY_CTRL_PAGEDOWN ; -break ; -default : -break ; - } - }else { -switch (ev->key.keysym.sym) { -case SDLK_UP : - keysym =QEMU_KEY_UP ; -break ; -case SDLK_DOWN : - keysym =QEMU_KEY_DOWN ; -break ; -case SDLK_LEFT : - keysym =QEMU_KEY_LEFT ; -break ; -case SDLK_RIGHT : - keysym =QEMU_KEY_RIGHT ; -break ; -case SDLK_HOME : - keysym =QEMU_KEY_HOME ; -break ; -case SDLK_END : - keysym =QEMU_KEY_END ; -break ; -case SDLK_PAGEUP : - keysym =QEMU_KEY_PAGEUP ; -break ; -case SDLK_PAGEDOWN : - keysym =QEMU_KEY_PAGEDOWN ; -break ; -case SDLK_BACKSPACE : - keysym =QEMU_KEY_BACKSPACE ; -break ; -case SDLK_DELETE : - keysym =QEMU_KEY_DELETE ; -break ; -default : -break ; - } - } -if (keysym) { -kbd_put_keysym (keysym); - } } -if (qemu_console_is_graphic (NULL ) && !gui_keysym) { +if (!gui_keysym) {sdl_process_key (&ev->key); } }
@@ -667,9 +574,7 @@ static void handle_keyup(SDL_Event *ev)if (gui_keysym ==0 ) {/* exit/enter grab if pressing Ctrl-Alt */ if (!gui_grab) { -if (qemu_console_is_graphic (NULL )) { -sdl_grab_start (scon); - } +sdl_grab_start (scon); }else if (!gui_fullscreen) {sdl_grab_end (scon); }
@@ -680,7 +585,7 @@ static void handle_keyup(SDL_Event *ev) } gui_keysym =0 ; } -if (qemu_console_is_graphic (NULL ) && !gui_keysym) { +if (!gui_keysym) {sdl_process_key (&ev->key); } }
@@ -690,8 +595,7 @@ static void handle_mousemotion(SDL_Event *ev)int max_x, max_y;struct sdl2_console_state *scon =get_scon_from_window (ev->key.windowID); -if (qemu_console_is_graphic (NULL ) && - (kbd_mouse_is_absolute () || absolute_enabled)) { +if (kbd_mouse_is_absolute () || absolute_enabled) {int scr_w, scr_h;SDL_GetWindowSize (scon->real_window, &scr_w, &scr_h); max_x = scr_w -1 ;
@@ -719,10 +623,6 @@ static void handle_mousebutton(SDL_Event *ev)struct sdl2_console_state *scon =get_scon_from_window (ev->key.windowID);int dz; -if (!qemu_console_is_graphic (NULL )) { -return ; - } - bev = &ev->button;if (!gui_grab && !kbd_mouse_is_absolute ()) {if (ev->type ==SDL_MOUSEBUTTONUP && bev->button ==SDL_BUTTON_LEFT ) {
@@ -766,8 +666,7 @@ static void handle_windowevent(DisplayChangeListener *dcl, SDL_Event *ev)break ;case SDL_WINDOWEVENT_FOCUS_GAINED :case SDL_WINDOWEVENT_ENTER : -if (!gui_grab &&qemu_console_is_graphic (NULL ) && - (kbd_mouse_is_absolute () || absolute_enabled)) { +if (!gui_grab && (kbd_mouse_is_absolute () || absolute_enabled)) {absolute_mouse_grab (scon); }break ;
Signature · 1 line
1.8.3.1
PATCH 4/44 console: export QemuConsole index, width, height
In reply to Gerd HoffmannAdd functions to query QemuConsole properties.
--- include/ui/console.h | 3 +++ ui/console.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+)
include/ui/console.h +3 -0
@@ -289,6 +289,9 @@ QemuConsole *qemu_console_lookup_by_device(DeviceState *dev);bool qemu_console_is_visible (QemuConsole *con);bool qemu_console_is_graphic (QemuConsole *con);bool qemu_console_is_fixedsize (QemuConsole *con); +int qemu_console_get_index (QemuConsole *con); +int qemu_console_get_width (QemuConsole *con,int fallback); +int qemu_console_get_height (QemuConsole *con,int fallback);void text_consoles_set_display (DisplayState *ds);void console_select (unsigned int index);
ui/console.c +24 -0
@@ -1641,6 +1641,30 @@ bool qemu_console_is_fixedsize(QemuConsole *con)return con && (con->console_type !=TEXT_CONSOLE ); } +int qemu_console_get_index (QemuConsole *con) +{ +if (con ==NULL ) { + con = active_console; + } +return con ? con->index :-1 ; +} + +int qemu_console_get_width (QemuConsole *con,int fallback) +{ +if (con ==NULL ) { + con = active_console; + } +return con ?surface_width (con->surface) : fallback; +} + +int qemu_console_get_height (QemuConsole *con,int fallback) +{ +if (con ==NULL ) { + con = active_console; + } +return con ?surface_height (con->surface) : fallback; +} +static void text_console_set_echo (CharDriverState *chr,bool echo) {QemuConsole *s = chr->opaque;
Signature · 1 line
1.8.3.1
PATCH 5/44 input: rename file to legacy
In reply to Gerd HoffmannRename ui/input.c to ui/input-legacy.c.
We are going to replace it step by step.
---
ui/Makefile.objs | 2 +-
ui/{input.c => input-legacy.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename ui/{input.c => input-legacy.c} (100%)ui/Makefile.objs +1 -1
@@ -7,7 +7,7 @@ vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o vnc-obj-$(CONFIG_VNC_WS) += vnc-ws.o vnc-obj-y += vnc-jobs.o -common-obj-y += keymaps.o console.o cursor.o input.o qemu-pixman.o +common-obj-y += keymaps.o console.o cursor.o input-legacy.o qemu-pixman.o common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o common-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o sdl2.o common-obj-$(CONFIG_COCOA) += cocoa.o
ui/input-legacy.c renamed from ui/input.c +0 -0
Signature · 1 line
1.8.3.1
PATCH 6/44 input: qapi: define event types
In reply to Gerd HoffmannDefine input event types, using qapi. So we get nicely autogenerated types for our input events. And when it comes to qmp support some day things will be a lot easier.
Types are modeled after the linux input layer. There are separate event types for each value. There is a sync to indicate the end of a event group.
Mouse events are split into motion events (one for each axis) and button events, which are grouped by sync.
Keyboard events are using the existing KeyValue type.
--- qapi-schema.json | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)
qapi-schema.json +76 -0
@@ -4500,3 +4500,79 @@ # Since: 1.7 ## { 'command': 'blockdev-add', 'data': { 'options': 'BlockdevOptions' } } + +## +# @InputButton +# +# Button of a pointer input device (mouse, tablet). +# +# Since: 2.0 +## +{ 'enum' : 'InputButton', + 'data' : [ 'Left', 'Middle', 'Right', 'WheelUp', 'WheelDown' ] } + +## +# @InputButton +# +# Position axis of a pointer input device (mouse, tablet). +# +# Since: 2.0 +## +{ 'enum' : 'InputAxis', + 'data' : [ 'X', 'Y' ] } + +## +# @InputKeyEvent +# +# Keyboard input event. +# +# @key: Which key this event is for. +# @down: True for key-down and false for key-up events. +# +# Since: 2.0 +## +{ 'type' : 'InputKeyEvent', + 'data' : { 'key' : 'KeyValue', + 'down' : 'bool' } } + +## +# @InputBtnEvent +# +# Pointer button input event. +# +# @button: Which button this event is for. +# @down: True for key-down and false for key-up events. +# +# Since: 2.0 +## +{ 'type' : 'InputBtnEvent', + 'data' : { 'button' : 'InputButton', + 'down' : 'bool' } } + +## +# @InputMoveEvent +# +# Pointer motion input event. +# +# @axis: Which axis is referenced by @value. +# @value: Pointer position. For absolute coordinates the +# valid range is 0 -> 0x7ffff +# +# Since: 2.0 +## +{ 'type' : 'InputMoveEvent', + 'data' : { 'axis' : 'InputAxis', + 'value' : 'int' } } + +## +# @InputEvent +# +# Input event union. +# +# Since: 2.0 +## +{ 'union' : 'InputEvent', + 'data' : { 'key' : 'InputKeyEvent', + 'btn' : 'InputBtnEvent', + 'rel' : 'InputMoveEvent', + 'abs' : 'InputMoveEvent' } }
Signature · 1 line
1.8.3.1
PATCH 7/44 input: qapi: add unmapped key
In reply to Gerd HoffmannSimplifies building something -> QkeyCode mapping tables. Uninitialized entries can easily identified then.
--- qapi-schema.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
qapi-schema.json +4 -1
@@ -3509,9 +3509,12 @@ # This is used by the send-key command. # # Since: 1.3.0 +# +# 'unmapped' since 2.0 ## { 'enum': 'QKeyCode', - 'data': [ 'shift', 'shift_r', 'alt', 'alt_r', 'altgr', 'altgr_r', 'ctrl', + 'data': [ 'unmapped', + 'shift', 'shift_r', 'alt', 'alt_r', 'altgr', 'altgr_r', 'ctrl', 'ctrl_r', 'menu', 'esc', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'minus', 'equal', 'backspace', 'tab', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', 'bracket_left', 'bracket_right',
Signature · 1 line
1.8.3.1
PATCH 8/44 input: qapi: add pause key
In reply to Gerd HoffmannIt's missing.
--- qapi-schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
qapi-schema.json +2 -2
@@ -3510,7 +3510,7 @@ # # Since: 1.3.0 # -# 'unmapped' since 2.0 +# 'unmapped' and 'pause' since 2.0 ## { 'enum': 'QKeyCode', 'data': [ 'unmapped',
@@ -3528,7 +3528,7 @@ 'kp_9', 'less', 'f11', 'f12', 'print', 'home', 'pgup', 'pgdn', 'end', 'left', 'up', 'down', 'right', 'insert', 'delete', 'stop', 'again', 'props', 'undo', 'front', 'copy', 'open', 'paste', 'find', 'cut', - 'lf', 'help', 'meta_l', 'meta_r', 'compose' ] } + 'lf', 'help', 'meta_l', 'meta_r', 'compose', 'pause' ] } ## # @KeyValue
Signature · 1 line
1.8.3.1
PATCH 9/44 input: add core bits of the new input layer
In reply to Gerd HoffmannRegister and unregister handlers.
Event dispatcher code.
--- include/ui/input.h | 32 +++++++++++++++++++++ ui/Makefile.objs | 2 +- ui/input.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 include/ui/input.h create mode 100644 ui/input.c
include/ui/input.h new file +32 -0
@@ -0,0 +1,32 @@ +#ifndef INPUT_H +#define INPUT_H + +#include "qapi-types.h" + +#define INPUT_EVENT_MASK_KEY (1<<INPUT_EVENT_KIND_KEY) +#define INPUT_EVENT_MASK_BTN (1<<INPUT_EVENT_KIND_BTN) +#define INPUT_EVENT_MASK_REL (1<<INPUT_EVENT_KIND_REL) +#define INPUT_EVENT_MASK_ABS (1<<INPUT_EVENT_KIND_ABS) + +typedef struct QemuInputHandler QemuInputHandler ; +typedef struct QemuInputHandlerState QemuInputHandlerState ; + +typedef void (*QemuInputHandlerEvent )(DeviceState *dev,QemuConsole *src, +InputEvent *evt); +typedef void (*QemuInputHandlerSync )(DeviceState *dev); + +struct QemuInputHandler { +const char *name; +uint32_t mask; +QemuInputHandlerEvent event; +QemuInputHandlerSync sync; +}; + +QemuInputHandlerState *qemu_input_handler_register (DeviceState *dev, +QemuInputHandler *handler); +void qemu_input_handler_activate (QemuInputHandlerState *s); +void qemu_input_handler_unregister (QemuInputHandlerState *s); +void qemu_input_event_send (QemuConsole *src,InputEvent *evt); +void qemu_input_event_sync (void ); + +#endif /* INPUT_H */
ui/Makefile.objs +1 -1
@@ -7,7 +7,7 @@ vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o vnc-obj-$(CONFIG_VNC_WS) += vnc-ws.o vnc-obj-y += vnc-jobs.o -common-obj-y += keymaps.o console.o cursor.o input-legacy.o qemu-pixman.o +common-obj-y += keymaps.o console.o cursor.o input.o input-legacy.o qemu-pixman.o common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o common-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o sdl2.o common-obj-$(CONFIG_COCOA) += cocoa.o
ui/input.c new file +83 -0
83 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 10/44 input: keyboard: add helper functions to core
In reply to Gerd HoffmannA bunch of helper functions to manage keyboard events, to make life simpler for the ui code when submitting keyboard events.
--- include/ui/input.h | 5 +++++ ui/input.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+)
include/ui/input.h +5 -0
@@ -29,4 +29,9 @@ void qemu_input_handler_unregister(QemuInputHandlerState *s);void qemu_input_event_send (QemuConsole *src,InputEvent *evt);void qemu_input_event_sync (void ); +InputEvent *qemu_input_event_new_key (KeyValue *key,bool down); +void qemu_input_event_send_key (QemuConsole *src,KeyValue *key,bool down); +void qemu_input_event_send_key_number (QemuConsole *src,int num,bool down); +void qemu_input_event_send_key_qcode (QemuConsole *src,QKeyCode q,bool down); +#endif /* INPUT_H */
ui/input.c +35 -0
@@ -81,3 +81,38 @@ void qemu_input_event_sync(void) s->events =0 ; } } + +InputEvent *qemu_input_event_new_key (KeyValue *key,bool down) +{ +InputEvent *evt =g_new0 (InputEvent,1 ); + evt->key =g_new0 (InputKeyEvent,1 ); + evt->kind =INPUT_EVENT_KIND_KEY ; + evt->key->key = key; + evt->key->down = down; +return evt; +} + +void qemu_input_event_send_key (QemuConsole *src,KeyValue *key,bool down) +{ +InputEvent *evt; + evt =qemu_input_event_new_key (key, down); +qemu_input_event_send (src, evt); +qemu_input_event_sync (); +qapi_free_InputEvent (evt); +} + +void qemu_input_event_send_key_number (QemuConsole *src,int num,bool down) +{ +KeyValue *key =g_new0 (KeyValue,1 ); + key->kind =KEY_VALUE_KIND_NUMBER ; + key->number = num; +qemu_input_event_send_key (src, key, down); +} + +void qemu_input_event_send_key_qcode (QemuConsole *src,QKeyCode q,bool down) +{ +KeyValue *key =g_new0 (KeyValue,1 ); + key->kind =KEY_VALUE_KIND_QCODE ; + key->qcode = q; +qemu_input_event_send_key (src, key, down); +}
Signature · 1 line
1.8.3.1
PATCH 11/44 input: keyboard: switch legacy handlers to new core
In reply to Gerd Hoffmannlegacy kbd event handlers are registered in the new core, so they receive events from the new input core code. keycode -> scancode translation needed here.
legacy kbd_put_keycode() sends events to the new core. scancode -> keycode translation needed here.
So with this patch the new input core is fully functional for keyboard events. New + legacy interfaces can be mixed in any way.
--- ui/input-legacy.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 56 insertions(+), 10 deletions(-)
ui/input-legacy.c +56 -10
@@ -29,6 +29,7 @@#include "qmp-commands.h" #include "qapi-types.h" #include "ui/keymaps.h" +#include "ui/input.h" struct QEMUPutMouseEntry {QEMUPutMouseEvent *qemu_put_mouse_event;
@@ -45,7 +46,7 @@ struct QEMUPutMouseEntry {struct QEMUPutKbdEntry {QEMUPutKBDEvent *put_kbd;void *opaque; -QTAILQ_ENTRY (QEMUPutKbdEntry) next; +QemuInputHandlerState *s; };struct QEMUPutLEDEntry {
@@ -56,8 +57,6 @@ struct QEMUPutLEDEntry { static QTAILQ_HEAD(, QEMUPutLEDEntry) led_handlers =QTAILQ_HEAD_INITIALIZER (led_handlers); -static QTAILQ_HEAD(, QEMUPutKbdEntry) kbd_handlers = -QTAILQ_HEAD_INITIALIZER (kbd_handlers); static QTAILQ_HEAD(, QEMUPutMouseEntry) mouse_handlers =QTAILQ_HEAD_INITIALIZER (mouse_handlers); static NotifierList mouse_mode_notifiers =
@@ -312,20 +311,56 @@ void qmp_send_key(KeyValueList *keys, bool has_hold_time, int64_t hold_time, muldiv64(get_ticks_per_sec(), hold_time, 1000)); } +static void legacy_kbd_event (DeviceState *dev,QemuConsole *src, +InputEvent *evt) +{ +QEMUPutKbdEntry *entry = (QEMUPutKbdEntry *)dev; +int keycode =keycode_from_keyvalue (evt->key->key); + +if (!entry || !entry->put_kbd) { +return ; + } +if (evt->key->key->kind ==KEY_VALUE_KIND_QCODE && + evt->key->key->qcode ==Q_KEY_CODE_PAUSE ) { +/* specific case */ +int v = evt->key->down ?0 :0x80 ; + entry->put_kbd (entry->opaque,0xe1 ); + entry->put_kbd (entry->opaque,0x1d | v); + entry->put_kbd (entry->opaque,0x45 | v); +return ; + } +if (keycode &SCANCODE_GREY ) { + entry->put_kbd (entry->opaque,SCANCODE_EMUL0 ); + keycode &= ~SCANCODE_GREY ; + } +if (!evt->key->down) { + keycode |=SCANCODE_UP ; + } + entry->put_kbd (entry->opaque, keycode); +} + +static QemuInputHandler legacy_kbd_handler = { + .name ="legacy-kbd" , + .mask =INPUT_EVENT_MASK_KEY , + .event = legacy_kbd_event, +}; +QEMUPutKbdEntry *qemu_add_kbd_event_handler (QEMUPutKBDEvent *func,void *opaque) {QEMUPutKbdEntry *entry; - entry =g_malloc0 (sizeof (QEMUPutKbdEntry)); + entry =g_new0 (QEMUPutKbdEntry,1 ); entry->put_kbd = func; entry->opaque = opaque; -QTAILQ_INSERT_HEAD (&kbd_handlers, entry, next); + entry->s =qemu_input_handler_register ((DeviceState *)entry, + &legacy_kbd_handler);return entry; }void qemu_remove_kbd_event_handler (QEMUPutKbdEntry *entry) { -QTAILQ_REMOVE (&kbd_handlers, entry, next); +qemu_input_handler_unregister (entry->s); +g_free (entry); }static void check_mode_change (void )
@@ -409,14 +444,25 @@ void qemu_remove_led_event_handler(QEMUPutLEDEntry *entry)void kbd_put_keycode (int keycode) { -QEMUPutKbdEntry *entry =QTAILQ_FIRST (&kbd_handlers); +static bool emul0; +bool up; -if (!runstate_is_running () && !runstate_check (RUN_STATE_SUSPENDED )) { +if (keycode ==SCANCODE_EMUL0 ) { + emul0 = true;return ; } -if (entry && entry->put_kbd) { - entry->put_kbd (entry->opaque, keycode); +if (keycode &SCANCODE_UP ) { + keycode &= ~SCANCODE_UP ; + up = true; + }else { + up = false; + } +if (emul0) { + keycode |=SCANCODE_GREY ; + emul0 = false; } + +qemu_input_event_send_key_number (NULL , keycode, !up); }void kbd_put_ledstate (int ledstate)
Signature · 1 line
1.8.3.1
PATCH 12/44 input: keyboard: switch qmp_send_key() to new core.
In reply to Gerd Hoffmann--- ui/input-legacy.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
ui/input-legacy.c +3 -8
@@ -260,10 +260,8 @@ static void free_keycodes(void)static void release_keys (void *opaque) {while (keycodes_size >0 ) { -if (keycodes[--keycodes_size] &SCANCODE_GREY ) { -kbd_put_keycode (SCANCODE_EMUL0 ); - } -kbd_put_keycode (keycodes[keycodes_size] |SCANCODE_UP ); +qemu_input_event_send_key_number (NULL , keycodes[--keycodes_size], + false); }free_keycodes ();
@@ -297,10 +295,7 @@ void qmp_send_key(KeyValueList *keys, bool has_hold_time, int64_t hold_time,return ; } -if (keycode &SCANCODE_GREY ) { -kbd_put_keycode (SCANCODE_EMUL0 ); - } -kbd_put_keycode (keycode &SCANCODE_KEYCODEMASK ); +qemu_input_event_send_key_number (NULL , keycode, true); keycodes =g_realloc (keycodes,sizeof (int ) * (keycodes_size +1 )); keycodes[keycodes_size++] = keycode;
Signature · 1 line
1.8.3.1
PATCH 13/44 input: keyboard: switch gtk ui to new core
In reply to Gerd Hoffmann--- ui/gtk.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
ui/gtk.c +4 -15
@@ -59,6 +59,7 @@#include "trace.h" #include "ui/console.h" +#include "ui/input.h" #include "sysemu/sysemu.h" #include "qmp-commands.h" #include "x_keymap.h"
@@ -280,10 +281,7 @@ static void gtk_release_modifiers(GtkDisplayState *s)if (!s->modifier_pressed[i]) {continue ; } -if (keycode &SCANCODE_GREY ) { -kbd_put_keycode (SCANCODE_EMUL0 ); - } -kbd_put_keycode (keycode |SCANCODE_UP ); +qemu_input_event_send_key_number (s->dcl.con, keycode, false); s->modifier_pressed[i] = false; } }
@@ -745,17 +743,8 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) } } -if (qemu_keycode &SCANCODE_GREY ) { -kbd_put_keycode (SCANCODE_EMUL0 ); - } - -if (key->type ==GDK_KEY_PRESS ) { -kbd_put_keycode (qemu_keycode &SCANCODE_KEYCODEMASK ); - }else if (key->type ==GDK_KEY_RELEASE ) { -kbd_put_keycode (qemu_keycode |SCANCODE_UP ); - }else { -g_assert_not_reached (); - } +qemu_input_event_send_key_number (s->dcl.con, qemu_keycode, + key->type ==GDK_KEY_PRESS );return TRUE; }
Signature · 1 line
1.8.3.1
PATCH 14/44 input: keyboard: switch sdl ui to new core
In reply to Gerd Hoffmann--- ui/sdl.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-)
ui/sdl.c +9 -18
@@ -32,6 +32,7 @@#include "qemu-common.h" #include "ui/console.h" +#include "ui/input.h" #include "sysemu/sysemu.h" #include "x_keymap.h" #include "sdl_zoom.h"
@@ -263,9 +264,7 @@ static void reset_keys(void)int i;for (i =0 ; i <256 ; i++) {if (modifiers_state[i]) { -if (i &SCANCODE_GREY ) -kbd_put_keycode (SCANCODE_EMUL0 ); -kbd_put_keycode (i |SCANCODE_UP ); +qemu_input_event_send_key_number (dcl->con, i, false); modifiers_state[i] =0 ; } }
@@ -273,16 +272,12 @@ static void reset_keys(void)static void sdl_process_key (SDL_KeyboardEvent *ev) { -int keycode, v; +int keycode;if (ev->keysym.sym ==SDLK_PAUSE ) {/* specific case */ - v =0 ; -if (ev->type ==SDL_KEYUP ) - v |=SCANCODE_UP ; -kbd_put_keycode (0xe1 ); -kbd_put_keycode (0x1d | v); -kbd_put_keycode (0x45 | v); +qemu_input_event_send_key_qcode (dcl->con,Q_KEY_CODE_PAUSE , + ev->type ==SDL_KEYDOWN );return ; }
@@ -314,19 +309,15 @@ static void sdl_process_key(SDL_KeyboardEvent *ev)case 0x45 :/* num lock */ case 0x3a :/* caps lock */ /* SDL does not send the key up event, so we generate it */ -kbd_put_keycode (keycode); -kbd_put_keycode (keycode |SCANCODE_UP ); +qemu_input_event_send_key_number (dcl->con, keycode, true); +qemu_input_event_send_key_number (dcl->con, keycode, false);return ;#endif }/* now send the key code */ -if (keycode &SCANCODE_GREY ) -kbd_put_keycode (SCANCODE_EMUL0 ); -if (ev->type ==SDL_KEYUP ) -kbd_put_keycode (keycode |SCANCODE_UP ); -else -kbd_put_keycode (keycode &SCANCODE_KEYCODEMASK ); +qemu_input_event_send_key_number (dcl->con, keycode, + ev->type ==SDL_KEYDOWN ); }static void sdl_update_caption (void )
Signature · 1 line
1.8.3.1
PATCH 15/44 sdl2: switch keyboard handling to new core
In reply to Gerd Hoffmann--- ui/sdl2.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
ui/sdl2.c +10 -13
@@ -33,6 +33,7 @@#include "qemu-common.h" #include "ui/console.h" +#include "ui/input.h" #include "sysemu/sysemu.h" #include "x_keymap.h" #include "sdl_zoom.h"
@@ -236,9 +237,7 @@ static void reset_keys(void)int i;for (i =0 ; i <256 ; i++) {if (modifiers_state[i]) { -if (i &SCANCODE_GREY ) -kbd_put_keycode (SCANCODE_EMUL0 ); -kbd_put_keycode (i |SCANCODE_UP ); +qemu_input_event_send_key_number (NULL , i, false); modifiers_state[i] =0 ; } }
@@ -246,11 +245,12 @@ static void reset_keys(void)static void sdl_process_key (SDL_KeyboardEvent *ev) { -int keycode, v; +int keycode; +#if 0 if (ev->keysym.sym ==SDLK_PAUSE ) {/* specific case */ - v =0 ; +int v =0 ;if (ev->type ==SDL_KEYUP ) v |=SCANCODE_UP ;kbd_put_keycode (0xe1 );
@@ -258,6 +258,7 @@ static void sdl_process_key(SDL_KeyboardEvent *ev)kbd_put_keycode (0x45 | v); return; } +#endif if (kbd_layout) { keycode =sdl_keyevent_to_keycode_generic (ev);
@@ -284,18 +285,14 @@ static void sdl_process_key(SDL_KeyboardEvent *ev)case 0x45 :/* num lock */ case 0x3a :/* caps lock */ /* SDL does not send the key up event, so we generate it */ -kbd_put_keycode (keycode); -kbd_put_keycode (keycode |SCANCODE_UP ); +qemu_input_event_send_key_number (NULL , keycode, true); +qemu_input_event_send_key_number (NULL , keycode, false);return ; }/* now send the key code */ -if (keycode &SCANCODE_GREY ) -kbd_put_keycode (SCANCODE_EMUL0 ); -if (ev->type ==SDL_KEYUP ) -kbd_put_keycode (keycode |SCANCODE_UP ); -else -kbd_put_keycode (keycode &SCANCODE_KEYCODEMASK ); +qemu_input_event_send_key_number (NULL , keycode, + ev->type ==SDL_KEYDOWN ); }static void sdl_update_caption (struct sdl2_console_state *scon)
Signature · 1 line
1.8.3.1
PATCH 16/44 input: keyboard: switch vnc ui to new core
In reply to Gerd Hoffmann--- ui/vnc.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-)
ui/vnc.c +6 -19
@@ -33,6 +33,7 @@#include "qapi/qmp/types.h" #include "qmp-commands.h" #include "qemu/osdep.h" +#include "ui/input.h" #define VNC_REFRESH_INTERVAL_BASE GUI_REFRESH_INTERVAL_DEFAULT#define VNC_REFRESH_INTERVAL_INC 50
@@ -1542,9 +1543,7 @@ static void reset_keys(VncState *vs)int i;for (i =0 ; i <256 ; i++) {if (vs->modifiers_state[i]) { -if (i &SCANCODE_GREY ) -kbd_put_keycode (SCANCODE_EMUL0 ); -kbd_put_keycode (i |SCANCODE_UP ); +qemu_input_event_send_key_number (vs->vd->dcl.con, i, false); vs->modifiers_state[i] =0 ; } }
@@ -1553,12 +1552,8 @@ static void reset_keys(VncState *vs)static void press_key (VncState *vs,int keysym) {int keycode =keysym2scancode (vs->vd->kbd_layout, keysym) &SCANCODE_KEYMASK ; -if (keycode &SCANCODE_GREY ) -kbd_put_keycode (SCANCODE_EMUL0 ); -kbd_put_keycode (keycode &SCANCODE_KEYCODEMASK ); -if (keycode &SCANCODE_GREY ) -kbd_put_keycode (SCANCODE_EMUL0 ); -kbd_put_keycode (keycode |SCANCODE_UP ); +qemu_input_event_send_key_number (vs->vd->dcl.con, keycode, true); +qemu_input_event_send_key_number (vs->vd->dcl.con, keycode, false); }static int current_led_state (VncState *vs)
@@ -1700,12 +1695,7 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym) }if (qemu_console_is_graphic (NULL )) { -if (keycode &SCANCODE_GREY ) -kbd_put_keycode (SCANCODE_EMUL0 ); -if (down) -kbd_put_keycode (keycode &SCANCODE_KEYCODEMASK ); -else -kbd_put_keycode (keycode |SCANCODE_UP ); +qemu_input_event_send_key_number (vs->vd->dcl.con, keycode, down); }else {bool numlock = vs->modifiers_state[0x45 ]; bool control = (vs->modifiers_state[0x1d] ||
@@ -1826,10 +1816,7 @@ static void vnc_release_modifiers(VncState *vs)if (!vs->modifiers_state[keycode]) {continue ; } -if (keycode &SCANCODE_GREY ) { -kbd_put_keycode (SCANCODE_EMUL0 ); - } -kbd_put_keycode (keycode |SCANCODE_UP ); +qemu_input_event_send_key_number (vs->vd->dcl.con, keycode, false); } }
Signature · 1 line
1.8.3.1
PATCH 17/44 input: keyboard: switch spice ui to new core
In reply to Gerd Hoffmann--- ui/spice-input.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
ui/spice-input.c +20 -2
@@ -26,12 +26,15 @@#include "qemu-common.h" #include "ui/qemu-spice.h" #include "ui/console.h" +#include "ui/keymaps.h" +#include "ui/input.h" /* keyboard bits */ typedef struct QemuSpiceKbd {SpiceKbdInstance sin;int ledstate; +bool emul0; }QemuSpiceKbd ;static void kbd_push_key (SpiceKbdInstance *sin,uint8_t frag);
@@ -47,9 +50,24 @@ static const SpiceKbdInterface kbd_interface = { .get_leds = kbd_get_leds, }; -static void kbd_push_key (SpiceKbdInstance *sin,uint8_t frag) +static void kbd_push_key (SpiceKbdInstance *sin,uint8_t scancode) { -kbd_put_keycode (frag); +QemuSpiceKbd *kbd =container_of (sin, QemuSpiceKbd, sin); +int keycode; +bool up; + +if (scancode ==SCANCODE_EMUL0 ) { + kbd->emul0 = true; +return ; + } + keycode = scancode & ~SCANCODE_UP ; + up = scancode &SCANCODE_UP ; +if (kbd->emul0) { + kbd->emul0 = false; + keycode |=SCANCODE_GREY ; + } + +qemu_input_event_send_key_number (NULL , keycode, !up); }static uint8_t kbd_get_leds (SpiceKbdInstance *sin)
Signature · 1 line
1.8.3.1
PATCH 18/44 input: keyboard: switch curses ui to new core
In reply to Gerd Hoffmann--- ui/curses.c | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-)
ui/curses.c +25 -22
@@ -30,6 +30,7 @@#include "qemu-common.h" #include "ui/console.h" +#include "ui/input.h" #include "sysemu/sysemu.h" #define FONT_HEIGHT 16
@@ -274,32 +275,34 @@ static void curses_refresh(DisplayChangeListener *dcl)if (qemu_console_is_graphic (NULL )) {/* since terminals don't know about key press and release * events, we need to emit both for each key received */ -if (keycode &SHIFT ) -kbd_put_keycode (SHIFT_CODE ); -if (keycode &CNTRL ) -kbd_put_keycode (CNTRL_CODE ); -if (keycode &ALT ) -kbd_put_keycode (ALT_CODE ); +if (keycode &SHIFT ) { +qemu_input_event_send_key_number (NULL ,SHIFT_CODE , true); + } +if (keycode &CNTRL ) { +qemu_input_event_send_key_number (NULL ,CNTRL_CODE , true); + } +if (keycode &ALT ) { +qemu_input_event_send_key_number (NULL ,ALT_CODE , true); + }if (keycode &ALTGR ) { -kbd_put_keycode (SCANCODE_EMUL0 ); -kbd_put_keycode (ALT_CODE ); +qemu_input_event_send_key_number (NULL ,GREY |ALT_CODE , true); } -if (keycode &GREY ) -kbd_put_keycode (GREY_CODE ); -kbd_put_keycode (keycode &KEY_MASK ); -if (keycode &GREY ) -kbd_put_keycode (GREY_CODE ); -kbd_put_keycode ((keycode &KEY_MASK ) |KEY_RELEASE ); + +qemu_input_event_send_key_number (NULL , keycode, true); +qemu_input_event_send_key_number (NULL , keycode, false); +if (keycode &ALTGR ) { -kbd_put_keycode (SCANCODE_EMUL0 ); -kbd_put_keycode (ALT_CODE |KEY_RELEASE ); +qemu_input_event_send_key_number (NULL ,GREY |ALT_CODE , false); + } +if (keycode &ALT ) { +qemu_input_event_send_key_number (NULL ,ALT_CODE , false); + } +if (keycode &CNTRL ) { +qemu_input_event_send_key_number (NULL ,CNTRL_CODE , false); + } +if (keycode &SHIFT ) { +qemu_input_event_send_key_number (NULL ,SHIFT_CODE , false); } -if (keycode &ALT ) -kbd_put_keycode (ALT_CODE |KEY_RELEASE ); -if (keycode &CNTRL ) -kbd_put_keycode (CNTRL_CODE |KEY_RELEASE ); -if (keycode &SHIFT ) -kbd_put_keycode (SHIFT_CODE |KEY_RELEASE ); }else { keysym = curses2qemu[chr];if (keysym ==-1 )
Signature · 1 line
1.8.3.1
PATCH 19/44 input: mouse: add helpers functions to core
In reply to Gerd HoffmannLikewise a bunch of helper functions to manage mouse button and movement events, again to make life easier for the ui code.
--- include/ui/input.h | 14 +++++++++++ ui/input.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+)
include/ui/input.h +14 -0
@@ -8,6 +8,8 @@#define INPUT_EVENT_MASK_REL (1<<INPUT_EVENT_KIND_REL)#define INPUT_EVENT_MASK_ABS (1<<INPUT_EVENT_KIND_ABS) +#define INPUT_EVENT_ABS_SIZE 0x8000 +typedef struct QemuInputHandler QemuInputHandler ;typedef struct QemuInputHandlerState QemuInputHandlerState ;
@@ -34,4 +36,16 @@ void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down);void qemu_input_event_send_key_number (QemuConsole *src,int num,bool down);void qemu_input_event_send_key_qcode (QemuConsole *src,QKeyCode q,bool down); +InputEvent *qemu_input_event_new_btn (InputButton btn,bool down); +void qemu_input_queue_btn (QemuConsole *src,InputButton btn,bool down); +void qemu_input_update_buttons (QemuConsole *src,uint32_t *button_map, +uint32_t button_old,uint32_t button_new); + +int qemu_input_scale_axis (int value,int size_in,int size_out); +InputEvent *qemu_input_event_new_move (InputEventKind kind, +InputAxis axis,int value); +void qemu_input_queue_rel (QemuConsole *src,InputAxis axis,int value); +void qemu_input_queue_abs (QemuConsole *src,InputAxis axis, +int value,int size); +#endif /* INPUT_H */
ui/input.c +71 -0
74 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 20/44 input: mouse: add graphic_rotate support
In reply to Gerd HoffmannTransform absolute mouse events according to graphic_rotate.
Legacy input code does it for both absolute and relative events, but the logic is broken for relative coordinates, so this is most likely not used anyway.
--- ui/input.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
ui/input.c +33 -0
@@ -50,6 +50,33 @@ qemu_input_find_handler(uint32_t mask)return NULL ; } +static void qemu_input_transform_abs_rotate (InputEvent *evt) +{ +switch (graphic_rotate) { +case 90 : +if (evt->abs->axis ==INPUT_AXIS_X ) { + evt->abs->axis =INPUT_AXIS_Y ; + } +if (evt->abs->axis ==INPUT_AXIS_Y ) { + evt->abs->axis =INPUT_AXIS_X ; + evt->abs->axis =INPUT_EVENT_ABS_SIZE -1 - evt->abs->axis; + } +break ; +case 180 : + evt->abs->axis =INPUT_EVENT_ABS_SIZE -1 - evt->abs->axis; +break ; +case 270 : +if (evt->abs->axis ==INPUT_AXIS_X ) { + evt->abs->axis =INPUT_AXIS_Y ; + evt->abs->axis =INPUT_EVENT_ABS_SIZE -1 - evt->abs->axis; + } +if (evt->abs->axis ==INPUT_AXIS_Y ) { + evt->abs->axis =INPUT_AXIS_X ; + } +break ; + } +} +void qemu_input_event_send (QemuConsole *src,InputEvent *evt) {QemuInputHandlerState *s;
@@ -58,6 +85,12 @@ void qemu_input_event_send(QemuConsole *src, InputEvent *evt)return ; } +/* pre processing */ +if (graphic_rotate && (evt->kind ==INPUT_EVENT_KIND_ABS )) { +qemu_input_transform_abs_rotate (evt); + } + +/* send event */ s =qemu_input_find_handler (1 << evt->kind); s->handler->event (s->dev, src, evt); s->events++;
Signature · 1 line
1.8.3.1
PATCH 21/44 input: mouse: add qemu_input_is_absolute()
In reply to Gerd HoffmannSame as kbd_mouse_is_absolute(), but using new input core.
--- include/ui/input.h | 1 + ui/input.c | 8 ++++++++ 2 files changed, 9 insertions(+)
include/ui/input.h +1 -0
@@ -41,6 +41,7 @@ void qemu_input_queue_btn(QemuConsole *src, InputButton btn, bool down);void qemu_input_update_buttons (QemuConsole *src,uint32_t *button_map,uint32_t button_old,uint32_t button_new); +bool qemu_input_is_absolute (void );int qemu_input_scale_axis (int value,int size_in,int size_out);InputEvent *qemu_input_event_new_move (InputEventKind kind,InputAxis axis,int value);
ui/input.c +8 -0
@@ -183,6 +183,14 @@ void qemu_input_update_buttons(QemuConsole *src, uint32_t *button_map, } } +bool qemu_input_is_absolute (void ) +{ +QemuInputHandlerState *s; + + s =qemu_input_find_handler (INPUT_EVENT_MASK_REL |INPUT_EVENT_MASK_ABS ); +return (s !=NULL ) && (s->handler->mask &INPUT_EVENT_MASK_ABS ); +} +int qemu_input_scale_axis (int value,int size_in,int size_out) {if (size_in <2 ) {
Signature · 1 line
1.8.3.1
PATCH 22/44 input: mouse: switch legacy handlers to new core
In reply to Gerd Hoffmannlegacy mouse event handlers are registered in the new core, so they receive events submitted to the new input core.
legacy kbd_mouse_event() continues to use the old code paths. So new-core event handlers wouldn't see events submitted via kbd_mouse_event.
This leads to the constrain that we we must transition all kbd_mouse_event() users first to keep things working. But that is easier to handle than translating legacy mouse events into new-core mouse events ;)
--- ui/input-legacy.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+)
ui/input-legacy.c +63 -0
@@ -41,6 +41,12 @@ struct QEMUPutMouseEntry {/* used internally by qemu for handling mice */ QTAILQ_ENTRY (QEMUPutMouseEntry) node; + +/* new input core */ +QemuInputHandler h; +QemuInputHandlerState *s; +int axis[INPUT_AXIS_MAX ]; +int buttons; };struct QEMUPutKbdEntry {
@@ -376,6 +382,51 @@ static void check_mode_change(void) current_has_absolute = has_absolute; } +static void legacy_mouse_event (DeviceState *dev,QemuConsole *src, +InputEvent *evt) +{ +static const int bmap[INPUT_BUTTON_MAX ] = { + [INPUT_BUTTON_LEFT ] =MOUSE_EVENT_LBUTTON , + [INPUT_BUTTON_MIDDLE ] =MOUSE_EVENT_MBUTTON , + [INPUT_BUTTON_RIGHT ] =MOUSE_EVENT_RBUTTON , + }; +QEMUPutMouseEntry *s = (QEMUPutMouseEntry *)dev; + +switch (evt->kind) { +case INPUT_EVENT_KIND_BTN : +if (evt->btn->down) { + s->buttons |= bmap[evt->btn->button]; + }else { + s->buttons &= ~bmap[evt->btn->button]; + } +break ; +case INPUT_EVENT_KIND_ABS : + s->axis[evt->abs->axis] = evt->abs->value; +break ; +case INPUT_EVENT_KIND_REL : + s->axis[evt->rel->axis] += evt->rel->value; +break ; +default : +break ; + } +} + +static void legacy_mouse_sync (DeviceState *dev) +{ +QEMUPutMouseEntry *s = (QEMUPutMouseEntry *)dev; + + s->qemu_put_mouse_event (s->qemu_put_mouse_event_opaque, + s->axis[INPUT_AXIS_X ], + s->axis[INPUT_AXIS_Y ], +0 , + s->buttons); + +if (!s->qemu_put_mouse_event_absolute) { + s->axis[INPUT_AXIS_X ] =0 ; + s->axis[INPUT_AXIS_Y ] =0 ; + } +} +QEMUPutMouseEntry *qemu_add_mouse_event_handler (QEMUPutMouseEvent *func,void *opaque,int absolute,const char *name)
@@ -393,6 +444,14 @@ QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func,QTAILQ_INSERT_TAIL (&mouse_handlers, s, node); + s->h.name = name; + s->h.mask =INPUT_EVENT_MASK_BTN | + (absolute ?INPUT_EVENT_MASK_ABS :INPUT_EVENT_MASK_REL ); + s->h.event = legacy_mouse_event; + s->h.sync = legacy_mouse_sync; + s->s =qemu_input_handler_register ((DeviceState *)s, + &s->h); +check_mode_change ();return s;
@@ -403,6 +462,8 @@ void qemu_activate_mouse_event_handler(QEMUPutMouseEntry *entry)QTAILQ_REMOVE (&mouse_handlers, entry, node);QTAILQ_INSERT_HEAD (&mouse_handlers, entry, node); +qemu_input_handler_activate (entry->s); +check_mode_change (); }
@@ -410,6 +471,8 @@ void qemu_remove_mouse_event_handler(QEMUPutMouseEntry *entry) {QTAILQ_REMOVE (&mouse_handlers, entry, node); +qemu_input_handler_unregister (entry->s); +g_free (entry->qemu_put_mouse_event_name);g_free (entry);
Signature · 1 line
1.8.3.1
PATCH 23/44 input: mouse: switch gtk ui to new core
In reply to Gerd Hoffmann--- ui/gtk.c | 58 +++++++++++++++++++--------------------------------------- 1 file changed, 19 insertions(+), 39 deletions(-)
ui/gtk.c +19 -39
@@ -194,7 +194,7 @@ static void gd_update_cursor(GtkDisplayState *s, gboolean override) on_vga =gd_on_vga (s);if ((override || on_vga) && - (s->full_screen ||kbd_mouse_is_absolute () ||gd_is_grab_active (s))) { + (s->full_screen ||qemu_input_is_absolute () ||gd_is_grab_active (s))) {gdk_window_set_cursor (window, s->null_cursor); }else {gdk_window_set_cursor (window,NULL );
@@ -580,7 +580,6 @@ static gboolean gd_motion_event(GtkWidget *widget, GdkEventMotion *motion, void *opaque) {GtkDisplayState *s = opaque; -int dx, dy;int x, y;int mx, my;int fbh, fbw;
@@ -608,25 +607,21 @@ static gboolean gd_motion_event(GtkWidget *widget, GdkEventMotion *motion,return TRUE; } -if (kbd_mouse_is_absolute ()) { - dx = x *0x7FFF / (surface_width (s->ds) -1 ); - dy = y *0x7FFF / (surface_height (s->ds) -1 ); - }else if (s->last_x ==-1 || s->last_y ==-1 ) { - dx =0 ; - dy =0 ; - }else { - dx = x - s->last_x; - dy = y - s->last_y; +if (qemu_input_is_absolute ()) { +qemu_input_queue_abs (s->dcl.con,INPUT_AXIS_X , x, +surface_width (s->ds)); +qemu_input_queue_abs (s->dcl.con,INPUT_AXIS_Y , y, +surface_height (s->ds)); +qemu_input_event_sync (); + }else if (s->last_x !=-1 && s->last_y !=-1 &&gd_is_grab_active (s)) { +qemu_input_queue_rel (s->dcl.con,INPUT_AXIS_X , x - s->last_x); +qemu_input_queue_rel (s->dcl.con,INPUT_AXIS_Y , y - s->last_y); +qemu_input_event_sync (); } - s->last_x = x; s->last_y = y; -if (kbd_mouse_is_absolute () ||gd_is_grab_active (s)) { -kbd_mouse_event (dx, dy,0 , s->button_mask); - } - -if (!kbd_mouse_is_absolute () &&gd_is_grab_active (s)) { +if (!qemu_input_is_absolute () &&gd_is_grab_active (s)) {GdkScreen *screen =gtk_widget_get_screen (s->drawing_area);int x = (int )motion->x_root;int y = (int )motion->y_root;
@@ -671,35 +666,20 @@ static gboolean gd_button_event(GtkWidget *widget, GdkEventButton *button, void *opaque) {GtkDisplayState *s = opaque; -int dx, dy; -int n; +InputButton btn;if (button->button ==1 ) { - n =0x01 ; + btn =INPUT_BUTTON_LEFT ; }else if (button->button ==2 ) { - n =0x04 ; + btn =INPUT_BUTTON_MIDDLE ; }else if (button->button ==3 ) { - n =0x02 ; - }else { - n =0x00 ; - } - -if (button->type ==GDK_BUTTON_PRESS ) { - s->button_mask |= n; - }else if (button->type ==GDK_BUTTON_RELEASE ) { - s->button_mask &= ~n; - } - -if (kbd_mouse_is_absolute ()) { - dx = s->last_x *0x7FFF / (surface_width (s->ds) -1 ); - dy = s->last_y *0x7FFF / (surface_height (s->ds) -1 ); + btn =INPUT_BUTTON_RIGHT ; }else { - dx =0 ; - dy =0 ; +return TRUE; } -kbd_mouse_event (dx, dy,0 , s->button_mask); - +qemu_input_queue_btn (s->dcl.con, btn, button->type ==GDK_BUTTON_PRESS ); +qemu_input_event_sync ();return TRUE; }
Signature · 1 line
1.8.3.1
PATCH 24/44 input: mouse: switch sdl ui to new core
In reply to Gerd Hoffmann--- ui/sdl.c | 84 ++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 39 insertions(+), 45 deletions(-)
ui/sdl.c +39 -45
@@ -353,7 +353,7 @@ static void sdl_hide_cursor(void)if (!cursor_hide)return ; -if (kbd_mouse_is_absolute ()) { +if (qemu_input_is_absolute ()) {SDL_ShowCursor (1 );SDL_SetCursor (sdl_cursor_hidden); }else {
@@ -366,10 +366,10 @@ static void sdl_show_cursor(void)if (!cursor_hide)return ; -if (!kbd_mouse_is_absolute () || !qemu_console_is_graphic (NULL )) { +if (!qemu_input_is_absolute () || !qemu_console_is_graphic (NULL )) {SDL_ShowCursor (1 );if (guest_cursor && - (gui_grab ||kbd_mouse_is_absolute () || absolute_enabled)) + (gui_grab ||qemu_input_is_absolute () || absolute_enabled))SDL_SetCursor (guest_sprite);else SDL_SetCursor (sdl_cursor_normal);
@@ -388,8 +388,9 @@ static void sdl_grab_start(void) }if (guest_cursor) {SDL_SetCursor (guest_sprite); -if (!kbd_mouse_is_absolute () && !absolute_enabled) +if (!qemu_input_is_absolute () && !absolute_enabled) {SDL_WarpMouse (guest_x, guest_y); + } }else sdl_hide_cursor ();SDL_WM_GrabInput (SDL_GRAB_ON );
@@ -418,7 +419,7 @@ static void absolute_mouse_grab(void)static void sdl_mouse_mode_change (Notifier *notify,void *data) { -if (kbd_mouse_is_absolute ()) { +if (qemu_input_is_absolute ()) {if (!absolute_enabled) { absolute_enabled =1 ;if (qemu_console_is_graphic (NULL )) {
@@ -433,33 +434,36 @@ static void sdl_mouse_mode_change(Notifier *notify, void *data) } } -static void sdl_send_mouse_event (int dx,int dy,int dz,int x,int y,int state) +static void sdl_send_mouse_event (int dx,int dy,int x,int y,int state) { -int buttons =0 ; - -if (state &SDL_BUTTON (SDL_BUTTON_LEFT )) { - buttons |=MOUSE_EVENT_LBUTTON ; - } -if (state &SDL_BUTTON (SDL_BUTTON_RIGHT )) { - buttons |=MOUSE_EVENT_RBUTTON ; - } -if (state &SDL_BUTTON (SDL_BUTTON_MIDDLE )) { - buttons |=MOUSE_EVENT_MBUTTON ; - } - -if (kbd_mouse_is_absolute ()) { - dx = x *0x7FFF / (real_screen->w -1 ); - dy = y *0x7FFF / (real_screen->h -1 ); +static uint32_t bmap[INPUT_BUTTON_MAX ] = { + [INPUT_BUTTON_LEFT ] =SDL_BUTTON (SDL_BUTTON_LEFT ), + [INPUT_BUTTON_MIDDLE ] =SDL_BUTTON (SDL_BUTTON_MIDDLE ), + [INPUT_BUTTON_RIGHT ] =SDL_BUTTON (SDL_BUTTON_RIGHT ), + [INPUT_BUTTON_WHEEL_UP ] =SDL_BUTTON (SDL_BUTTON_WHEELUP ), + [INPUT_BUTTON_WHEEL_DOWN ] =SDL_BUTTON (SDL_BUTTON_WHEELDOWN ), + }; +static uint32_t prev_state; + +if (prev_state != state) { +qemu_input_update_buttons (dcl->con, bmap, prev_state, state); + prev_state = state; + } + +if (qemu_input_is_absolute ()) { +qemu_input_queue_abs (dcl->con,INPUT_AXIS_X , x, + real_screen->w); +qemu_input_queue_abs (dcl->con,INPUT_AXIS_Y , y, + real_screen->h); }else if (guest_cursor) { x -= guest_x; y -= guest_y; guest_x += x; guest_y += y; - dx = x; - dy = y; +qemu_input_queue_rel (dcl->con,INPUT_AXIS_X , x); +qemu_input_queue_rel (dcl->con,INPUT_AXIS_Y , y); } - -kbd_mouse_event (dx, dy, dz, buttons); +qemu_input_event_sync (); }static void sdl_scale (int width,int height)
@@ -687,7 +691,7 @@ static void handle_mousemotion(SDL_Event *ev)int max_x, max_y;if (qemu_console_is_graphic (NULL ) && - (kbd_mouse_is_absolute () || absolute_enabled)) { + (qemu_input_is_absolute () || absolute_enabled)) { max_x = real_screen->w -1 ; max_y = real_screen->h -1 ; if (gui_grab && (ev->motion.x == 0 || ev->motion.y == 0 ||
@@ -700,8 +704,8 @@ static void handle_mousemotion(SDL_Event *ev)sdl_grab_start (); } } -if (gui_grab ||kbd_mouse_is_absolute () || absolute_enabled) { -sdl_send_mouse_event (ev->motion.xrel, ev->motion.yrel,0 , +if (gui_grab ||qemu_input_is_absolute () || absolute_enabled) { +sdl_send_mouse_event (ev->motion.xrel, ev->motion.yrel, ev->motion.x, ev->motion.y, ev->motion.state); } }
@@ -710,35 +714,24 @@ static void handle_mousebutton(SDL_Event *ev) {int buttonstate =SDL_GetMouseState (NULL ,NULL );SDL_MouseButtonEvent *bev; -int dz;if (!qemu_console_is_graphic (NULL )) {return ; } bev = &ev->button; -if (!gui_grab && !kbd_mouse_is_absolute ()) { +if (!gui_grab && !qemu_input_is_absolute ()) {if (ev->type ==SDL_MOUSEBUTTONUP && bev->button ==SDL_BUTTON_LEFT ) {/* start grabbing all events */ sdl_grab_start (); } }else { - dz =0 ;if (ev->type ==SDL_MOUSEBUTTONDOWN ) { buttonstate |=SDL_BUTTON (bev->button); }else { buttonstate &= ~SDL_BUTTON (bev->button); } -#ifdef SDL_BUTTON_WHEELUP -if (bev->button ==SDL_BUTTON_WHEELUP && - ev->type ==SDL_MOUSEBUTTONDOWN ) { - dz =-1 ; - }else if (bev->button ==SDL_BUTTON_WHEELDOWN && - ev->type ==SDL_MOUSEBUTTONDOWN ) { - dz =1 ; - } -#endif -sdl_send_mouse_event (0 ,0 , dz, bev->x, bev->y, buttonstate); +sdl_send_mouse_event (0 ,0 , bev->x, bev->y, buttonstate); } }
@@ -753,7 +746,7 @@ static void handle_activation(SDL_Event *ev) }#endif if (!gui_grab && ev->active.gain &&qemu_console_is_graphic (NULL ) && - (kbd_mouse_is_absolute () || absolute_enabled)) { + (qemu_input_is_absolute () || absolute_enabled)) {absolute_mouse_grab (); }if (ev->active.state &SDL_APPACTIVE ) {
@@ -825,10 +818,11 @@ static void sdl_mouse_warp(DisplayChangeListener *dcl,if (on) {if (!guest_cursor)sdl_show_cursor (); -if (gui_grab ||kbd_mouse_is_absolute () || absolute_enabled) { +if (gui_grab ||qemu_input_is_absolute () || absolute_enabled) {SDL_SetCursor (guest_sprite); -if (!kbd_mouse_is_absolute () && !absolute_enabled) +if (!qemu_input_is_absolute () && !absolute_enabled) {SDL_WarpMouse (x, y); + } } }else if (gui_grab)sdl_hide_cursor ();
@@ -856,7 +850,7 @@ static void sdl_mouse_define(DisplayChangeListener *dcl,g_free (mask);if (guest_cursor && - (gui_grab ||kbd_mouse_is_absolute () || absolute_enabled)) + (gui_grab ||qemu_input_is_absolute () || absolute_enabled))SDL_SetCursor (guest_sprite); }
Signature · 1 line
1.8.3.1
PATCH 25/44 sdl2: switch mouse handling to new core
In reply to Gerd Hoffmann--- ui/sdl2.c | 60 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 29 deletions(-)
ui/sdl2.c +31 -29
@@ -329,7 +329,7 @@ static void sdl_hide_cursor(void)if (!cursor_hide)return ; -if (kbd_mouse_is_absolute ()) { +if (qemu_input_is_absolute ()) {SDL_ShowCursor (1 );SDL_SetCursor (sdl_cursor_hidden); }else {
@@ -342,10 +342,10 @@ static void sdl_show_cursor(void)if (!cursor_hide)return ; -if (!kbd_mouse_is_absolute ()) { +if (!qemu_input_is_absolute ()) {SDL_ShowCursor (1 );if (guest_cursor && - (gui_grab ||kbd_mouse_is_absolute () || absolute_enabled)) + (gui_grab ||qemu_input_is_absolute () || absolute_enabled))SDL_SetCursor (guest_sprite);else SDL_SetCursor (sdl_cursor_normal);
@@ -364,7 +364,7 @@ static void sdl_grab_start(struct sdl2_console_state *scon) }if (guest_cursor) {SDL_SetCursor (guest_sprite); -if (!kbd_mouse_is_absolute () && !absolute_enabled) { +if (!qemu_input_is_absolute () && !absolute_enabled) {SDL_WarpMouseInWindow (scon->real_window, guest_x, guest_y); } }else
@@ -396,7 +396,7 @@ static void absolute_mouse_grab(struct sdl2_console_state *scon)static void sdl_mouse_mode_change (Notifier *notify,void *data) { -if (kbd_mouse_is_absolute ()) { +if (qemu_input_is_absolute ()) {if (!absolute_enabled) { absolute_enabled =1 ;absolute_mouse_grab (&sdl2_console[0 ]);
@@ -411,19 +411,23 @@ static void sdl_mouse_mode_change(Notifier *notify, void *data)static void sdl_send_mouse_event (struct sdl2_console_state *scon,int dx,int dy,int dz,int x,int y,int state) { -int buttons =0 ; +static uint32_t bmap[INPUT_BUTTON_MAX ] = { + [INPUT_BUTTON_LEFT ] =SDL_BUTTON (SDL_BUTTON_LEFT ), + [INPUT_BUTTON_MIDDLE ] =SDL_BUTTON (SDL_BUTTON_MIDDLE ), + [INPUT_BUTTON_RIGHT ] =SDL_BUTTON (SDL_BUTTON_RIGHT ), +#if 0 + [INPUT_BUTTON_WHEEL_UP ] =SDL_BUTTON (SDL_BUTTON_WHEELUP ), + [INPUT_BUTTON_WHEEL_DOWN ] =SDL_BUTTON (SDL_BUTTON_WHEELDOWN ), +#endif + }; +static uint32_t prev_state; -if (state &SDL_BUTTON (SDL_BUTTON_LEFT )) { - buttons |=MOUSE_EVENT_LBUTTON ; - } -if (state &SDL_BUTTON (SDL_BUTTON_RIGHT )) { - buttons |=MOUSE_EVENT_RBUTTON ; - } -if (state &SDL_BUTTON (SDL_BUTTON_MIDDLE )) { - buttons |=MOUSE_EVENT_MBUTTON ; +if (prev_state != state) { +qemu_input_update_buttons (scon->dcl.con, bmap, prev_state, state); + prev_state = state; } -if (kbd_mouse_is_absolute ()) { +if (qemu_input_is_absolute ()) {int scr_w, scr_h;int max_w =0 , max_h =0 ;int off_x =0 , off_y =0 ;
@@ -446,19 +450,17 @@ static void sdl_send_mouse_event(struct sdl2_console_state *scon, int dx, int dy } } } - - dx = (off_x + x) *0x7FFF / (max_w -1 ); - dy = (off_y + y) *0x7FFF / (max_h -1 ); +qemu_input_queue_abs (scon->dcl.con,INPUT_AXIS_X , off_x + x, max_w); +qemu_input_queue_abs (scon->dcl.con,INPUT_AXIS_Y , off_y + y, max_h); }else if (guest_cursor) { x -= guest_x; y -= guest_y; guest_x += x; guest_y += y; - dx = x; - dy = y; +qemu_input_queue_rel (scon->dcl.con,INPUT_AXIS_X , x); +qemu_input_queue_rel (scon->dcl.con,INPUT_AXIS_Y , y); } - -kbd_mouse_event (dx, dy, dz, buttons); +qemu_input_event_sync (); }static void sdl_scale (struct sdl2_console_state *scon,int width,int height)
@@ -592,7 +594,7 @@ static void handle_mousemotion(SDL_Event *ev)int max_x, max_y;struct sdl2_console_state *scon =get_scon_from_window (ev->key.windowID); -if (kbd_mouse_is_absolute () || absolute_enabled) { +if (qemu_input_is_absolute () || absolute_enabled) {int scr_w, scr_h;SDL_GetWindowSize (scon->real_window, &scr_w, &scr_h); max_x = scr_w -1 ;
@@ -607,7 +609,7 @@ static void handle_mousemotion(SDL_Event *ev)sdl_grab_start (scon); } } -if (gui_grab ||kbd_mouse_is_absolute () || absolute_enabled) { +if (gui_grab ||qemu_input_is_absolute () || absolute_enabled) {sdl_send_mouse_event (scon, ev->motion.xrel, ev->motion.yrel,0 , ev->motion.x, ev->motion.y, ev->motion.state); }
@@ -621,7 +623,7 @@ static void handle_mousebutton(SDL_Event *ev)int dz; bev = &ev->button; -if (!gui_grab && !kbd_mouse_is_absolute ()) { +if (!gui_grab && !qemu_input_is_absolute ()) {if (ev->type ==SDL_MOUSEBUTTONUP && bev->button ==SDL_BUTTON_LEFT ) {/* start grabbing all events */ sdl_grab_start (scon);
@@ -663,7 +665,7 @@ static void handle_windowevent(DisplayChangeListener *dcl, SDL_Event *ev)break ;case SDL_WINDOWEVENT_FOCUS_GAINED :case SDL_WINDOWEVENT_ENTER : -if (!gui_grab && (kbd_mouse_is_absolute () || absolute_enabled)) { +if (!gui_grab && (qemu_input_is_absolute () || absolute_enabled)) {absolute_mouse_grab (scon); }break ;
@@ -735,9 +737,9 @@ static void sdl_mouse_warp(DisplayChangeListener *dcl,if (on) {if (!guest_cursor)sdl_show_cursor (); -if (gui_grab ||kbd_mouse_is_absolute () || absolute_enabled) { +if (gui_grab ||qemu_input_is_absolute () || absolute_enabled) {SDL_SetCursor (guest_sprite); -if (!kbd_mouse_is_absolute () && !absolute_enabled) { +if (!qemu_input_is_absolute () && !absolute_enabled) {SDL_WarpMouseInWindow (scon->real_window, x, y); } }
@@ -772,7 +774,7 @@ static void sdl_mouse_define(DisplayChangeListener *dcl,return ; }if (guest_cursor && - (gui_grab ||kbd_mouse_is_absolute () || absolute_enabled)) + (gui_grab ||qemu_input_is_absolute () || absolute_enabled))SDL_SetCursor (guest_sprite); }
Signature · 1 line
1.8.3.1
PATCH 26/44 input: mouse: switch vnc ui to new core
In reply to Gerd Hoffmann--- ui/vnc.c | 46 ++++++++++++++++++++++------------------------ ui/vnc.h | 1 + 2 files changed, 23 insertions(+), 24 deletions(-)
ui/vnc.c +22 -24
@@ -1484,7 +1484,7 @@ static void client_cut_text(VncState *vs, size_t len, uint8_t *text)static void check_pointer_type_change (Notifier *notifier,void *data) {VncState *vs =container_of (notifier, VncState, mouse_mode_notifier); -int absolute =kbd_mouse_is_absolute (); +int absolute =qemu_input_is_absolute ();if (vnc_has_feature (vs,VNC_FEATURE_POINTER_TYPE_CHANGE ) && vs->absolute != absolute) {vnc_lock_output (vs);
@@ -1503,39 +1503,37 @@ static void check_pointer_type_change(Notifier *notifier, void *data)static void pointer_event (VncState *vs,int button_mask,int x,int y) { -int buttons =0 ; -int dz =0 ; +static uint32_t bmap[INPUT_BUTTON_MAX ] = { + [INPUT_BUTTON_LEFT ] =0x01 , + [INPUT_BUTTON_MIDDLE ] =0x02 , + [INPUT_BUTTON_RIGHT ] =0x04 , + [INPUT_BUTTON_WHEEL_UP ] =0x08 , + [INPUT_BUTTON_WHEEL_DOWN ] =0x10 , + }; +QemuConsole *con = vs->vd->dcl.con;int width =surface_width (vs->vd->ds);int height =surface_height (vs->vd->ds); -if (button_mask &0x01 ) - buttons |=MOUSE_EVENT_LBUTTON ; -if (button_mask &0x02 ) - buttons |=MOUSE_EVENT_MBUTTON ; -if (button_mask &0x04 ) - buttons |=MOUSE_EVENT_RBUTTON ; -if (button_mask &0x08 ) - dz =-1 ; -if (button_mask &0x10 ) - dz =1 ; +if (vs->last_bmask != button_mask) { +qemu_input_update_buttons (con, bmap, vs->last_bmask, button_mask); + vs->last_bmask = button_mask; + }if (vs->absolute) { -kbd_mouse_event (width >1 ? x *0x7FFF / (width -1 ) :0x4000 , - height >1 ? y *0x7FFF / (height -1 ) :0x4000 , - dz, buttons); +qemu_input_queue_abs (con,INPUT_AXIS_X , x, width); +qemu_input_queue_abs (con,INPUT_AXIS_Y , y, height); }else if (vnc_has_feature (vs,VNC_FEATURE_POINTER_TYPE_CHANGE )) { - x -=0x7FFF ; - y -=0x7FFF ; - -kbd_mouse_event (x, y, dz, buttons); +qemu_input_queue_rel (con,INPUT_AXIS_X , x -0x7FFF ); +qemu_input_queue_rel (con,INPUT_AXIS_Y , y -0x7FFF ); }else { -if (vs->last_x !=-1 ) -kbd_mouse_event (x - vs->last_x, - y - vs->last_y, - dz, buttons); +if (vs->last_x !=-1 ) { +qemu_input_queue_rel (con,INPUT_AXIS_X , x - vs->last_x); +qemu_input_queue_rel (con,INPUT_AXIS_Y , y - vs->last_y); + } vs->last_x = x; vs->last_y = y; } +qemu_input_event_sync (); }static void reset_keys (VncState *vs)
ui/vnc.h +1 -0
@@ -257,6 +257,7 @@ struct VncStateint absolute;int last_x;int last_y; +uint32_t last_bmask;int client_width;int client_height;VncShareMode share_mode;
Signature · 1 line
1.8.3.1
PATCH 27/44 input: mouse: switch spice ui to new core
In reply to Gerd Hoffmann--- ui/spice-input.c | 62 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 24 deletions(-)
ui/spice-input.c +38 -24
@@ -98,41 +98,52 @@ static void kbd_leds(void *opaque, int ledstate)typedef struct QemuSpicePointer {SpiceMouseInstance mouse;SpiceTabletInstance tablet; -int width, height, x, y; +int width, height; +uint32_t last_bmask;Notifier mouse_mode;bool absolute; }QemuSpicePointer ; -static int map_buttons (int spice_buttons) +static void spice_update_buttons (QemuSpicePointer *pointer, +int wheel,uint32_t button_mask) { -int qemu_buttons =0 ; - -/* -* Note: SPICE_MOUSE_BUTTON_* specifies the wire protocol but this -* isn't what we get passed in via interface callbacks for the -* middle and right button ... -*/ -if (spice_buttons &SPICE_MOUSE_BUTTON_MASK_LEFT ) { - qemu_buttons |=MOUSE_EVENT_LBUTTON ; +static uint32_t bmap[INPUT_BUTTON_MAX ] = { + [INPUT_BUTTON_LEFT ] =0x01 , + [INPUT_BUTTON_MIDDLE ] =0x04 , + [INPUT_BUTTON_RIGHT ] =0x02 , + [INPUT_BUTTON_WHEEL_UP ] =0x10 , + [INPUT_BUTTON_WHEEL_DOWN ] =0x20 , + }; + +if (wheel <0 ) { + button_mask |=0x10 ; } -if (spice_buttons &0x04 /* SPICE_MOUSE_BUTTON_MASK_MIDDLE */ ) { - qemu_buttons |=MOUSE_EVENT_MBUTTON ; +if (wheel >0 ) { + button_mask |=0x20 ; } -if (spice_buttons &0x02 /* SPICE_MOUSE_BUTTON_MASK_RIGHT */ ) { - qemu_buttons |=MOUSE_EVENT_RBUTTON ; + +if (pointer->last_bmask == button_mask) { +return ; } -return qemu_buttons; +qemu_input_update_buttons (NULL , bmap, pointer->last_bmask, button_mask); + pointer->last_bmask = button_mask; }static void mouse_motion (SpiceMouseInstance *sin,int dx,int dy,int dz,uint32_t buttons_state) { -kbd_mouse_event (dx, dy, dz,map_buttons (buttons_state)); +QemuSpicePointer *pointer =container_of (sin, QemuSpicePointer, mouse); +spice_update_buttons (pointer, dz, buttons_state); +qemu_input_queue_rel (NULL ,INPUT_AXIS_X , dx); +qemu_input_queue_rel (NULL ,INPUT_AXIS_Y , dy); +qemu_input_event_sync (); }static void mouse_buttons (SpiceMouseInstance *sin,uint32_t buttons_state) { -kbd_mouse_event (0 ,0 ,0 ,map_buttons (buttons_state)); +QemuSpicePointer *pointer =container_of (sin, QemuSpicePointer, mouse); +spice_update_buttons (pointer,0 , buttons_state); +qemu_input_event_sync (); }static const SpiceMouseInterface mouse_interface = {
@@ -163,9 +174,10 @@ static void tablet_position(SpiceTabletInstance* sin, int x, int y, {QemuSpicePointer *pointer =container_of (sin, QemuSpicePointer, tablet); - pointer->x = x *0x7FFF / (pointer->width -1 ); - pointer->y = y *0x7FFF / (pointer->height -1 ); -kbd_mouse_event (pointer->x, pointer->y,0 ,map_buttons (buttons_state)); +spice_update_buttons (pointer,0 , buttons_state); +qemu_input_queue_abs (NULL ,INPUT_AXIS_X , x, pointer->width); +qemu_input_queue_abs (NULL ,INPUT_AXIS_Y , y, pointer->width); +qemu_input_event_sync (); }
@@ -174,7 +186,8 @@ static void tablet_wheel(SpiceTabletInstance* sin, int wheel, {QemuSpicePointer *pointer =container_of (sin, QemuSpicePointer, tablet); -kbd_mouse_event (pointer->x, pointer->y, wheel,map_buttons (buttons_state)); +spice_update_buttons (pointer, wheel, buttons_state); +qemu_input_event_sync (); } static void tablet_buttons(SpiceTabletInstance *sin,
@@ -182,7 +195,8 @@ static void tablet_buttons(SpiceTabletInstance *sin, {QemuSpicePointer *pointer =container_of (sin, QemuSpicePointer, tablet); -kbd_mouse_event (pointer->x, pointer->y,0 ,map_buttons (buttons_state)); +spice_update_buttons (pointer,0 , buttons_state); +qemu_input_event_sync (); }static const SpiceTabletInterface tablet_interface = {
@@ -199,7 +213,7 @@ static const SpiceTabletInterface tablet_interface = {static void mouse_mode_notifier (Notifier *notifier,void *data) {QemuSpicePointer *pointer =container_of (notifier, QemuSpicePointer, mouse_mode); -bool is_absolute =kbd_mouse_is_absolute (); +bool is_absolute =qemu_input_is_absolute ();if (pointer->absolute == is_absolute) {return ;
Signature · 1 line
1.8.3.1
PATCH 28/44 input: mouse: switch monitor to new core
In reply to Gerd Hoffmann--- monitor.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-)
monitor.c +26 -5
@@ -39,6 +39,7 @@#include "monitor/monitor.h" #include "qemu/readline.h" #include "ui/console.h" +#include "ui/input.h" #include "sysemu/blockdev.h" #include "audio/audio.h" #include "disas/disas.h"
@@ -1458,23 +1459,43 @@ static int mouse_button_state;static void do_mouse_move (Monitor *mon,const QDict *qdict) { -int dx, dy, dz; +int dx, dy, dz, button;const char *dx_str =qdict_get_str (qdict,"dx_str" );const char *dy_str =qdict_get_str (qdict,"dy_str" );const char *dz_str =qdict_get_try_str (qdict,"dz_str" ); + dx =strtol (dx_str,NULL ,0 ); dy =strtol (dy_str,NULL ,0 ); - dz =0 ; -if (dz_str) +qemu_input_queue_rel (NULL ,INPUT_AXIS_X , dx); +qemu_input_queue_rel (NULL ,INPUT_AXIS_Y , dy); + +if (dz_str) { dz =strtol (dz_str,NULL ,0 ); -kbd_mouse_event (dx, dy, dz, mouse_button_state); +if (dz !=0 ) { + button = (dz >0 ) ?INPUT_BUTTON_WHEEL_UP :INPUT_BUTTON_WHEEL_DOWN ; +qemu_input_queue_btn (NULL , button, true); +qemu_input_event_sync (); +qemu_input_queue_btn (NULL , button, false); + } + } +qemu_input_event_sync (); }static void do_mouse_button (Monitor *mon,const QDict *qdict) { +static uint32_t bmap[INPUT_BUTTON_MAX ] = { + [INPUT_BUTTON_LEFT ] =MOUSE_EVENT_LBUTTON , + [INPUT_BUTTON_MIDDLE ] =MOUSE_EVENT_MBUTTON , + [INPUT_BUTTON_RIGHT ] =MOUSE_EVENT_RBUTTON , + };int button_state =qdict_get_int (qdict,"button_state" ); + +if (mouse_button_state == button_state) { +return ; + } +qemu_input_update_buttons (NULL , bmap, mouse_button_state, button_state); +qemu_input_event_sync (); mouse_button_state = button_state; -kbd_mouse_event (0 ,0 ,0 , mouse_button_state); }static void do_ioport_read (Monitor *mon,const QDict *qdict)
Signature · 1 line
1.8.3.1
PATCH 29/44 input: keyboard: switch cocoa ui to new core
In reply to Gerd Hoffmann--- ui/cocoa.m | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
ui/cocoa.m +6 -12
@@ -514,16 +514,14 @@ QemuCocoaView *cocoaView; if (keycode) { if (keycode == 58 || keycode == 69) { // emulate caps lock and num lock keydown and keyup - kbd_put_keycode(keycode); - kbd_put_keycode(keycode | 0x80); + qemu_input_event_send_key_number(dcl->con, keycode, true); + qemu_input_event_send_key_number(dcl->con, keycode, false); } else if (qemu_console_is_graphic(NULL)) { - if (keycode & 0x80) - kbd_put_keycode(0xe0); if (modifiers_state[keycode] == 0) { // keydown - kbd_put_keycode(keycode & 0x7f); + qemu_input_event_send_key_number(dcl->con, keycode, true); modifiers_state[keycode] = 1; } else { // keyup - kbd_put_keycode(keycode | 0x80); + qemu_input_event_send_key_number(dcl->con, keycode, false); modifiers_state[keycode] = 0; } }
@@ -557,9 +555,7 @@ QemuCocoaView *cocoaView; // handle keys for graphic console } else if (qemu_console_is_graphic(NULL)) { - if (keycode & 0x80) //check bit for e0 in front - kbd_put_keycode(0xe0); - kbd_put_keycode(keycode & 0x7f); //remove e0 bit in front + qemu_input_event_send_key_number(dcl->con, keycode, true); // handlekeys for Monitor } else {
@@ -607,9 +603,7 @@ QemuCocoaView *cocoaView; } if (qemu_console_is_graphic(NULL)) { - if (keycode & 0x80) - kbd_put_keycode(0xe0); - kbd_put_keycode(keycode | 0x80); //add 128 to signal release of key + qemu_input_event_send_key_number(dcl->con, keycode, false); } break; case NSMouseMoved:
Signature · 1 line
1.8.3.1
PATCH 30/44 input: mouse: switch cocoa ui to new core
In reply to Gerd HoffmannBuild fixes by Peter Maydell.
--- include/ui/console.h | 2 ++ ui/cocoa.m | 63 ++++++++++++++++++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 21 deletions(-)
include/ui/console.h +2 -0
@@ -14,6 +14,8 @@#define MOUSE_EVENT_LBUTTON 0x01#define MOUSE_EVENT_RBUTTON 0x02#define MOUSE_EVENT_MBUTTON 0x04 +#define MOUSE_EVENT_WHEELUP 0x08 +#define MOUSE_EVENT_WHEELDN 0x10/* identical to the ps/2 keyboard bits */ #define QEMU_SCROLL_LOCK_LED (1 << 0)
ui/cocoa.m +42 -21
146 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH 30/44] input: mouse: switch cocoa ui to new core
Hi Gerd,
If this is a v2 of your PULL, please update your scripts to label the patches "PULL" rather than "PATCH", as requested by mst. This is to avoid confusion as to whether patches should still be reviewed or not.
Thanks,
Andreas
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
PATCH 31/44 input: trace events
In reply to Gerd Hoffmann--- trace-events | 8 ++++++++ ui/input.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+)
trace-events +8 -0
@@ -1020,6 +1020,14 @@ gd_switch(int width, int height) "width=%d, height=%d" gd_update(int x, int y, int w, int h) "x=%d, y=%d, w=%d, h=%d" gd_key_event(int gdk_keycode, int qemu_keycode, const char *action) "translated GDK keycode %d to QEMU keycode %d (%s)" +# ui/input.c +input_event_key_number(int conidx, int number, bool down) "con %d, key number 0x%d, down %d" +input_event_key_qcode(int conidx, const char *qcode, bool down) "con %d, key qcode %s, down %d" +input_event_btn(int conidx, const char *btn, bool down) "con %d, button %s, down %d" +input_event_rel(int conidx, const char *axis, int value) "con %d, axis %s, value %d" +input_event_abs(int conidx, const char *axis, int value) "con %d, axis %s, value 0x%x" +input_event_sync(void) "" + # hw/display/vmware_vga.c vmware_value_read(uint32_t index, uint32_t value) "index %d, value 0x%x" vmware_value_write(uint32_t index, uint32_t value) "index %d, value 0x%x"
ui/input.c +48 -0
72 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 32/44 input-legacy: remove kbd_put_keycode
In reply to Gerd Hoffmann--- include/ui/console.h | 1 - ui/input-legacy.c | 23 ----------------------- 2 files changed, 24 deletions(-)
include/ui/console.h +0 -1
@@ -46,7 +46,6 @@ void qemu_activate_mouse_event_handler(QEMUPutMouseEntry *entry);QEMUPutLEDEntry *qemu_add_led_event_handler (QEMUPutLEDEvent *func,void *opaque);void qemu_remove_led_event_handler (QEMUPutLEDEntry *entry); -void kbd_put_keycode (int keycode);void kbd_put_ledstate (int ledstate);void kbd_mouse_event (int dx,int dy,int dz,int buttons_state);
ui/input-legacy.c +0 -23
@@ -500,29 +500,6 @@ void qemu_remove_led_event_handler(QEMUPutLEDEntry *entry)g_free (entry); } -void kbd_put_keycode (int keycode) -{ -static bool emul0; -bool up; - -if (keycode ==SCANCODE_EMUL0 ) { - emul0 = true; -return ; - } -if (keycode &SCANCODE_UP ) { - keycode &= ~SCANCODE_UP ; - up = true; - }else { - up = false; - } -if (emul0) { - keycode |=SCANCODE_GREY ; - emul0 = false; - } - -qemu_input_event_send_key_number (NULL , keycode, !up); -} -void kbd_put_ledstate (int ledstate) {QEMUPutLEDEntry *cursor;
Signature · 1 line
1.8.3.1
PATCH 33/44 input-legacy: remove kbd_mouse_has_absolute
In reply to Gerd Hoffmann--- include/ui/console.h | 3 --- ui/input-legacy.c | 21 ++------------------- 2 files changed, 2 insertions(+), 22 deletions(-)
include/ui/console.h +0 -3
@@ -54,9 +54,6 @@ int kbd_mouse_is_absolute(void);void qemu_add_mouse_mode_change_notifier (Notifier *notify);void qemu_remove_mouse_mode_change_notifier (Notifier *notify); -/* Of all the mice, is there one that generates absolute events */ -int kbd_mouse_has_absolute (void ); -struct MouseTransformInfo {/* Touchscreen resolution */ int x;
ui/input-legacy.c +2 -19
@@ -366,20 +366,16 @@ void qemu_remove_kbd_event_handler(QEMUPutKbdEntry *entry)static void check_mode_change (void ) { -static int current_is_absolute, current_has_absolute; +static int current_is_absolute;int is_absolute; -int has_absolute; is_absolute =kbd_mouse_is_absolute (); - has_absolute =kbd_mouse_has_absolute (); -if (is_absolute != current_is_absolute || - has_absolute != current_has_absolute) { +if (is_absolute != current_is_absolute) {notifier_list_notify (&mouse_mode_notifiers,NULL ); } current_is_absolute = is_absolute; - current_has_absolute = has_absolute; } static void legacy_mouse_event(DeviceState *dev, QemuConsole *src,
@@ -567,19 +563,6 @@ int kbd_mouse_is_absolute(void)return QTAILQ_FIRST (&mouse_handlers)->qemu_put_mouse_event_absolute; } -int kbd_mouse_has_absolute (void ) -{ -QEMUPutMouseEntry *entry; - - QTAILQ_FOREACH(entry, &mouse_handlers, node) { -if (entry->qemu_put_mouse_event_absolute) { -return 1 ; - } - } - -return 0 ; -} -MouseInfoList *qmp_query_mice (Error **errp) {MouseInfoList *mice_list =NULL ;
Signature · 1 line
1.8.3.1
PATCH 34/44 input-legacy: remove kbd_mouse_is_absolute
In reply to Gerd Hoffmann--- include/ui/console.h | 1 - ui/input-legacy.c | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-)
include/ui/console.h +0 -1
@@ -50,7 +50,6 @@ void kbd_put_ledstate(int ledstate);void kbd_mouse_event (int dx,int dy,int dz,int buttons_state);/* Does the current mouse generate absolute events */ -int kbd_mouse_is_absolute (void );void qemu_add_mouse_mode_change_notifier (Notifier *notify);void qemu_remove_mouse_mode_change_notifier (Notifier *notify);
ui/input-legacy.c +1 -10
@@ -369,7 +369,7 @@ static void check_mode_change(void)static int current_is_absolute;int is_absolute; - is_absolute =kbd_mouse_is_absolute (); + is_absolute =qemu_input_is_absolute ();if (is_absolute != current_is_absolute) {notifier_list_notify (&mouse_mode_notifiers,NULL );
@@ -554,15 +554,6 @@ void kbd_mouse_event(int dx, int dy, int dz, int buttons_state) } } -int kbd_mouse_is_absolute (void ) -{ -if (QTAILQ_EMPTY (&mouse_handlers)) { -return 0 ; - } - -return QTAILQ_FIRST (&mouse_handlers)->qemu_put_mouse_event_absolute; -} -MouseInfoList *qmp_query_mice (Error **errp) {MouseInfoList *mice_list =NULL ;
Signature · 1 line
1.8.3.1
PATCH 35/44 input-legacy: remove kbd_mouse_event
In reply to Gerd Hoffmann--- include/ui/console.h | 1 - ui/input-legacy.c | 49 ------------------------------------------------- 2 files changed, 50 deletions(-)
include/ui/console.h +0 -1
@@ -47,7 +47,6 @@ QEMUPutLEDEntry *qemu_add_led_event_handler(QEMUPutLEDEvent *func, void *opaque)void qemu_remove_led_event_handler (QEMUPutLEDEntry *entry);void kbd_put_ledstate (int ledstate); -void kbd_mouse_event (int dx,int dy,int dz,int buttons_state);/* Does the current mouse generate absolute events */ void qemu_add_mouse_mode_change_notifier (Notifier *notify);
ui/input-legacy.c +0 -49
55 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 36/44 input: move mouse mode notifier to new core
In reply to Gerd Hoffmann--- include/ui/console.h | 4 ---- include/ui/input.h | 4 ++++ ui/input-legacy.c | 34 +--------------------------------- ui/input.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 37 deletions(-)
include/ui/console.h +0 -4
@@ -48,10 +48,6 @@ void qemu_remove_led_event_handler(QEMUPutLEDEntry *entry);void kbd_put_ledstate (int ledstate); -/* Does the current mouse generate absolute events */ -void qemu_add_mouse_mode_change_notifier (Notifier *notify); -void qemu_remove_mouse_mode_change_notifier (Notifier *notify); -struct MouseTransformInfo {/* Touchscreen resolution */ int x;
include/ui/input.h +4 -0
@@ -49,4 +49,8 @@ void qemu_input_queue_rel(QemuConsole *src, InputAxis axis, int value);void qemu_input_queue_abs (QemuConsole *src,InputAxis axis,int value,int size); +void qemu_input_check_mode_change (void ); +void qemu_add_mouse_mode_change_notifier (Notifier *notify); +void qemu_remove_mouse_mode_change_notifier (Notifier *notify); +#endif /* INPUT_H */
ui/input-legacy.c +1 -33
@@ -65,8 +65,6 @@ static QTAILQ_HEAD(, QEMUPutLEDEntry) led_handlers =QTAILQ_HEAD_INITIALIZER (led_handlers); static QTAILQ_HEAD(, QEMUPutMouseEntry) mouse_handlers =QTAILQ_HEAD_INITIALIZER (mouse_handlers); -static NotifierList mouse_mode_notifiers = -NOTIFIER_LIST_INITIALIZER (mouse_mode_notifiers);static const int key_defs[] = { [Q_KEY_CODE_SHIFT ] =0x2a ,
@@ -364,20 +362,6 @@ void qemu_remove_kbd_event_handler(QEMUPutKbdEntry *entry)g_free (entry); } -static void check_mode_change (void ) -{ -static int current_is_absolute; -int is_absolute; - - is_absolute =qemu_input_is_absolute (); - -if (is_absolute != current_is_absolute) { -notifier_list_notify (&mouse_mode_notifiers,NULL ); - } - - current_is_absolute = is_absolute; -} -static void legacy_mouse_event (DeviceState *dev,QemuConsole *src,InputEvent *evt) {
@@ -448,8 +432,6 @@ QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func, s->s =qemu_input_handler_register ((DeviceState *)s, &s->h); -check_mode_change (); -return s; }
@@ -459,8 +441,6 @@ void qemu_activate_mouse_event_handler(QEMUPutMouseEntry *entry)QTAILQ_INSERT_HEAD (&mouse_handlers, entry, node);qemu_input_handler_activate (entry->s); - -check_mode_change (); }void qemu_remove_mouse_event_handler (QEMUPutMouseEntry *entry)
@@ -471,8 +451,6 @@ void qemu_remove_mouse_event_handler(QEMUPutMouseEntry *entry)g_free (entry->qemu_put_mouse_event_name);g_free (entry); - -check_mode_change (); } QEMUPutLEDEntry *qemu_add_led_event_handler(QEMUPutLEDEvent *func,
@@ -551,15 +529,5 @@ void do_mouse_set(Monitor *mon, const QDict *qdict)monitor_printf (mon,"Mouse at given index not found\n" ); } -check_mode_change (); -} - -void qemu_add_mouse_mode_change_notifier (Notifier *notify) -{ -notifier_list_add (&mouse_mode_notifiers, notify); -} - -void qemu_remove_mouse_mode_change_notifier (Notifier *notify) -{ -notifier_remove (notify); +qemu_input_check_mode_change (); }
ui/input.c +30 -0
@@ -13,6 +13,8 @@ struct QemuInputHandlerState { }; static QTAILQ_HEAD(, QemuInputHandlerState) handlers =QTAILQ_HEAD_INITIALIZER (handlers); +static NotifierList mouse_mode_notifiers = +NOTIFIER_LIST_INITIALIZER (mouse_mode_notifiers);QemuInputHandlerState *qemu_input_handler_register (DeviceState *dev,QemuInputHandler *handler)
@@ -24,6 +26,8 @@ QemuInputHandlerState *qemu_input_handler_register(DeviceState *dev, s->handler = handler; s->id = id++;QTAILQ_INSERT_TAIL (&handlers, s, node); + +qemu_input_check_mode_change ();return s; }
@@ -31,12 +35,14 @@ void qemu_input_handler_activate(QemuInputHandlerState *s) {QTAILQ_REMOVE (&handlers, s, node);QTAILQ_INSERT_HEAD (&handlers, s, node); +qemu_input_check_mode_change (); }void qemu_input_handler_unregister (QemuInputHandlerState *s) {QTAILQ_REMOVE (&handlers, s, node);g_free (s); +qemu_input_check_mode_change (); } static QemuInputHandlerState*
@@ -276,3 +282,27 @@ void qemu_input_queue_abs(QemuConsole *src, InputAxis axis, int value, int size)qemu_input_event_send (src, evt);qapi_free_InputEvent (evt); } + +void qemu_input_check_mode_change (void ) +{ +static int current_is_absolute; +int is_absolute; + + is_absolute =qemu_input_is_absolute (); + +if (is_absolute != current_is_absolute) { +notifier_list_notify (&mouse_mode_notifiers,NULL ); + } + + current_is_absolute = is_absolute; +} + +void qemu_add_mouse_mode_change_notifier (Notifier *notify) +{ +notifier_list_add (&mouse_mode_notifiers, notify); +} + +void qemu_remove_mouse_mode_change_notifier (Notifier *notify) +{ +notifier_remove (notify); +}
Signature · 1 line
1.8.3.1
PATCH 37/44 input: add input_mouse_mode tracepoint
In reply to Gerd Hoffmann--- trace-events | 1 + ui/input.c | 1 + 2 files changed, 2 insertions(+)
trace-events +1 -0
@@ -1027,6 +1027,7 @@ input_event_btn(int conidx, const char *btn, bool down) "con %d, button %s, down input_event_rel(int conidx, const char *axis, int value) "con %d, axis %s, value %d" input_event_abs(int conidx, const char *axis, int value) "con %d, axis %s, value 0x%x" input_event_sync(void) "" +input_mouse_mode(int absolute) "absolute %d" # hw/display/vmware_vga.c vmware_value_read(uint32_t index, uint32_t value) "index %d, value 0x%x"
ui/input.c +1 -0
@@ -291,6 +291,7 @@ void qemu_input_check_mode_change(void) is_absolute =qemu_input_is_absolute ();if (is_absolute != current_is_absolute) { +trace_input_mouse_mode (is_absolute);notifier_list_notify (&mouse_mode_notifiers,NULL ); }
Signature · 1 line
1.8.3.1
PATCH 38/44 sdl2: simplify keymap handling
In reply to Gerd Hoffmannsdl2 gives us scancodes (i.e. identifies keys by location not by keysym mapped to it). We can map them directly to QKeyCodes, pass them on to the new input core and be done with it.
No need to jump though any keymap hops. Zap the code. Also operate directly on SDL scancodes for any hotkeys.
--- ui/sdl2-keymap.h | 266 +++++++++++++++++++++++++++++++++++++++++++ ui/sdl2.c | 147 ++++++------------------ ui/sdl2_scancode_translate.h | 260 ------------------------------------------ 3 files changed, 298 insertions(+), 375 deletions(-) create mode 100644 ui/sdl2-keymap.h delete mode 100644 ui/sdl2_scancode_translate.h
ui/sdl2-keymap.h new file +266 -0
@@ -0,0 +1,266 @@ + +/* map SDL2 scancodes to QKeyCode */ + +static const int sdl2_scancode_to_qcode[SDL_NUM_SCANCODES ] = { + [SDL_SCANCODE_A ] =Q_KEY_CODE_A , + [SDL_SCANCODE_B ] =Q_KEY_CODE_B , + [SDL_SCANCODE_C ] =Q_KEY_CODE_C , + [SDL_SCANCODE_D ] =Q_KEY_CODE_D , + [SDL_SCANCODE_E ] =Q_KEY_CODE_E , + [SDL_SCANCODE_F ] =Q_KEY_CODE_F , + [SDL_SCANCODE_G ] =Q_KEY_CODE_G , + [SDL_SCANCODE_H ] =Q_KEY_CODE_H , + [SDL_SCANCODE_I ] =Q_KEY_CODE_I , + [SDL_SCANCODE_J ] =Q_KEY_CODE_J , + [SDL_SCANCODE_K ] =Q_KEY_CODE_K , + [SDL_SCANCODE_L ] =Q_KEY_CODE_L , + [SDL_SCANCODE_M ] =Q_KEY_CODE_M , + [SDL_SCANCODE_N ] =Q_KEY_CODE_N , + [SDL_SCANCODE_O ] =Q_KEY_CODE_O , + [SDL_SCANCODE_P ] =Q_KEY_CODE_P , + [SDL_SCANCODE_Q ] =Q_KEY_CODE_Q , + [SDL_SCANCODE_R ] =Q_KEY_CODE_R , + [SDL_SCANCODE_S ] =Q_KEY_CODE_S , + [SDL_SCANCODE_T ] =Q_KEY_CODE_T , + [SDL_SCANCODE_U ] =Q_KEY_CODE_U , + [SDL_SCANCODE_V ] =Q_KEY_CODE_V , + [SDL_SCANCODE_W ] =Q_KEY_CODE_W , + [SDL_SCANCODE_X ] =Q_KEY_CODE_X , + [SDL_SCANCODE_Y ] =Q_KEY_CODE_Y , + [SDL_SCANCODE_Z ] =Q_KEY_CODE_Z , + + [SDL_SCANCODE_1 ] =Q_KEY_CODE_1 , + [SDL_SCANCODE_2 ] =Q_KEY_CODE_2 , + [SDL_SCANCODE_3 ] =Q_KEY_CODE_3 , + [SDL_SCANCODE_4 ] =Q_KEY_CODE_4 , + [SDL_SCANCODE_5 ] =Q_KEY_CODE_5 , + [SDL_SCANCODE_6 ] =Q_KEY_CODE_6 , + [SDL_SCANCODE_7 ] =Q_KEY_CODE_7 , + [SDL_SCANCODE_8 ] =Q_KEY_CODE_8 , + [SDL_SCANCODE_9 ] =Q_KEY_CODE_9 , + [SDL_SCANCODE_0 ] =Q_KEY_CODE_0 , + + [SDL_SCANCODE_RETURN ] =Q_KEY_CODE_RET , + [SDL_SCANCODE_ESCAPE ] =Q_KEY_CODE_ESC , + [SDL_SCANCODE_BACKSPACE ] =Q_KEY_CODE_BACKSPACE , + [SDL_SCANCODE_TAB ] =Q_KEY_CODE_TAB , + [SDL_SCANCODE_SPACE ] =Q_KEY_CODE_SPC , + [SDL_SCANCODE_MINUS ] =Q_KEY_CODE_MINUS , + [SDL_SCANCODE_EQUALS ] =Q_KEY_CODE_EQUAL , + [SDL_SCANCODE_LEFTBRACKET ] =Q_KEY_CODE_BRACKET_LEFT , + [SDL_SCANCODE_RIGHTBRACKET ] =Q_KEY_CODE_BRACKET_RIGHT , + [SDL_SCANCODE_BACKSLASH ] =Q_KEY_CODE_BACKSLASH , +#if 0 + [SDL_SCANCODE_NONUSHASH ] =Q_KEY_CODE_NONUSHASH , +#endif + [SDL_SCANCODE_SEMICOLON ] =Q_KEY_CODE_SEMICOLON , + [SDL_SCANCODE_APOSTROPHE ] =Q_KEY_CODE_APOSTROPHE , + [SDL_SCANCODE_GRAVE ] =Q_KEY_CODE_GRAVE_ACCENT , + [SDL_SCANCODE_COMMA ] =Q_KEY_CODE_COMMA , + [SDL_SCANCODE_PERIOD ] =Q_KEY_CODE_DOT , + [SDL_SCANCODE_SLASH ] =Q_KEY_CODE_SLASH , + [SDL_SCANCODE_CAPSLOCK ] =Q_KEY_CODE_CAPS_LOCK , + + [SDL_SCANCODE_F1 ] =Q_KEY_CODE_F1 , + [SDL_SCANCODE_F2 ] =Q_KEY_CODE_F2 , + [SDL_SCANCODE_F3 ] =Q_KEY_CODE_F3 , + [SDL_SCANCODE_F4 ] =Q_KEY_CODE_F4 , + [SDL_SCANCODE_F5 ] =Q_KEY_CODE_F5 , + [SDL_SCANCODE_F6 ] =Q_KEY_CODE_F6 , + [SDL_SCANCODE_F7 ] =Q_KEY_CODE_F7 , + [SDL_SCANCODE_F8 ] =Q_KEY_CODE_F8 , + [SDL_SCANCODE_F9 ] =Q_KEY_CODE_F9 , + [SDL_SCANCODE_F10 ] =Q_KEY_CODE_F10 , + [SDL_SCANCODE_F11 ] =Q_KEY_CODE_F11 , + [SDL_SCANCODE_F12 ] =Q_KEY_CODE_F12 , + + [SDL_SCANCODE_PRINTSCREEN ] =Q_KEY_CODE_PRINT , + [SDL_SCANCODE_SCROLLLOCK ] =Q_KEY_CODE_SCROLL_LOCK , + [SDL_SCANCODE_PAUSE ] =Q_KEY_CODE_PAUSE , + [SDL_SCANCODE_INSERT ] =Q_KEY_CODE_INSERT , + [SDL_SCANCODE_HOME ] =Q_KEY_CODE_HOME , + [SDL_SCANCODE_PAGEUP ] =Q_KEY_CODE_PGUP , + [SDL_SCANCODE_DELETE ] =Q_KEY_CODE_DELETE , + [SDL_SCANCODE_END ] =Q_KEY_CODE_END , + [SDL_SCANCODE_PAGEDOWN ] =Q_KEY_CODE_PGDN , + [SDL_SCANCODE_RIGHT ] =Q_KEY_CODE_RIGHT , + [SDL_SCANCODE_LEFT ] =Q_KEY_CODE_LEFT , + [SDL_SCANCODE_DOWN ] =Q_KEY_CODE_DOWN , + [SDL_SCANCODE_UP ] =Q_KEY_CODE_UP , + [SDL_SCANCODE_NUMLOCKCLEAR ] =Q_KEY_CODE_NUM_LOCK , + + [SDL_SCANCODE_KP_DIVIDE ] =Q_KEY_CODE_KP_DIVIDE , + [SDL_SCANCODE_KP_MULTIPLY ] =Q_KEY_CODE_KP_MULTIPLY , + [SDL_SCANCODE_KP_MINUS ] =Q_KEY_CODE_KP_SUBTRACT , + [SDL_SCANCODE_KP_PLUS ] =Q_KEY_CODE_KP_ADD , + [SDL_SCANCODE_KP_ENTER ] =Q_KEY_CODE_KP_ENTER , + [SDL_SCANCODE_KP_1 ] =Q_KEY_CODE_KP_1 , + [SDL_SCANCODE_KP_2 ] =Q_KEY_CODE_KP_2 , + [SDL_SCANCODE_KP_3 ] =Q_KEY_CODE_KP_3 , + [SDL_SCANCODE_KP_4 ] =Q_KEY_CODE_KP_4 , + [SDL_SCANCODE_KP_5 ] =Q_KEY_CODE_KP_5 , + [SDL_SCANCODE_KP_6 ] =Q_KEY_CODE_KP_6 , + [SDL_SCANCODE_KP_7 ] =Q_KEY_CODE_KP_7 , + [SDL_SCANCODE_KP_8 ] =Q_KEY_CODE_KP_8 , + [SDL_SCANCODE_KP_9 ] =Q_KEY_CODE_KP_9 , + [SDL_SCANCODE_KP_0 ] =Q_KEY_CODE_KP_0 , + [SDL_SCANCODE_KP_PERIOD ] =Q_KEY_CODE_KP_DECIMAL , +#if 0 + [SDL_SCANCODE_NONUSBACKSLASH ] =Q_KEY_CODE_NONUSBACKSLASH , + [SDL_SCANCODE_APPLICATION ] =Q_KEY_CODE_APPLICATION , + [SDL_SCANCODE_POWER ] =Q_KEY_CODE_POWER , + [SDL_SCANCODE_KP_EQUALS ] =Q_KEY_CODE_KP_EQUALS , + + [SDL_SCANCODE_F13 ] =Q_KEY_CODE_F13 , + [SDL_SCANCODE_F14 ] =Q_KEY_CODE_F14 , + [SDL_SCANCODE_F15 ] =Q_KEY_CODE_F15 , + [SDL_SCANCODE_F16 ] =Q_KEY_CODE_F16 , + [SDL_SCANCODE_F17 ] =Q_KEY_CODE_F17 , + [SDL_SCANCODE_F18 ] =Q_KEY_CODE_F18 , + [SDL_SCANCODE_F19 ] =Q_KEY_CODE_F19 , + [SDL_SCANCODE_F20 ] =Q_KEY_CODE_F20 , + [SDL_SCANCODE_F21 ] =Q_KEY_CODE_F21 , + [SDL_SCANCODE_F22 ] =Q_KEY_CODE_F22 , + [SDL_SCANCODE_F23 ] =Q_KEY_CODE_F23 , + [SDL_SCANCODE_F24 ] =Q_KEY_CODE_F24 , + + [SDL_SCANCODE_EXECUTE ] =Q_KEY_CODE_EXECUTE , +#endif + [SDL_SCANCODE_HELP ] =Q_KEY_CODE_HELP , + [SDL_SCANCODE_MENU ] =Q_KEY_CODE_MENU , +#if 0 + [SDL_SCANCODE_SELECT ] =Q_KEY_CODE_SELECT , +#endif + [SDL_SCANCODE_STOP ] =Q_KEY_CODE_STOP , + [SDL_SCANCODE_AGAIN ] =Q_KEY_CODE_AGAIN , + [SDL_SCANCODE_UNDO ] =Q_KEY_CODE_UNDO , + [SDL_SCANCODE_CUT ] =Q_KEY_CODE_CUT , + [SDL_SCANCODE_COPY ] =Q_KEY_CODE_COPY , + [SDL_SCANCODE_PASTE ] =Q_KEY_CODE_PASTE , + [SDL_SCANCODE_FIND ] =Q_KEY_CODE_FIND , +#if 0 + [SDL_SCANCODE_MUTE ] =Q_KEY_CODE_MUTE , + [SDL_SCANCODE_VOLUMEUP ] =Q_KEY_CODE_VOLUMEUP , + [SDL_SCANCODE_VOLUMEDOWN ] =Q_KEY_CODE_VOLUMEDOWN , + + [SDL_SCANCODE_KP_COMMA ] =Q_KEY_CODE_KP_COMMA , + [SDL_SCANCODE_KP_EQUALSAS400 ] =Q_KEY_CODE_KP_EQUALSAS400 , + + [SDL_SCANCODE_INTERNATIONAL1 ] =Q_KEY_CODE_INTERNATIONAL1 , + [SDL_SCANCODE_INTERNATIONAL2 ] =Q_KEY_CODE_INTERNATIONAL2 , + [SDL_SCANCODE_INTERNATIONAL3 ] =Q_KEY_CODE_INTERNATIONAL3 , + [SDL_SCANCODE_INTERNATIONAL4 ] =Q_KEY_CODE_INTERNATIONAL4 , + [SDL_SCANCODE_INTERNATIONAL5 ] =Q_KEY_CODE_INTERNATIONAL5 , + [SDL_SCANCODE_INTERNATIONAL6 ] =Q_KEY_CODE_INTERNATIONAL6 , + [SDL_SCANCODE_INTERNATIONAL7 ] =Q_KEY_CODE_INTERNATIONAL7 , + [SDL_SCANCODE_INTERNATIONAL8 ] =Q_KEY_CODE_INTERNATIONAL8 , + [SDL_SCANCODE_INTERNATIONAL9 ] =Q_KEY_CODE_INTERNATIONAL9 , + [SDL_SCANCODE_LANG1 ] =Q_KEY_CODE_LANG1 , + [SDL_SCANCODE_LANG2 ] =Q_KEY_CODE_LANG2 , + [SDL_SCANCODE_LANG3 ] =Q_KEY_CODE_LANG3 , + [SDL_SCANCODE_LANG4 ] =Q_KEY_CODE_LANG4 , + [SDL_SCANCODE_LANG5 ] =Q_KEY_CODE_LANG5 , + [SDL_SCANCODE_LANG6 ] =Q_KEY_CODE_LANG6 , + [SDL_SCANCODE_LANG7 ] =Q_KEY_CODE_LANG7 , + [SDL_SCANCODE_LANG8 ] =Q_KEY_CODE_LANG8 , + [SDL_SCANCODE_LANG9 ] =Q_KEY_CODE_LANG9 , + [SDL_SCANCODE_ALTERASE ] =Q_KEY_CODE_ALTERASE , +#endif + [SDL_SCANCODE_SYSREQ ] =Q_KEY_CODE_SYSRQ , +#if 0 + [SDL_SCANCODE_CANCEL ] =Q_KEY_CODE_CANCEL , + [SDL_SCANCODE_CLEAR ] =Q_KEY_CODE_CLEAR , + [SDL_SCANCODE_PRIOR ] =Q_KEY_CODE_PRIOR , + [SDL_SCANCODE_RETURN2 ] =Q_KEY_CODE_RETURN2 , + [SDL_SCANCODE_SEPARATOR ] =Q_KEY_CODE_SEPARATOR , + [SDL_SCANCODE_OUT ] =Q_KEY_CODE_OUT , + [SDL_SCANCODE_OPER ] =Q_KEY_CODE_OPER , + [SDL_SCANCODE_CLEARAGAIN ] =Q_KEY_CODE_CLEARAGAIN , + [SDL_SCANCODE_CRSEL ] =Q_KEY_CODE_CRSEL , + [SDL_SCANCODE_EXSEL ] =Q_KEY_CODE_EXSEL , + [SDL_SCANCODE_KP_00 ] =Q_KEY_CODE_KP_00 , + [SDL_SCANCODE_KP_000 ] =Q_KEY_CODE_KP_000 , + [SDL_SCANCODE_THOUSANDSSEPARATOR ] =Q_KEY_CODE_THOUSANDSSEPARATOR , + [SDL_SCANCODE_DECIMALSEPARATOR ] =Q_KEY_CODE_DECIMALSEPARATOR , + [SDL_SCANCODE_CURRENCYUNIT ] =Q_KEY_CODE_CURRENCYUNIT , + [SDL_SCANCODE_CURRENCYSUBUNIT ] =Q_KEY_CODE_CURRENCYSUBUNIT , + [SDL_SCANCODE_KP_LEFTPAREN ] =Q_KEY_CODE_KP_LEFTPAREN , + [SDL_SCANCODE_KP_RIGHTPAREN ] =Q_KEY_CODE_KP_RIGHTPAREN , + [SDL_SCANCODE_KP_LEFTBRACE ] =Q_KEY_CODE_KP_LEFTBRACE , + [SDL_SCANCODE_KP_RIGHTBRACE ] =Q_KEY_CODE_KP_RIGHTBRACE , + [SDL_SCANCODE_KP_TAB ] =Q_KEY_CODE_KP_TAB , + [SDL_SCANCODE_KP_BACKSPACE ] =Q_KEY_CODE_KP_BACKSPACE , + [SDL_SCANCODE_KP_A ] =Q_KEY_CODE_KP_A , + [SDL_SCANCODE_KP_B ] =Q_KEY_CODE_KP_B , + [SDL_SCANCODE_KP_C ] =Q_KEY_CODE_KP_C , + [SDL_SCANCODE_KP_D ] =Q_KEY_CODE_KP_D , + [SDL_SCANCODE_KP_E ] =Q_KEY_CODE_KP_E , + [SDL_SCANCODE_KP_F ] =Q_KEY_CODE_KP_F , + [SDL_SCANCODE_KP_XOR ] =Q_KEY_CODE_KP_XOR , + [SDL_SCANCODE_KP_POWER ] =Q_KEY_CODE_KP_POWER , + [SDL_SCANCODE_KP_PERCENT ] =Q_KEY_CODE_KP_PERCENT , + [SDL_SCANCODE_KP_LESS ] =Q_KEY_CODE_KP_LESS , + [SDL_SCANCODE_KP_GREATER ] =Q_KEY_CODE_KP_GREATER , + [SDL_SCANCODE_KP_AMPERSAND ] =Q_KEY_CODE_KP_AMPERSAND , + [SDL_SCANCODE_KP_DBLAMPERSAND ] =Q_KEY_CODE_KP_DBLAMPERSAND , + [SDL_SCANCODE_KP_VERTICALBAR ] =Q_KEY_CODE_KP_VERTICALBAR , + [SDL_SCANCODE_KP_DBLVERTICALBAR ] =Q_KEY_CODE_KP_DBLVERTICALBAR , + [SDL_SCANCODE_KP_COLON ] =Q_KEY_CODE_KP_COLON , + [SDL_SCANCODE_KP_HASH ] =Q_KEY_CODE_KP_HASH , + [SDL_SCANCODE_KP_SPACE ] =Q_KEY_CODE_KP_SPACE , + [SDL_SCANCODE_KP_AT ] =Q_KEY_CODE_KP_AT , + [SDL_SCANCODE_KP_EXCLAM ] =Q_KEY_CODE_KP_EXCLAM , + [SDL_SCANCODE_KP_MEMSTORE ] =Q_KEY_CODE_KP_MEMSTORE , + [SDL_SCANCODE_KP_MEMRECALL ] =Q_KEY_CODE_KP_MEMRECALL , + [SDL_SCANCODE_KP_MEMCLEAR ] =Q_KEY_CODE_KP_MEMCLEAR , + [SDL_SCANCODE_KP_MEMADD ] =Q_KEY_CODE_KP_MEMADD , + [SDL_SCANCODE_KP_MEMSUBTRACT ] =Q_KEY_CODE_KP_MEMSUBTRACT , + [SDL_SCANCODE_KP_MEMMULTIPLY ] =Q_KEY_CODE_KP_MEMMULTIPLY , + [SDL_SCANCODE_KP_MEMDIVIDE ] =Q_KEY_CODE_KP_MEMDIVIDE , + [SDL_SCANCODE_KP_PLUSMINUS ] =Q_KEY_CODE_KP_PLUSMINUS , + [SDL_SCANCODE_KP_CLEAR ] =Q_KEY_CODE_KP_CLEAR , + [SDL_SCANCODE_KP_CLEARENTRY ] =Q_KEY_CODE_KP_CLEARENTRY , + [SDL_SCANCODE_KP_BINARY ] =Q_KEY_CODE_KP_BINARY , + [SDL_SCANCODE_KP_OCTAL ] =Q_KEY_CODE_KP_OCTAL , + [SDL_SCANCODE_KP_DECIMAL ] =Q_KEY_CODE_KP_DECIMAL , + [SDL_SCANCODE_KP_HEXADECIMAL ] =Q_KEY_CODE_KP_HEXADECIMAL , +#endif + [SDL_SCANCODE_LCTRL ] =Q_KEY_CODE_CTRL , + [SDL_SCANCODE_LSHIFT ] =Q_KEY_CODE_SHIFT , + [SDL_SCANCODE_LALT ] =Q_KEY_CODE_ALT , + [SDL_SCANCODE_LGUI ] =Q_KEY_CODE_META_L , + [SDL_SCANCODE_RCTRL ] =Q_KEY_CODE_CTRL_R , + [SDL_SCANCODE_RSHIFT ] =Q_KEY_CODE_SHIFT_R , + [SDL_SCANCODE_RALT ] =Q_KEY_CODE_ALTGR , + [SDL_SCANCODE_RGUI ] =Q_KEY_CODE_META_R , +#if 0 + [SDL_SCANCODE_MODE ] =Q_KEY_CODE_MODE , + [SDL_SCANCODE_AUDIONEXT ] =Q_KEY_CODE_AUDIONEXT , + [SDL_SCANCODE_AUDIOPREV ] =Q_KEY_CODE_AUDIOPREV , + [SDL_SCANCODE_AUDIOSTOP ] =Q_KEY_CODE_AUDIOSTOP , + [SDL_SCANCODE_AUDIOPLAY ] =Q_KEY_CODE_AUDIOPLAY , + [SDL_SCANCODE_AUDIOMUTE ] =Q_KEY_CODE_AUDIOMUTE , + [SDL_SCANCODE_MEDIASELECT ] =Q_KEY_CODE_MEDIASELECT , + [SDL_SCANCODE_WWW ] =Q_KEY_CODE_WWW , + [SDL_SCANCODE_MAIL ] =Q_KEY_CODE_MAIL , + [SDL_SCANCODE_CALCULATOR ] =Q_KEY_CODE_CALCULATOR , + [SDL_SCANCODE_COMPUTER ] =Q_KEY_CODE_COMPUTER , + [SDL_SCANCODE_AC_SEARCH ] =Q_KEY_CODE_AC_SEARCH , + [SDL_SCANCODE_AC_HOME ] =Q_KEY_CODE_AC_HOME , + [SDL_SCANCODE_AC_BACK ] =Q_KEY_CODE_AC_BACK , + [SDL_SCANCODE_AC_FORWARD ] =Q_KEY_CODE_AC_FORWARD , + [SDL_SCANCODE_AC_STOP ] =Q_KEY_CODE_AC_STOP , + [SDL_SCANCODE_AC_REFRESH ] =Q_KEY_CODE_AC_REFRESH , + [SDL_SCANCODE_AC_BOOKMARKS ] =Q_KEY_CODE_AC_BOOKMARKS , + [SDL_SCANCODE_BRIGHTNESSDOWN ] =Q_KEY_CODE_BRIGHTNESSDOWN , + [SDL_SCANCODE_BRIGHTNESSUP ] =Q_KEY_CODE_BRIGHTNESSUP , + [SDL_SCANCODE_DISPLAYSWITCH ] =Q_KEY_CODE_DISPLAYSWITCH , + [SDL_SCANCODE_KBDILLUMTOGGLE ] =Q_KEY_CODE_KBDILLUMTOGGLE , + [SDL_SCANCODE_KBDILLUMDOWN ] =Q_KEY_CODE_KBDILLUMDOWN , + [SDL_SCANCODE_KBDILLUMUP ] =Q_KEY_CODE_KBDILLUMUP , + [SDL_SCANCODE_EJECT ] =Q_KEY_CODE_EJECT , + [SDL_SCANCODE_SLEEP ] =Q_KEY_CODE_SLEEP , + [SDL_SCANCODE_APP1 ] =Q_KEY_CODE_APP1 , + [SDL_SCANCODE_APP2 ] =Q_KEY_CODE_APP2 , +#endif +};
ui/sdl2.c +32 -115
215 lines not on this page · raw message
ui/sdl2_scancode_translate.h deleted +0 -260
260 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 39/44 sdl2: codestyle fixups
In reply to Gerd Hoffmann--- ui/Makefile.objs | 2 +- ui/sdl2.c | 173 +++++++++++++++++++++++++++++++++---------------------- 2 files changed, 104 insertions(+), 71 deletions(-)
ui/Makefile.objs +1 -1
@@ -15,6 +15,6 @@ common-obj-$(CONFIG_CURSES) += curses.o common-obj-$(CONFIG_VNC) += $(vnc-obj-y) common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o -$(obj)/sdl.o $(obj)/sdl_zoom.o $(obj)/sdl2.o: QEMU_CFLAGS += $(SDL_CFLAGS) +$(obj)/sdl.o $(obj)/sdl_zoom.o $(obj)/sdl2.o: QEMU_CFLAGS += $(SDL_CFLAGS) $(obj)/gtk.o: QEMU_CFLAGS += $(GTK_CFLAGS) $(VTE_CFLAGS)
ui/sdl2.c +103 -70
478 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 40/44 input: move qmp_query_mice to new core
In reply to Gerd Hoffmann--- ui/input-legacy.c | 23 ----------------------- ui/input.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 23 deletions(-)
ui/input-legacy.c +0 -23
@@ -483,29 +483,6 @@ void kbd_put_ledstate(int ledstate) } } -MouseInfoList *qmp_query_mice (Error **errp) -{ -MouseInfoList *mice_list =NULL ; -QEMUPutMouseEntry *cursor; -bool current = true; - - QTAILQ_FOREACH(cursor, &mouse_handlers, node) { -MouseInfoList *info =g_malloc0 (sizeof (*info)); - info->value =g_malloc0 (sizeof (*info->value)); - info->value->name =g_strdup (cursor->qemu_put_mouse_event_name); - info->value->index = cursor->index; - info->value->absolute = !!cursor->qemu_put_mouse_event_absolute; - info->value->current = current; - - current = false; - - info->next = mice_list; - mice_list = info; - } - -return mice_list; -} -void do_mouse_set (Monitor *mon,const QDict *qdict) {QEMUPutMouseEntry *cursor;
ui/input.c +29 -0
@@ -1,5 +1,6 @@#include "sysemu/sysemu.h" #include "qapi-types.h" +#include "qmp-commands.h" #include "trace.h" #include "ui/input.h" #include "ui/console.h"
@@ -307,3 +308,31 @@ void qemu_remove_mouse_mode_change_notifier(Notifier *notify) {notifier_remove (notify); } + +MouseInfoList *qmp_query_mice (Error **errp) +{ +MouseInfoList *mice_list =NULL ; +MouseInfoList *info; +QemuInputHandlerState *s; +bool current = true; + + QTAILQ_FOREACH(s, &handlers, node) { +if (!(s->handler->mask & + (INPUT_EVENT_MASK_REL |INPUT_EVENT_MASK_ABS ))) { +continue ; + } + + info =g_new0 (MouseInfoList,1 ); + info->value =g_new0 (MouseInfo,1 ); + info->value->index = s->id; + info->value->name =g_strdup (s->handler->name); + info->value->absolute = s->handler->mask &INPUT_EVENT_MASK_ABS ; + info->value->current = current; + + current = false; + info->next = mice_list; + mice_list = info; + } + +return mice_list; +}
Signature · 1 line
1.8.3.1
PATCH 41/44 input: move do_mouse_set to new core
In reply to Gerd HoffmannThis removes the last user of the lecagy input mouse handler list, so we can remove more legacy bits with this.
--- ui/input-legacy.c | 43 ------------------------------------------- ui/input.c | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 43 deletions(-)
ui/input-legacy.c +0 -43
@@ -35,12 +35,6 @@ struct QEMUPutMouseEntry {QEMUPutMouseEvent *qemu_put_mouse_event;void *qemu_put_mouse_event_opaque;int qemu_put_mouse_event_absolute; -char *qemu_put_mouse_event_name; - -int index; - -/* used internally by qemu for handling mice */ -QTAILQ_ENTRY (QEMUPutMouseEntry) node;/* new input core */ QemuInputHandler h;
@@ -412,17 +406,12 @@ QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func, const char *name) {QEMUPutMouseEntry *s; -static int mouse_index =0 ; s =g_malloc0 (sizeof (QEMUPutMouseEntry)); s->qemu_put_mouse_event = func; s->qemu_put_mouse_event_opaque = opaque; s->qemu_put_mouse_event_absolute = absolute; - s->qemu_put_mouse_event_name =g_strdup (name); - s->index = mouse_index++; - -QTAILQ_INSERT_TAIL (&mouse_handlers, s, node); s->h.name = name; s->h.mask = INPUT_EVENT_MASK_BTN |
@@ -437,19 +426,13 @@ QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func,void qemu_activate_mouse_event_handler (QEMUPutMouseEntry *entry) { -QTAILQ_REMOVE (&mouse_handlers, entry, node); -QTAILQ_INSERT_HEAD (&mouse_handlers, entry, node); -qemu_input_handler_activate (entry->s); }void qemu_remove_mouse_event_handler (QEMUPutMouseEntry *entry) { -QTAILQ_REMOVE (&mouse_handlers, entry, node); -qemu_input_handler_unregister (entry->s); -g_free (entry->qemu_put_mouse_event_name);g_free (entry); }
@@ -482,29 +465,3 @@ void kbd_put_ledstate(int ledstate) cursor->put_led (cursor->opaque, ledstate); } } - -void do_mouse_set (Monitor *mon,const QDict *qdict) -{ -QEMUPutMouseEntry *cursor; -int index =qdict_get_int (qdict,"index" ); -int found =0 ; - -if (QTAILQ_EMPTY (&mouse_handlers)) { -monitor_printf (mon,"No mouse devices connected\n" ); -return ; - } - - QTAILQ_FOREACH(cursor, &mouse_handlers, node) { -if (cursor->index == index) { - found =1 ; -qemu_activate_mouse_event_handler (cursor); -break ; - } - } - -if (!found) { -monitor_printf (mon,"Mouse at given index not found\n" ); - } - -qemu_input_check_mode_change (); -}
ui/input.c +21 -0
@@ -336,3 +336,24 @@ MouseInfoList *qmp_query_mice(Error **errp)return mice_list; } + +void do_mouse_set (Monitor *mon,const QDict *qdict) +{ +QemuInputHandlerState *s; +int index =qdict_get_int (qdict,"index" ); +int found =0 ; + + QTAILQ_FOREACH(s, &handlers, node) { +if (s->id == index) { + found =1 ; +qemu_input_handler_activate (s); +break ; + } + } + +if (!found) { +monitor_printf (mon,"Mouse at given index not found\n" ); + } + +qemu_input_check_mode_change (); +}
Signature · 1 line
1.8.3.1
PATCH 42/44 input: remove index_from_keycode (no users)
In reply to Gerd Hoffmann--- include/ui/console.h | 1 - ui/input-legacy.c | 14 -------------- 2 files changed, 15 deletions(-)
include/ui/console.h +0 -1
@@ -329,7 +329,6 @@ void curses_display_init(DisplayState *ds, int full_screen);/* input.c */ int index_from_key (const char *key); -int index_from_keycode (int code);/* gtk.c */ void early_gtk_display_init (void );
ui/input-legacy.c +0 -14
@@ -220,20 +220,6 @@ int index_from_key(const char *key)return i; } -int index_from_keycode (int code) -{ -int i; - -for (i =0 ; i <Q_KEY_CODE_MAX ; i++) { -if (key_defs[i] == code) { -break ; - } - } - -/* Return Q_KEY_CODE_MAX if the code is invalid */ -return i; -} -static int *keycodes;static int keycodes_size;static QEMUTimer *key_timer;
Signature · 1 line
1.8.3.1
PATCH 43/44 console: add head to index to qemu consoles.
In reply to Gerd Hoffmann--- hw/arm/musicpal.c | 2 +- hw/display/blizzard.c | 2 +- hw/display/cirrus_vga.c | 4 ++-- hw/display/exynos4210_fimd.c | 2 +- hw/display/g364fb.c | 2 +- hw/display/jazz_led.c | 2 +- hw/display/milkymist-vgafb.c | 2 +- hw/display/omap_lcdc.c | 2 +- hw/display/pl110.c | 2 +- hw/display/pxa2xx_lcd.c | 2 +- hw/display/qxl.c | 4 ++-- hw/display/sm501.c | 2 +- hw/display/ssd0303.c | 2 +- hw/display/ssd0323.c | 2 +- hw/display/tc6393xb.c | 2 +- hw/display/tcx.c | 4 ++-- hw/display/vga-isa-mm.c | 2 +- hw/display/vga-isa.c | 2 +- hw/display/vga-pci.c | 2 +- hw/display/vmware_vga.c | 2 +- hw/unicore32/puv3.c | 2 +- include/ui/console.h | 5 +++-- ui/console.c | 28 ++++++++++++++++++++++++---- 23 files changed, 51 insertions(+), 30 deletions(-)
hw/arm/musicpal.c +1 -1
@@ -632,7 +632,7 @@ static int musicpal_lcd_init(SysBusDevice *sbd) "musicpal-lcd", MP_LCD_SIZE);sysbus_init_mmio (sbd, &s->iomem); - s->con =graphic_console_init (dev, &musicpal_gfx_ops, s); + s->con =graphic_console_init (dev,0 , &musicpal_gfx_ops, s);qemu_console_resize (s->con,128 *3 ,64 *3 );qdev_init_gpio_in (dev, musicpal_lcd_gpio_brightness_in,3 );
hw/display/blizzard.c +1 -1
@@ -956,7 +956,7 @@ void *s1d13745_init(qemu_irq gpio_int) s->fb =g_malloc (0x180000 ); - s->con =graphic_console_init (NULL , &blizzard_ops, s); + s->con =graphic_console_init (NULL ,0 , &blizzard_ops, s); surface =qemu_console_surface (s->con);switch (surface_bits_per_pixel (surface)) {
hw/display/cirrus_vga.c +2 -2
@@ -2917,7 +2917,7 @@ static void isa_cirrus_vga_realizefn(DeviceState *dev, Error **errp)cirrus_init_common (&d->cirrus_vga,OBJECT (dev),CIRRUS_ID_CLGD5430 ,0 ,isa_address_space (isadev),isa_address_space_io (isadev)); - s->con =graphic_console_init (dev, s->hw_ops, s); + s->con =graphic_console_init (dev,0 , s->hw_ops, s);rom_add_vga (VGABIOS_CIRRUS_FILENAME );/* XXX ISA-LFB support */ /* FIXME not qdev yet */
@@ -2963,7 +2963,7 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev)vga_common_init (&s->vga,OBJECT (dev));cirrus_init_common (s,OBJECT (dev), device_id,1 ,pci_address_space (dev),pci_address_space_io (dev)); - s->vga.con =graphic_console_init (DEVICE (dev), s->vga.hw_ops, &s->vga); + s->vga.con =graphic_console_init (DEVICE (dev),0 , s->vga.hw_ops, &s->vga);/* setup PCI */
hw/display/exynos4210_fimd.c +1 -1
@@ -1917,7 +1917,7 @@ static int exynos4210_fimd_init(SysBusDevice *dev)memory_region_init_io (&s->iomem,OBJECT (s), &exynos4210_fimd_mmio_ops, s,"exynos4210.fimd" ,FIMD_REGS_SIZE );sysbus_init_mmio (dev, &s->iomem); - s->console =graphic_console_init (DEVICE (dev), &exynos4210_fimd_ops, s); + s->console =graphic_console_init (DEVICE (dev),0 , &exynos4210_fimd_ops, s);return 0 ; }
hw/display/g364fb.c +1 -1
@@ -484,7 +484,7 @@ static void g364fb_init(DeviceState *dev, G364State *s) { s->vram =g_malloc0 (s->vram_size); - s->con =graphic_console_init (dev, &g364fb_ops, s); + s->con =graphic_console_init (dev,0 , &g364fb_ops, s);memory_region_init_io (&s->mem_ctrl,NULL , &g364fb_ctrl_ops, s,"ctrl" ,0x180000 ); memory_region_init_ram_ptr(&s->mem_vram, NULL, "vram",
hw/display/jazz_led.c +1 -1
@@ -271,7 +271,7 @@ static int jazz_led_init(SysBusDevice *dev)memory_region_init_io (&s->iomem,OBJECT (s), &led_ops, s,"led" ,1 );sysbus_init_mmio (dev, &s->iomem); - s->con =graphic_console_init (DEVICE (dev), &jazz_led_ops, s); + s->con =graphic_console_init (DEVICE (dev),0 , &jazz_led_ops, s);return 0 ; }
hw/display/milkymist-vgafb.c +1 -1
@@ -290,7 +290,7 @@ static int milkymist_vgafb_init(SysBusDevice *dev) "milkymist-vgafb", R_MAX * 4);sysbus_init_mmio (dev, &s->regs_region); - s->con =graphic_console_init (DEVICE (dev), &vgafb_ops, s); + s->con =graphic_console_init (DEVICE (dev),0 , &vgafb_ops, s);return 0 ; }
hw/display/omap_lcdc.c +1 -1
@@ -406,7 +406,7 @@ struct omap_lcd_panel_s *omap_lcdc_init(MemoryRegion *sysmem,memory_region_init_io (&s->iomem,NULL , &omap_lcdc_ops, s,"omap.lcdc" ,0x100 );memory_region_add_subregion (sysmem, base, &s->iomem); - s->con =graphic_console_init (NULL , &omap_ops, s); + s->con =graphic_console_init (NULL ,0 , &omap_ops, s);return s; }
hw/display/pl110.c +1 -1
@@ -464,7 +464,7 @@ static int pl110_initfn(SysBusDevice *sbd)sysbus_init_mmio (sbd, &s->iomem);sysbus_init_irq (sbd, &s->irq);qdev_init_gpio_in (dev, pl110_mux_ctrl_set,1 ); - s->con =graphic_console_init (dev, &pl110_gfx_ops, s); + s->con =graphic_console_init (dev,0 , &pl110_gfx_ops, s);return 0 ; }
hw/display/pxa2xx_lcd.c +1 -1
@@ -1013,7 +1013,7 @@ PXA2xxLCDState *pxa2xx_lcdc_init(MemoryRegion *sysmem, "pxa2xx-lcd-controller", 0x00100000);memory_region_add_subregion (sysmem, base, &s->iomem); - s->con =graphic_console_init (NULL , &pxa2xx_ops, s); + s->con =graphic_console_init (NULL ,0 , &pxa2xx_ops, s); surface =qemu_console_surface (s->con);switch (surface_bits_per_pixel (surface)) {
hw/display/qxl.c +2 -2
@@ -2063,7 +2063,7 @@ static int qxl_init_primary(PCIDevice *dev)portio_list_set_flush_coalesced (qxl_vga_port_list);portio_list_add (qxl_vga_port_list,pci_address_space_io (dev),0x3b0 ); - vga->con =graphic_console_init (DEVICE (dev), &qxl_ops, qxl); + vga->con =graphic_console_init (DEVICE (dev),0 , &qxl_ops, qxl);qemu_spice_display_init_common (&qxl->ssd); rc =qxl_init_common (qxl);
@@ -2088,7 +2088,7 @@ static int qxl_init_secondary(PCIDevice *dev) qxl->vga.vram_size);vmstate_register_ram (&qxl->vga.vram, &qxl->pci.qdev); qxl->vga.vram_ptr =memory_region_get_ram_ptr (&qxl->vga.vram); - qxl->vga.con =graphic_console_init (DEVICE (dev), &qxl_ops, qxl); + qxl->vga.con =graphic_console_init (DEVICE (dev),0 , &qxl_ops, qxl);return qxl_init_common (qxl); }
hw/display/sm501.c +1 -1
@@ -1449,5 +1449,5 @@ void sm501_init(MemoryRegion *address_space_mem, uint32_t base, }/* create qemu graphic console */ - s->con =graphic_console_init (DEVICE (dev), &sm501_ops, s); + s->con =graphic_console_init (DEVICE (dev),0 , &sm501_ops, s); }
hw/display/ssd0303.c +1 -1
@@ -299,7 +299,7 @@ static int ssd0303_init(I2CSlave *i2c) {ssd0303_state *s =SSD0303 (i2c); - s->con =graphic_console_init (DEVICE (i2c), &ssd0303_ops, s); + s->con =graphic_console_init (DEVICE (i2c),0 , &ssd0303_ops, s);qemu_console_resize (s->con,96 *MAGNIFY ,16 *MAGNIFY );return 0 ; }
hw/display/ssd0323.c +1 -1
@@ -342,7 +342,7 @@ static int ssd0323_init(SSISlave *dev) s->col_end =63 ; s->row_end =79 ; - s->con =graphic_console_init (DEVICE (dev), &ssd0323_ops, s); + s->con =graphic_console_init (DEVICE (dev),0 , &ssd0323_ops, s);qemu_console_resize (s->con,128 *MAGNIFY ,64 *MAGNIFY );qdev_init_gpio_in (&dev->qdev, ssd0323_cd,1 );
hw/display/tc6393xb.c +1 -1
@@ -587,7 +587,7 @@ TC6393xbState *tc6393xb_init(MemoryRegion *sysmem, uint32_t base, qemu_irq irq)memory_region_add_subregion (sysmem, base +0x100000 , &s->vram); s->scr_width =480 ; s->scr_height =640 ; - s->con =graphic_console_init (NULL , &tc6393xb_gfx_ops, s); + s->con =graphic_console_init (NULL ,0 , &tc6393xb_gfx_ops, s);return s; }
hw/display/tcx.c +2 -2
@@ -602,14 +602,14 @@ static int tcx_init1(SysBusDevice *dev) &s->vram_mem, vram_offset, size);sysbus_init_mmio (dev, &s->vram_cplane); - s->con =graphic_console_init (DEVICE (dev), &tcx24_ops, s); + s->con =graphic_console_init (DEVICE (dev),0 , &tcx24_ops, s); }else {/* THC 8 bit (dummy) */ memory_region_init_io (&s->thc8,OBJECT (s), &dummy_ops, s,"tcx.thc8" ,TCX_THC_NREGS_8 );sysbus_init_mmio (dev, &s->thc8); - s->con =graphic_console_init (DEVICE (dev), &tcx_ops, s); + s->con =graphic_console_init (DEVICE (dev),0 , &tcx_ops, s); }qemu_console_resize (s->con, s->width, s->height);
hw/display/vga-isa-mm.c +1 -1
@@ -135,7 +135,7 @@ int isa_vga_mm_init(hwaddr vram_base,vga_common_init (&s->vga,NULL );vga_mm_init (s, vram_base, ctrl_base, it_shift, address_space); - s->vga.con =graphic_console_init (NULL , s->vga.hw_ops, s); + s->vga.con =graphic_console_init (NULL ,0 , s->vga.hw_ops, s);vga_init_vbe (&s->vga,NULL , address_space);return 0 ;
hw/display/vga-isa.c +1 -1
@@ -67,7 +67,7 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp) isa_mem_base +0x000a0000 , vga_io_memory, 1);memory_region_set_coalescing (vga_io_memory); - s->con =graphic_console_init (DEVICE (dev), s->hw_ops, s); + s->con =graphic_console_init (DEVICE (dev),0 , s->hw_ops, s);vga_init_vbe (s,OBJECT (dev),isa_address_space (isadev));/* ROM BIOS */
hw/display/vga-pci.c +1 -1
@@ -151,7 +151,7 @@ static int pci_std_vga_initfn(PCIDevice *dev)vga_init (s,OBJECT (dev),pci_address_space (dev),pci_address_space_io (dev), true); - s->con =graphic_console_init (DEVICE (dev), s->hw_ops, s); + s->con =graphic_console_init (DEVICE (dev),0 , s->hw_ops, s);/* XXX: VGA_RAM_SIZE must be a power of two */ pci_register_bar (&d->dev,0 ,PCI_BASE_ADDRESS_MEM_PREFETCH , &s->vram);
hw/display/vmware_vga.c +1 -1
@@ -1199,7 +1199,7 @@ static void vmsvga_init(DeviceState *dev, struct vmsvga_state_s *s, s->scratch_size =SVGA_SCRATCH_SIZE ; s->scratch =g_malloc (s->scratch_size *4 ); - s->vga.con =graphic_console_init (dev, &vmsvga_ops, s); + s->vga.con =graphic_console_init (dev,0 , &vmsvga_ops, s); s->fifo_size =SVGA_FIFO_SIZE ;memory_region_init_ram (&s->fifo_ram,NULL ,"vmsvga.fifo" , s->fifo_size);
hw/unicore32/puv3.c +1 -1
@@ -98,7 +98,7 @@ static void puv3_load_kernel(const char *kernel_filename) }/* cheat curses that we have a graphic console, only under ocd console */ -graphic_console_init (NULL , &no_ops,NULL ); +graphic_console_init (NULL ,0 , &no_ops,NULL ); }static void puv3_init (QEMUMachineInitArgs *args)
include/ui/console.h +3 -2
@@ -268,7 +268,7 @@ typedef struct GraphicHwOps {void (*update_interval)(void *opaque,uint64_t interval); } GraphicHwOps; -QemuConsole *graphic_console_init (DeviceState *dev, +QemuConsole *graphic_console_init (DeviceState *dev,uint32_t head,const GraphicHwOps *ops,void *opaque);
@@ -277,11 +277,12 @@ void graphic_hw_invalidate(QemuConsole *con);void graphic_hw_text_update (QemuConsole *con,console_ch_t *chardata);QemuConsole *qemu_console_lookup_by_index (unsigned int index); -QemuConsole *qemu_console_lookup_by_device (DeviceState *dev); +QemuConsole *qemu_console_lookup_by_device (DeviceState *dev,uint32_t head);bool qemu_console_is_visible (QemuConsole *con);bool qemu_console_is_graphic (QemuConsole *con);bool qemu_console_is_fixedsize (QemuConsole *con);int qemu_console_get_index (QemuConsole *con); +uint32_t qemu_console_get_head (QemuConsole *con);int qemu_console_get_width (QemuConsole *con,int fallback);int qemu_console_get_height (QemuConsole *con,int fallback);
ui/console.c +24 -4
@@ -124,6 +124,7 @@ struct QemuConsole {/* Graphic console state. */ Object *device; +uint32_t head;const GraphicHwOps *hw_ops;void *hw;
@@ -1179,6 +1180,8 @@ static QemuConsole *new_console(DisplayState *ds, console_type_t console_type) s =QEMU_CONSOLE (obj);object_property_add_link (obj,"device" ,TYPE_DEVICE , (Object **)&s->device, &local_err); +object_property_add_uint32_ptr (obj,"head" , + &s->head, &local_err);if (!active_console || ((active_console->console_type !=GRAPHIC_CONSOLE ) && (console_type ==GRAPHIC_CONSOLE ))) {
@@ -1569,7 +1572,7 @@ DisplayState *init_displaystate(void)return display_state; } -QemuConsole *graphic_console_init (DeviceState *dev, +QemuConsole *graphic_console_init (DeviceState *dev,uint32_t head,const GraphicHwOps *hw_ops,void *opaque) {
@@ -1587,6 +1590,8 @@ QemuConsole *graphic_console_init(DeviceState *dev,if (dev) {object_property_set_link (OBJECT (s),OBJECT (dev),"device" , &local_err); +object_property_set_int (OBJECT (s), head, +"head" , &local_err); } s->surface =qemu_create_displaysurface (width, height);
@@ -1601,10 +1606,11 @@ QemuConsole *qemu_console_lookup_by_index(unsigned int index)return consoles[index]; } -QemuConsole *qemu_console_lookup_by_device (DeviceState *dev) +QemuConsole *qemu_console_lookup_by_device (DeviceState *dev,uint32_t head) {Error *local_err =NULL ;Object *obj; +uint32_t h;int i;for (i =0 ; i < nb_consoles; i++) {
@@ -1613,9 +1619,15 @@ QemuConsole *qemu_console_lookup_by_device(DeviceState *dev) } obj =object_property_get_link (OBJECT (consoles[i]),"device" , &local_err); -if (DEVICE (obj) == dev) { -return consoles[i]; +if (DEVICE (obj) != dev) { +continue ; + } + h =object_property_get_int (OBJECT (consoles[i]), +"head" , &local_err); +if (h != head) { +continue ; } +return consoles[i]; }return NULL ; }
@@ -1649,6 +1661,14 @@ int qemu_console_get_index(QemuConsole *con)return con ? con->index :-1 ; } +uint32_t qemu_console_get_head (QemuConsole *con) +{ +if (con ==NULL ) { + con = active_console; + } +return con ? con->head :-1 ; +} +int qemu_console_get_width (QemuConsole *con,int fallback) {if (con ==NULL ) {
Signature · 1 line
1.8.3.1
PATCH 44/44 console: add QemuUIInfo
In reply to Gerd Hoffmann--- include/ui/console.h | 12 ++++++++++++ ui/console.c | 17 +++++++++++++++++ 2 files changed, 29 insertions(+)
include/ui/console.h +12 -0
@@ -120,6 +120,14 @@ struct DisplaySurface {struct PixelFormat pf; }; +typedef struct QemuUIInfo { +/* geometry */ +int xoff; +int yoff; +uint32_t width; +uint32_t height; +}QemuUIInfo ; +/* cursor data format is 32bit RGBA */ typedef struct QEMUCursor { int width, height;
@@ -204,6 +212,8 @@ void update_displaychangelistener(DisplayChangeListener *dcl, uint64_t interval);void unregister_displaychangelistener (DisplayChangeListener *dcl); +int dpy_set_ui_info (QemuConsole *con,QemuUIInfo *info); +void dpy_gfx_update (QemuConsole *con,int x,int y,int w,int h);void dpy_gfx_replace_surface (QemuConsole *con,DisplaySurface *surface);
@@ -266,6 +276,7 @@ typedef struct GraphicHwOps {void (*gfx_update)(void *opaque);void (*text_update)(void *opaque,console_ch_t *text);void (*update_interval)(void *opaque,uint64_t interval); +int (*ui_info)(void *opaque,uint32_t head,QemuUIInfo *info); } GraphicHwOps; QemuConsole *graphic_console_init(DeviceState *dev, uint32_t head,
@@ -283,6 +294,7 @@ bool qemu_console_is_graphic(QemuConsole *con);bool qemu_console_is_fixedsize (QemuConsole *con);int qemu_console_get_index (QemuConsole *con);uint32_t qemu_console_get_head (QemuConsole *con); +QemuUIInfo *qemu_console_get_ui_info (QemuConsole *con);int qemu_console_get_width (QemuConsole *con,int fallback);int qemu_console_get_height (QemuConsole *con,int fallback);
ui/console.c +17 -0
@@ -125,6 +125,7 @@ struct QemuConsole {/* Graphic console state. */ Object *device;uint32_t head; +QemuUIInfo ui_info;const GraphicHwOps *hw_ops;void *hw;
@@ -1347,6 +1348,16 @@ void unregister_displaychangelistener(DisplayChangeListener *dcl)gui_setup_refresh (ds); } +int dpy_set_ui_info (QemuConsole *con,QemuUIInfo *info) +{ +assert (con !=NULL ); + con->ui_info = *info; +if (con->hw_ops->ui_info) { +return con->hw_ops->ui_info (con->hw, con->head, info); + } +return -1 ; +} +void dpy_gfx_update (QemuConsole *con,int x,int y,int w,int h) {DisplayState *s = con->ds;
@@ -1669,6 +1680,12 @@ uint32_t qemu_console_get_head(QemuConsole *con)return con ? con->head :-1 ; } +QemuUIInfo *qemu_console_get_ui_info (QemuConsole *con) +{ +assert (con !=NULL ); +return &con->ui_info; +} +int qemu_console_get_width (QemuConsole *con,int fallback) {if (con ==NULL ) {
Signature · 1 line
1.8.3.1
Quoted 22 lines · Gerd Hoffmann
Hi,
The input layer moves to a model modeled roughly after the linux event layer. It also uses qapi to create all the data types needed. First, because it is convinient to have all the support code generated, and also to make it easier to integrate with qmp some day.
Porting work has only be done on the UI side so far. Input device emulation is still to be done.
SDL2 consists of dave's original patch with a bunch of cleanups on top. Some of the cleanups depend on the new input layer code, thus the incremental patches are sprinkled all over the patch series for bisectability reasons.
Pull v2 fixes minor issues and adds missing sign-offs.
please pull,
GerdThe following changes since commit
105a060188dc6fdd4551571a966514d1a5f6815a:
Quoted 8 lines
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140220' into staging (2014-02-21 15:04:58 +0000)
are available in the git repository at:
git://git.kraxel.org/qemutags/pull-input-2for you to fetch changes up to
445b5bad4a72d6f62071a9e9756e2a54c0de0b34:
I hate bouncing this pull request for a second time, but this still contains stuff that's obviously not ready:
* patch which adds a 1000 line new file, then another patch 2 commits later deletes 100 of those lines
* "build fix" patch -- we shouldn't break the build in one patch and fix it in another, this breaks bisection
* patches which don't come anywhere near passing checkpatch
Sorry.
-- PMM
Quoted 4 lines
I hate bouncing this pull request for a second time, but this still contains stuff that's obviously not ready:
* patch which adds a 1000 line new file, then another patch 2 commits later deletes 100 of those lines
That is just a case of having forgotten to specify '-M' switch for git-format-patch. Hmm, seems there is no config option to flip the default according to 'git config --help'.
It's not a new file, it is "git mv ui/input.c ui/input-legacy.c".
Quoted 2 lines
* "build fix" patch -- we shouldn't break the build in one patch and fix it in another, this breaks bisection
I wanted to keep patch authorship, that's why it isn't squashed in. Also it is in the braille support bits which are not compiled unless you have brlapi-devel installed. I expect this being pretty unusual, so most people will not see it.
Quoted 2 lines
* patches which don't come anywhere near passing
checkpatch
Same reason, keep patch authorship. Dave's SDL2 patch has a bunch of codestyle issues, mostly due to using the SDl1 code as base. They are fixed up later in the series, by deleting code not needed any step by step, and finally with a codestyle cleanup patch.
You can easily check that by running the whole pull request through checkpatch:
git diff 105a060188dc6fdd4551571a966514d1a5f6815a..pull-input-2 \
| scripts/checkpatch.pl -
That'll show a single issue, in the legacy input code, which only shows up due to the file with the legacy input code being renamed (see above).
cheers,
Gerd
Quoted 10 lines · Gerd Hoffmann
Quoted 4 lines
I hate bouncing this pull request for a second time, but this still contains stuff that's obviously not ready:
* patch which adds a 1000 line new file, then another patch 2 commits later deletes 100 of those linesThat is just a case of having forgotten to specify '-M' switch for git-format-patch. Hmm, seems there is no config option to flip the default according to 'git config --help'.
It's not a new file, it is "git mv
ui/input.cui/input-legacy.c".
No, I mean ui/sdl2.c.
Quoted 7 lines
Quoted 2 lines
* "build fix" patch -- we shouldn't break the build in one patch and fix it in another, this breaks bisection
I wanted to keep patch authorship, that's why it isn't squashed in. Also it is in the braille support bits which are not compiled unless you have brlapi-devel installed. I expect this being pretty unusual, so most people will not see it.
I expect quite a few people will have brlapi-devel installed because it's useful to have all the build-depends for optional bits of QEMU around so you can check you haven't accidentally broken them. I have it installed, for example.
If you need to fix up somebody else's patch because they've dumped it on the list and run away without fixing review issues, the right way to do this is:
* retain their email as the author
* retain their Signed-off-by line
* after that, include a brief summary in square brackets of the changes you made to it to fix it up, eg
[Gerd: fixed style issues, removed unnecessary code, fixed
breaking of baum2 code] (feel free to be more verbose)
* then add your Signed-off-by line underneath it
Quoted 7 lines
Quoted 2 lines
* patches which don't come anywhere near passing
checkpatchSame reason, keep patch authorship. Dave's SDL2 patch has a bunch of codestyle issues, mostly due to using the SDl1 code as base. They are fixed up later in the series, by deleting code not needed any step by step, and finally with a codestyle cleanup patch.
Yes. Don't do this. Patches to be committed should be correct to start with, not initially broken and then fixed up in later patches.
thanks
-- PMM
Hi,
Quoted 10 lines
If you need to fix up somebody else's patch because they've dumped it on the list and run away without fixing review issues, the right way to do this is:
* retain their email as the author
* retain their Signed-off-by line
* after that, include a brief summary in square brackets of the changes you made to it to fix it up, eg
[Gerd: fixed style issues, removed unnecessary code, fixed
breaking of baum2 code] (feel free to be more verbose)
* then add your Signed-off-by line underneath it
Ok, I'll squash all SDL2 bits this way into a single patch then, which should resolve all issues.
cheers,
Gerd
Quoted 9 lines · Gerd Hoffmann
Quoted 4 lines
I hate bouncing this pull request for a second time, but this still contains stuff that's obviously not ready:
* patch which adds a 1000 line new file, then another patch 2 commits later deletes 100 of those linesThat is just a case of having forgotten to specify '-M' switch for git-format-patch. Hmm, seems there is no config option to flip the default according to 'git config --help'.
Not the first time git help is incomplete. You're looking for:
git config diff.renames true
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Quoted 1 line · Eric Blake
git config diff.renames true
Thanks.
Gerd