From patchwork Fri Aug 30 20:06:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 34362 Received: (qmail 46997 invoked by alias); 30 Aug 2019 20:06:51 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 46989 invoked by uid 89); 30 Aug 2019 20:06:51 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: gateway24.websitewelcome.com Received: from gateway24.websitewelcome.com (HELO gateway24.websitewelcome.com) (192.185.50.252) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 30 Aug 2019 20:06:49 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 6FAB31A4F for ; Fri, 30 Aug 2019 15:06:48 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id 3nAWiVF4o4FKp3nAWiZ6l5; Fri, 30 Aug 2019 15:06:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version :Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=v8j1QwlrXYu6iird5DgGTBx9He2yWLPtnCKG4h+Nq64=; b=N4q0CUfq59VrCOzIHUKiPIDWuR MI+iurq2nwMJ7dXBh8OAtltdOEWKr6w9SFIdo4hhk2+r/2hI+PECBk9VFmO3J9OSNUL4rLPb1Rovd U6uXSqzabPCUoY01vxYmZWTQz; Received: from 71-218-73-27.hlrn.qwest.net ([71.218.73.27]:34346 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1i3nAW-0023SQ-6x; Fri, 30 Aug 2019 15:06:48 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Use ui_out for "info win" Date: Fri, 30 Aug 2019 14:06:44 -0600 Message-Id: <20190830200644.18619-1-tom@tromey.com> This changes the "info win" command to use ui-out. This yields somewhat nicer table output. gdb/ChangeLog 2019-08-30 Tom Tromey * tui/tui-win.c (tui_all_windows_info): Use ui_out. --- gdb/ChangeLog | 4 ++++ gdb/tui/tui-win.c | 20 ++++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 8d41372cf90..bf84cdac442 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -828,18 +828,26 @@ static void tui_all_windows_info (const char *arg, int from_tty) { struct tui_win_info *win_with_focus = tui_win_with_focus (); + struct ui_out *uiout = current_uiout; + + ui_out_emit_table table_emitter (uiout, 3, -1, "tui-windows"); + uiout->table_header (10, ui_left, "name", "Name"); + uiout->table_header (5, ui_right, "lines", "Lines"); + uiout->table_header (10, ui_left, "focus", "Focus"); + uiout->table_body (); for (tui_win_info *win_info : all_tui_windows ()) if (win_info->is_visible ()) { + ui_out_emit_tuple tuple_emitter (uiout, nullptr); + + uiout->field_string ("name", win_info->name ()); + uiout->field_signed ("lines", win_info->height); if (win_with_focus == win_info) - printf_filtered (" %s\t(%d lines) \n", - win_info->name (), - win_info->height); + uiout->field_string ("focus", _("(has focus)")); else - printf_filtered (" %s\t(%d lines)\n", - win_info->name (), - win_info->height); + uiout->field_skip ("focus"); + uiout->text ("\n"); } }