clean up toolbar/gutter edge geometry -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-25 Ben Wing <ben@xemacs.org> * EmacsFrame.c (EmacsFrameSetValues): * frame-impl.h: * frame-impl.h (struct frame): * frame-impl.h (FRAME_THEORETICAL_TOP_TOOLBAR_HEIGHT): * frame-impl.h (FRAME_THEORETICAL_TOP_TOOLBAR_BORDER_WIDTH): * frame-impl.h (FRAME_REAL_TOP_TOOLBAR_HEIGHT): * frame-impl.h (FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH): * frame-impl.h (FRAME_REAL_TOP_TOOLBAR_VISIBLE): * frame-impl.h (FRAME_REAL_TOP_TOOLBAR_BOUNDS): * frame.h: * frame.h (enum edge_pos): * gutter.c: * gutter.c (get_gutter_coords): * gutter.c (display_boxes_in_gutter_p): * gutter.c (construct_window_gutter_spec): * gutter.c (calculate_gutter_size_from_display_lines): * gutter.c (calculate_gutter_size): * gutter.c (output_gutter): * gutter.c (clear_gutter): * gutter.c (mark_gutters): * gutter.c (gutter_extent_signal_changed_region_maybe): * gutter.c (update_gutter_geometry): * gutter.c (update_frame_gutter_geometry): * gutter.c (update_frame_gutters): * gutter.c (reset_gutter_display_lines): * gutter.c (redraw_exposed_gutter): * gutter.c (redraw_exposed_gutters): * gutter.c (free_frame_gutters): * gutter.c (decode_gutter_position): * gutter.c (Fset_default_gutter_position): * gutter.c (Fgutter_pixel_width): * gutter.c (Fgutter_pixel_height): * gutter.c (recompute_overlaying_specifier): * gutter.c (gutter_specs_changed_1): * gutter.c (gutter_specs_changed): * gutter.c (top_gutter_specs_changed): * gutter.c (bottom_gutter_specs_changed): * gutter.c (left_gutter_specs_changed): * gutter.c (right_gutter_specs_changed): * gutter.c (gutter_geometry_changed_in_window): * gutter.c (init_frame_gutters): * gutter.c (specifier_vars_of_gutter): * gutter.h: * gutter.h (WINDOW_REAL_TOP_GUTTER_BOUNDS): * gutter.h (FRAME_TOP_GUTTER_BOUNDS): * lisp.h (enum edge_style): * native-gtk-toolbar.c: * native-gtk-toolbar.c (gtk_output_toolbar): * native-gtk-toolbar.c (gtk_clear_toolbar): * native-gtk-toolbar.c (gtk_output_frame_toolbars): * native-gtk-toolbar.c (gtk_initialize_frame_toolbars): * toolbar-msw.c: * toolbar-msw.c (TOOLBAR_HANDLE): * toolbar-msw.c (allocate_toolbar_item_id): * toolbar-msw.c (mswindows_clear_toolbar): * toolbar-msw.c (mswindows_output_toolbar): * toolbar-msw.c (mswindows_move_toolbar): * toolbar-msw.c (mswindows_redraw_exposed_toolbars): * toolbar-msw.c (mswindows_initialize_frame_toolbars): * toolbar-msw.c (mswindows_output_frame_toolbars): * toolbar-msw.c (mswindows_clear_frame_toolbars): * toolbar-msw.c (DELETE_TOOLBAR): * toolbar-msw.c (mswindows_free_frame_toolbars): * toolbar-msw.c (mswindows_get_toolbar_button_text): * toolbar-xlike.c: * toolbar-xlike.c (__prepare_button_area): * toolbar-xlike.c (XLIKE_OUTPUT_BUTTONS_LOOP): * toolbar-xlike.c (xlike_output_toolbar): * toolbar-xlike.c (xlike_clear_toolbar): * toolbar-xlike.c (xlike_output_frame_toolbars): * toolbar-xlike.c (xlike_clear_frame_toolbars): * toolbar-xlike.c (xlike_redraw_exposed_toolbar): * toolbar-xlike.c (xlike_redraw_exposed_toolbars): * toolbar-xlike.c (xlike_redraw_frame_toolbars): * toolbar.c: * toolbar.c (decode_toolbar_position): * toolbar.c (Fset_default_toolbar_position): * toolbar.c (mark_frame_toolbar_buttons_dirty): * toolbar.c (compute_frame_toolbar_buttons): * toolbar.c (set_frame_toolbar): * toolbar.c (compute_frame_toolbars_data): * toolbar.c (update_frame_toolbars_geometry): * toolbar.c (init_frame_toolbars): * toolbar.c (get_toolbar_coords): * toolbar.c (CHECK_TOOLBAR): * toolbar.c (toolbar_buttons_at_pixpos): * toolbar.c (CTB_ERROR): * toolbar.c (recompute_overlaying_specifier): * toolbar.c (specifier_vars_of_toolbar): * toolbar.h: * toolbar.h (SET_TOOLBAR_WAS_VISIBLE_FLAG): Create new enum edge_pos with TOP_EDGE, BOTTOM_EDGE, LEFT_EDGE, RIGHT_EDGE; subsume TOP_BORDER, TOP_GUTTER, enum toolbar_pos, enum gutter_pos, etc. Create EDGE_POS_LOOP, subsuming GUTTER_POS_LOOP. Create NUM_EDGES, use in many places instead of hardcoded '4'. Instead of top_toolbar_was_visible, bottom_toolbar_was_visible, etc. make an array toolbar_was_visible[NUM_EDGES]. This increases the frame size by 15 bytes or so (could be 3 if we use Boolbytes) but hardly seems w to matter -- frames are heavy weight objects anyway. Same with top_gutter_was_visible, etc. Remove duplicated SET_TOOLBAR_WAS_VISIBLE_FLAG and put defn in one place (toolbar.h).

