diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk.c | 14 | ||||
| -rw-r--r-- | ui/vnc.c | 20 |
2 files changed, 26 insertions, 8 deletions
diff --git a/ui/gtk.c b/ui/gtk.c index 8e055da0dc..a5f6869e9a 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -435,6 +435,15 @@ static void gtk_release_modifiers(GtkDisplayState *s) } } +static void gd_widget_reparent(GtkWidget *from, GtkWidget *to, + GtkWidget *widget) +{ + g_object_ref(G_OBJECT(widget)); + gtk_container_remove(GTK_CONTAINER(from), widget); + gtk_container_add(GTK_CONTAINER(to), widget); + g_object_unref(G_OBJECT(widget)); +} + /** DisplayState Callbacks **/ static void gd_update(DisplayChangeListener *dcl, @@ -1031,7 +1040,7 @@ static gboolean gd_tab_window_close(GtkWidget *widget, GdkEvent *event, GtkDisplayState *s = vc->s; gtk_widget_set_sensitive(vc->menu_item, true); - gtk_widget_reparent(vc->tab_item, s->notebook); + gd_widget_reparent(vc->window, s->notebook, vc->tab_item); gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(s->notebook), vc->tab_item, vc->label); gtk_widget_destroy(vc->window); @@ -1065,7 +1074,7 @@ static void gd_menu_untabify(GtkMenuItem *item, void *opaque) if (!vc->window) { gtk_widget_set_sensitive(vc->menu_item, false); vc->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_widget_reparent(vc->tab_item, vc->window); + gd_widget_reparent(s->notebook, vc->window, vc->tab_item); g_signal_connect(vc->window, "delete-event", G_CALLBACK(gd_tab_window_close), vc); @@ -1666,7 +1675,6 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc, GDK_LEAVE_NOTIFY_MASK | GDK_SCROLL_MASK | GDK_KEY_PRESS_MASK); - gtk_widget_set_double_buffered(vc->gfx.drawing_area, FALSE); gtk_widget_set_can_focus(vc->gfx.drawing_area, TRUE); vc->type = GD_VC_GFX; diff --git a/ui/vnc.c b/ui/vnc.c index 0fe6eff1b8..57070150d4 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2026,6 +2026,16 @@ static void set_pixel_format(VncState *vs, return; } + switch (bits_per_pixel) { + case 8: + case 16: + case 32: + break; + default: + vnc_client_error(vs); + return; + } + vs->client_pf.rmax = red_max; vs->client_pf.rbits = hweight_long(red_max); vs->client_pf.rshift = red_shift; @@ -2768,6 +2778,11 @@ static void vnc_refresh(DisplayChangeListener *dcl) VncState *vs, *vn; int has_dirty, rects = 0; + if (QTAILQ_EMPTY(&vd->clients)) { + update_displaychangelistener(&vd->dcl, VNC_REFRESH_INTERVAL_MAX); + return; + } + graphic_hw_update(NULL); if (vnc_trylock_display(vd)) { @@ -2783,11 +2798,6 @@ static void vnc_refresh(DisplayChangeListener *dcl) /* vs might be free()ed here */ } - if (QTAILQ_EMPTY(&vd->clients)) { - update_displaychangelistener(&vd->dcl, VNC_REFRESH_INTERVAL_MAX); - return; - } - if (has_dirty && rects) { vd->dcl.update_interval /= 2; if (vd->dcl.update_interval < VNC_REFRESH_INTERVAL_BASE) { |