From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: YAMAMOTO Mitsuharu Newsgroups: gmane.emacs.devel Subject: Re: [hober0@gmail.com: Re: mode-line redisplay bug] Date: Wed, 12 Oct 2005 17:41:18 +0900 Organization: Faculty of Science, Chiba University Message-ID: References: <46247494-627E-4DE6-892E-57AAF7C70E1C@swipnet.se> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Trace: sea.gmane.org 1129109900 1565 80.91.229.2 (12 Oct 2005 09:38:20 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 12 Oct 2005 09:38:20 +0000 (UTC) Cc: "Jan D." , Jason Rumney , rms@gnu.org, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 12 11:38:19 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EPd3Q-00055M-5i for ged-emacs-devel@m.gmane.org; Wed, 12 Oct 2005 11:37:44 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EPd3P-0004C6-6F for ged-emacs-devel@m.gmane.org; Wed, 12 Oct 2005 05:37:43 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EPcAy-0004nV-B0 for emacs-devel@gnu.org; Wed, 12 Oct 2005 04:41:29 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EPcAu-0004mm-F1 for emacs-devel@gnu.org; Wed, 12 Oct 2005 04:41:25 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EPcAr-0004me-3R for emacs-devel@gnu.org; Wed, 12 Oct 2005 04:41:22 -0400 Original-Received: from [133.82.132.2] (helo=mathmail.math.s.chiba-u.ac.jp) by monty-python.gnu.org with esmtp (Exim 4.34) id 1EPcAp-0006sM-Hj; Wed, 12 Oct 2005 04:41:20 -0400 Original-Received: from church.math.s.chiba-u.ac.jp (church [133.82.132.36]) by mathmail.math.s.chiba-u.ac.jp (Postfix) with ESMTP id 24F552C9E; Wed, 12 Oct 2005 17:41:18 +0900 (JST) Original-To: storm@cua.dk (Kim F. Storm) In-Reply-To: User-Agent: Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.6 (Marutamachi) APEL/10.6 Emacs/22.0.50 (sparc-sun-solaris2.8) MULE/5.0 (SAKAKI) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:43909 Archived-At: >>>>> On Wed, 12 Oct 2005 12:15:37 +0900, YAMAMOTO Mitsuharu said: > I tried it on Mac, and found that the calculated rectangle on a > mode-line was not correct when it was displayed with a > variable-width font. Sorry for the noise. If enabled rows except the mode-line in the current matrix are gathered to the lower indices, the following one would be better. YAMAMOTO Mitsuharu mituharu@math.s.chiba-u.ac.jp *** xdisp.c.~1.1059.~ Wed Oct 12 09:31:47 2005 --- xdisp.c Wed Oct 12 14:59:59 2005 *************** *** 2059,2067 **** width = WINDOW_FRAME_COLUMN_WIDTH (w); height = WINDOW_FRAME_LINE_HEIGHT (w); - r = MATRIX_FIRST_TEXT_ROW (w->current_matrix); - end_row = r + w->current_matrix->nrows - 1; - if (w->pseudo_window_p) { area = TEXT_AREA; --- 2059,2064 ---- *************** *** 2085,2097 **** area = TEXT_AREA; text_glyph: gr = 0; gy = 0; ! for (; r < end_row && r->enabled_p; ++r) ! if (r->y + r->height > y) ! { ! gr = r; gy = r->y; ! break; ! } if (gr && gy <= y) { --- 2082,2104 ---- area = TEXT_AREA; text_glyph: + r = MATRIX_HEADER_LINE_ROW (w->current_matrix); + end_row = MATRIX_MODE_LINE_ROW (w->current_matrix); + gr = 0; gy = 0; ! for (; r <= end_row; ++r) ! { ! if (!r->enabled_p) ! if (end_row->enabled_p) ! r = end_row; ! else ! break; ! if (r->y + r->height > y) ! { ! gr = r; gy = r->y; ! break; ! } ! } if (gr && gy <= y) { *************** *** 2148,2155 **** width = WINDOW_SCROLL_BAR_AREA_WIDTH (w); row_glyph: gr = 0, gy = 0; ! for (; r < end_row && r->enabled_p; ++r) if (r->y + r->height > y) { gr = r; gy = r->y; --- 2155,2165 ---- width = WINDOW_SCROLL_BAR_AREA_WIDTH (w); row_glyph: + r = MATRIX_FIRST_TEXT_ROW (w->current_matrix); + end_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); + gr = 0, gy = 0; ! for (; r <= end_row && r->enabled_p; ++r) if (r->y + r->height > y) { gr = r; gy = r->y;