qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Matthew Kilgore <mattkilgore12@gmail.com>,
	Gerd Hoffmann <kraxel@redhat.com>
Subject: [PULL 2/4] curses: use the bit mask constants provided by curses
Date: Fri, 18 Oct 2019 12:17:09 +0200	[thread overview]
Message-ID: <20191018101711.24105-3-kraxel@redhat.com> (raw)
In-Reply-To: <20191018101711.24105-1-kraxel@redhat.com>

From: Matthew Kilgore <mattkilgore12@gmail.com>

The curses API provides the A_ATTRIBUTES and A_CHARTEXT bit masks for
getting the attributes and character parts of a chtype, respectively. We
should use provided constants instead of using 0xff.

Signed-off-by: Matthew Kilgore <mattkilgore12@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Tested-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Message-id: 20191004035338.25601-2-mattkilgore12@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/curses.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/curses.c b/ui/curses.c
index ec281125acbd..84003f56a323 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -75,8 +75,8 @@ static void curses_update(DisplayChangeListener *dcl,
     line = screen + y * width;
     for (h += y; y < h; y ++, line += width) {
         for (x = 0; x < width; x++) {
-            chtype ch = line[x] & 0xff;
-            chtype at = line[x] & ~0xff;
+            chtype ch = line[x] & A_CHARTEXT;
+            chtype at = line[x] & A_ATTRIBUTES;
             ret = getcchar(&vga_to_curses[ch], wch, &attrs, &colors, NULL);
             if (ret == ERR || wch[0] == 0) {
                 wch[0] = ch;
-- 
2.18.1



  parent reply	other threads:[~2019-10-18 10:19 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-18 10:17 [PULL 0/4] Ui 20191018 patches Gerd Hoffmann
2019-10-18 10:17 ` [PULL 1/4] ui: Fix hanging up Cocoa display on macOS 10.15 (Catalina) Gerd Hoffmann
2019-10-18 11:54   ` Peter Maydell
2019-10-18 13:01   ` Christian Schoenebeck
2019-10-18 13:02     ` Peter Maydell
2019-10-18 14:11       ` Christian Schoenebeck
2019-10-18 10:17 ` Gerd Hoffmann [this message]
2019-10-18 10:17 ` [PULL 3/4] curses: correctly pass the color pair to setcchar() Gerd Hoffmann
2019-10-18 10:17 ` [PULL 4/4] ui: fix keymap file search in input-barrier object Gerd Hoffmann
2019-10-18 11:53 ` [PULL 0/4] Ui 20191018 patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191018101711.24105-3-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=mattkilgore12@gmail.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).