annotate admin/make-emacs @ 107648:babfb0a156a1

Initial support for bidirectional editing. Makefile.in (obj): Include bidi.o. (bidi.o): New target. makefile.w32-in (OBJ1): Add $(BLD)/bidi.$(O). ($(BLD)/bidi.$(O)): New target. bidi.c: New file. buffer.h (struct buffer): New members bidi_display_reordering and bidi_paragraph_direction. buffer.c (init_buffer_once): Initialize bidi_display_reordering and bidi_paragraph_direction. (syms_of_buffer): Declare Lisp variables bidi-display-reordering and bidi-paragraph-direction. (Fbuffer_swap_text): Swap the values of bidi_display_reordering and bidi_paragraph_direction. dispextern.h (BIDI_MAXLEVEL, BIDI_AT_BASE_LEVEL): New macros. (bidi_type_t, bidi_dir_t): New types. (bidi_saved_info, bidi_stack, bidi_it): New structures. (struct it): New members bidi_p, bidi_it, paragraph_embedding, prev_stop, base_level_stop, and eol_pos. (bidi_init_it, bidi_get_next_char_visually): New prototypes. (IT_STACK_SIZE): Enlarge to 5. (struct glyph_row): New member reversed_p. <string_buffer_position>: Update prototype. (PRODUCE_GLYPHS): Set the reversed_p flag in the iterator's glyph_row if bidi_it.paragraph_dir == R2L. (struct glyph): New members resolved_level and bidi_type. dispnew.c (direct_output_forward_char): Give up if we need bidi processing or buffer's direction is right-to-left. (prepare_desired_row): Preserve the reversed_p flag. (row_equal_p): Compare the reversed_p attributes as well. xdisp.c (init_iterator): Initialize it->bidi_p. Call bidi_init_it and set it->paragraph_embedding from the current buffer's value of bidi_paragraph_direction. (reseat_1): Initialize bidi_it.first_elt. (set_iterator_to_next, next_element_from_buffer): Use the value of paragraph_embedding to determine the paragraph direction. (set_iterator_to_next): Under bidi reordering, call bidi_get_next_char_visually. Call bidi_paragraph_init if the new_paragraph flag is set in the bidi iterator. (next_element_from_buffer): If bidi_it.first_elt is set, initialize paragraph direction and find the first character to display in the visual order. If reseated to a middle of a line, prime the bidi iterator starting at the line's beginning. Handle the situation where we overstepped stop_charpos due to non-linearity of the bidi iteration. Likewise for when we back up beyond the previous stop_charpos. When moving across stop_charpos, record it in prev_stop. (display_line): Set row->end and it->start for the next row to the next character in logical order. Always extend reversed_p rows to the end of line, even if they end at ZV. Copy the reversed_p flag to the next glyph row. Keep calling set_cursor_from_row for bidi-reordered rows even if we already have a possible candidate for cursor position. Set row_end after all the row's glyphs have been produced, by looping over the glyphs. Record the position after EOL in it->eol_pos, and use it to set end_pos of the last row produced for a continued line. <Qright_to_left, Qleft_to_right>: New variables. (syms_of_xdisp): Initialize and staticpro them. (string_buffer_position_lim): New function. (string_buffer_position): Most of code moved to string_buffer_position_lim. Last argument and return value are now EMACS_INT; all callers changed. (set_cursor_from_row): Rewritten to support bidirectional text and reversed glyph rows. (text_outside_line_unchanged_p, try_window_id): Disable optimizations if we are reordering bidirectional text and the paragraph direction can be affected by the change. (append_glyph, append_composite_glyph) (produce_image_glyph, append_stretch_glyph): Set the resolved_level and bidi_type members of each glyph. (append_glyph): If the glyph row is reversed, prepend the glyph rather than appending it. (handle_stop_backwards): New function. (reseat_1, pop_it, push_it): Set prev_stop and base_level_stop. (reseat): call handle_stop_backwards to recompute prev_stop and base_level_stop for the new position. (handle_invisible_prop): Under bidi iteration, skip invisible text using bidi_get_next_char_visually. If we are `reseat'ed, init the paragraph direction. Update IT->prev_stop after skipping invisible text. (move_it_in_display_line_to): New variables prev_method and prev_pos. Compare for strict equality in BUFFER_POS_REACHED_P. (try_cursor_movement): Examine all the candidate rows that occlude point, to return the best match. If rows are bidi-reordered and point moved backwards, back up to the row that is not a continuation line, and start looking for a suitable row from there. term.c (append_glyph): Reverse glyphs by pre-pending them, rather than appending, if the glyph_row's reversed_p flag is set. Set the resolved_level and bidi_type members of each glyph. .gdbinit (pbiditype): New command. (pgx): Use it to display bidi level and type of the glyph. (pitx): Display some bidi information about the iterator. (prowlims, pmtxrows): New commands. files.el: Make bidi-display-reordering safe variable for boolean values. mule.texi (International): Mention support of bidirectional editing. (Bidirectional Editing): New section. HELLO: Reorder Arabic and Hebrew into logical order, and insert RLM before the opening paren, to make the display more reasonable. Add setting for bidi-display-reordering in the local variables section. NEWS: Mention initial support for bidirectional editing.

