Mercurial > hg > xemacs-beta
comparison lisp/window-xemacs.el @ 2872:5bf18ccb05df
[xemacs-hg @ 2005-07-24 17:53:21 by michaels]
Subject: Fix window-config problems on Windows
lisp/ChangeLog:
2005-07-24 Fabrice Popineau <Fabrice.Popineau@supelec.fr>
* window-xemacs.el (really-set-window-configuration):
* window-xemacs.el (current-window-configuration):
* window-xemacs.el (window-configuration-equal):
* window-xemacs.el (window-configuration): Add `frame-top' and
`frame-left' field to windows configurations, and save and restore
them.
src/ChangeLog:
2005-07-24 Fabrice Popineau <Fabrice.Popineau@supelec.fr>
* frame-msw.c (mswindows_set_frame_size): Don't have a frame size
change trigger restoring the frame.
author | michaels |
---|---|
date | Sun, 24 Jul 2005 17:53:27 +0000 |
parents | 627e25731054 |
children | 6caa3d30f19f |
comparison
equal
deleted
inserted
replaced
2871:e8c263f619d8 | 2872:5bf18ccb05df |
---|---|
117 dedicatedp | 117 dedicatedp |
118 first-hchild first-vchild next-child) | 118 first-hchild first-vchild next-child) |
119 | 119 |
120 (defstruct window-configuration | 120 (defstruct window-configuration |
121 frame | 121 frame |
122 frame-top frame-left | |
122 frame-pixel-width frame-pixel-height | 123 frame-pixel-width frame-pixel-height |
123 current-buffer | 124 current-buffer |
124 minibuffer-pixel-height | 125 minibuffer-pixel-height |
125 min-width min-height | 126 min-width min-height |
126 saved-root-window) | 127 saved-root-window) |
133 (window-configuration-frame conf-2)) | 134 (window-configuration-frame conf-2)) |
134 (= (window-configuration-frame-pixel-width conf-1) | 135 (= (window-configuration-frame-pixel-width conf-1) |
135 (window-configuration-frame-pixel-width conf-2)) | 136 (window-configuration-frame-pixel-width conf-2)) |
136 (= (window-configuration-frame-pixel-height conf-1) | 137 (= (window-configuration-frame-pixel-height conf-1) |
137 (window-configuration-frame-pixel-height conf-2)) | 138 (window-configuration-frame-pixel-height conf-2)) |
139 (= (window-configuration-frame-top conf-1) | |
140 (window-configuration-frame-top conf-2)) | |
141 (= (window-configuration-frame-left conf-1) | |
142 (window-configuration-frame-left conf-2)) | |
138 (eq (window-configuration-current-buffer conf-1) | 143 (eq (window-configuration-current-buffer conf-1) |
139 (window-configuration-current-buffer conf-2)) | 144 (window-configuration-current-buffer conf-2)) |
140 (saved-window-equal (window-configuration-saved-root-window conf-1) | 145 (saved-window-equal (window-configuration-saved-root-window conf-1) |
141 (window-configuration-saved-root-window conf-2))))) | 146 (window-configuration-saved-root-window conf-2))))) |
142 | 147 |
211 ; 0))) | 216 ; 0))) |
212 ; ...) | 217 ; ...) |
213 | 218 |
214 (make-window-configuration | 219 (make-window-configuration |
215 :frame frame | 220 :frame frame |
221 :frame-top (frame-property frame 'top) | |
222 :frame-left (frame-property frame 'left) | |
216 :frame-pixel-width (frame-pixel-width frame) | 223 :frame-pixel-width (frame-pixel-width frame) |
217 :frame-pixel-height (frame-pixel-height frame) | 224 :frame-pixel-height (frame-pixel-height frame) |
218 :current-buffer (current-buffer) | 225 :current-buffer (current-buffer) |
219 :min-width window-min-width :min-height window-min-height | 226 :min-width window-min-width :min-height window-min-height |
220 :minibuffer-pixel-height (window-pixel-height (minibuffer-window frame)) | 227 :minibuffer-pixel-height (window-pixel-height (minibuffer-window frame)) |
282 (setq window-min-height 0) | 289 (setq window-min-height 0) |
283 (setq minibuffer-scroll-window nil) | 290 (setq minibuffer-scroll-window nil) |
284 | 291 |
285 (frame-reduce-to-one-window frame) | 292 (frame-reduce-to-one-window frame) |
286 (set-window-configuration-frame-size configuration) | 293 (set-window-configuration-frame-size configuration) |
294 (set-frame-property frame 'left (window-configuration-frame-left configuration)) | |
295 (set-frame-property frame 'top (window-configuration-frame-top configuration)) | |
287 | 296 |
288 ;; these may have changed because of the delete | 297 ;; these may have changed because of the delete |
289 (let ((root-window (frame-root-window frame))) | 298 (let ((root-window (frame-root-window frame))) |
290 (enlarge-window-pixels | 299 (enlarge-window-pixels |
291 (- (window-configuration-minibuffer-pixel-height configuration) | 300 (- (window-configuration-minibuffer-pixel-height configuration) |