From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Anthony Liguori <aliguori@amazon.com>
Subject: [Qemu-devel] [PULL v4 37/38] console: add QemuUIInfo
Date: Wed, 5 Mar 2014 12:53:39 +0100 [thread overview]
Message-ID: <1394020420-17576-38-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1394020420-17576-1-git-send-email-kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/ui/console.h | 12 ++++++++++++
ui/console.c | 17 +++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/include/ui/console.h b/include/ui/console.h
index b2af53e..08a38ea 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -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);
diff --git a/ui/console.c b/ui/console.c
index 0a4f912..4df251d 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -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) {
--
1.8.3.1
next prev parent reply other threads:[~2014-03-05 11:55 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-05 11:53 [Qemu-devel] [PULL v4 00/38] rework input handling, sdl2 support Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 01/38] console: export QemuConsole index, width, height Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 02/38] input: rename file to legacy Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 03/38] input: qapi: define event types Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 04/38] input: qapi: add unmapped key Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 05/38] input: qapi: add pause key Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 06/38] input: add core bits of the new input layer Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 07/38] input: keyboard: add helper functions to core Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 08/38] input: keyboard: switch legacy handlers to new core Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 09/38] input: keyboard: switch qmp_send_key() " Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 10/38] input: keyboard: switch gtk ui " Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 11/38] input: keyboard: switch sdl " Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 12/38] input: keyboard: switch vnc " Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 13/38] input: keyboard: switch spice " Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 14/38] input: keyboard: switch curses " Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 15/38] input: mouse: add helpers functions to core Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 16/38] input: mouse: add graphic_rotate support Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 17/38] input: mouse: add qemu_input_is_absolute() Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 18/38] input: mouse: switch legacy handlers to new core Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 19/38] input: mouse: switch gtk ui " Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 20/38] input: mouse: switch sdl " Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 21/38] input: mouse: switch vnc " Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 22/38] input: mouse: switch spice " Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 23/38] input: mouse: switch monitor " Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 24/38] input: keyboard: switch cocoa ui " Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 25/38] input: mouse: " Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 26/38] input: trace events Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 27/38] input-legacy: remove kbd_put_keycode Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 28/38] input-legacy: remove kbd_mouse_has_absolute Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 29/38] input-legacy: remove kbd_mouse_is_absolute Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 30/38] input-legacy: remove kbd_mouse_event Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 31/38] input: move mouse mode notifier to new core Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 32/38] input: add input_mouse_mode tracepoint Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 33/38] input: move qmp_query_mice to new core Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 34/38] input: move do_mouse_set " Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 35/38] input: remove index_from_keycode (no users) Gerd Hoffmann
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 36/38] console: add head to index to qemu consoles Gerd Hoffmann
2014-03-05 11:53 ` Gerd Hoffmann [this message]
2014-03-05 11:53 ` [Qemu-devel] [PULL v4 38/38] ui/sdl2 : initial port to SDL 2.0 (v2.0) Gerd Hoffmann
2014-03-07 19:23 ` [Qemu-devel] [PULL v4 00/38] rework input handling, sdl2 support Peter Maydell
2014-03-07 19:45 ` Andreas Färber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394020420-17576-38-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=aliguori@amazon.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).