From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1OVvga-000369-EZ for mharc-grub-devel@gnu.org; Mon, 05 Jul 2010 20:06:52 -0400 Received: from [140.186.70.92] (port=43361 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OVvgY-00035x-Hf for grub-devel@gnu.org; Mon, 05 Jul 2010 20:06:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OVvgX-0005fs-BA for grub-devel@gnu.org; Mon, 05 Jul 2010 20:06:50 -0400 Received: from mail-ew0-f41.google.com ([209.85.215.41]:60835) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OVvgX-0005fl-6a for grub-devel@gnu.org; Mon, 05 Jul 2010 20:06:49 -0400 Received: by ewy28 with SMTP id 28so1955180ewy.0 for ; Mon, 05 Jul 2010 17:06:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:references:in-reply-to :x-enigmail-version:content-type; bh=8HVxZ/WOVcW2X2dyze+OCTqkBfQZFz/kkuvBPWWE5l0=; b=YfIoMlZL1yo26yg35KUjNjO+tceM+/VaZuxERQn0XKFi4Dptn/6uKw4r3A2ziNX8sk HnhXG2KnkCEDzf6E/a3o3+t6+skCePWzoN94b8hcxeq119je51QR2qNrRpBQO2lzDLi3 CteXCv3Zfjm6wSawCloRY2Wse2RmnR1LC5uiw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:x-enigmail-version:content-type; b=eWa0x0iFGiO+svsZXRqIPThLS/ghw+/ol1qYLUVIJx3cZXiYWEE8I9XYA4iz2+qEny zSJkB/TqYb/NGBaQD5bfN4f91O/ikXEl4KAzBA09Q+tUM2I6RWq2iw0B3cIeKB9JJa1k AVFLxszwnth04vjdiGjbI8j3rs0enDm9SUD8s= Received: by 10.213.19.82 with SMTP id z18mr2148030eba.74.1278374808455; Mon, 05 Jul 2010 17:06:48 -0700 (PDT) Received: from debian.bg45.phnet ([109.229.191.139]) by mx.google.com with ESMTPS id v8sm40629321eeh.2.2010.07.05.17.06.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 05 Jul 2010 17:06:47 -0700 (PDT) Message-ID: <4C327397.4030508@gmail.com> Date: Tue, 06 Jul 2010 02:06:47 +0200 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100620 Icedove/3.0.5 MIME-Version: 1.0 To: grub-devel@gnu.org References: <20100705124723.GD21862@riva.ucam.org> In-Reply-To: <20100705124723.GD21862@riva.ucam.org> X-Enigmail-Version: 1.0.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enig8309ED6889FF13D223A68D12" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: Re: gfxterm/pager regression X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jul 2010 00:06:51 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig8309ED6889FF13D223A68D12 Content-Type: multipart/mixed; boundary="------------000507090209090409090905" This is a multi-part message in MIME format. --------------000507090209090409090905 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 07/05/2010 02:47 PM, Colin Watson wrote: > gfxterm is behaving very oddly for me with 'set pager=3D1' right now; t= he > --MORE-- prompt appears after only a few lines of text have been output= =2E > It looks rather as if it is counting the number of output characters as= > if they were the number of output lines. This doesn't happen when the > terminal output is an ordinary VGA console. > > Looking at normal/term.c:put_glyphs_terminal, it seems that it > increments state->num_lines after every glyph. This seems pretty odd. > Doesn't it need to do something a bit smarter than that? Vladimir, is > this a regression from your bidi branch merge? > > =20 Looks this way. Please test attached patch. > Thanks, > > =20 --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------000507090209090409090905 Content-Type: text/x-diff; name="charnl.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="charnl.diff" =3D=3D=3D modified file 'normal/term.c' --- normal/term.c 2010-07-02 16:20:48 +0000 +++ normal/term.c 2010-07-06 00:05:55 +0000 @@ -616,16 +616,18 @@ if (visual_ptr->base =3D=3D '\n') grub_print_spaces (term, margin_right); putglyph (visual_ptr, term); - if (state && ++state->num_lines - >=3D (grub_ssize_t) grub_term_height (term) - 2) - { - state->backlog_glyphs =3D visual_ptr + 1; - state->backlog_len =3D visual_len - (visual - visual_ptr) - 1; - return 1; - } + if (visual_ptr->base =3D=3D '\n') + { + if (state && ++state->num_lines + >=3D (grub_ssize_t) grub_term_height (term) - 2) + { + state->backlog_glyphs =3D visual_ptr + 1; + state->backlog_len =3D visual_len - (visual - visual_ptr) - 1; + return 1; + } =20 - if (visual_ptr->base =3D=3D '\n') - grub_print_spaces (term, margin_left); + grub_print_spaces (term, margin_left); + } grub_free (visual_ptr->combining); } return 0; --------------000507090209090409090905-- --------------enig8309ED6889FF13D223A68D12 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iF4EAREKAAYFAkwyc5cACgkQNak7dOguQgnTMAD/QE4mByz+sgaYkfXgwmgJDSU1 U2w7kdjsqF69H6iYuU8A/0crEPrAhQYV4LlnUyj9hHJoSAK+DcnFNJFWnNWsi3EA =Cu84 -----END PGP SIGNATURE----- --------------enig8309ED6889FF13D223A68D12--