Mercurial > hg > xemacs-beta
view src/gutter.c @ 2367:ecf1ebac70d8
[xemacs-hg @ 2004-11-04 23:05:23 by ben]
commit mega-patch
configure.in: Turn off -Winline and -Wchar-subscripts.
Use the right set of cflags when compiling modules.
Rewrite ldap configuration to separate the inclusion of lber
(needed in recent Cygwin) from the basic checks for the
needed libraries.
add a function for MAKE_JUNK_C; initially code was added to
generate xemacs.def using this, but it will need to be rewritten.
add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto
an existing file.
Sort list of auto-detected functions and eliminate unused checks for
stpcpy, setlocale and getwd.
Add autodetection of Cygwin scanf problems
BETA: Rewrite section on configure to indicate what flags are important
and what not.
digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main().
make-msgfile.c: Document that this is old junk.
Move proposal to text.c.
make-msgfile.lex: Move proposal to text.c.
make-mswin-unicode.pl: Convert error-generating code so that the entire message will
be seen as a single unrecognized token.
mule/mule-ccl.el: Update docs.
lispref/mule.texi: Update CCL docs.
ldap/eldap.c: Mule-ize.
Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP.
* XEmacs 21.5.18 "chestnut" is released.
---------------------------------------------------------------
MULE-RELATED WORK:
---------------------------------------------------------------
---------------------------
byte-char conversion
---------------------------
buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken
previous version. Track the char position of the gap. Add
functions to do char-byte conversion downwards as well as upwards.
Move comments about algorithm workings to internals manual.
---------------------------
work on types
---------------------------
alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all
the basic semantics of `char' that I have so far identified, so that
its semantics can always be identified for the purposes of proper
Mule-safe code, and the raw use of `char' always avoided.
(1) More type renaming, for consistency of naming.
Char_ASCII -> Ascbyte
UChar_ASCII -> UAscbyte
Char_Binary -> CBinbyte
UChar_Binary -> Binbyte
SChar_Binary -> SBinbyte
(2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and
Bitbyte and use them.
(3) New types Itext, Wexttext and Textcount for separating out
the concepts of bytes and textual units (different under UTF-16
and UTF-32, which are potential internal encodings).
(4) qxestr*_c -> qxestr*_ascii.
lisp.h: New; goes with other qxe() functions. #### Maybe goes in a
different section.
lisp.h: Group generic int-type defs together with EMACS_INT defs.
lisp.h: * lisp.h (WEXTTEXT_IS_WIDE)
New defns.
lisp.h: New type to replace places where int occurs as a boolean.
It's signed because occasionally people may want to use -1 as
an error value, and because unsigned ints are viral -- see comments
in the internals manual against using them.
dynarr.c: int -> Bytecount.
---------------------------
Mule-izing
---------------------------
device-x.c: Partially Mule-ize.
dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*().
sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be
Unicode (e.g. startup code under Windows).
emacs.c: Mule-ize. Properly deal with argv in external encoding.
Use wext_*() and Wexttext. Use Rawbyte.
#if 0 some old junk on SCO that is unlikely to be correct.
Rewrite allocation code in run-temacs.
emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to
initialize mswindows_9x_p even earlier, for use in startup code
(XEUNICODE_P).
process.c: Use _wenviron not environ under Windows, to get Unicode environment
variables.
event-Xt.c: Mule-ize drag-n-drop related stuff.
dragdrop.c, dragdrop.h, frame-x.c: Mule-ize.
text.h: Add some more stand-in defines for particular kinds of conversion;
use in Mule-ization work in frame-x.c etc.
---------------------------
Freshening
---------------------------
intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate.
---------------------------
Unicode-work
---------------------------
intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and
WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc()
and convert_unicode_to_multibyte_dynarr() and use. Add stuff for
alloca() conversion of multibyte/unicode.
alloc.c: Use dfc_external_data_len() in case of unicode coding system.
alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up
dump-time loading. Anyway, either we load them at dump time or
run time, never both.
unicode.c: Dump the blank tables as well.
---------------------------------------------------------------
DOCUMENTATION, MOSTLY MULE-RELATED:
---------------------------------------------------------------
EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed.
text.h: Add more documentation describing why DFC routines were not written
to return their value. Add some other DFC documentation.
console-msw.c, console-msw.h: Add pointer to docs in win32.c.
emacs.c: Add comments on sources of doc info.
text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and
internationalization, and proposals for work to be done, in text.c
or Internals manual, stuff related to specific textual API's in
text.h, and stuff related to internal implementation of Unicode
conversion in unicode.c. Put lots of pointers to the comments to
make them easier to find.
s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of
builds and environments under Windows and how they work.
Collect this info in win32.c. Add pointers to these docs in
the relevant s/* files.
emacs.c: Document places with long comments.
Remove comment about exiting, move to internals manual, put
in pointer.
event-stream.c: Move docs about event queues and focus to internals manual, put
in pointer.
events.h: Move docs about event stream callbacks to internals manual, put
in pointer.
profile.c, redisplay.c, signal.c: Move documentation to the Internals manual.
process-nt.c: Add pointer to comment in win32-native.el.
lisp.h: Add comments about some comment conventions.
lisp.h: Add comment about the second argument.
device-msw.c, redisplay-msw.c: @@#### comments are out-of-date.
---------------------------------------------------------------
PDUMP WORK (MOTIVATED BY UNICODE CHANGES)
---------------------------------------------------------------
alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP:
Properly implement dump_add_root_block(), which never worked before,
and is necessary for dumping Unicode tables.
Pdump name changes for accuracy:
XD_STRUCT_PTR -> XD_BLOCK_PTR.
XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY.
XD_C_STRING -> XD_ASCII_STRING.
*_structure_* -> *_block_*.
lrecord.h: some comments added about
dump_add_root_block() vs dump_add_root_block_ptr().
extents.c: remove incorrect comment about pdump problems with gap array.
---------------------------------------------------------------
ALLOCATION
---------------------------------------------------------------
abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for
more convenient allocation of these commonly requested items.
Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes,
xnew_ibytes, etc. also XREALLOC_ARRAY, xnew.
alloc.c: Rewrite the allocation functions to factor out repeated code.
Add assertions for freeing dumped data.
lisp.h: Moved down and consolidated with other allocation stuff.
lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in
LIFO order.
lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs.
text.h, lisp.h: Fill out convenience routines for allocating various kinds of
bytes and put them in lisp.h. Use them in place of xmalloc(),
ALLOCA().
text.h: Fill out the convenience functions so the _MALLOC() kinds match
the alloca() kinds.
---------------------------------------------------------------
ERROR-CHECKING
---------------------------------------------------------------
text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN()
from similar Eistring checkers and change the Eistring checkers to
use them instead.
---------------------------------------------------------------
MACROS IN LISP.H
---------------------------------------------------------------
lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can
be used to generate any kind of gcpro sets -- regular, ngcpro,
nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2.
buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities.
Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3
or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2
(new macro). Removed/redid comments on EXTERNAL_LIST_LOOP.
---------------------------------------------------------------
SPACING FIXES
---------------------------------------------------------------
callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes.
---------------------------------------------------------------
FIX FOR GEOMETRY PROBLEM IN FIRST FRAME
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows.
will be overridden by my other ws.
---------------------------------------------------------------
FIX FOR LEAKING PROCESS HANDLES:
---------------------------------------------------------------
process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner
<adrian@xemacs.org>.
---------------------------------------------------------------
FIX FOR CYGWIN BUG (Unicode-related):
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
---------------------------------------------------------------
WARNING FIXES:
---------------------------------------------------------------
console-stream.c: `reinit' is unused.
compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got.
regex.c: Gather includes together to avoid warning.
---------------------------------------------------------------
CHANGES TO INITIALIZATION ROUTINES:
---------------------------------------------------------------
buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity.
Factor out some redundant init code. Move disallowed stuff
that had crept into vars_of_glyphs() into complex_vars_of_glyphs().
Call init_eval_semi_early() from eval.c not in the middle of
vars_of_() in emacs.c since there should be no order dependency
in the latter calls.
---------------------------------------------------------------
ARMAGEDDON:
---------------------------------------------------------------
alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to
inhibit_non_essential_conversion_operations.
text.c: Assert on !inhibit_non_essential_conversion_operations.
console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid
problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT
in places where problems would arise.
---------------------------------------------------------------
CHANGES TO THE BUILD PROCEDURE:
---------------------------------------------------------------
config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file.
Rearrange everything to follow this -- put all #undefs together
and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA,
BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused
HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE.
m/gec63.h: Deleted; totally broken, not used at all, not in FSF.
m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION,
BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected.
When in doubt, I followed recent FSF sources, which also have
these things deleted.
author | ben |
---|---|
date | Thu, 04 Nov 2004 23:08:28 +0000 |
parents | 04bc9d2f42c7 |
children | 3d8143fc88e1 |
line wrap: on
line source
/* Gutter implementation. Copyright (C) 1999, 2000 Andy Piper. 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. */ /* written by Andy Piper <andy@xemacs.org> with specifiers partially ripped-off from toolbar.c */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "frame-impl.h" #include "device-impl.h" #include "faces.h" #include "glyphs.h" #include "redisplay.h" #include "window.h" #include "gutter.h" Lisp_Object Vgutter[4]; Lisp_Object Vgutter_size[4]; Lisp_Object Vgutter_visible_p[4]; Lisp_Object Vgutter_border_width[4]; Lisp_Object Vdefault_gutter, Vdefault_gutter_visible_p; Lisp_Object Vdefault_gutter_width, Vdefault_gutter_height; Lisp_Object Vdefault_gutter_border_width; Lisp_Object Vdefault_gutter_position; Lisp_Object Qgutter_size; Lisp_Object Qgutter_visible; Lisp_Object Qdefault_gutter_position_changed_hook; static void update_gutter_geometry (struct frame *f, enum gutter_pos pos); #define SET_GUTTER_WAS_VISIBLE_FLAG(frame, pos, flag) \ do { \ switch (pos) \ { \ case TOP_GUTTER: \ (frame)->top_gutter_was_visible = flag; \ break; \ case BOTTOM_GUTTER: \ (frame)->bottom_gutter_was_visible = flag; \ break; \ case LEFT_GUTTER: \ (frame)->left_gutter_was_visible = flag; \ break; \ case RIGHT_GUTTER: \ (frame)->right_gutter_was_visible = flag; \ break; \ default: \ abort (); \ } \ } while (0) static int gutter_was_visible (struct frame* frame, enum gutter_pos pos) { switch (pos) { case TOP_GUTTER: return frame->top_gutter_was_visible; case BOTTOM_GUTTER: return frame->bottom_gutter_was_visible; case LEFT_GUTTER: return frame->left_gutter_was_visible; case RIGHT_GUTTER: return frame->right_gutter_was_visible; default: abort (); return 0; /* To keep the compiler happy */ } } #if 0 static Lisp_Object frame_topmost_window (struct frame *f) { Lisp_Object w = FRAME_ROOT_WINDOW (f); do { while (!NILP (XWINDOW (w)->vchild)) { w = XWINDOW (w)->vchild; } } while (!NILP (XWINDOW (w)->hchild) && !NILP (w = XWINDOW (w)->hchild)); return w; } #endif static Lisp_Object frame_bottommost_window (struct frame *f) { Lisp_Object w = FRAME_ROOT_WINDOW (f); do { while (!NILP (XWINDOW (w)->vchild)) { w = XWINDOW (w)->vchild; while (!NILP (XWINDOW (w)->next)) { w = XWINDOW (w)->next; } } } while (!NILP (XWINDOW (w)->hchild) && !NILP (w = XWINDOW (w)->hchild)); return w; } #if 0 static Lisp_Object frame_leftmost_window (struct frame *f) { Lisp_Object w = FRAME_ROOT_WINDOW (f); do { while (!NILP (XWINDOW (w)->hchild)) { w = XWINDOW (w)->hchild; } } while (!NILP (XWINDOW (w)->vchild) && !NILP (w = XWINDOW (w)->vchild)); return w; } static Lisp_Object frame_rightmost_window (struct frame *f) { Lisp_Object w = FRAME_ROOT_WINDOW (f); do { while (!NILP (XWINDOW (w)->hchild)) { w = XWINDOW (w)->hchild; while (!NILP (XWINDOW (w)->next)) { w = XWINDOW (w)->next; } } } while (!NILP (XWINDOW (w)->vchild) && !NILP (w = XWINDOW (w)->vchild)); return w; } #endif /* calculate the coordinates of a gutter for the current frame and selected window. we have to be careful in calculating this as we need to use *two* windows, the currently selected window will give us the actual height, width and contents of the gutter, but if we use this for calculating the gutter positions we run into trouble if it is not the window nearest the gutter. Instead we predetermine the nearest window and then use that.*/ static void get_gutter_coords (struct frame *f, enum gutter_pos pos, int *x, int *y, int *width, int *height) { struct window * bot = XWINDOW (frame_bottommost_window (f)); /* The top and bottom gutters take precedence over the left and right. */ switch (pos) { case TOP_GUTTER: *x = FRAME_LEFT_BORDER_END (f); *y = FRAME_TOP_BORDER_END (f); *width = FRAME_RIGHT_BORDER_START (f) - FRAME_LEFT_BORDER_END (f); *height = FRAME_TOP_GUTTER_BOUNDS (f); break; case BOTTOM_GUTTER: *x = FRAME_LEFT_BORDER_END (f); *y = WINDOW_BOTTOM (bot); *width = FRAME_RIGHT_BORDER_START (f) - FRAME_LEFT_BORDER_END (f); *height = FRAME_BOTTOM_GUTTER_BOUNDS (f); break; case LEFT_GUTTER: *x = FRAME_LEFT_BORDER_END (f); *y = FRAME_TOP_BORDER_END (f) + FRAME_TOP_GUTTER_BOUNDS (f); *width = FRAME_LEFT_GUTTER_BOUNDS (f); *height = WINDOW_BOTTOM (bot) - (FRAME_TOP_BORDER_END (f) + FRAME_TOP_GUTTER_BOUNDS (f)); break; case RIGHT_GUTTER: *x = FRAME_RIGHT_BORDER_START (f) - FRAME_RIGHT_GUTTER_BOUNDS (f); *y = FRAME_TOP_BORDER_END (f) + FRAME_TOP_GUTTER_BOUNDS (f); *width = FRAME_RIGHT_GUTTER_BOUNDS (f); *height = WINDOW_BOTTOM (bot) - (FRAME_TOP_BORDER_END (f) + FRAME_TOP_GUTTER_BOUNDS (f)); break; default: abort (); } } /* display_boxes_in_gutter_p Determine whether the required display_glyph_area is completely inside the gutter. -1 means the display_box is not in the gutter. 1 means the display_box and the display_glyph_area are in the window. 0 means the display_box is in the gutter but the display_glyph_area is not. */ int display_boxes_in_gutter_p (struct frame *f, struct display_box* db, struct display_glyph_area* dga) { enum gutter_pos pos; GUTTER_POS_LOOP (pos) { if (FRAME_GUTTER_VISIBLE (f, pos)) { int x, y, width, height; get_gutter_coords (f, pos, &x, &y, &width, &height); if (db->xpos + dga->xoffset >= x && db->ypos + dga->yoffset >= y && db->xpos + dga->xoffset + dga->width <= x + width && db->ypos + dga->yoffset + dga->height <= y + height) return 1; else if (db->xpos >= x && db->ypos >= y && db->xpos + db->width <= x + width && db->ypos + db->height <= y + height) return 0; } } return -1; } /* Convert the gutter specifier into something we can actually display. */ static Lisp_Object construct_window_gutter_spec (struct window* w, enum gutter_pos pos) { Lisp_Object rest, *args; int nargs = 0; Lisp_Object gutter = RAW_WINDOW_GUTTER (w, pos); if (STRINGP (gutter) || NILP (gutter)) return gutter; GET_LIST_LENGTH (gutter, nargs); args = alloca_array (Lisp_Object, nargs >> 1); nargs = 0; for (rest = gutter; !NILP (rest); rest = XCDR (XCDR (rest))) { /* We only put things in the real gutter that are declared to be visible. */ if (!CONSP (WINDOW_GUTTER_VISIBLE (w, pos)) || !NILP (Fmemq (XCAR (rest), WINDOW_GUTTER_VISIBLE (w, pos)))) { args [nargs++] = XCAR (XCDR (rest)); } } return Fconcat (nargs, args); } /* Sizing gutters is a pain so we try and help the user by determining what height will accommodate all lines. This is useless on left and right gutters as we always have a maximal number of lines. */ static int calculate_gutter_size_from_display_lines (enum gutter_pos pos, display_line_dynarr* ddla) { int size = 0; struct display_line *dl; /* For top and bottom the calculation is easy. */ if (pos == TOP_GUTTER || pos == BOTTOM_GUTTER) { /* grab coordinates of last line */ if (Dynarr_length (ddla)) { dl = Dynarr_atp (ddla, Dynarr_length (ddla) - 1); size = (dl->ypos + dl->descent - dl->clip) - (Dynarr_atp (ddla, 0)->ypos - Dynarr_atp (ddla, 0)->ascent); } } /* For left and right we have to do some maths. */ else { int start_pos = 0, end_pos = 0, line; for (line = 0; line < Dynarr_length (ddla); line++) { int block; dl = Dynarr_atp (ddla, line); for (block = 0; block < Dynarr_largest (dl->display_blocks); block++) { struct display_block *db = Dynarr_atp (dl->display_blocks, block); if (db->type == TEXT) { start_pos = min (db->start_pos, start_pos); end_pos = max (db->end_pos, end_pos); } } } size = end_pos - start_pos; } return size; } static Lisp_Object calculate_gutter_size (struct window *w, enum gutter_pos pos) { struct frame* f = XFRAME (WINDOW_FRAME (w)); display_line_dynarr *ddla; Lisp_Object ret = Qnil; /* Callers need to handle this. */ assert (!in_display); /* degenerate case */ if (NILP (RAW_WINDOW_GUTTER (w, pos)) || !FRAME_VISIBLE_P (f) || NILP (w->buffer)) return Qnil; if (!in_display) { int count; /* We are calling directly into redisplay from the outside, so turn on critical section protection. */ count = enter_redisplay_critical_section (); ddla = Dynarr_new (display_line); /* generate some display lines */ generate_displayable_area (w, WINDOW_GUTTER (w, pos), FRAME_LEFT_BORDER_END (f), FRAME_TOP_BORDER_END (f), FRAME_RIGHT_BORDER_START (f) - FRAME_LEFT_BORDER_END (f), FRAME_BOTTOM_BORDER_START (f) - FRAME_TOP_BORDER_END (f), ddla, 0, 0); /* Let GC happen again. */ exit_redisplay_critical_section (count); ret = make_int (calculate_gutter_size_from_display_lines (pos, ddla)); free_display_lines (ddla); } return ret; } static void output_gutter (struct frame *f, enum gutter_pos pos, int force) { Lisp_Object window = FRAME_LAST_NONMINIBUF_WINDOW (f); struct device *d = XDEVICE (f->device); struct window* w = XWINDOW (window); int x, y, width, height, ypos; int line, border_width; face_index findex; display_line_dynarr* ddla, *cdla; struct display_line *dl = 0; int cdla_len; if (!WINDOW_LIVE_P (w)) return; border_width = FRAME_GUTTER_BORDER_WIDTH (f, pos); findex = get_builtin_face_cache_index (w, Vwidget_face); if (!f->current_display_lines[pos]) f->current_display_lines[pos] = Dynarr_new (display_line); if (!f->desired_display_lines[pos]) f->desired_display_lines[pos] = Dynarr_new (display_line); ddla = f->desired_display_lines[pos]; cdla = f->current_display_lines[pos]; cdla_len = Dynarr_length (cdla); get_gutter_coords (f, pos, &x, &y, &width, &height); /* generate some display lines */ generate_displayable_area (w, WINDOW_GUTTER (w, pos), x + border_width, y + border_width, width - 2 * border_width, height - 2 * border_width, ddla, 0, findex); /* We only output the gutter if we think something of significance has changed. This is, for example, because redisplay can cause new face cache elements to get added causing compare_runes to fail because the findex for a particular face has changed. */ if (force || f->faces_changed || f->frame_changed || f->gutter_changed || f->glyphs_changed || f->size_changed || f->subwindows_changed || w->windows_changed || f->windows_structure_changed || cdla_len != Dynarr_length (ddla) || (f->extents_changed && w->gutter_extent_modiff[pos])) { #ifdef DEBUG_GUTTERS stderr_out ("gutter redisplay [%s %dx%d@%d+%d] triggered by %s,\n", pos == TOP_GUTTER ? "TOP" : pos == BOTTOM_GUTTER ? "BOTTOM" : pos == LEFT_GUTTER ? "LEFT" : "RIGHT", width, height, x, y, force ? "force" : f->faces_changed ? "f->faces_changed" : f->frame_changed ? "f->frame_changed" : f->gutter_changed ? "f->gutter_changed" : f->glyphs_changed ? "f->glyphs_changed" : f->size_changed ? "f->size_changed" : f->subwindows_changed ? "f->subwindows_changed" : w->windows_changed ? "w->windows_changed" : f->windows_structure_changed ? "f->windows_structure_changed" : cdla_len != Dynarr_length (ddla) ? "different display structures" : f->extents_changed && w->gutter_extent_modiff[pos] ? "f->extents_changed && w->gutter_extent_modiff[pos]" : "<null>"); #endif /* Output each line. */ for (line = 0; line < Dynarr_length (ddla); line++) { output_display_line (w, cdla, ddla, line, -1, -1); } /* If the number of display lines has shrunk, adjust. */ if (cdla_len > Dynarr_length (ddla)) { Dynarr_length (cdla) = Dynarr_length (ddla); } /* grab coordinates of last line and blank after it. */ if (Dynarr_length (ddla) > 0) { dl = Dynarr_atp (ddla, Dynarr_length (ddla) - 1); ypos = dl->ypos + dl->descent - dl->clip; } else ypos = y; redisplay_clear_region (window, findex, x + border_width , ypos, width - 2 * border_width, height - (ypos - y) - border_width); /* If, for some reason, we have more to display than we have room for, and we are allowed to resize the gutter, then make sure this happens before the next time we try and output. This can happen when face font sizes change. */ if (dl && EQ (w->gutter_size[pos], Qautodetect) && (dl->clip > 0 || calculate_gutter_size_from_display_lines (pos, ddla) > WINDOW_GUTTER_SIZE_INTERNAL (w, pos))) { /* #### Ideally we would just mark the specifier as dirty and everything else would "just work". Unfortunately we have two problems with this. One is that the specifier cache won't be recalculated unless the specifier code thinks the cached value has actually changed, even though we have marked the specifier as dirty. Additionally, although doing this results in a gutter size change, we never seem to get back into redisplay so that the frame size can be updated. I think this is because we are already in redisplay and later on the frame will be marked as clean. Thus we also have to force a pending recalculation of the frame size. */ w->gutter_size[pos] = Qnil; Fset_specifier_dirty_flag (Vgutter_size[pos]); update_gutter_geometry (f, pos); } /* bevel the gutter area if so desired */ if (border_width != 0) { MAYBE_DEVMETH (d, bevel_area, (w, findex, x, y, width, height, border_width, EDGE_ALL, EDGE_BEVEL_OUT)); } } else { /* Nothing of significance happened so sync the display line structs. */ for (line = 0; line < Dynarr_length (ddla); line++) { sync_display_line_structs (w, line, 1, cdla, ddla); } } w->gutter_extent_modiff [pos] = 0; } static void clear_gutter (struct frame *f, enum gutter_pos pos) { int x, y, width, height; Lisp_Object window = FRAME_LAST_NONMINIBUF_WINDOW (f); face_index findex = get_builtin_face_cache_index (XWINDOW (window), Vwidget_face); get_gutter_coords (f, pos, &x, &y, &width, &height); SET_GUTTER_WAS_VISIBLE_FLAG (f, pos, 0); redisplay_clear_region (window, findex, x, y, width, height); } /* [[#### I don't currently believe that redisplay needs to mark the glyphs in its structures since these will always be referenced from somewhere else. However, I'm not sure enough to stake my life on it at this point, so we do the safe thing.]] ALWAYS mark everything. --ben */ /* See the comment in image_instantiate_cache_result as to why marking the glyph will also mark the image_instance. */ void mark_gutters (struct frame *f) { enum gutter_pos pos; GUTTER_POS_LOOP (pos) { if (f->current_display_lines[pos]) mark_redisplay_structs (f->current_display_lines[pos]); /* [[#### Do we really need to mark the desired lines?]] ALWAYS mark everything. --ben */ if (f->desired_display_lines[pos]) mark_redisplay_structs (f->desired_display_lines[pos]); } } /* This is called by extent_changed_for_redisplay, so that redisplay knows exactly what extents have changed. */ void gutter_extent_signal_changed_region_maybe (Lisp_Object obj, Charbpos UNUSED (start), Charbpos UNUSED (end)) { /* #### Start and end are currently ignored but could be used by a more optimal gutter redisplay. We currently loop over all frames here, this could be optimized. */ Lisp_Object frmcons, devcons, concons; FRAME_LOOP_NO_BREAK (frmcons, devcons, concons) { struct frame *f = XFRAME (XCAR (frmcons)); enum gutter_pos pos; Lisp_Object window = FRAME_LAST_NONMINIBUF_WINDOW (f); struct window* w = XWINDOW (window); GUTTER_POS_LOOP (pos) { if (EQ (WINDOW_GUTTER (w, pos), obj)) { w->gutter_extent_modiff[pos]++; } } } } /* We have to change the gutter geometry separately to the gutter update since it needs to occur outside of redisplay proper. */ static void update_gutter_geometry (struct frame *f, enum gutter_pos pos) { /* If the gutter geometry has changed then re-layout the frame. If we are in display there is almost no point in doing anything else since the frame size changes will be delayed until we are out of redisplay proper. */ if (FRAME_GUTTER_BOUNDS (f, pos) != f->current_gutter_bounds[pos]) { int width, height; pixel_to_char_size (f, FRAME_PIXWIDTH (f), FRAME_PIXHEIGHT (f), &width, &height); change_frame_size (f, height, width, 0); MARK_FRAME_LAYOUT_CHANGED (f); } /* Mark sizes as up-to-date. */ f->current_gutter_bounds[pos] = FRAME_GUTTER_BOUNDS (f, pos); } void update_frame_gutter_geometry (struct frame *f) { if (f->gutter_changed || f->frame_layout_changed || f->windows_structure_changed) { enum gutter_pos pos; /* If the gutter geometry has changed then re-layout the frame. If we are in display there is almost no point in doing anything else since the frame size changes will be delayed until we are out of redisplay proper. */ GUTTER_POS_LOOP (pos) { update_gutter_geometry (f, pos); } } } void update_frame_gutters (struct frame *f) { if (f->faces_changed || f->frame_changed || f->gutter_changed || f->glyphs_changed || f->size_changed || f->subwindows_changed || f->windows_changed || f->windows_structure_changed || f->extents_changed || f->frame_layout_changed) { enum gutter_pos pos; /* We don't actually care about these when outputting the gutter so locally disable them. */ int local_clip_changed = f->clip_changed; int local_buffers_changed = f->buffers_changed; f->clip_changed = 0; f->buffers_changed = 0; /* and output */ GUTTER_POS_LOOP (pos) { if (FRAME_GUTTER_VISIBLE (f, pos)) output_gutter (f, pos, 0); else if (gutter_was_visible (f, pos)) clear_gutter (f, pos); } f->clip_changed = local_clip_changed; f->buffers_changed = local_buffers_changed; f->gutter_changed = 0; } } void reset_gutter_display_lines (struct frame* f) { enum gutter_pos pos; GUTTER_POS_LOOP (pos) { if (f->current_display_lines[pos]) Dynarr_reset (f->current_display_lines[pos]); } } static void redraw_exposed_gutter (struct frame *f, enum gutter_pos pos, int x, int y, int width, int height) { int g_x, g_y, g_width, g_height; get_gutter_coords (f, pos, &g_x, &g_y, &g_width, &g_height); if (((y + height) < g_y) || (y > (g_y + g_height)) || !height || !width || !g_height || !g_width) return; if (((x + width) < g_x) || (x > (g_x + g_width))) return; #ifdef DEBUG_WIDGETS stderr_out ("redrawing gutter after expose %d+%d, %dx%d\n", x, y, width, height); #endif /* #### optimize this - redrawing the whole gutter for every expose is very expensive. We reset the current display lines because if they're being exposed they are no longer current. */ reset_gutter_display_lines (f); /* Even if none of the gutter is in the area, the blank region at the very least must be because the first thing we did is verify that some portion of the gutter is in the exposed region. */ output_gutter (f, pos, 1); } void redraw_exposed_gutters (struct frame *f, int x, int y, int width, int height) { enum gutter_pos pos; /* We are already inside the critical section -- our caller did that. */ GUTTER_POS_LOOP (pos) { if (FRAME_GUTTER_VISIBLE (f, pos)) redraw_exposed_gutter (f, pos, x, y, width, height); } } void free_frame_gutters (struct frame *f) { enum gutter_pos pos; GUTTER_POS_LOOP (pos) { if (f->current_display_lines[pos]) { free_display_lines (f->current_display_lines[pos]); f->current_display_lines[pos] = 0; } if (f->desired_display_lines[pos]) { free_display_lines (f->desired_display_lines[pos]); f->desired_display_lines[pos] = 0; } } } static enum gutter_pos decode_gutter_position (Lisp_Object position) { if (EQ (position, Qtop)) return TOP_GUTTER; if (EQ (position, Qbottom)) return BOTTOM_GUTTER; if (EQ (position, Qleft)) return LEFT_GUTTER; if (EQ (position, Qright)) return RIGHT_GUTTER; invalid_constant ("Invalid gutter position", position); RETURN_NOT_REACHED (TOP_GUTTER); } DEFUN ("set-default-gutter-position", Fset_default_gutter_position, 1, 1, 0, /* Set the position that the `default-gutter' will be displayed at. Valid positions are 'top, 'bottom, 'left and 'right. See `default-gutter-position'. */ (position)) { enum gutter_pos cur = decode_gutter_position (Vdefault_gutter_position); enum gutter_pos new = decode_gutter_position (position); if (cur != new) { /* The following calls will automatically cause the dirty flags to be set; we delay frame size changes to avoid lots of frame flickering. */ /* #### I think this should be GC protected. -sb */ int depth = begin_hold_frame_size_changes (); set_specifier_fallback (Vgutter[cur], list1 (Fcons (Qnil, Qnil))); set_specifier_fallback (Vgutter[new], Vdefault_gutter); set_specifier_fallback (Vgutter_size[cur], list1 (Fcons (Qnil, Qzero))); set_specifier_fallback (Vgutter_size[new], new == TOP_GUTTER || new == BOTTOM_GUTTER ? Vdefault_gutter_height : Vdefault_gutter_width); set_specifier_fallback (Vgutter_border_width[cur], list1 (Fcons (Qnil, Qzero))); set_specifier_fallback (Vgutter_border_width[new], Vdefault_gutter_border_width); set_specifier_fallback (Vgutter_visible_p[cur], list1 (Fcons (Qnil, Qt))); set_specifier_fallback (Vgutter_visible_p[new], Vdefault_gutter_visible_p); Vdefault_gutter_position = position; unbind_to (depth); } run_hook (Qdefault_gutter_position_changed_hook); return position; } DEFUN ("default-gutter-position", Fdefault_gutter_position, 0, 0, 0, /* Return the position that the `default-gutter' will be displayed at. The `default-gutter' will only be displayed here if the corresponding position-specific gutter specifier does not provide a value. */ ()) { return Vdefault_gutter_position; } DEFUN ("gutter-pixel-width", Fgutter_pixel_width, 0, 2, 0, /* Return the pixel width of the gutter at POS in LOCALE. POS defaults to the default gutter position. LOCALE defaults to the current window. */ (pos, locale)) { int x, y, width, height; enum gutter_pos p = TOP_GUTTER; struct frame *f = decode_frame (FW_FRAME (locale)); if (NILP (pos)) pos = Vdefault_gutter_position; p = decode_gutter_position (pos); get_gutter_coords (f, p, &x, &y, &width, &height); width -= (FRAME_GUTTER_BORDER_WIDTH (f, p) * 2); return make_int (width); } DEFUN ("gutter-pixel-height", Fgutter_pixel_height, 0, 2, 0, /* Return the pixel height of the gutter at POS in LOCALE. POS defaults to the default gutter position. LOCALE defaults to the current window. */ (pos, locale)) { int x, y, width, height; enum gutter_pos p = TOP_GUTTER; struct frame *f = decode_frame (FW_FRAME (locale)); if (NILP (pos)) pos = Vdefault_gutter_position; p = decode_gutter_position (pos); get_gutter_coords (f, p, &x, &y, &width, &height); height -= (FRAME_GUTTER_BORDER_WIDTH (f, p) * 2); return make_int (height); } DEFINE_SPECIFIER_TYPE (gutter); static void gutter_after_change (Lisp_Object UNUSED (specifier), Lisp_Object UNUSED (locale)) { MARK_GUTTER_CHANGED; } static void gutter_validate (Lisp_Object instantiator) { if (NILP (instantiator)) return; /* Must be a string or a plist. */ if (!STRINGP (instantiator) && NILP (Fvalid_plist_p (instantiator))) sferror ("Gutter spec must be string, plist or nil", instantiator); if (!STRINGP (instantiator)) { Lisp_Object rest; for (rest = instantiator; !NILP (rest); rest = XCDR (XCDR (rest))) { if (!SYMBOLP (XCAR (rest)) || !STRINGP (XCAR (XCDR (rest)))) sferror ("Gutter plist spec must contain strings", instantiator); } } } DEFUN ("gutter-specifier-p", Fgutter_specifier_p, 1, 1, 0, /* Return non-nil if OBJECT is a gutter specifier. See `make-gutter-specifier' for a description of possible gutter instantiators. */ (object)) { return GUTTER_SPECIFIERP (object) ? Qt : Qnil; } /* Helper for invalidating the real specifier when default specifier caching changes */ static void recompute_overlaying_specifier (Lisp_Object real_one[4]) { enum gutter_pos pos = decode_gutter_position (Vdefault_gutter_position); Fset_specifier_dirty_flag (real_one[pos]); } static void gutter_specs_changed (Lisp_Object specifier, struct window *w, Lisp_Object oldval, enum gutter_pos pos); static void gutter_specs_changed_1 (Lisp_Object arg) { gutter_specs_changed (X1ST (arg), XWINDOW (X2ND (arg)), X3RD (arg), (enum gutter_pos) XINT (X4TH (arg))); free_list (arg); } static void gutter_specs_changed (Lisp_Object specifier, struct window *w, Lisp_Object oldval, enum gutter_pos pos) { if (in_display) register_post_redisplay_action (gutter_specs_changed_1, list4 (specifier, wrap_window (w), oldval, make_int (pos))); else { w->real_gutter[pos] = construct_window_gutter_spec (w, pos); w->real_gutter_size[pos] = w->gutter_size[pos]; if (EQ (w->real_gutter_size[pos], Qautodetect) && !NILP (w->gutter_visible_p[pos])) { w->real_gutter_size [pos] = calculate_gutter_size (w, pos); } MARK_GUTTER_CHANGED; MARK_MODELINE_CHANGED; MARK_WINDOWS_CHANGED (w); } } /* We define all of these so we can access which actual gutter changed. */ static void top_gutter_specs_changed (Lisp_Object specifier, struct window *w, Lisp_Object oldval) { gutter_specs_changed (specifier, w, oldval, TOP_GUTTER); } static void bottom_gutter_specs_changed (Lisp_Object specifier, struct window *w, Lisp_Object oldval) { gutter_specs_changed (specifier, w, oldval, BOTTOM_GUTTER); } static void left_gutter_specs_changed (Lisp_Object specifier, struct window *w, Lisp_Object oldval) { gutter_specs_changed (specifier, w, oldval, LEFT_GUTTER); } static void right_gutter_specs_changed (Lisp_Object specifier, struct window *w, Lisp_Object oldval) { gutter_specs_changed (specifier, w, oldval, RIGHT_GUTTER); } static void default_gutter_specs_changed (Lisp_Object UNUSED (specifier), struct window *UNUSED (w), Lisp_Object UNUSED (oldval)) { recompute_overlaying_specifier (Vgutter); } static void gutter_geometry_changed_in_window (Lisp_Object specifier, struct window *w, Lisp_Object oldval); static void gutter_geometry_changed_in_window_1 (Lisp_Object arg) { gutter_geometry_changed_in_window (X1ST (arg), XWINDOW (X2ND (arg)), X3RD (arg)); free_list (arg); } static void gutter_geometry_changed_in_window (Lisp_Object specifier, struct window *w, Lisp_Object oldval) { if (in_display) register_post_redisplay_action (gutter_geometry_changed_in_window_1, list3 (specifier, wrap_window (w), oldval)); else { enum gutter_pos pos; GUTTER_POS_LOOP (pos) { w->real_gutter_size[pos] = w->gutter_size[pos]; if (EQ (w->real_gutter_size[pos], Qautodetect) && !NILP (w->gutter_visible_p[pos])) { w->real_gutter_size [pos] = calculate_gutter_size (w, pos); } } MARK_GUTTER_CHANGED; MARK_MODELINE_CHANGED; MARK_WINDOWS_CHANGED (w); } } static void default_gutter_size_changed_in_window (Lisp_Object UNUSED (specifier), struct window *UNUSED (w), Lisp_Object UNUSED (oldval)) { recompute_overlaying_specifier (Vgutter_size); } static void default_gutter_border_width_changed_in_window (Lisp_Object UNUSED (specifier), struct window *UNUSED (w), Lisp_Object UNUSED (oldval)) { recompute_overlaying_specifier (Vgutter_border_width); } static void default_gutter_visible_p_changed_in_window (Lisp_Object UNUSED (specifier), struct window *UNUSED (w), Lisp_Object UNUSED (oldval)) { recompute_overlaying_specifier (Vgutter_visible_p); /* Need to reconstruct the gutter specifier as it is affected by the visibility. */ recompute_overlaying_specifier (Vgutter); } DECLARE_SPECIFIER_TYPE (gutter_size); #define GUTTER_SIZE_SPECIFIERP(x) SPECIFIER_TYPEP (x, gutter_size) DEFINE_SPECIFIER_TYPE (gutter_size); static void gutter_size_validate (Lisp_Object instantiator) { if (NILP (instantiator)) return; if (!INTP (instantiator) && !EQ (instantiator, Qautodetect)) invalid_argument ("Gutter size must be an integer or 'autodetect", instantiator); } DEFUN ("gutter-size-specifier-p", Fgutter_size_specifier_p, 1, 1, 0, /* Return non-nil if OBJECT is a gutter-size specifier. See `make-gutter-size-specifier' for a description of possible gutter-size instantiators. */ (object)) { return GUTTER_SIZE_SPECIFIERP (object) ? Qt : Qnil; } DECLARE_SPECIFIER_TYPE (gutter_visible); #define GUTTER_VISIBLE_SPECIFIERP(x) SPECIFIER_TYPEP (x, gutter_visible) DEFINE_SPECIFIER_TYPE (gutter_visible); static void gutter_visible_validate (Lisp_Object instantiator) { if (NILP (instantiator)) return; if (!NILP (instantiator) && !EQ (instantiator, Qt) && !CONSP (instantiator)) invalid_argument ("Gutter visibility must be a boolean or list of symbols", instantiator); if (CONSP (instantiator)) { EXTERNAL_LIST_LOOP_2 (elt, instantiator) { if (!SYMBOLP (elt)) invalid_argument ("Gutter visibility must be a boolean or list of symbols", instantiator); } } } DEFUN ("gutter-visible-specifier-p", Fgutter_visible_specifier_p, 1, 1, 0, /* Return non-nil if OBJECT is a gutter-visible specifier. See `make-gutter-visible-specifier' for a description of possible gutter-visible instantiators. */ (object)) { return GUTTER_VISIBLE_SPECIFIERP (object) ? Qt : Qnil; } DEFUN ("redisplay-gutter-area", Fredisplay_gutter_area, 0, 0, 0, /* Ensure that all gutters are correctly showing their gutter specifier. */ ()) { Lisp_Object devcons, concons; /* Can't reentrantly enter redisplay */ if (in_display) return Qnil; DEVICE_LOOP_NO_BREAK (devcons, concons) { struct device *d = XDEVICE (XCAR (devcons)); Lisp_Object frmcons; DEVICE_FRAME_LOOP (frmcons, d) { struct frame *f = XFRAME (XCAR (frmcons)); MAYBE_DEVMETH (d, frame_output_begin, (f)); /* Sequence is quite important here. We not only want to redisplay the gutter area but we also want to flush any frame size changes out so that the gutter redisplay happens in a kosha environment. This is not only so that things look right but so that glyph redisplay optimization kicks in, by default display lines will be completely re-output if f->windows_structure_changed is 1, and this is true if frame size changes haven't been flushed out. Once frame size changes have been flushed out we then need to redisplay the frame in order to flush out pending window size changes. */ update_frame_gutter_geometry (f); if (f->windows_structure_changed) redisplay_frame (f, 1); else if (FRAME_REPAINT_P (f)) { int depth; /* We have to be "in display" when we output the gutter - make it so. */ depth = enter_redisplay_critical_section (); update_frame_gutters (f); exit_redisplay_critical_section (depth); } MAYBE_DEVMETH (d, frame_output_end, (f)); } d->gutter_changed = 0; } /* This is so that further changes to the gutters will trigger redisplay. */ gutter_changed_set = 0; gutter_changed = 0; return Qnil; } void init_frame_gutters (struct frame *f) { enum gutter_pos pos; struct window* w = XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)); /* We are here as far in frame creation so cached specifiers are already recomputed, and possibly modified by resource initialization. We need to recalculate autodetected gutters. */ GUTTER_POS_LOOP (pos) { w->real_gutter[pos] = construct_window_gutter_spec (w, pos); w->real_gutter_size[pos] = w->gutter_size[pos]; if (EQ (w->gutter_size[pos], Qautodetect) && !NILP (w->gutter_visible_p[pos])) { w->real_gutter_size [pos] = calculate_gutter_size (w, pos); MARK_GUTTER_CHANGED; MARK_WINDOWS_CHANGED (w); } } /* Keep a record of the current sizes of things. */ GUTTER_POS_LOOP (pos) { f->current_gutter_bounds[pos] = FRAME_GUTTER_BOUNDS (f, pos); } } void syms_of_gutter (void) { DEFSUBR (Fgutter_specifier_p); DEFSUBR (Fgutter_size_specifier_p); DEFSUBR (Fgutter_visible_specifier_p); DEFSUBR (Fset_default_gutter_position); DEFSUBR (Fdefault_gutter_position); DEFSUBR (Fgutter_pixel_height); DEFSUBR (Fgutter_pixel_width); DEFSUBR (Fredisplay_gutter_area); DEFSYMBOL (Qgutter_size); DEFSYMBOL (Qgutter_visible); DEFSYMBOL (Qdefault_gutter_position_changed_hook); } void vars_of_gutter (void) { staticpro (&Vdefault_gutter_position); Vdefault_gutter_position = Qtop; Fprovide (Qgutter); } void specifier_type_create_gutter (void) { INITIALIZE_SPECIFIER_TYPE (gutter, "gutter", "gutter-specifier-p"); SPECIFIER_HAS_METHOD (gutter, validate); SPECIFIER_HAS_METHOD (gutter, after_change); INITIALIZE_SPECIFIER_TYPE (gutter_size, "gutter-size", "gutter-size-specifier-p"); SPECIFIER_HAS_METHOD (gutter_size, validate); INITIALIZE_SPECIFIER_TYPE (gutter_visible, "gutter-visible", "gutter-visible-specifier-p"); SPECIFIER_HAS_METHOD (gutter_visible, validate); } void reinit_specifier_type_create_gutter (void) { REINITIALIZE_SPECIFIER_TYPE (gutter); REINITIALIZE_SPECIFIER_TYPE (gutter_size); REINITIALIZE_SPECIFIER_TYPE (gutter_visible); } void specifier_vars_of_gutter (void) { Lisp_Object fb; DEFVAR_SPECIFIER ("default-gutter", &Vdefault_gutter /* Specifier for a fallback gutter. Use `set-specifier' to change this. The position of this gutter is specified in the function `default-gutter-position'. If the corresponding position-specific gutter (e.g. `top-gutter' if `default-gutter-position' is 'top) does not specify a gutter in a particular domain (usually a window), then the value of `default-gutter' in that domain, if any, will be used instead. Note that the gutter at any particular position will not be displayed unless its visibility flag is true and its thickness \(width or height, depending on orientation) is non-zero. The visibility is controlled by the specifiers `top-gutter-visible-p', `bottom-gutter-visible-p', `left-gutter-visible-p', and `right-gutter-visible-p', and the thickness is controlled by the specifiers `top-gutter-height', `bottom-gutter-height', `left-gutter-width', and `right-gutter-width'. Note that one of the four visibility specifiers inherits from `default-gutter-visibility' and one of the four thickness specifiers inherits from either `default-gutter-width' or `default-gutter-height' (depending on orientation), just like for the gutter description specifiers (e.g. `top-gutter') mentioned above. Therefore, if you are setting `default-gutter', you should control the visibility and thickness using `default-gutter-visible-p', `default-gutter-width', and `default-gutter-height', rather than using position-specific specifiers. That way, you will get sane behavior if the user changes the default gutter position. The gutter value should be a string, a property list of strings or nil. You can attach extents and glyphs to the string and hence display glyphs and text in other fonts in the gutter area. If the gutter value is a property list then the strings will be concatenated together before being displayed. */ ); Vdefault_gutter = Fmake_specifier (Qgutter); /* #### It would be even nicer if the specifier caching automatically knew about specifier fallbacks, so we didn't have to do it ourselves. */ set_specifier_caching (Vdefault_gutter, offsetof (struct window, default_gutter), default_gutter_specs_changed, 0, 0, 1); DEFVAR_SPECIFIER ("top-gutter", &Vgutter[TOP_GUTTER] /* Specifier for the gutter at the top of the frame. Use `set-specifier' to change this. See `default-gutter' for a description of a valid gutter instantiator. */ ); Vgutter[TOP_GUTTER] = Fmake_specifier (Qgutter); set_specifier_caching (Vgutter[TOP_GUTTER], offsetof (struct window, gutter[TOP_GUTTER]), top_gutter_specs_changed, 0, 0, 1); DEFVAR_SPECIFIER ("bottom-gutter", &Vgutter[BOTTOM_GUTTER] /* Specifier for the gutter at the bottom of the frame. Use `set-specifier' to change this. See `default-gutter' for a description of a valid gutter instantiator. Note that, unless the `default-gutter-position' is `bottom', by default the height of the bottom gutter (controlled by `bottom-gutter-height') is 0; thus, a bottom gutter will not be displayed even if you provide a value for `bottom-gutter'. */ ); Vgutter[BOTTOM_GUTTER] = Fmake_specifier (Qgutter); set_specifier_caching (Vgutter[BOTTOM_GUTTER], offsetof (struct window, gutter[BOTTOM_GUTTER]), bottom_gutter_specs_changed, 0, 0, 1); DEFVAR_SPECIFIER ("left-gutter", &Vgutter[LEFT_GUTTER] /* Specifier for the gutter at the left edge of the frame. Use `set-specifier' to change this. See `default-gutter' for a description of a valid gutter instantiator. Note that, unless the `default-gutter-position' is `left', by default the height of the left gutter (controlled by `left-gutter-width') is 0; thus, a left gutter will not be displayed even if you provide a value for `left-gutter'. */ ); Vgutter[LEFT_GUTTER] = Fmake_specifier (Qgutter); set_specifier_caching (Vgutter[LEFT_GUTTER], offsetof (struct window, gutter[LEFT_GUTTER]), left_gutter_specs_changed, 0, 0, 1); DEFVAR_SPECIFIER ("right-gutter", &Vgutter[RIGHT_GUTTER] /* Specifier for the gutter at the right edge of the frame. Use `set-specifier' to change this. See `default-gutter' for a description of a valid gutter instantiator. Note that, unless the `default-gutter-position' is `right', by default the height of the right gutter (controlled by `right-gutter-width') is 0; thus, a right gutter will not be displayed even if you provide a value for `right-gutter'. */ ); Vgutter[RIGHT_GUTTER] = Fmake_specifier (Qgutter); set_specifier_caching (Vgutter[RIGHT_GUTTER], offsetof (struct window, gutter[RIGHT_GUTTER]), right_gutter_specs_changed, 0, 0, 1); /* initially, top inherits from default; this can be changed with `set-default-gutter-position'. */ fb = list1 (Fcons (Qnil, Qnil)); set_specifier_fallback (Vdefault_gutter, fb); set_specifier_fallback (Vgutter[TOP_GUTTER], Vdefault_gutter); set_specifier_fallback (Vgutter[BOTTOM_GUTTER], fb); set_specifier_fallback (Vgutter[LEFT_GUTTER], fb); set_specifier_fallback (Vgutter[RIGHT_GUTTER], fb); DEFVAR_SPECIFIER ("default-gutter-height", &Vdefault_gutter_height /* *Height of the default gutter, if it's oriented horizontally. This is a specifier; use `set-specifier' to change it. The position of the default gutter is specified by the function `set-default-gutter-position'. If the corresponding position-specific gutter thickness specifier (e.g. `top-gutter-height' if `default-gutter-position' is 'top) does not specify a thickness in a particular domain (a window or a frame), then the value of `default-gutter-height' or `default-gutter-width' (depending on the gutter orientation) in that domain, if any, will be used instead. Note that `default-gutter-height' is only used when `default-gutter-position' is 'top or 'bottom, and `default-gutter-width' is only used when `default-gutter-position' is 'left or 'right. Note that all of the position-specific gutter thickness specifiers have a fallback value of zero when they do not correspond to the default gutter. Therefore, you will have to set a non-zero thickness value if you want a position-specific gutter to be displayed. If you set the height to 'autodetect the size of the gutter will be calculated to be large enough to hold the contents of the gutter. This is the default. */ ); Vdefault_gutter_height = Fmake_specifier (Qgutter_size); set_specifier_caching (Vdefault_gutter_height, offsetof (struct window, default_gutter_height), default_gutter_size_changed_in_window, 0, 0, 1); DEFVAR_SPECIFIER ("default-gutter-width", &Vdefault_gutter_width /* *Width of the default gutter, if it's oriented vertically. This is a specifier; use `set-specifier' to change it. See `default-gutter-height' for more information. */ ); Vdefault_gutter_width = Fmake_specifier (Qgutter_size); set_specifier_caching (Vdefault_gutter_width, offsetof (struct window, default_gutter_width), default_gutter_size_changed_in_window, 0, 0, 1); DEFVAR_SPECIFIER ("top-gutter-height", &Vgutter_size[TOP_GUTTER] /* *Height of the top gutter. This is a specifier; use `set-specifier' to change it. See `default-gutter-height' for more information. */ ); Vgutter_size[TOP_GUTTER] = Fmake_specifier (Qgutter_size); set_specifier_caching (Vgutter_size[TOP_GUTTER], offsetof (struct window, gutter_size[TOP_GUTTER]), gutter_geometry_changed_in_window, 0, 0, 1); DEFVAR_SPECIFIER ("bottom-gutter-height", &Vgutter_size[BOTTOM_GUTTER] /* *Height of the bottom gutter. This is a specifier; use `set-specifier' to change it. See `default-gutter-height' for more information. */ ); Vgutter_size[BOTTOM_GUTTER] = Fmake_specifier (Qgutter_size); set_specifier_caching (Vgutter_size[BOTTOM_GUTTER], offsetof (struct window, gutter_size[BOTTOM_GUTTER]), gutter_geometry_changed_in_window, 0, 0, 1); DEFVAR_SPECIFIER ("left-gutter-width", &Vgutter_size[LEFT_GUTTER] /* *Width of left gutter. This is a specifier; use `set-specifier' to change it. See `default-gutter-height' for more information. */ ); Vgutter_size[LEFT_GUTTER] = Fmake_specifier (Qgutter_size); set_specifier_caching (Vgutter_size[LEFT_GUTTER], offsetof (struct window, gutter_size[LEFT_GUTTER]), gutter_geometry_changed_in_window, 0, 0, 1); DEFVAR_SPECIFIER ("right-gutter-width", &Vgutter_size[RIGHT_GUTTER] /* *Width of right gutter. This is a specifier; use `set-specifier' to change it. See `default-gutter-height' for more information. */ ); Vgutter_size[RIGHT_GUTTER] = Fmake_specifier (Qgutter_size); set_specifier_caching (Vgutter_size[RIGHT_GUTTER], offsetof (struct window, gutter_size[RIGHT_GUTTER]), gutter_geometry_changed_in_window, 0, 0, 1); fb = Qnil; #ifdef HAVE_TTY fb = Fcons (Fcons (list1 (Qtty), Qautodetect), fb); #endif #ifdef HAVE_GTK fb = Fcons (Fcons (list1 (Qgtk), Qautodetect), fb); #endif #ifdef HAVE_X_WINDOWS fb = Fcons (Fcons (list1 (Qx), Qautodetect), fb); #endif #ifdef HAVE_MS_WINDOWS fb = Fcons (Fcons (list1 (Qmsprinter), Qautodetect), fb); fb = Fcons (Fcons (list1 (Qmswindows), Qautodetect), fb); #endif if (!NILP (fb)) set_specifier_fallback (Vdefault_gutter_height, fb); fb = Qnil; #ifdef HAVE_TTY fb = Fcons (Fcons (list1 (Qtty), Qautodetect), fb); #endif #ifdef HAVE_X_WINDOWS fb = Fcons (Fcons (list1 (Qx), Qautodetect), fb); #endif #ifdef HAVE_GTK fb = Fcons (Fcons (list1 (Qgtk), Qautodetect), fb); #endif #ifdef HAVE_MS_WINDOWS fb = Fcons (Fcons (list1 (Qmsprinter), Qautodetect), fb); fb = Fcons (Fcons (list1 (Qmswindows), Qautodetect), fb); #endif if (!NILP (fb)) set_specifier_fallback (Vdefault_gutter_width, fb); set_specifier_fallback (Vgutter_size[TOP_GUTTER], Vdefault_gutter_height); fb = list1 (Fcons (Qnil, Qzero)); set_specifier_fallback (Vgutter_size[BOTTOM_GUTTER], fb); set_specifier_fallback (Vgutter_size[LEFT_GUTTER], fb); set_specifier_fallback (Vgutter_size[RIGHT_GUTTER], fb); DEFVAR_SPECIFIER ("default-gutter-border-width", &Vdefault_gutter_border_width /* *Width of the border around the default gutter. This is a specifier; use `set-specifier' to change it. The position of the default gutter is specified by the function `set-default-gutter-position'. If the corresponding position-specific gutter border width specifier (e.g. `top-gutter-border-width' if `default-gutter-position' is 'top) does not specify a border width in a particular domain (a window or a frame), then the value of `default-gutter-border-width' in that domain, if any, will be used instead. */ ); Vdefault_gutter_border_width = Fmake_specifier (Qnatnum); set_specifier_caching (Vdefault_gutter_border_width, offsetof (struct window, default_gutter_border_width), default_gutter_border_width_changed_in_window, 0, 0, 0); DEFVAR_SPECIFIER ("top-gutter-border-width", &Vgutter_border_width[TOP_GUTTER] /* *Border width of the top gutter. This is a specifier; use `set-specifier' to change it. See `default-gutter-height' for more information. */ ); Vgutter_border_width[TOP_GUTTER] = Fmake_specifier (Qnatnum); set_specifier_caching (Vgutter_border_width[TOP_GUTTER], offsetof (struct window, gutter_border_width[TOP_GUTTER]), gutter_geometry_changed_in_window, 0, 0, 0); DEFVAR_SPECIFIER ("bottom-gutter-border-width", &Vgutter_border_width[BOTTOM_GUTTER] /* *Border width of the bottom gutter. This is a specifier; use `set-specifier' to change it. See `default-gutter-height' for more information. */ ); Vgutter_border_width[BOTTOM_GUTTER] = Fmake_specifier (Qnatnum); set_specifier_caching (Vgutter_border_width[BOTTOM_GUTTER], offsetof (struct window, gutter_border_width[BOTTOM_GUTTER]), gutter_geometry_changed_in_window, 0, 0, 0); DEFVAR_SPECIFIER ("left-gutter-border-width", &Vgutter_border_width[LEFT_GUTTER] /* *Border width of left gutter. This is a specifier; use `set-specifier' to change it. See `default-gutter-height' for more information. */ ); Vgutter_border_width[LEFT_GUTTER] = Fmake_specifier (Qnatnum); set_specifier_caching (Vgutter_border_width[LEFT_GUTTER], offsetof (struct window, gutter_border_width[LEFT_GUTTER]), gutter_geometry_changed_in_window, 0, 0, 0); DEFVAR_SPECIFIER ("right-gutter-border-width", &Vgutter_border_width[RIGHT_GUTTER] /* *Border width of right gutter. This is a specifier; use `set-specifier' to change it. See `default-gutter-height' for more information. */ ); Vgutter_border_width[RIGHT_GUTTER] = Fmake_specifier (Qnatnum); set_specifier_caching (Vgutter_border_width[RIGHT_GUTTER], offsetof (struct window, gutter_border_width[RIGHT_GUTTER]), gutter_geometry_changed_in_window, 0, 0, 0); fb = Qnil; #ifdef HAVE_TTY fb = Fcons (Fcons (list1 (Qtty), Qzero), fb); #endif #ifdef HAVE_X_WINDOWS fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_GUTTER_BORDER_WIDTH)), fb); #endif #ifdef HAVE_MS_WINDOWS fb = Fcons (Fcons (list1 (Qmsprinter), Qzero), fb); fb = Fcons (Fcons (list1 (Qmswindows), make_int (DEFAULT_GUTTER_BORDER_WIDTH)), fb); #endif if (!NILP (fb)) set_specifier_fallback (Vdefault_gutter_border_width, fb); set_specifier_fallback (Vgutter_border_width[TOP_GUTTER], Vdefault_gutter_border_width); fb = list1 (Fcons (Qnil, Qzero)); set_specifier_fallback (Vgutter_border_width[BOTTOM_GUTTER], fb); set_specifier_fallback (Vgutter_border_width[LEFT_GUTTER], fb); set_specifier_fallback (Vgutter_border_width[RIGHT_GUTTER], fb); DEFVAR_SPECIFIER ("default-gutter-visible-p", &Vdefault_gutter_visible_p /* *Whether the default gutter is visible. This is a specifier; use `set-specifier' to change it. The position of the default gutter is specified by the function `set-default-gutter-position'. If the corresponding position-specific gutter visibility specifier (e.g. `top-gutter-visible-p' if `default-gutter-position' is 'top) does not specify a visible-p value in a particular domain (a window or a frame), then the value of `default-gutter-visible-p' in that domain, if any, will be used instead. `default-gutter-visible-p' and all of the position-specific gutter visibility specifiers have a fallback value of true. */ ); Vdefault_gutter_visible_p = Fmake_specifier (Qgutter_visible); set_specifier_caching (Vdefault_gutter_visible_p, offsetof (struct window, default_gutter_visible_p), default_gutter_visible_p_changed_in_window, 0, 0, 0); DEFVAR_SPECIFIER ("top-gutter-visible-p", &Vgutter_visible_p[TOP_GUTTER] /* *Whether the top gutter is visible. This is a specifier; use `set-specifier' to change it. See `default-gutter-visible-p' for more information. */ ); Vgutter_visible_p[TOP_GUTTER] = Fmake_specifier (Qgutter_visible); set_specifier_caching (Vgutter_visible_p[TOP_GUTTER], offsetof (struct window, gutter_visible_p[TOP_GUTTER]), top_gutter_specs_changed, 0, 0, 0); DEFVAR_SPECIFIER ("bottom-gutter-visible-p", &Vgutter_visible_p[BOTTOM_GUTTER] /* *Whether the bottom gutter is visible. This is a specifier; use `set-specifier' to change it. See `default-gutter-visible-p' for more information. */ ); Vgutter_visible_p[BOTTOM_GUTTER] = Fmake_specifier (Qgutter_visible); set_specifier_caching (Vgutter_visible_p[BOTTOM_GUTTER], offsetof (struct window, gutter_visible_p[BOTTOM_GUTTER]), bottom_gutter_specs_changed, 0, 0, 0); DEFVAR_SPECIFIER ("left-gutter-visible-p", &Vgutter_visible_p[LEFT_GUTTER] /* *Whether the left gutter is visible. This is a specifier; use `set-specifier' to change it. See `default-gutter-visible-p' for more information. */ ); Vgutter_visible_p[LEFT_GUTTER] = Fmake_specifier (Qgutter_visible); set_specifier_caching (Vgutter_visible_p[LEFT_GUTTER], offsetof (struct window, gutter_visible_p[LEFT_GUTTER]), left_gutter_specs_changed, 0, 0, 0); DEFVAR_SPECIFIER ("right-gutter-visible-p", &Vgutter_visible_p[RIGHT_GUTTER] /* *Whether the right gutter is visible. This is a specifier; use `set-specifier' to change it. See `default-gutter-visible-p' for more information. */ ); Vgutter_visible_p[RIGHT_GUTTER] = Fmake_specifier (Qgutter_visible); set_specifier_caching (Vgutter_visible_p[RIGHT_GUTTER], offsetof (struct window, gutter_visible_p[RIGHT_GUTTER]), right_gutter_specs_changed, 0, 0, 0); /* initially, top inherits from default; this can be changed with `set-default-gutter-position'. */ fb = list1 (Fcons (Qnil, Qt)); set_specifier_fallback (Vdefault_gutter_visible_p, fb); set_specifier_fallback (Vgutter_visible_p[TOP_GUTTER], Vdefault_gutter_visible_p); set_specifier_fallback (Vgutter_visible_p[BOTTOM_GUTTER], fb); set_specifier_fallback (Vgutter_visible_p[LEFT_GUTTER], fb); set_specifier_fallback (Vgutter_visible_p[RIGHT_GUTTER], fb); }