qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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] [PATCH 44/44] console: add QemuUIInfo
Date: Mon, 24 Feb 2014 12:52:51 +0100	[thread overview]
Message-ID: <1393242771-28076-45-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1393242771-28076-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

  parent reply	other threads:[~2014-02-24 11:54 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-24 11:52 [Qemu-devel] [PULL v2 00/44] rework input handling, sdl2 support Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 01/44] ui/sdl2 : initial port to SDL 2.0 (v2.0) Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 02/44] sdl2: baum build fix Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 03/44] sdl2: remove text console logic Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 04/44] console: export QemuConsole index, width, height Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 05/44] input: rename file to legacy Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 06/44] input: qapi: define event types Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 07/44] input: qapi: add unmapped key Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 08/44] input: qapi: add pause key Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 09/44] input: add core bits of the new input layer Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 10/44] input: keyboard: add helper functions to core Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 11/44] input: keyboard: switch legacy handlers to new core Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 12/44] input: keyboard: switch qmp_send_key() " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 13/44] input: keyboard: switch gtk ui " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 14/44] input: keyboard: switch sdl " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 15/44] sdl2: switch keyboard handling " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 16/44] input: keyboard: switch vnc ui " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 17/44] input: keyboard: switch spice " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 18/44] input: keyboard: switch curses " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 19/44] input: mouse: add helpers functions to core Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 20/44] input: mouse: add graphic_rotate support Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 21/44] input: mouse: add qemu_input_is_absolute() Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 22/44] input: mouse: switch legacy handlers to new core Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 23/44] input: mouse: switch gtk ui " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 24/44] input: mouse: switch sdl " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 25/44] sdl2: switch mouse handling " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 26/44] input: mouse: switch vnc ui " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 27/44] input: mouse: switch spice " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 28/44] input: mouse: switch monitor " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 29/44] input: keyboard: switch cocoa ui " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 30/44] input: mouse: " Gerd Hoffmann
2014-02-24 12:01   ` Andreas Färber
2014-02-24 11:52 ` [Qemu-devel] [PATCH 31/44] input: trace events Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 32/44] input-legacy: remove kbd_put_keycode Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 33/44] input-legacy: remove kbd_mouse_has_absolute Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 34/44] input-legacy: remove kbd_mouse_is_absolute Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 35/44] input-legacy: remove kbd_mouse_event Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 36/44] input: move mouse mode notifier to new core Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 37/44] input: add input_mouse_mode tracepoint Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 38/44] sdl2: simplify keymap handling Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 39/44] sdl2: codestyle fixups Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 40/44] input: move qmp_query_mice to new core Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 41/44] input: move do_mouse_set " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 42/44] input: remove index_from_keycode (no users) Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 43/44] console: add head to index to qemu consoles Gerd Hoffmann
2014-02-24 11:52 ` Gerd Hoffmann [this message]
2014-02-26 20:06 ` [Qemu-devel] [PULL v2 00/44] rework input handling, sdl2 support Peter Maydell
2014-02-27 13:19   ` Gerd Hoffmann
2014-02-27 13:30     ` Peter Maydell
2014-02-27 14:06       ` Gerd Hoffmann
2014-02-27 13:55     ` Eric Blake
2014-02-27 14:04       ` Gerd Hoffmann

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=1393242771-28076-45-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).