diff options
author | Karoly Lorentey <lorentey@elte.hu> | 2004-07-22 22:01:29 +0000 |
---|---|---|
committer | Karoly Lorentey <lorentey@elte.hu> | 2004-07-22 22:01:29 +0000 |
commit | 407e382d35ede779a23b974d7ac40a7d3d0fa5ff (patch) | |
tree | 4a9e97dd58011b0ce2d6223626554765860fd6db /src/window.h | |
parent | 31d7e9bc5a474c2da8c40f4812ea3e09cd5fb82c (diff) | |
parent | bb6a9650da7971581f2ddf625c172b58a6806e7a (diff) | |
download | emacs-407e382d35ede779a23b974d7ac40a7d3d0fa5ff.tar.gz |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-461
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-462
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-463
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-220
Diffstat (limited to 'src/window.h')
-rw-r--r-- | src/window.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/window.h b/src/window.h index 63a19cc4b0d..8df0b6bb3eb 100644 --- a/src/window.h +++ b/src/window.h @@ -236,6 +236,11 @@ struct window struct glyph_matrix *current_matrix; struct glyph_matrix *desired_matrix; + /* Scaling factor for the glyph_matrix size calculation in this window. + Used if window contains many small images or uses proportional fonts, + as the normal may yield a matrix which is too small. */ + int nrows_scale_factor, ncols_scale_factor; + /* Cursor position as of last update that completed without pause. This is the position of last_point. */ struct cursor_pos last_cursor; |