Mercurial > hg > xemacs-beta
view src/mem-limits.h @ 5090:0ca81354c4c7
Further frame-geometry cleanups
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Intro to Window and Frame Geometry):
* internals/internals.texi (The Paned Area):
* internals/internals.texi (The Displayable Area):
Update to make note of e.g. the fact that the bottom gutter is
actually above the minibuffer.
src/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* emacs.c:
* emacs.c (assert_equal_failed):
* lisp.h:
* lisp.h (assert_equal):
New fun assert_equal, asserting that two values == each other, and
printing out both values upon failure.
* frame-gtk.c (gtk_initialize_frame_size):
* frame-impl.h:
* frame-impl.h (FRAME_TOP_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_BOTTOM_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_LEFT_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_PANED_TOP_EDGE):
* frame-impl.h (FRAME_NONPANED_SIZE):
* frame-x.c (x_initialize_frame_size):
* frame.c:
* gutter.c (get_gutter_coords):
* gutter.c (calculate_gutter_size):
* gutter.h:
* gutter.h (WINDOW_REAL_TOP_GUTTER_BOUNDS):
* gutter.h (FRAME_TOP_GUTTER_BOUNDS):
* input-method-xlib.c:
* input-method-xlib.c (XIM_SetGeometry):
* redisplay-output.c (clear_left_border):
* redisplay-output.c (clear_right_border):
* redisplay-output.c (redisplay_output_pixmap):
* redisplay-output.c (redisplay_clear_region):
* redisplay-output.c (redisplay_clear_top_of_window):
* redisplay-output.c (redisplay_clear_to_window_end):
* redisplay-xlike-inc.c (XLIKE_clear_frame):
* redisplay.c:
* redisplay.c (UPDATE_CACHE_RETURN):
* redisplay.c (pixel_to_glyph_translation):
* toolbar.c (update_frame_toolbars_geometry):
* window.c (Fwindow_pixel_edges):
Get rid of some redundant macros. Consistently use the
FRAME_TOP_*_START, FRAME_RIGHT_*_END, etc. format. Rename
FRAME_*_BORDER_* to FRAME_*_INTERNAL_BORDER_*. Comment out
FRAME_BOTTOM_* for gutters and the paned area due to the
uncertainty over where the paned area actually begins. (Eventually
we should probably move the gutters outside the minibuffer so that
the paned area is contiguous.) Use FRAME_PANED_* more often in the
code to make things clearer.
Update the diagram to show that the bottom gutter is inside the
minibuffer (!) and that there are "junk boxes" when you have left
and/or right gutters (dead boxes that are mistakenly left uncleared,
unlike the corresponding scrollbar dead boxes). Update the text
appropriately to cover the bottom gutter position, etc.
Rewrite gutter-geometry code to use the FRAME_*_GUTTER_* in place of
equivalent expressions referencing other frame elements, to make the
code more portable in case we move around the gutter location.
Cleanup FRAME_*_GUTTER_BOUNDS() in gutter.h.
Add some #### GEOM! comments where I think code is incorrect --
typically, it wasn't fixed up properly when the gutter was added.
Some cosmetic changes.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Mar 2010 05:07:47 -0600 |
parents | 702b5727498a |
children | 308d34e9f07d |
line wrap: on
line source
/* Includes for memory limit warnings. Copyright (C) 1990, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: FSF 19.30. */ /* Subsequently cleaned up and reorganised, made to use configure. */ #ifndef INCLUDED_mem_limits_h_ #define INCLUDED_mem_limits_h_ #ifdef HAVE_CONFIG_H #include <config.h> #endif #ifdef HAVE_ULIMIT_H #include <ulimit.h> #endif #ifdef HAVE_SYS_RESOURCE_H /* Some systems need either sys/types.h or sys/time.h before <sys/resource.h>. */ #include <sys/types.h> #include <sys/time.h> #include <sys/resource.h> #endif #ifdef HAVE_SYS_VLIMIT_H #include <sys/vlimit.h> #endif #ifdef _LIBC /* Old Linux startup code won't define __data_start. */ extern int etext, __data_start; weak_symbol (__data_start) #define start_of_data() (&__data_start ?: &etext) #else /* not GNU libc */ #ifdef emacs typedef void *POINTER; #ifndef CYGWIN typedef unsigned long SIZE; #endif extern POINTER start_of_data (void); #define EXCEEDS_LISP_PTR(ptr) 0 #ifdef BSD extern int etext; #define start_of_data() &etext #endif #else /* not emacs */ extern char etext; #define start_of_data() &etext #endif /* not emacs */ #endif /* not _LIBC */ /* start of data space; can be changed by calling malloc_init */ static POINTER data_space_start; /* Number of bytes of writable memory we can expect to be able to get */ extern unsigned long lim_data; /* The implementation of get_lim_data() is very machine dependent. */ #if defined (HEAP_IN_DATA) && !defined(PDUMP) extern unsigned long static_heap_size; extern MODULE_API int initialized; static void get_lim_data (void) { if (!initialized) { lim_data = (unsigned long) -1; /* static_heap_size; */ } else { lim_data = (unsigned long) -1; } } #elif defined(NO_LIM_DATA) static void get_lim_data (void) { lim_data = (unsigned long) -1; } #elif defined(HAVE_GETRLIMIT) static void get_lim_data (void) { struct rlimit XXrlimit; getrlimit (RLIMIT_DATA, &XXrlimit); #ifdef RLIM_INFINITY lim_data = XXrlimit.rlim_cur & RLIM_INFINITY; /* soft limit */ #else lim_data = XXrlimit.rlim_cur; /* soft limit */ #endif } #elif defined(HAVE_ULIMIT) static void get_lim_data (void) { lim_data = (unsigned long) -1; /* Use the ulimit call, if we seem to have it. */ #if !defined (ULIMIT_BREAK_VALUE) lim_data = ulimit (3, 0); #endif /* If that didn't work, just use the macro's value. */ #ifdef ULIMIT_BREAK_VALUE if (lim_data == (unsigned long) -1) lim_data = ULIMIT_BREAK_VALUE; #endif lim_data -= (long) data_space_start; } #elif defined(WIN32_NATIVE) static void get_lim_data (void) { extern unsigned long data_region_size; lim_data = data_region_size; } #elif defined(HAVE_VLIMIT) static void get_lim_data (void) { lim_data = vlimit (LIM_DATA, -1); } #else #error Cannot determine an implementation of get_lim_data(). #endif /* not HAVE_VLIMIT */ #endif /* INCLUDED_mem_limits_h_ */