| Message ID | 1363772625-9182-22-git-send-email-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
Gerd Hoffmann <kraxel@redhat.com> writes: > Makes gtk ui play nicely with qxl (and vmware_svga) > as you can actually see your pointer now ;) > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > ui/gtk.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/ui/gtk.c b/ui/gtk.c > index 7599ff4..512e974 100644 > --- a/ui/gtk.c > +++ b/ui/gtk.c > @@ -303,6 +303,29 @@ static void gd_refresh(DisplayChangeListener *dcl) > graphic_hw_update(dcl->con); > } > > +static void gd_mouse_set(DisplayChangeListener *dcl, > + int x, int y, int visible) > +{ > + /* should warp pointer to x, y here */ This is just a matter of doing: gdk_window_get_root_coords(window, x, y, &x_root, &y_root); gdk_display_warp_pointer(display, screen, x_root, y_root); > +} > + > +static void gd_cursor_define(DisplayChangeListener *dcl, > + QEMUCursor *c) > +{ > + GtkDisplayState *s = container_of(dcl, GtkDisplayState, dcl); > + GdkPixbuf *pixbuf; > + GdkCursor *cursor; > + > + pixbuf = gdk_pixbuf_new_from_data((guchar *)(c->data), > + GDK_COLORSPACE_RGB, true, 8, > + c->width, c->height, c->width * 4, > + NULL, NULL); > + cursor = gdk_cursor_new_from_pixbuf(gdk_display_get_default(), You should get the display from the drawing_area widget. > + pixbuf, c->hot_x, c->hot_y); > + gdk_window_set_cursor(s->drawing_area->window, cursor); > + g_object_unref(pixbuf); You should also dereference the cursor here. Regards, Anthony Liguori
>> +static void gd_mouse_set(DisplayChangeListener *dcl, >> + int x, int y, int visible) >> +{ >> + /* should warp pointer to x, y here */ > > This is just a matter of doing: > > gdk_window_get_root_coords(window, x, y, &x_root, &y_root); > gdk_display_warp_pointer(display, screen, x_root, y_root); Thanks. >> + cursor = gdk_cursor_new_from_pixbuf(gdk_display_get_default(), > > You should get the display from the drawing_area widget. Yea, couldn't find the function which does this though. >> + pixbuf, c->hot_x, c->hot_y); >> + gdk_window_set_cursor(s->drawing_area->window, cursor); >> + g_object_unref(pixbuf); > > You should also dereference the cursor here. Will fix. cheers, Gerd
Gerd Hoffmann <kraxel@redhat.com> writes: >>> +static void gd_mouse_set(DisplayChangeListener *dcl, >>> + int x, int y, int visible) >>> +{ >>> + /* should warp pointer to x, y here */ >> >> This is just a matter of doing: >> >> gdk_window_get_root_coords(window, x, y, &x_root, &y_root); >> gdk_display_warp_pointer(display, screen, x_root, y_root); > > Thanks. > >>> + cursor = gdk_cursor_new_from_pixbuf(gdk_display_get_default(), >> >> You should get the display from the drawing_area widget. > > Yea, couldn't find the function which does this though. gtk_widget_get_display(s->drawing_area) for both GTK2/GTK3. I don't think this will play all that nicely with GTK3 and multiple input devices but I can't think of a better way. The notion of a guest initiated cursor warp doesn't really make sense with multiple input devices I think. Regards, Anthony Liguori > >>> + pixbuf, c->hot_x, c->hot_y); >>> + gdk_window_set_cursor(s->drawing_area->window, cursor); >>> + g_object_unref(pixbuf); >> >> You should also dereference the cursor here. > > Will fix. > > cheers, > Gerd
diff --git a/ui/gtk.c b/ui/gtk.c index 7599ff4..512e974 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -303,6 +303,29 @@ static void gd_refresh(DisplayChangeListener *dcl) graphic_hw_update(dcl->con); } +static void gd_mouse_set(DisplayChangeListener *dcl, + int x, int y, int visible) +{ + /* should warp pointer to x, y here */ +} + +static void gd_cursor_define(DisplayChangeListener *dcl, + QEMUCursor *c) +{ + GtkDisplayState *s = container_of(dcl, GtkDisplayState, dcl); + GdkPixbuf *pixbuf; + GdkCursor *cursor; + + pixbuf = gdk_pixbuf_new_from_data((guchar *)(c->data), + GDK_COLORSPACE_RGB, true, 8, + c->width, c->height, c->width * 4, + NULL, NULL); + cursor = gdk_cursor_new_from_pixbuf(gdk_display_get_default(), + pixbuf, c->hot_x, c->hot_y); + gdk_window_set_cursor(s->drawing_area->window, cursor); + g_object_unref(pixbuf); +} + static void gd_switch(DisplayChangeListener *dcl, DisplaySurface *surface) { @@ -1309,6 +1332,8 @@ static const DisplayChangeListenerOps dcl_ops = { .dpy_gfx_update = gd_update, .dpy_gfx_switch = gd_switch, .dpy_refresh = gd_refresh, + .dpy_mouse_set = gd_mouse_set, + .dpy_cursor_define = gd_cursor_define, }; void gtk_display_init(DisplayState *ds)
Makes gtk ui play nicely with qxl (and vmware_svga) as you can actually see your pointer now ;) Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- ui/gtk.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)