Mercurial > hg > xemacs-beta

comparison src/lisp.h @ 5090:0ca81354c4c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d372b17f63ce
children 33bc58a32dc2
comparison
equal deleted inserted replaced
5080:5502045ec510 5090:0ca81354c4c7
82 assumption that Ibyte * text is composed of 1-byte units (e.g. UTF-16 82 assumption that Ibyte * text is composed of 1-byte units (e.g. UTF-16
83 is composed of 2-byte units and might be a possible format to consider 83 is composed of 2-byte units and might be a possible format to consider
84 for Ibyte * text). 84 for Ibyte * text).
85 85
86 %%#### marks places that need work for KKCC (the new garbage collector). 86 %%#### marks places that need work for KKCC (the new garbage collector).
87
88 @@#### marks places that need work to get Unicode-internal working,
89 i.e. using UTF-8 as the internal text format.
90
91 #### BILL! marks places that need work for GTK.
92
93 #### GEOM! marks places needing work to fix various bugs in the handling
94 of window and frame sizing and positioning. Often the root of the
95 problems is that the code was originally written before there was a
96 gutter and then not completely fixed up to accommodate the gutter.
87 97
88 */ 98 */
89 99
90 /************************************************************************/ 100 /************************************************************************/
91 /* include files */ 101 /* include files */
1227 and line of the inline function, which is not very useful. */ 1237 and line of the inline function, which is not very useful. */
1228 1238
1229 /* Highly dubious kludge */ 1239 /* Highly dubious kludge */
1230 /* (thanks, Jamie, I feel better now -- ben) */ 1240 /* (thanks, Jamie, I feel better now -- ben) */
1231 MODULE_API void assert_failed (const Ascbyte *, int, const Ascbyte *); 1241 MODULE_API void assert_failed (const Ascbyte *, int, const Ascbyte *);
1242 void assert_equal_failed (const Ascbyte *file, int line, EMACS_INT x,
1243 EMACS_INT y, const Ascbyte *exprx,
1244 const Ascbyte *expry);
1232 #define ABORT() assert_failed (__FILE__, __LINE__, "ABORT()") 1245 #define ABORT() assert_failed (__FILE__, __LINE__, "ABORT()")
1233 #define abort_with_message(msg) assert_failed (__FILE__, __LINE__, msg) 1246 #define abort_with_message(msg) assert_failed (__FILE__, __LINE__, msg)
1234 1247
1235 /* This used to be ((void) (0)) but that triggers lots of unused variable 1248 /* This used to be ((void) (0)) but that triggers lots of unused variable
1236 warnings -- furthermore, if `x' has any side effects, e.g. 1249 warnings -- furthermore, if `x' has any side effects, e.g.
1247 # define assert(x) ((x) ? (void) 0 : assert_failed (__FILE__, __LINE__, #x)) 1260 # define assert(x) ((x) ? (void) 0 : assert_failed (__FILE__, __LINE__, #x))
1248 # define assert_with_message(x, msg) \ 1261 # define assert_with_message(x, msg) \
1249 ((x) ? (void) 0 : assert_failed (__FILE__, __LINE__, msg)) 1262 ((x) ? (void) 0 : assert_failed (__FILE__, __LINE__, msg))
1250 # define assert_at_line(x, file, line) \ 1263 # define assert_at_line(x, file, line) \
1251 ((x) ? (void) 0 : assert_failed (file, line, #x)) 1264 ((x) ? (void) 0 : assert_failed (file, line, #x))
1265 # define assert_equal(x, y) \
1266 ((x) == (y) ? (void) 0 : \
1267 assert_equal_failed (__FILE__, __LINE__, (EMACS_INT) x, (EMACS_INT) y, \
1268 #x, #y))
1252 #else 1269 #else
1253 /* This used to be ((void) (0)) but that triggers lots of unused variable 1270 /* This used to be ((void) (0)) but that triggers lots of unused variable
1254 warnings. It's pointless to force all that code to be rewritten, with 1271 warnings. It's pointless to force all that code to be rewritten, with
1255 added ifdefs. Any reasonable compiler will eliminate an expression with 1272 added ifdefs. Any reasonable compiler will eliminate an expression with
1256 no effects. */ 1273 no effects. */
1257 # define assert(x) disabled_assert (x) 1274 # define assert(x) disabled_assert (x)
1258 # define assert_with_message(x, msg) disabled_assert_with_message (x, msg) 1275 # define assert_with_message(x, msg) disabled_assert_with_message (x, msg)
1259 # define assert_at_line(x, file, line) disabled_assert_at_line (x, file, line) 1276 # define assert_at_line(x, file, line) disabled_assert_at_line (x, file, line)
1277 # define assert_equal(x, y) disabled_assert ((x) == (y))
1260 #endif 1278 #endif
1261 1279
1262 /************************************************************************/ 1280 /************************************************************************/
1263 /** Memory allocation **/ 1281 /** Memory allocation **/
1264 /************************************************************************/ 1282 /************************************************************************/