/* Define prototypes for graphics library interface functions.
   Copyright (C) 2002 Ben Wing.

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: Not in FSF. */

#ifndef INCLUDED_libinterface_h_
#define INCLUDED_libinterface_h_

#ifdef HAVE_GIF
#include <gif_lib.h>
#endif /* HAVE_GIF */

#ifdef HAVE_PNG
BEGIN_C_DECLS
#define message message_ /* Yuck */
  /* See comment in libinterface.c for the following */
#define PNG_EXPORT(type, symbol) type XCDECL symbol
#define ZEXPORT XCDECL
#define ZEXPORTVA XCDECL
#include <png.h>
#undef message
END_C_DECLS
#endif /* HAVE_PNG */

/* #### WARNING: Utterly random magic here to prevent namespace conflicts
   when no one bothers to be the least bit namespace-clean.  Potential
   problems: INT32, FAR.  DONT_NEED_JPEG avoids the problem with FAR in
   glyphs-msw.c.  For some reason, putting the XPM code after this fixes
   other problems; don't move it before. --ben */
#if defined (HAVE_JPEG) && !defined (DONT_NEED_JPEG)
BEGIN_C_DECLS
#ifdef _MSC_VER
# ifndef XMD_H
  /* Yuck!  This tricks jpeglib.h into not defining INT32, which is defined
     in VC98/INCLUDE/basetsd.h */
#  define UNDEF_XMD_H_ME_HARDER
#  define XMD_H
# endif
#endif /* _MSC_VER */
#include <jpeglib.h>
#ifdef UNDEF_XMD_H_ME_HARDER
# undef XMD_H
#endif
#include <jerror.h>
END_C_DECLS

boolean XCDECL qxe_jpeg_finish_decompress (j_decompress_ptr cinfo);
boolean XCDECL qxe_jpeg_start_decompress (j_decompress_ptr cinfo);
JDIMENSION XCDECL qxe_jpeg_read_scanlines (j_decompress_ptr cinfo,
					  JSAMPARRAY scanlines,
					  JDIMENSION max_lines);
int XCDECL qxe_jpeg_read_header (j_decompress_ptr cinfo, boolean require_image);
#define qxe_jpeg_create_decompress(cinfo)				      \
    qxe_jpeg_CreateDecompress((cinfo), JPEG_LIB_VERSION,		      \
			      (size_t) sizeof(struct jpeg_decompress_struct))
void XCDECL qxe_jpeg_CreateDecompress (j_decompress_ptr cinfo, int version,
				      size_t structsize);
struct jpeg_error_mgr * XCDECL qxe_jpeg_std_error (struct jpeg_error_mgr *err);
void XCDECL qxe_jpeg_destroy_decompress (j_decompress_ptr cinfo);
boolean XCDECL qxe_jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired);

#endif /* defined (HAVE_JPEG) && !defined (DONT_NEED_JPEG) */

#ifdef HAVE_XPM

#ifndef HAVE_GTK /* #### ????????????????????? No comprendo ni un poco.
		    This was here before, in a different file. --ben */
#include <X11/xpm.h>
#endif

void XCDECL qxe_XpmFreeXpmImage (XpmImage *image);
void XCDECL qxe_XpmFreeXpmInfo (XpmInfo *info);
int XCDECL qxe_XpmCreateXpmImageFromBuffer (char *buffer, XpmImage *image,
					   XpmInfo *info);
void XCDECL qxe_XpmFree (void *ptr);
int XCDECL qxe_XpmReadFileToData (char *filename, char ***data_return);

#endif /* HAVE_XPM */

#ifdef HAVE_TIFF
#include "tiffio.h"

tdata_t XCDECL qxe_TIFFmalloc (tsize_t x1);
void XCDECL qxe_TIFFfree (tdata_t x1);
void XCDECL qxe_TIFFClose (TIFF *x1);
int XCDECL qxe_TIFFGetField (TIFF *x1, ttag_t x2, uint32 *x3);
TIFF * XCDECL qxe_TIFFClientOpen (const char *x1, const char *x2,
				 thandle_t x3, TIFFReadWriteProc x4,
				 TIFFReadWriteProc x5, TIFFSeekProc x6,
				 TIFFCloseProc x7, TIFFSizeProc x8,
				 TIFFMapFileProc x9, TIFFUnmapFileProc x10);
TIFFErrorHandler XCDECL qxe_TIFFSetErrorHandler (TIFFErrorHandler x1);
TIFFErrorHandler XCDECL qxe_TIFFSetWarningHandler (TIFFErrorHandler x1);
int XCDECL qxe_TIFFReadRGBAImage (TIFF *x1, uint32 x2, uint32 x3, uint32 *x4,
				 int x5);

#endif /* HAVE_TIFF */

#endif /* INCLUDED_libinterface_h_ */