From patchwork Mon Feb 25 15:20:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 222932 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 97EE02C02BA for ; Tue, 26 Feb 2013 02:22:23 +1100 (EST) Received: from localhost ([::1]:34054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9zsj-00018o-Mj for incoming@patchwork.ozlabs.org; Mon, 25 Feb 2013 10:22:21 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9zrc-0007yK-RF for qemu-devel@nongnu.org; Mon, 25 Feb 2013 10:21:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U9zrV-0007Q8-KJ for qemu-devel@nongnu.org; Mon, 25 Feb 2013 10:21:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33946) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9zrV-0007Pr-A3 for qemu-devel@nongnu.org; Mon, 25 Feb 2013 10:21:05 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1PFL4Pg029414 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 25 Feb 2013 10:21:04 -0500 Received: from t500wlan.home.berrange.com.com (vpn1-4-92.ams2.redhat.com [10.36.4.92]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r1PFKrXU032143; Mon, 25 Feb 2013 10:21:03 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 25 Feb 2013 15:20:42 +0000 Message-Id: <1361805646-6425-10-git-send-email-berrange@redhat.com> In-Reply-To: <1361805646-6425-1-git-send-email-berrange@redhat.com> References: <1361805646-6425-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH ui/gtk 09/13] Replace expose-event handler with draw handler in GTK3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Daniel P. Berrange" In GTK3 the 'expose-event' signal has been replaced by a new 'draw' signal. The only difference is that the latter will pre-create the cairo drawing context & set the clip mask. Since the drawing code is already structured in a nice way, we can just wire up the 'gd_draw_event' method to the 'draw' signal in GTK3 Signed-off-by: Daniel P. Berrange --- ui/gtk.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ui/gtk.c b/ui/gtk.c index c89c7c4..fa4c3b0 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -433,6 +433,7 @@ static gboolean gd_draw_event(GtkWidget *widget, cairo_t *cr, void *opaque) return TRUE; } +#if !GTK_CHECK_VERSION(3, 0, 0) static gboolean gd_expose_event(GtkWidget *widget, GdkEventExpose *expose, void *opaque) { @@ -453,6 +454,7 @@ static gboolean gd_expose_event(GtkWidget *widget, GdkEventExpose *expose, return ret; } +#endif static gboolean gd_motion_event(GtkWidget *widget, GdkEventMotion *motion, void *opaque) @@ -1100,8 +1102,13 @@ static void gd_connect_signals(GtkDisplayState *s) g_signal_connect(s->window, "delete-event", G_CALLBACK(gd_window_close), s); +#if GTK_CHECK_VERSION(3, 0, 0) + g_signal_connect(s->drawing_area, "draw", + G_CALLBACK(gd_draw_event), s); +#else g_signal_connect(s->drawing_area, "expose-event", G_CALLBACK(gd_expose_event), s); +#endif g_signal_connect(s->drawing_area, "motion-notify-event", G_CALLBACK(gd_motion_event), s); g_signal_connect(s->drawing_area, "button-press-event",