hw/9pfs: Update v9fs_mknod to use coroutines

[qemu.git] / console.h

diff --git a/console.h b/console.h
index dcb49adad3bb4b1b65884ff0466c5e65023bfc65..67d137384e152c77f019c7fb141fce2f4646a989 100644 (file)
--- a/console.h
+++ b/console.h
@@ -2,6 +2,10 @@
 #define CONSOLE_H
 
 #include "qemu-char.h"
 #define CONSOLE_H
 
 #include "qemu-char.h"

+#include "qdict.h"
+#include "notify.h"
+#include "qerror.h"
+#include "monitor.h"

 
 /* keyboard/mouse support */
 
 
 /* keyboard/mouse support */
 


@@ -9,10 +13,16 @@
 #define MOUSE_EVENT_RBUTTON 0x02
 #define MOUSE_EVENT_MBUTTON 0x04
 
 #define MOUSE_EVENT_RBUTTON 0x02
 #define MOUSE_EVENT_MBUTTON 0x04
 

+/* identical to the ps/2 keyboard bits */
+#define QEMU_SCROLL_LOCK_LED (1 << 0)
+#define QEMU_NUM_LOCK_LED    (1 << 1)
+#define QEMU_CAPS_LOCK_LED   (1 << 2)
+

 /* in ms */
 #define GUI_REFRESH_INTERVAL 30
 
 typedef void QEMUPutKBDEvent(void *opaque, int keycode);
 /* in ms */
 #define GUI_REFRESH_INTERVAL 30
 
 typedef void QEMUPutKBDEvent(void *opaque, int keycode);

+typedef void QEMUPutLEDEvent(void *opaque, int ledstate);

 typedef void QEMUPutMouseEvent(void *opaque, int dx, int dy, int dz, int buttons_state);
 
 typedef struct QEMUPutMouseEntry {
 typedef void QEMUPutMouseEvent(void *opaque, int dx, int dy, int dz, int buttons_state);
 
 typedef struct QEMUPutMouseEntry {


@@ -21,21 +31,42 @@ typedef struct QEMUPutMouseEntry {
     int qemu_put_mouse_event_absolute;
     char *qemu_put_mouse_event_name;
 
     int qemu_put_mouse_event_absolute;
     char *qemu_put_mouse_event_name;
 

+    int index;
+

     /* used internally by qemu for handling mice */
     /* used internally by qemu for handling mice */

-    struct QEMUPutMouseEntry *next;
+    QTAILQ_ENTRY(QEMUPutMouseEntry) node;

 } QEMUPutMouseEntry;
 
 } QEMUPutMouseEntry;
 

+typedef struct QEMUPutLEDEntry {
+    QEMUPutLEDEvent *put_led;
+    void *opaque;
+    QTAILQ_ENTRY(QEMUPutLEDEntry) next;
+} QEMUPutLEDEntry;
+

 void qemu_add_kbd_event_handler(QEMUPutKBDEvent *func, void *opaque);
 void qemu_add_kbd_event_handler(QEMUPutKBDEvent *func, void *opaque);

+void qemu_remove_kbd_event_handler(void);

 QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func,
                                                 void *opaque, int absolute,
                                                 const char *name);
 void qemu_remove_mouse_event_handler(QEMUPutMouseEntry *entry);
 QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func,
                                                 void *opaque, int absolute,
                                                 const char *name);
 void qemu_remove_mouse_event_handler(QEMUPutMouseEntry *entry);

+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_keycode(int keycode);

