From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1JEYcF-0003jI-Ii for mharc-grub-devel@gnu.org; Mon, 14 Jan 2008 18:21:15 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JEYcE-0003iZ-9i for grub-devel@gnu.org; Mon, 14 Jan 2008 18:21:14 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JEYcD-0003i7-JB for grub-devel@gnu.org; Mon, 14 Jan 2008 18:21:13 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JEYcD-0003hz-E2 for grub-devel@gnu.org; Mon, 14 Jan 2008 18:21:13 -0500 Received: from aybabtu.com ([69.60.117.155]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JEYcD-0002l4-NK for grub-devel@gnu.org; Mon, 14 Jan 2008 18:21:13 -0500 Received: from [192.168.10.6] (helo=thorin) by aybabtu.com with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1JEYcA-0003fC-Vb for grub-devel@gnu.org; Tue, 15 Jan 2008 00:21:12 +0100 Received: from rmh by thorin with local (Exim 4.63) (envelope-from ) id 1JEYZz-0004mQ-Tx for grub-devel@gnu.org; Tue, 15 Jan 2008 00:18:55 +0100 Date: Tue, 15 Jan 2008 00:18:55 +0100 From: Robert Millan To: The development of GRUB 2 Message-ID: <20080114231855.GA18277@thorin> References: <20080114141015.GA27293@thorin> <20080114203225.GA21792@nubol.oskuro.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="bp/iNruPH9dso1Pn" Content-Disposition: inline In-Reply-To: <20080114203225.GA21792@nubol.oskuro.net> Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.13 (2006-08-11) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. Subject: Re: [PATCH] fix flickering timeout message for slow terminals (gfxterm) X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 23:21:14 -0000 --bp/iNruPH9dso1Pn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Jan 14, 2008 at 09:32:25PM +0100, Jordi Mallach wrote: > Hi Robert, > > On Mon, Jan 14, 2008 at 03:10:15PM +0100, Robert Millan wrote: > > + char *prelude = " The highlighted entry will be booted automatically in"; > > + grub_printf ("%s %ds. ", second_stage ? "" : prelude, timeout); > > As you feared, this is not nice from a i18n POV. Concatenating strings > like this will make the message untranslatable for a number of > languages. Is this better? -- Robert Millan I know my rights; I want my phone call! What use is a phone call, if you are unable to speak? (as seen on /.) --bp/iNruPH9dso1Pn Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="flickering_timeout.diff" * normal/menu.c (run_menu): Move timeout message to a separate (local) function, print_timeout(). Use print_timeout() once during initial draw to print the whole message, and again in every clock tick to update only the number of seconds. diff -x '*~' -x configure -x config.h.in -urp grub2/normal/menu.c time/normal/menu.c --- grub2/normal/menu.c 2008-01-05 13:10:28.000000000 +0100 +++ time/normal/menu.c 2008-01-15 00:18:12.000000000 +0100 @@ -314,6 +314,21 @@ run_menu (grub_menu_t menu, int nested) int first, offset; unsigned long saved_time; int default_entry; + int timeout; + + auto void print_timeout (int); + void print_timeout (int second_stage) + { + /* NOTE: Do not remove the trailing space characters. + They are required to clear the line. */ + char *msg = " The highlighted entry will be booted automatically in %ds. "; + char *msg_end = grub_strchr (msg, '%'); + + grub_gotoxy (second_stage ? (msg_end - msg) : 0, GRUB_TERM_HEIGHT - 3); + grub_printf (second_stage ? msg_end : msg, timeout); + grub_gotoxy (GRUB_TERM_CURSOR_X, GRUB_TERM_FIRST_ENTRY_Y + offset); + grub_refresh (); + }; first = 0; @@ -340,11 +355,14 @@ run_menu (grub_menu_t menu, int nested) print_entries (menu, first, offset); grub_refresh (); + timeout = get_timeout (); + + if (timeout > 0) + print_timeout (0); + while (1) { int c; - int timeout; - timeout = get_timeout (); if (timeout > 0) @@ -357,16 +375,8 @@ run_menu (grub_menu_t menu, int nested) timeout--; set_timeout (timeout); saved_time = current_time; + print_timeout (1); } - - grub_gotoxy (0, GRUB_TERM_HEIGHT - 3); - /* NOTE: Do not remove the trailing space characters. - They are required to clear the line. */ - grub_printf ("\ - The highlighted entry will be booted automatically in %d s. ", - timeout); - grub_gotoxy (GRUB_TERM_CURSOR_X, GRUB_TERM_FIRST_ENTRY_Y + offset); - grub_refresh (); } if (timeout == 0) --bp/iNruPH9dso1Pn--