From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Francis Litterio Newsgroups: gmane.emacs.devel,gmane.emacs.windows Subject: Improved patch to fix frame positioning bug on Windows Date: Thu, 13 Jan 2005 12:41:44 -0500 Message-ID: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1105639128 11724 80.91.229.6 (13 Jan 2005 17:58:48 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 13 Jan 2005 17:58:48 +0000 (UTC) Cc: help-emacs-windows@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 13 18:58:39 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1Cp9Ag-00022m-00 for ; Thu, 13 Jan 2005 18:54:10 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Cp9MK-0007aB-FJ for ged-emacs-devel@m.gmane.org; Thu, 13 Jan 2005 13:06:12 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Cp9FS-0005v9-EM for emacs-devel@gnu.org; Thu, 13 Jan 2005 12:59:06 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Cp9FE-0005lT-Sc for emacs-devel@gnu.org; Thu, 13 Jan 2005 12:58:53 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Cp9FE-0005ja-Mh for emacs-devel@gnu.org; Thu, 13 Jan 2005 12:58:52 -0500 Original-Received: from [80.91.229.2] (helo=main.gmane.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1Cp8yu-0003sQ-FV for emacs-devel@gnu.org; Thu, 13 Jan 2005 12:42:00 -0500 Original-Received: from list by main.gmane.org with local (Exim 3.35 #1 (Debian)) id 1Cp8ys-0006lm-00 for ; Thu, 13 Jan 2005 18:41:58 +0100 Original-Received: from brick.estc.com ([209.27.151.2]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 13 Jan 2005 18:41:58 +0100 Original-Received: from franl by brick.estc.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 13 Jan 2005 18:41:58 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-To: emacs-devel@gnu.org Original-Lines: 161 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: brick.estc.com X-Draft-From: ("nntp+news.gmane.org:gmane.emacs.devel" "") Gcc: nnfolder:sent-usenet X-Random-Quote: Indeed, it has been said that democracy is the worst form of government except all those other forms that have been tried from time to time. -- Sir Winston Churchill User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/21.3.50 (windows-nt) Cancel-Lock: sha1:2ytoLRkPBdjtLxiDz6Mu5Ae5VMw= 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: main.gmane.org gmane.emacs.devel:32199 gmane.emacs.windows:2513 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:32199 On Windows, evaluating (make-frame '((left . -1))) creates a frame that is positioned several pixels off the right edge of the display. Similarly, (make-frame '((top . -1))) creates a frame that is positioned off the bottom edge of the display. The below patch fixes this bug and does not regress the fix to Drew Adams' bug reported at: http://lists.gnu.org/archive/html/emacs-pretest-bug/2004-11/msg00519.html (modulo the mistaken assumption about frame width in step #2 of Drew's bug report). This patch changes function x_calc_absolute_position() in w32term.c so that it properly accounts for the width and height of the Windows-drawn borders around the frame when converting a negative 'left or 'top parameter into its equivalent non-negative value. This code works correctly even if the user has configured the Windows-drawn borders to have a different width or height from the default. After applying this patch, you can test it by evaluating these forms and seeing the described behavior: ;; Create a frame flush against the right edge of the display. (make-frame '((left . -1))) ;; Create a frame flush against the bottom edge of the display. (make-frame '((top . -1))) ;; Create a frame flush against the bottom/right edge of the display. (make-frame '((top . -1) (left . -1))) ;; Move the current frame flush against the right edge of the display. (modify-frame-parameters nil '((left . -1))) ;; Move the current frame flush against the bottom edge of the display. (modify-frame-parameters nil '((top . -1))) ;; Test that setting the current frame's 'left parameter to a negative ;; value that is equivalent to its current positive value does not ;; move the frame. The value of border-width in this test _MUST_ be ;; set to the width of your left (or right) Windows border in pixels. ;; Values shown here are typical but may not be correct for your ;; system. (let* ((border-width 4) (negative-left (- (+ 1 (- (display-pixel-width) (+ (* 2 border-width) (frame-pixel-width nil) (frame-parameter nil 'left))))))) (modify-frame-parameters nil `((left . ,negative-left)))) ;; Test that setting the current frame's 'top parameter to a negative ;; value that is equivalent to its current positive value does not ;; move the frame. The value of border-height-top in this test _MUST_ ;; be set to the height of your top Windows border in pixels. The ;; value of border-height-bottom in this test _MUST_ be set to the ;; height of your bottom Windows border in pixels. Values shown here ;; are typical but may not be correct for your system. (let* ((border-height-top 29) (border-height-bottom 4) (negative-top (- (+ 1 (- (display-pixel-height) (+ border-height-top border-height-bottom (frame-pixel-height nil) (frame-parameter nil 'top))))))) (modify-frame-parameters nil `((top . ,negative-top)))) I hope this helps. -- Francis Litterio franl world . std . com --- src/ChangeLog 10 Jan 2005 08:29:50 -0500 1.4147 +++ src/ChangeLog 13 Jan 2005 12:39:35 -0500 @@ -1,3 +1,10 @@ +2005-01-13 Francis Litterio + + * w32term.c (x_calc_absolute_position): Changed function + x_calc_absolute_position() to account for the Windows-drawn + borders around a frame when converting a negative 'top or 'left + parameter into the equivalent positive value. + 2005-01-10 Kim F. Storm * dispextern.h (merge_faces): Rename from merge_into_realized_face. --- src/w32term.c 03 Jan 2005 17:52:51 -0500 1.221 +++ src/w32term.c 13 Jan 2005 12:17:05 -0500 @@ -1461,7 +1461,7 @@ { real_x = max (real_x, s->gc->clip_rectangle.left); real_y = max (real_y, s->gc->clip_rectangle.top); - real_w = min (real_w, s->gc->clip_rectangle.right + real_w = min (real_w, s->gc->clip_rectangle.r ght - s->gc->clip_rectangle.left); real_h = min (real_h, s->gc->clip_rectangle.bottom - s->gc->clip_rectangle.top); @@ -5376,17 +5376,58 @@ { int flags = f->size_hint_flags; - /* Treat negative positions as relative to the leftmost bottommost + /* left_right_borders_width holds the sum of the widths of the frame's left + and right borders (in pixels) drawn by Windows. */ + + unsigned int left_right_borders_width = 8; /* A sensible default value. */ + + /* top_bottom_borders_height holds the sum of the heights of the frame's top and + bottom borders (in pixels) drawn by Windows. */ + + unsigned int top_bottom_borders_height = 32; /* A sensible default value. */ + + /* Now obtain the actual values of the above two variables. If we fail to + obtain the actual values, we will use the defaults assigned above. We compute + the border width (height) by subtracting the width (height) of the frame's + client area from the width (height) of the frame's entire window. + */ + + WINDOWPLACEMENT wp = { 0 }; + + BOOL status = GetWindowPlacement (FRAME_W32_WINDOW (f), &wp); + + if (status != FALSE) + { + RECT client_rect = { 0 }; + + status = GetClientRect (FRAME_W32_WINDOW (f), &client_rect); + + if (status != FALSE) + { + left_right_borders_width = + (wp.rcNormalPosition.right - wp.rcNormalPosition.left) - + (client_rect.right - client_rect.left); + + top_bottom_borders_height = + (wp.rcNormalPosition.bottom - wp.rcNormalPosition.top) - + (client_rect.bottom - client_rect.top); + } + } + + /* Treat negative positions as relative to the rightmost bottommost position that fits on the screen. */ if (flags & XNegative) f->left_pos = (FRAME_W32_DISPLAY_INFO (f)->width - FRAME_PIXEL_WIDTH (f) - + f->left_pos); + + f->left_pos + - (left_right_borders_width - 1)); if (flags & YNegative) f->top_pos = (FRAME_W32_DISPLAY_INFO (f)->height - FRAME_PIXEL_HEIGHT (f) - + f->top_pos); + + f->top_pos + - (top_bottom_borders_height - 1)); + /* The left_pos and top_pos are now relative to the top and left screen edges, so the flags should correspond. */