diff options
| author | Stefan Monnier <[email protected]> | 2011-02-01 12:09:25 -0500 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2011-02-01 12:09:25 -0500 |
| commit | 8f1d2ef658f95549eb33fe5265f8f11c5129bece (patch) | |
| tree | b7cd852a1adb423384532cfe22c31547160b22bc /src/nsterm.h | |
| parent | 590130fb19e1f433965c421d98fedeb2d7c33310 (diff) | |
| parent | 1dc4075fa8809805aed5092e93e225e889725c94 (diff) | |
Merge from trunk
Diffstat (limited to 'src/nsterm.h')
| -rw-r--r-- | src/nsterm.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/nsterm.h b/src/nsterm.h index 7ee960bd7a..09ec8c19b1 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -1,5 +1,5 @@ /* Definitions and headers for communication with NeXT/Open/GNUstep API. - Copyright (C) 1989, 1993, 2005, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 2005, 2008-2011 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -66,6 +66,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ int rows, cols; int scrollbarsNeedingUpdate; EmacsToolbar *toolbar; + NSRect ns_userRect; } /* AppKit-side interface */ @@ -565,6 +566,12 @@ struct ns_output /* This is the Emacs structure for the NS display this frame is on. */ struct ns_display_info *display_info; + + /* Non-zero if we want to constrain the frame to the screen. */ + int dont_constrain; + + /* Non-zero if we are zooming (maximizing) the frame. */ + int zooming; }; /* this dummy decl needed to support TTYs */ @@ -812,5 +819,3 @@ extern char gnustep_base_version[]; /* version tracking */ #endif /* HAVE_NS */ -/* arch-tag: 0a28b142-4ac1-4a81-a243-abcd82d9c4e5 - (do not change this comment) */ |