From patchwork Tue Aug 23 20:36:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Karas X-Patchwork-Id: 662038 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sJj115dghz9sxb for ; Wed, 24 Aug 2016 06:37:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=inbox.ru header.i=@inbox.ru header.b=VBPACrz6; dkim-atps=neutral Received: from localhost ([::1]:48150 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcIRj-0003kw-K3 for incoming@patchwork.ozlabs.org; Tue, 23 Aug 2016 16:37:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcIR4-0003Tf-JJ for qemu-devel@nongnu.org; Tue, 23 Aug 2016 16:36:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bcIQy-0001TK-JN for qemu-devel@nongnu.org; Tue, 23 Aug 2016 16:36:37 -0400 Received: from f45.i.mail.ru ([94.100.185.16]:49031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcIQx-0001Rx-4o for qemu-devel@nongnu.org; Tue, 23 Aug 2016 16:36:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=inbox.ru; s=mail; h=Content-Transfer-Encoding:Content-Type:Message-ID:Reply-To:Date:MIME-Version:Subject:Cc:To:From; bh=BsLXQGAmXrDP2tvzdLxIHS1yYV1vSTa9GY0SOYtrQwk=; b=VBPACrz62uoKOZRF35cmcGZdYoZxD3otDLR8PebfIhRVCWYEIMujwP2hE2CIoZ0h5A4Cklx/nSpEfMhfhhwDRNibrl2xH3znfeWByresK1fvkiEKdSyoYXLKb7rbvk8hB2E6EKnJbCJaEPgU1Og3jJZYV5HWjJgBtIKnxHFHxek=; Received: from [46.56.69.109] (ident=mail) by f45.i.mail.ru with local (envelope-from ) id 1bcIQo-0006ds-F3; Tue, 23 Aug 2016 23:36:23 +0300 Received: from [46.56.69.109] by e.mail.ru with HTTP; Tue, 23 Aug 2016 23:36:22 +0300 From: =?UTF-8?B?QW5kcmVpIEthcmFz?= To: =?UTF-8?B?cWVtdS1kZXZlbA==?= MIME-Version: 1.0 X-Mailer: Mail.Ru Mailer 1.0 X-Originating-IP: [46.56.69.109] Date: Tue, 23 Aug 2016 23:36:22 +0300 X-Priority: 3 (Normal) Message-ID: <1471984582.966257043@f45.i.mail.ru> X-Mailru-Sender: 993AF40496C338182205535F0447C0F145713657948C7CA357867438996867A21482271117D14358 X-Mras: OK X-Spam: undefined X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 94.100.185.16 Subject: [Qemu-devel] =?utf-8?q?_=5BPATCH_1/2=5D_SDL2=3A_only_show_console?= =?utf-8?q?s_by_shortcuts_and_not_hide=2E?= X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: =?UTF-8?B?QW5kcmVpIEthcmFz?= Cc: =?UTF-8?B?R2VyZCBIb2ZmbWFubg==?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This fix issue with stuck keys in SDL2 if press one of shortcuts for show/hide consoles. For close any consoles except main window can be used default WM/DE action for close window. Signed-off-by: Andrei Karas --- ui/sdl2.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/ui/sdl2.c b/ui/sdl2.c index 30d2a3c..4441e99 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -363,15 +363,17 @@ static void handle_keydown(SDL_Event *ev) win = ev->key.keysym.scancode - SDL_SCANCODE_1; if (win < sdl2_num_outputs) { - sdl2_console[win].hidden = !sdl2_console[win].hidden; - if (sdl2_console[win].real_window) { - if (sdl2_console[win].hidden) { - SDL_HideWindow(sdl2_console[win].real_window); - } else { - SDL_ShowWindow(sdl2_console[win].real_window); + if (sdl2_console[win].hidden == 1) { + sdl2_console[win].hidden = !sdl2_console[win].hidden; + if (sdl2_console[win].real_window) { + if (sdl2_console[win].hidden) { + SDL_HideWindow(sdl2_console[win].real_window); + } else { + SDL_ShowWindow(sdl2_console[win].real_window); + } } + gui_keysym = 1; } - gui_keysym = 1; } break; case SDL_SCANCODE_F: @@ -566,9 +568,14 @@ static void handle_windowevent(SDL_Event *ev) update_displaychangelistener(&scon->dcl, 500); break; case SDL_WINDOWEVENT_CLOSE: - if (!no_quit) { - no_shutdown = 0; - qemu_system_shutdown_request(); + if (scon->idx == 0) { + if (!no_quit) { + no_shutdown = 0; + qemu_system_shutdown_request(); + } + } else { + scon->hidden = true; + SDL_HideWindow(scon->real_window); } break; case SDL_WINDOWEVENT_SHOWN: