Mercurial > hg > xemacs-beta
annotate src/objects.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 | 5502045ec510 |
children | 7be849cb8828 |
rev | line source |
---|---|
872 | 1 /* Generic object functions -- interface. |
428 | 2 Copyright (C) 1995 Board of Trustees, University of Illinois. |
872 | 3 Copyright (C) 1995, 1996, 2002 Ben Wing. |
428 | 4 |
5 This file is part of XEmacs. | |
6 | |
7 XEmacs is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
9 Free Software Foundation; either version 2, or (at your option) any | |
10 later version. | |
11 | |
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with XEmacs; see the file COPYING. If not, write to | |
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
20 Boston, MA 02111-1307, USA. */ | |
21 | |
22 /* Synched up with: Not in FSF. */ | |
23 | |
440 | 24 #ifndef INCLUDED_objects_h_ |
25 #define INCLUDED_objects_h_ | |
428 | 26 |
2268 | 27 DECLARE_DOESNT_RETURN (finalose (void *ptr)); |
428 | 28 |
872 | 29 /**************************************************************************** |
30 * Color Instance Object * | |
31 ****************************************************************************/ | |
428 | 32 |
872 | 33 DECLARE_LRECORD (color_instance, Lisp_Color_Instance); |
34 #define XCOLOR_INSTANCE(x) XRECORD (x, color_instance, Lisp_Color_Instance) | |
35 #define wrap_color_instance(p) wrap_record (p, color_instance) | |
36 #define COLOR_INSTANCEP(x) RECORDP (x, color_instance) | |
37 #define CHECK_COLOR_INSTANCE(x) CHECK_RECORD (x, color_instance) | |
38 #define CONCHECK_COLOR_INSTANCE(x) CONCHECK_RECORD (x, color_instance) | |
428 | 39 |
872 | 40 EXFUN (Fmake_color_instance, 3); |
41 | |
42 extern Lisp_Object Vthe_null_color_instance; | |
428 | 43 |
44 void set_color_attached_to (Lisp_Object obj, Lisp_Object face, | |
45 Lisp_Object property); | |
46 | |
872 | 47 /**************************************************************************** |
48 * Font Instance Object * | |
49 ****************************************************************************/ | |
428 | 50 |
872 | 51 void initialize_charset_font_caches (struct device *d); |
52 void invalidate_charset_font_caches (Lisp_Object charset); | |
428 | 53 |
872 | 54 DECLARE_LRECORD (font_instance, Lisp_Font_Instance); |
55 #define XFONT_INSTANCE(x) XRECORD (x, font_instance, Lisp_Font_Instance) | |
56 #define wrap_font_instance(p) wrap_record (p, font_instance) | |
57 #define FONT_INSTANCEP(x) RECORDP (x, font_instance) | |
58 #define CHECK_FONT_INSTANCE(x) CHECK_RECORD (x, font_instance) | |
59 #define CONCHECK_FONT_INSTANCE(x) CONCHECK_RECORD (x, font_instance) | |
428 | 60 |
3094 | 61 EXFUN (Fmake_font_instance, 4); |
872 | 62 EXFUN (Ffont_instance_name, 1); |
63 EXFUN (Ffont_instance_p, 1); | |
64 EXFUN (Ffont_instance_truename, 1); | |
3094 | 65 EXFUN (Ffont_instance_charset, 1); |
872 | 66 |
67 extern Lisp_Object Vthe_null_font_instance; | |
428 | 68 |
69 void set_font_attached_to (Lisp_Object obj, Lisp_Object face, | |
70 Lisp_Object property); | |
71 | |
72 /***************************************************************************** | |
73 * Face Boolean Specifier Object * | |
74 *****************************************************************************/ | |
75 | |
76 void set_face_boolean_attached_to (Lisp_Object obj, Lisp_Object face, | |
77 Lisp_Object property); | |
78 | |
5080
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
79 /***************************************************************************** |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
80 * Face Background Placement Specifier Object * |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
81 *****************************************************************************/ |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
82 |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
83 void set_face_background_placement_attached_to |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
84 (Lisp_Object obj, Lisp_Object face); |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
85 |
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
4960
diff
changeset
|
86 |
440 | 87 #endif /* INCLUDED_objects_h_ */ |