Mercurial > hg > xemacs-beta
view src/marker.c @ 4932:8b63e21b0436
fix compile issues with gcc 4
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* aclocal.m4 (XE_SHLIB_STUFF):
Use -export-all-symbols instead of -export-dynamic on PE targets
(Cygwin and MinGW).
* configure.ac (XE_EXPAND_VARIABLE):
* configure.ac (TAB):
Create variable XEMACS_CC_GPP to check whether we're running g++.
Don't just check for an executable called `g++' -- it might be
called g++-4 or whatever. Instead, check for either named `g++*'
or claiming to be g++ when called with --version. Rewrite code do
use the variable.
Add -fno-strict-aliasing to optimization flags when GCC and
optimized, and in all cases with g++, since under these circumstances
strict aliasing is otherwise assumed, and XEmacs can't easily be
made to respect its restrictions.
* configure: Regenerate.
lib-src/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* fakemail.c (args_size):
* fakemail.c (parse_header):
* ootags.c (C_entries):
Fix warnings about possible use of uninitialized vars.
lwlib/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* xlwgauge.c (GaugeResize):
* xlwgauge.c (GaugeSize):
Fix warnings about possible use of uninitialized vars.
modules/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_exec):
* postgresql/postgresql.c (Fpq_get_result):
Fix g++ 4.3 complaints about implicit conversions of string
literals (const char *) to char *.
src/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* chartab.c (decode_char_table_range):
* extents.c (extent_fragment_update):
* objects-msw.c (initialize_font_instance):
* process.c (Fgetenv):
* redisplay-output.c (get_next_display_block):
Fix warnings about possible use of uninitialized vars.
* compiler.h:
* compiler.h (REGISTER):
* event-stream.c (is_scrollbar_event):
* window.c (window_scrollbar_width):
* window.c (window_scrollbar_height):
* window.c (window_left_window_gutter_width):
* window.c (window_right_window_gutter_width):
Add USED_IF_SCROLLBARS. Use it to fix warnings about unused
vars when --with-scrollbars=no.
* config.h.in:
Change comment to explain better why DECLARE_INLINE_HEADER
is needed.
* dialog-msw.c:
* emacs.c (SHEBANG_EXE_PROGNAME_LENGTH):
* emacs.c (main_1):
* event-msw.c (struct mswin_message_debug):
* event-msw.c (debug_output_mswin_message):
* font-mgr.c:
* font-mgr.c (Ffc_config_filename):
* glyphs-msw.c (struct):
* glyphs-msw.c (bitmap_table):
* glyphs-x.c (update_widget_face):
* intl-win32.c (struct lang_to_string):
* intl-win32.c (lang_to_string_table):
* nas.c:
* objects-xlike-inc.c:
* objects-xlike-inc.c (xft_find_charset_font):
* syswindows.h:
* win32.c (mswindows_output_last_error):
Fix g++ 4.3 complaints about implicit conversions of string
literals (const char *) to char *.
* lisp.h:
G++ 4.3 needs #include <limits> to avoid errors about min/max.
* lisp.h (disabled_assert_with_message):
Use disabled_assert* whenever asserts are disabled. Rewrite
disabled_assert* to avoid complaints about unused vars by
pretending to use the vars but casting them to (void).
Remove code that defined assert() weirdly if DEBUG_XEMACS but
not USE_ASSERTIONS -- configure sets USE_ASSERTIONS automatically
when DEBUG_XEMACS, and if the user has forced it off, then
so be it.
* lisp.h (SYMBOL_KEYWORD):
Put some of the combined `extern Lisp_Object's back under
the file they are declared in. Cosmetic fix.
* number.h:
Remove `extern Lisp_Object' decls that duplicate lisp.h,
since they have different C vs. C++ linkage.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sun, 24 Jan 2010 22:04:58 -0600 |
parents | d674024a8674 |
children | 6ef8256a020a 19a72041c5ed e0db3c197671 |
line wrap: on
line source
/* Markers: examining, setting and killing. Copyright (C) 1985, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. 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: FSF 19.30. */ /* This file has been Mule-ized. */ /* Note that markers are currently kept in an unordered list. This means that marker operations may be inefficient if there are a bunch of markers in the buffer. This probably won't have a significant impact on redisplay (which uses markers), but if it does, it wouldn't be too hard to change to an ordered gap array. (Just copy the code from extents.c.) */ #include <config.h> #include "lisp.h" #include "buffer.h" static Lisp_Object mark_marker (Lisp_Object obj) { Lisp_Marker *marker = XMARKER (obj); Lisp_Object buf; /* DO NOT mark through the marker's chain. The buffer's markers chain does not preserve markers from gc; Instead, markers are removed from the chain when they are freed by gc. */ if (!marker->buffer) return (Qnil); buf = wrap_buffer (marker->buffer); return (buf); } static void print_marker (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag)) { Lisp_Marker *marker = XMARKER (obj); if (print_readably) printing_unreadable_object ("#<marker 0x%lx>", (long) marker); write_c_string (printcharfun, GETTEXT ("#<marker ")); if (!marker->buffer) write_c_string (printcharfun, GETTEXT ("in no buffer")); else { write_fmt_string (printcharfun, "at %ld in ", (long) marker_position (obj)); print_internal (marker->buffer->name, printcharfun, 0); } if (marker->insertion_type) write_c_string (printcharfun, " insertion-type=t"); write_fmt_string (printcharfun, " 0x%lx>", (long) marker); } static int marker_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) { Lisp_Marker *marker1 = XMARKER (obj1); Lisp_Marker *marker2 = XMARKER (obj2); return ((marker1->buffer == marker2->buffer) && (marker1->membpos == marker2->membpos || /* All markers pointing nowhere are equal */ !marker1->buffer)); } static Hashcode marker_hash (Lisp_Object obj, int UNUSED (depth)) { Hashcode hash = (Hashcode) XMARKER (obj)->buffer; if (hash) hash = HASH2 (hash, XMARKER (obj)->membpos); return hash; } static const struct memory_description marker_description[] = { { XD_LISP_OBJECT, offsetof (Lisp_Marker, next), 0, { 0 }, XD_FLAG_NO_KKCC }, { XD_LISP_OBJECT, offsetof (Lisp_Marker, prev), 0, { 0 }, XD_FLAG_NO_KKCC }, { XD_LISP_OBJECT, offsetof (Lisp_Marker, buffer) }, { XD_END } }; #ifdef NEW_GC static void finalize_marker (void *header, int for_disksave) { if (!for_disksave) { Lisp_Object tem = wrap_marker (header); unchain_marker (tem); } } DEFINE_BASIC_LRECORD_IMPLEMENTATION ("marker", marker, 1, /*dumpable-flag*/ mark_marker, print_marker, finalize_marker, marker_equal, marker_hash, marker_description, Lisp_Marker); #else /* not NEW_GC */ DEFINE_BASIC_LRECORD_IMPLEMENTATION ("marker", marker, 1, /*dumpable-flag*/ mark_marker, print_marker, 0, marker_equal, marker_hash, marker_description, Lisp_Marker); #endif /* not NEW_GC */ /* Operations on markers. */ DEFUN ("marker-buffer", Fmarker_buffer, 1, 1, 0, /* Return the buffer that MARKER points into, or nil if none. Return nil if MARKER points into a dead buffer or doesn't point anywhere. */ (marker)) { struct buffer *buf; CHECK_MARKER (marker); /* Return marker's buffer only if it is not dead. */ if ((buf = XMARKER (marker)->buffer) && BUFFER_LIVE_P (buf)) { return wrap_buffer (buf); } return Qnil; } DEFUN ("marker-position", Fmarker_position, 1, 1, 0, /* Return the position MARKER points at, as a character number. Return `nil' if marker doesn't point anywhere. */ (marker)) { CHECK_MARKER (marker); return XMARKER (marker)->buffer ? make_int (marker_position (marker)) : Qnil; } #if 0 /* useful debugging function */ static void check_marker_circularities (struct buffer *buf) { Lisp_Marker *tortoise, *hare; tortoise = BUF_MARKERS (buf); hare = tortoise; if (!tortoise) return; while (1) { assert (hare->buffer == buf); hare = hare->next; if (!hare) return; assert (hare->buffer == buf); hare = hare->next; if (!hare) return; tortoise = tortoise->next; assert (tortoise != hare); } } #endif static Lisp_Object set_marker_internal (Lisp_Object marker, Lisp_Object position, Lisp_Object buffer, int restricted_p) { Charbpos charno; struct buffer *b; Lisp_Marker *m; int point_p; CHECK_MARKER (marker); point_p = POINT_MARKER_P (marker); /* If position is nil or a marker that points nowhere, make this marker point nowhere. */ if (NILP (position) || (MARKERP (position) && !XMARKER (position)->buffer)) { if (point_p) invalid_operation ("Can't make point-marker point nowhere", marker); if (XMARKER (marker)->buffer) unchain_marker (marker); return marker; } CHECK_INT_COERCE_MARKER (position); if (NILP (buffer)) b = current_buffer; else { CHECK_BUFFER (buffer); b = XBUFFER (buffer); /* If buffer is dead, set marker to point nowhere. */ if (!BUFFER_LIVE_P (XBUFFER (buffer))) { if (point_p) invalid_operation ("Can't move point-marker in a killed buffer", marker); if (XMARKER (marker)->buffer) unchain_marker (marker); return marker; } } charno = XINT (position); m = XMARKER (marker); if (restricted_p) { if (charno < BUF_BEGV (b)) charno = BUF_BEGV (b); if (charno > BUF_ZV (b)) charno = BUF_ZV (b); } else { if (charno < BUF_BEG (b)) charno = BUF_BEG (b); if (charno > BUF_Z (b)) charno = BUF_Z (b); } if (point_p) { #ifndef moving_point_by_moving_its_marker_is_a_bug BUF_SET_PT (b, charno); /* this will move the marker */ #else /* It's not a feature, so it must be a bug */ invalid_operation ("DEBUG: attempt to move point via point-marker", marker); #endif } else { m->membpos = charbpos_to_membpos (b, charno); } if (m->buffer != b) { if (point_p) invalid_operation ("Can't change buffer of point-marker", marker); if (m->buffer != 0) unchain_marker (marker); m->buffer = b; marker_next (m) = BUF_MARKERS (b); marker_prev (m) = 0; if (BUF_MARKERS (b)) marker_prev (BUF_MARKERS (b)) = m; BUF_MARKERS (b) = m; } return marker; } DEFUN ("set-marker", Fset_marker, 2, 3, 0, /* Move MARKER to position POSITION in BUFFER. POSITION can be a marker, an integer or nil. If POSITION is an integer, make MARKER point before the POSITIONth character in BUFFER. If POSITION is nil, makes MARKER point nowhere. Then it no longer slows down editing in any buffer. If POSITION is less than 1, move MARKER to the beginning of BUFFER. If POSITION is greater than the size of BUFFER, move MARKER to the end of BUFFER. BUFFER defaults to the current buffer. If this marker was returned by (point-marker t), then changing its position moves point. You cannot change its buffer or make it point nowhere. The return value is MARKER. */ (marker, position, buffer)) { return set_marker_internal (marker, position, buffer, 0); } /* This version of Fset_marker won't let the position be outside the visible part. */ Lisp_Object set_marker_restricted (Lisp_Object marker, Lisp_Object position, Lisp_Object buffer) { return set_marker_internal (marker, position, buffer, 1); } /* This is called during garbage collection, so we must be careful to ignore and preserve mark bits, including those in chain fields of markers. */ void unchain_marker (Lisp_Object m) { Lisp_Marker *marker = XMARKER (m); struct buffer *b = marker->buffer; if (b == 0) return; #ifdef ERROR_CHECK_STRUCTURES assert (BUFFER_LIVE_P (b)); #endif if (marker_next (marker)) marker_prev (marker_next (marker)) = marker_prev (marker); if (marker_prev (marker)) marker_next (marker_prev (marker)) = marker_next (marker); else BUF_MARKERS (b) = marker_next (marker); #ifdef ERROR_CHECK_STRUCTURES assert (marker != XMARKER (b->point_marker)); #endif marker->buffer = 0; } Bytebpos byte_marker_position (Lisp_Object marker) { Lisp_Marker *m = XMARKER (marker); struct buffer *buf = m->buffer; Bytebpos pos; if (!buf) invalid_argument ("Marker does not point anywhere", Qunbound); /* FSF claims that marker indices could end up denormalized, i.e. in the gap. This is way bogus if it ever happens, and means something fucked up elsewhere. Since I've overhauled all this shit, I don't think this can happen. In any case, the following macro has an assert() in it that will catch these denormalized positions. */ pos = membpos_to_bytebpos (buf, m->membpos); return pos; } Charbpos marker_position (Lisp_Object marker) { struct buffer *buf = XMARKER (marker)->buffer; if (!buf) invalid_argument ("Marker does not point anywhere", Qunbound); return bytebpos_to_charbpos (buf, byte_marker_position (marker)); } void set_byte_marker_position (Lisp_Object marker, Bytebpos pos) { Lisp_Marker *m = XMARKER (marker); struct buffer *buf = m->buffer; if (!buf) invalid_argument ("Marker does not point anywhere", Qunbound); m->membpos = bytebpos_to_membpos (buf, pos); } void set_marker_position (Lisp_Object marker, Charbpos pos) { struct buffer *buf = XMARKER (marker)->buffer; if (!buf) invalid_argument ("Marker does not point anywhere", Qunbound); set_byte_marker_position (marker, charbpos_to_bytebpos (buf, pos)); } static Lisp_Object copy_marker_1 (Lisp_Object marker, Lisp_Object type, int noseeum) { REGISTER Lisp_Object new_; while (1) { if (INTP (marker) || MARKERP (marker)) { if (noseeum) new_ = noseeum_make_marker (); else new_ = Fmake_marker (); Fset_marker (new_, marker, (MARKERP (marker) ? Fmarker_buffer (marker) : Qnil)); XMARKER (new_)->insertion_type = !NILP (type); return new_; } else marker = wrong_type_argument (Qinteger_or_marker_p, marker); } RETURN_NOT_REACHED (Qnil); /* not reached */ } DEFUN ("copy-marker", Fcopy_marker, 1, 2, 0, /* Return a new marker pointing at the same place as MARKER-OR-INTEGER. If MARKER-OR-INTEGER is an integer, return a new marker pointing at that position in the current buffer. Optional argument MARKER-TYPE specifies the insertion type of the new marker; see `marker-insertion-type'. */ (marker_or_integer, marker_type)) { return copy_marker_1 (marker_or_integer, marker_type, 0); } Lisp_Object noseeum_copy_marker (Lisp_Object marker, Lisp_Object marker_type) { return copy_marker_1 (marker, marker_type, 1); } DEFUN ("marker-insertion-type", Fmarker_insertion_type, 1, 1, 0, /* Return insertion type of MARKER: t if it stays after inserted text. nil means the marker stays before text inserted there. */ (marker)) { CHECK_MARKER (marker); return XMARKER (marker)->insertion_type ? Qt : Qnil; } DEFUN ("set-marker-insertion-type", Fset_marker_insertion_type, 2, 2, 0, /* Set the insertion-type of MARKER to TYPE. If TYPE is t, it means the marker advances when you insert text at it. If TYPE is nil, it means the marker stays behind when you insert text at it. */ (marker, type)) { CHECK_MARKER (marker); XMARKER (marker)->insertion_type = ! NILP (type); return type; } /* #### What is the possible use of this? It looks quite useless to me, because there is no way to find *which* markers are positioned at POSITION. Additional bogosity bonus: (buffer-has-markers-at (point)) will always return t because of the `point-marker'. The same goes for the position of mark. Bletch! Someone should discuss this with Stallman, but I don't have the stomach. In fact, this function sucks so badly that I'm disabling it by default (although I've debugged it). If you want to use it, use extents instead. --hniksic */ #if 0 DEFUN ("buffer-has-markers-at", Fbuffer_has_markers_at, 1, 1, 0, /* Return t if there are markers pointing at POSITION in the current buffer. */ (position)) { Lisp_Marker *marker; Membpos pos; /* A small optimization trick: convert POS to membpos now, rather than converting every marker's memory index to charbpos. */ pos = bytebpos_to_membpos (current_buffer, get_buffer_pos_byte (current_buffer, position, GB_COERCE_RANGE)); for (marker = BUF_MARKERS (current_buffer); marker; marker = marker_next (marker)) { /* We use marker->membpos, so we don't have to go through the unwieldy operation of creating a Lisp_Object for marker_position() every time around. */ if (marker->membpos == pos) return Qt; } return Qnil; } #endif /* 0 */ #ifdef MEMORY_USAGE_STATS int compute_buffer_marker_usage (struct buffer *b, struct overhead_stats *ovstats) { Lisp_Marker *m; int total = 0; int overhead; for (m = BUF_MARKERS (b); m; m = m->next) total += sizeof (Lisp_Marker); ovstats->was_requested += total; #ifdef NEW_GC overhead = mc_alloced_storage_size (total, 0); #else /* not NEW_GC */ overhead = fixed_type_block_overhead (total); #endif /* not NEW_GC */ /* #### claiming this is all malloc overhead is not really right, but it has to go somewhere. */ ovstats->malloc_overhead += overhead; return total + overhead; } #endif /* MEMORY_USAGE_STATS */ void syms_of_marker (void) { INIT_LRECORD_IMPLEMENTATION (marker); DEFSUBR (Fmarker_position); DEFSUBR (Fmarker_buffer); DEFSUBR (Fset_marker); DEFSUBR (Fcopy_marker); DEFSUBR (Fmarker_insertion_type); DEFSUBR (Fset_marker_insertion_type); #if 0 /* FSFmacs crock */ DEFSUBR (Fbuffer_has_markers_at); #endif } void init_buffer_markers (struct buffer *b) { Lisp_Object buf = wrap_buffer (b); b->mark = Fmake_marker (); BUF_MARKERS (b) = 0; b->point_marker = Fmake_marker (); Fset_marker (b->point_marker, /* For indirect buffers, point is already set. */ b->base_buffer ? make_int (BUF_PT (b)) : make_int (1), buf); } void uninit_buffer_markers (struct buffer *b) { /* Unchain all markers of this buffer and leave them pointing nowhere. */ REGISTER Lisp_Marker *m, *next; for (m = BUF_MARKERS (b); m; m = next) { m->buffer = 0; next = marker_next (m); marker_next (m) = 0; marker_prev (m) = 0; } BUF_MARKERS (b) = 0; }