comparison src/redisplay-xlike-inc.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 5502045ec510
children bc3ede8f29a8
comparison
equal deleted inserted replaced
5080:5502045ec510 5090:0ca81354c4c7
2156 XLIKE_DISPLAY dpy = GET_XLIKE_DISPLAY (XDEVICE (f->device)); 2156 XLIKE_DISPLAY dpy = GET_XLIKE_DISPLAY (XDEVICE (f->device));
2157 XLIKE_WINDOW x_win = GET_XLIKE_WINDOW (f); 2157 XLIKE_WINDOW x_win = GET_XLIKE_WINDOW (f);
2158 int x, y, width, height; 2158 int x, y, width, height;
2159 Lisp_Object frame; 2159 Lisp_Object frame;
2160 2160
2161 x = FRAME_LEFT_BORDER_START (f); 2161 /* #### GEOM! This clears the internal border and gutter (and scrollbars)
2162 width = (FRAME_PIXWIDTH (f) - FRAME_REAL_LEFT_TOOLBAR_WIDTH (f) - 2162 but not the toolbar. Correct? */
2163 FRAME_REAL_RIGHT_TOOLBAR_WIDTH (f) - 2163 x = FRAME_LEFT_INTERNAL_BORDER_START (f);
2164 2 * FRAME_REAL_LEFT_TOOLBAR_BORDER_WIDTH (f) - 2164 width = (FRAME_RIGHT_INTERNAL_BORDER_END (f) - x);
2165 2 * FRAME_REAL_RIGHT_TOOLBAR_BORDER_WIDTH (f));
2166 /* #### This adjustment by 1 should be being done in the macros. 2165 /* #### This adjustment by 1 should be being done in the macros.
2167 There is some small differences between when the menubar is on 2166 There is some small differences between when the menubar is on
2168 and off that we still need to deal with. */ 2167 and off that we still need to deal with. The adjustment also occurs in
2169 y = FRAME_TOP_BORDER_START (f) - 1; 2168 redisplay_clear_top_of_window(). */
2170 height = (FRAME_PIXHEIGHT (f) - FRAME_REAL_TOP_TOOLBAR_HEIGHT (f) - 2169 y = FRAME_TOP_INTERNAL_BORDER_START (f) - 1;
2171 FRAME_REAL_BOTTOM_TOOLBAR_HEIGHT (f) - 2170 height = (FRAME_BOTTOM_INTERNAL_BORDER_END (f) - y);
2172 2 * FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH (f) -
2173 2 * FRAME_REAL_BOTTOM_TOOLBAR_BORDER_WIDTH (f)) + 1;
2174 2171
2175 XLIKE_CLEAR_AREA (dpy, x_win, x, y, width, height); 2172 XLIKE_CLEAR_AREA (dpy, x_win, x, y, width, height);
2176 2173
2177 frame = wrap_frame (f); 2174 frame = wrap_frame (f);
2178 2175