+void kbd_put_ledstate(int ledstate);

 void kbd_mouse_event(int dx, int dy, int dz, int buttons_state);
 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);
 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 mouse_transform_info_s {
+struct MouseTransformInfo {

     /* Touchscreen resolution */
     int x;
     int y;
     /* Touchscreen resolution */
     int x;
     int y;


@@ -43,8 +74,9 @@ struct mouse_transform_info_s {
     int a[7];
 };
 
     int a[7];
 };
 

-void do_info_mice(void);
-void do_mouse_set(int index);
+void do_info_mice_print(Monitor *mon, const QObject *data);
+void do_info_mice(Monitor *mon, QObject **ret_data);
+void do_mouse_set(Monitor *mon, const QDict *qdict);

 
 /* keysym is a unicode code except for special keys (see QEMU_KEY_xxx
    constants) */
 
 /* keysym is a unicode code except for special keys (see QEMU_KEY_xxx
    constants) */


@@ -75,6 +107,7 @@ void kbd_put_keysym(int keysym);
 
 #define QEMU_BIG_ENDIAN_FLAG    0x01
 #define QEMU_ALLOCATED_FLAG     0x02
 
 #define QEMU_BIG_ENDIAN_FLAG    0x01
 #define QEMU_ALLOCATED_FLAG     0x02

+#define QEMU_REALPIXELS_FLAG    0x04

 
 struct PixelFormat {
     uint8_t bits_per_pixel;
 
 struct PixelFormat {
     uint8_t bits_per_pixel;


@@ -96,6 +129,27 @@ struct DisplaySurface {
     struct PixelFormat pf;
 };
 
     struct PixelFormat pf;
 };
 

+/* cursor data format is 32bit RGBA */
+typedef struct QEMUCursor {
+    int                 width, height;
+    int                 hot_x, hot_y;
+    int                 refcount;
+    uint32_t            data[];
+} QEMUCursor;
+
+QEMUCursor *cursor_alloc(int width, int height);
+void cursor_get(QEMUCursor *c);
+void cursor_put(QEMUCursor *c);
+QEMUCursor *cursor_builtin_hidden(void);
+QEMUCursor *cursor_builtin_left_ptr(void);
+void cursor_print_ascii_art(QEMUCursor *c, const char *prefix);
+int cursor_get_mono_bpl(QEMUCursor *c);
+void cursor_set_mono(QEMUCursor *c,
+                     uint32_t foreground, uint32_t background, uint8_t *image,
+                     int transparent, uint8_t *mask);
+void cursor_get_mono_image(QEMUCursor *c, int foreground, uint8_t *mask);
+void cursor_get_mono_mask(QEMUCursor *c, int transparent, uint8_t *mask);
+

 struct DisplayChangeListener {
     int idle;
     uint64_t gui_timer_interval;
 struct DisplayChangeListener {
     int idle;
     uint64_t gui_timer_interval;


@@ -113,34 +167,64 @@ struct DisplayChangeListener {
     struct DisplayChangeListener *next;
 };
 
     struct DisplayChangeListener *next;
 };
 

+struct DisplayAllocator {
+    DisplaySurface* (*create_displaysurface)(int width, int height);
+    DisplaySurface* (*resize_displaysurface)(DisplaySurface *surface, int width, int height);
+    void (*free_displaysurface)(DisplaySurface *surface);
+};
+

 struct DisplayState {
     struct DisplaySurface *surface;
     void *opaque;
     struct QEMUTimer *gui_timer;
 
 struct DisplayState {
     struct DisplaySurface *surface;
     void *opaque;
     struct QEMUTimer *gui_timer;
 

+    struct DisplayAllocator* allocator;

     struct DisplayChangeListener* listeners;
 
     void (*mouse_set)(int x, int y, int on);
     struct DisplayChangeListener* listeners;
 
     void (*mouse_set)(int x, int y, int on);

-    void (*cursor_define)(int width, int height, int bpp, int hot_x, int hot_y,
-                          uint8_t *image, uint8_t *mask);
+    void (*cursor_define)(QEMUCursor *cursor);

 
     struct DisplayState *next;
 };
 
 void register_displaystate(DisplayState *ds);
 DisplayState *get_displaystate(void);
 
     struct DisplayState *next;
 };
 
 void register_displaystate(DisplayState *ds);
 DisplayState *get_displaystate(void);

-DisplaySurface* qemu_create_displaysurface(int width, int height, int bpp, int linesize);
-DisplaySurface* qemu_resize_displaysurface(DisplaySurface *surface,
-                                           int width, int height, int bpp, int linesize);

 DisplaySurface* qemu_create_displaysurface_from(int width, int height, int bpp,
                                                 int linesize, uint8_t *data);
 DisplaySurface* qemu_create_displaysurface_from(int width, int height, int bpp,
                                                 int linesize, uint8_t *data);

-void qemu_free_displaysurface(DisplaySurface *surface);
+void qemu_alloc_display(DisplaySurface *surface, int width, int height,
+                        int linesize, PixelFormat pf, int newflags);

 PixelFormat qemu_different_endianness_pixelformat(int bpp);
 PixelFormat qemu_default_pixelformat(int bpp);
 
 PixelFormat qemu_different_endianness_pixelformat(int bpp);
 PixelFormat qemu_default_pixelformat(int bpp);
 

+DisplayAllocator *register_displayallocator(DisplayState *ds, DisplayAllocator *da);
+
+static inline DisplaySurface* qemu_create_displaysurface(DisplayState *ds, int width, int height)
+{
+    return ds->allocator->create_displaysurface(width, height);    
+}
+
+static inline DisplaySurface* qemu_resize_displaysurface(DisplayState *ds, int width, int height)
+{
+    return ds->allocator->resize_displaysurface(ds->surface, width, height);
+}
+
+static inline void qemu_free_displaysurface(DisplayState *ds)
+{
+    ds->allocator->free_displaysurface(ds->surface);
+}
+
+static inline int is_surface_bgr(DisplaySurface *surface)
+{
+    if (surface->pf.bits_per_pixel == 32 && surface->pf.rshift == 0)
+        return 1;
+    else
+        return 0;
+}
+

 static inline int is_buffer_shared(DisplaySurface *surface)
 {
 static inline int is_buffer_shared(DisplaySurface *surface)
 {

-    return (!(surface->flags & QEMU_ALLOCATED_FLAG));
+    return (!(surface->flags & QEMU_ALLOCATED_FLAG) &&
+            !(surface->flags & QEMU_REALPIXELS_FLAG));

 }
 
 static inline void register_displaychangelistener(DisplayState *ds, DisplayChangeListener *dcl)
 }
 
 static inline void register_displaychangelistener(DisplayState *ds, DisplayChangeListener *dcl)


@@ -247,7 +331,9 @@ static inline int ds_get_bytes_per_pixel(DisplayState *ds)
 typedef unsigned long console_ch_t;
 static inline void console_write_ch(console_ch_t *dest, uint32_t ch)
 {
 typedef unsigned long console_ch_t;
 static inline void console_write_ch(console_ch_t *dest, uint32_t ch)
 {

-    cpu_to_le32wu((uint32_t *) dest, ch);
+    if (!(ch & 0xff))
+        ch |= ' ';
+    *dest = ch;

 }
 
 typedef void (*vga_hw_update_ptr)(void *);
 }
 
 typedef void (*vga_hw_update_ptr)(void *);


@@ -268,7 +354,7 @@ void vga_hw_text_update(console_ch_t *chardata);
 
 int is_graphic_console(void);
 int is_fixedsize_console(void);
 
 int is_graphic_console(void);
 int is_fixedsize_console(void);

-CharDriverState *text_console_init(const char *p);
+int text_console_init(QemuOpts *opts, CharDriverState **_chr);

 void text_consoles_set_display(DisplayState *ds);
 void console_select(unsigned int index);
 void console_color_init(DisplayState *ds);
 void text_consoles_set_display(DisplayState *ds);
 void console_select(unsigned int index);
 void console_color_init(DisplayState *ds);


@@ -286,40 +372,35 @@ void cocoa_display_init(DisplayState *ds, int full_screen);
 void vnc_display_init(DisplayState *ds);
 void vnc_display_close(DisplayState *ds);
 int vnc_display_open(DisplayState *ds, const char *display);
 void vnc_display_init(DisplayState *ds);
 void vnc_display_close(DisplayState *ds);
 int vnc_display_open(DisplayState *ds, const char *display);

+void vnc_display_add_client(DisplayState *ds, int csock, int skipauth);
+int vnc_display_disable_login(DisplayState *ds);
+char *vnc_display_local_addr(DisplayState *ds);
+#ifdef CONFIG_VNC

 int vnc_display_password(DisplayState *ds, const char *password);
 int vnc_display_password(DisplayState *ds, const char *password);

-void do_info_vnc(void);
+int vnc_display_pw_expire(DisplayState *ds, time_t expires);
+void do_info_vnc_print(Monitor *mon, const QObject *data);
+void do_info_vnc(Monitor *mon, QObject **ret_data);
+#else
+static inline int vnc_display_password(DisplayState *ds, const char *password)
+{
+    qerror_report(QERR_FEATURE_DISABLED, "vnc");
+    return -ENODEV;
+}
+static inline int vnc_display_pw_expire(DisplayState *ds, time_t expires)
+{
+    qerror_report(QERR_FEATURE_DISABLED, "vnc");
+    return -ENODEV;
+};
+static inline void do_info_vnc(Monitor *mon, QObject **ret_data)
+{
+};
+static inline void do_info_vnc_print(Monitor *mon, const QObject *data)
+{
+    monitor_printf(mon, "VNC support disabled\n");
+};
+#endif

 
 /* curses.c */
 void curses_display_init(DisplayState *ds, int full_screen);
 
 
 /* curses.c */
 void curses_display_init(DisplayState *ds, int full_screen);
 

-/* FIXME: term_printf et al should probably go elsewhere so everything
-   does not need to include console.h  */
-/* monitor.c */
-void monitor_init(CharDriverState *hd, int show_banner);
-void term_puts(const char *str);
-void term_vprintf(const char *fmt, va_list ap);
-void term_printf(const char *fmt, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
-void term_print_filename(const char *filename);
-void term_flush(void);
-void term_print_help(void);
-void monitor_suspend(void);
-void monitor_resume(void);
-
-#include "block.h"
-void monitor_read_bdrv_key_start(BlockDriverState *bs,
-                                 BlockDriverCompletionFunc *completion_cb,
-                                 void *opaque);
-
-/* readline.c */
-typedef void ReadLineFunc(void *opaque, const char *str);
-
-extern int completion_index;
-void add_completion(const char *str);
-void readline_handle_byte(int ch);
-void readline_find_completion(const char *cmdline);
-const char *readline_get_history(unsigned int index);
-void readline_start(const char *prompt, int is_password,
-                    ReadLineFunc *readline_func, void *opaque);
-void readline_show_prompt(void);
-

 #endif
 #endif