Revision c78f7137 include/ui/console.h

b/include/ui/console.h
223 223
                                    DisplayChangeListener *dcl);
224 224
void unregister_displaychangelistener(DisplayChangeListener *dcl);
225 225

  
226
void dpy_gfx_update(DisplayState *s, int x, int y, int w, int h);
227
void dpy_gfx_replace_surface(DisplayState *s,
226
void dpy_gfx_update(QemuConsole *con, int x, int y, int w, int h);
227
void dpy_gfx_replace_surface(QemuConsole *con,
228 228
                             DisplaySurface *surface);
229 229
void dpy_refresh(DisplayState *s);
230
void dpy_gfx_copy(struct DisplayState *s, int src_x, int src_y,
230
void dpy_gfx_copy(QemuConsole *con, int src_x, int src_y,
231 231
                  int dst_x, int dst_y, int w, int h);
232
void dpy_text_cursor(struct DisplayState *s, int x, int y);
233
void dpy_text_update(DisplayState *s, int x, int y, int w, int h);
234
void dpy_text_resize(DisplayState *s, int w, int h);
235
void dpy_mouse_set(struct DisplayState *s, int x, int y, int on);
236
void dpy_cursor_define(struct DisplayState *s, QEMUCursor *cursor);
237
bool dpy_cursor_define_supported(struct DisplayState *s);
232
void dpy_text_cursor(QemuConsole *con, int x, int y);
233
void dpy_text_update(QemuConsole *con, int x, int y, int w, int h);
234
void dpy_text_resize(QemuConsole *con, int w, int h);
235
void dpy_mouse_set(QemuConsole *con, int x, int y, int on);
236
void dpy_cursor_define(QemuConsole *con, QEMUCursor *cursor);
237
bool dpy_cursor_define_supported(QemuConsole *con);
238 238

  
239 239
static inline int surface_stride(DisplaySurface *s)
240 240
{
......
347 347
                                       Error **errp);
348 348
typedef void (*vga_hw_text_update_ptr)(void *, console_ch_t *);
349 349

  
350
DisplayState *graphic_console_init(vga_hw_update_ptr update,
351
                                   vga_hw_invalidate_ptr invalidate,
352
                                   vga_hw_screen_dump_ptr screen_dump,
353
                                   vga_hw_text_update_ptr text_update,
354
                                   void *opaque);
350
QemuConsole *graphic_console_init(vga_hw_update_ptr update,
351
                                  vga_hw_invalidate_ptr invalidate,
352
                                  vga_hw_screen_dump_ptr screen_dump,
353
                                  vga_hw_text_update_ptr text_update,
354
                                  void *opaque);
355 355

  
356 356
void vga_hw_update(void);
357 357
void vga_hw_invalidate(void);
......
362 362
void text_consoles_set_display(DisplayState *ds);
363 363
void console_select(unsigned int index);
364 364
void console_color_init(DisplayState *ds);
365
void qemu_console_resize(DisplayState *ds, int width, int height);
366
void qemu_console_copy(DisplayState *ds, int src_x, int src_y,
365
void qemu_console_resize(QemuConsole *con, int width, int height);
366
void qemu_console_copy(QemuConsole *con, int src_x, int src_y,
367 367
                       int dst_x, int dst_y, int w, int h);
368
DisplaySurface *qemu_console_surface(QemuConsole *con);
369
DisplayState *qemu_console_displaystate(QemuConsole *console);
368 370

  
369 371
typedef CharDriverState *(VcHandler)(ChardevVC *vc);
370 372

  

Also available in: Unified diff