comparison src/emacs.c @ 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 6f2158fa75ed
children 33bc58a32dc2
comparison
equal deleted inserted replaced
5080:5502045ec510 5090:0ca81354c4c7
4054 #endif /* !defined (ASSERTIONS_DONT_ABORT) */ 4054 #endif /* !defined (ASSERTIONS_DONT_ABORT) */
4055 inhibit_non_essential_conversion_operations--; 4055 inhibit_non_essential_conversion_operations--;
4056 in_assert_failed--; 4056 in_assert_failed--;
4057 } 4057 }
4058 4058
4059 /* This is called when an assert() fails or when ABORT() is called -- both
4060 of those are defined in the preprocessor to an expansion involving
4061 assert_failed(). */
4062 void
4063 assert_equal_failed (const Ascbyte *file, int line, EMACS_INT x, EMACS_INT y,
4064 const Ascbyte *exprx, const Ascbyte *expry)
4065 {
4066 Ascbyte bigstr[1000]; /* #### Could overflow, but avoids any need to do any
4067 allocation, even alloca(), hence safer */
4068 sprintf (bigstr, "%s (%ld) should == %s (%ld) but doesn't",
4069 exprx, x, expry, y);
4070 assert_failed (file, line, bigstr);
4071 }
4072
4059 /* -------------------------------------- */ 4073 /* -------------------------------------- */
4060 /* low-memory notification */ 4074 /* low-memory notification */
4061 /* -------------------------------------- */ 4075 /* -------------------------------------- */
4062 4076
4063 #ifdef SIGDANGER 4077 #ifdef SIGDANGER