#! /usr/bin/perl
# Build Emacs with various options for profiling, debugging,
# with and without warnings enabled etc.

# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
#   Free Software Foundation, Inc.

# This file is part of GNU Emacs.

# GNU Emacs 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 3 of the License, or
# (at your option) any later version.

# GNU Emacs 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 GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.


require 5;
use Getopt::Long;
use File::Basename;
use Cwd;

# Default CVS sandbox directory.  Only used when called from outside
# of the sandbox.

$root = $ENV{"EMACS_ROOT"};
$root = "/gd/gnu/emacs" unless $root;

# Default make command.

$make = $ENV{"EMACS_MAKE"};
$make = "gmake" unless $make;

$rc = GetOptions ("help" => \$help,
		  "enable-checking" => \$enable_checking,
		  "no-warn" => \$no_warn,
		  "check-marked" => \$check_marked,
		  "all" => \$all,
		  "no-optim" => \$no_optim,
		  "union-type" => \$union_type,
		  "gprof" => \$profile,
		  "malloc-check" => \$malloc_check,
		  "no-mcheck" => \$no_mcheck,
		  "alias" => \$aliasing,
                  "boot" => \$boot,
		  "wall" => \$wall,
		  "gcc3" => \$gcc3,
		  "trace-selection" => \$trace_selection,
		  "trace-move" => \$trace_move,
		  "stabs" => \$use_stabs,
		  "optim" => \$optim);

if ($rc == 0 || $help)
 {
   print <<USAGE;
make-emacs [options] ...

Build Emacs.

 --help			show this help
 --all			make clean versionclean first
 --boot			make bootstrap, log to boot.log
 --enable-checking	ENABLE_CHECKING=1
 --no-warn		disable warnings
 --check-marked		GC_CHECK_MARKED_OBJECTS=1
 --optim		no debug defines
 --gprof		make Emacs for profiling
 --union-type		define USE_LISP_UNION_TYPE (bad for GDB)
 --malloc-check		define GC_MALLOC_CHECK
 --no-mcheck		dont define GC_MCHECK
 --wall			compile with -Wall
 --gcc3			use GCC 3.0 (30% slower compilation, slower code)
 --trace-selection	print traces in xselect.c
 --trace-move		print traces for move_it* functions
 --stabs		use -gstabs instead -g

Default is to compile with warnings, with -DGC_MCHECK=1, and
with -DGLYPH_DEBUG=1.

USAGE
   exit 1;
 }

# Chdir to the top-level directory of the tree.  If not in a tree
# containing Emacs, use the default.

while (! -f "src/emacs.c" && cwd () ne "/")
  {
    chdir "..";
  }

chdir $root if cwd () eq "/";
chdir "./src";
print "Build in ", cwd (), "\n";

# If first arg is `all' or if `--all' specified, ensure a clean
# build.

if (@ARGV && $ARGV[0] eq "all")
  {
    $all = 1;
    shift @ARGV;
  }

system ("$make clean versionclean") if $all;

if ($wall)
  {
    $warn = "-Wall";
  }
elsif (!$no_warn)
  {
    $warn = "-Wpointer-arith -Wchar-subscripts -Wformat -Wimplicit-int";
    $warn = "$warn -Wreturn-type -Wswitch -Wuninitialized";
  }

$defs = "-DGLYPH_DEBUG=1" unless $optim;
$defs = "$defs -DGC_CHECK_MARKED_OBJECTS=1" if $check_marked;
$defs = "$defs -DENABLE_CHECKING=1" if $enable_checking;

if ($profile)
  {
    $opts = "-pg";
    $defs = "$defs -DPROFILING=1";
  }
else
  {
    if ($use_stabs)
      {
	$opts = "-gstabs";
      }
    else
      {
	$opts = "-g";
      }
  }

$defs = "$defs -DUSE_LISP_UNION_TYPE" if $union_type;
$defs = "$defs -DGC_MALLOC_CHECK=1 -DGC_PROTECT_MALLOC_STATE=1" if $malloc_check;
$defs = "$defs -DGC_MCHECK=1" unless $no_mcheck;

$defs = "$defs -DTRACE_SELECTION" if $trace_selection;
$defs = "$defs -DDEBUG_TRACE_MOVE" if $trace_move;

# arch=pentium leads to slightly faster code than without.
$opts = "$opts -march=pentiumpro";

if ($optim)
  {
    $opts = "$opts -pipe -O3";
  }
elsif ($no_optim)
  {
    $opts = "$opts -pipe -fno-inline";
  }
else
  {
    $opts = "$opts -O -pipe -fno-inline";
  }

$opts = "$opts -fstrict-aliasing" if $aliasing;

$opts = "$opts $defs" if $defs;
$opts = "$opts $warn" if $warn;

$cc = "/usr/bin/gcc";
$cc = "/gd/local/bin/gcc" if $gcc3;

if ($boot)
  {
    chdir "..";
    system "mv boot.log boot.log.old" if -f "boot.log";
    exit system "script boot.log $make CC=\"$cc\" CFLAGS=\"$opts\" bootstrap";
  }

exit system "$make CC=\"$cc\" CFLAGS=\"$opts\" @ARGV";

# Local Variables:
# mode: cperl
# End:

# arch-tag: 5c3f9713-9ece-4a12-b3f8-deaff15974ba