Mercurial > emacs
view src/unexcw.c @ 107998:531d454c3a99
Implement GUI display of R2L lines, fix TTY display of R2L lines.
xdisp.c [HAVE_WINDOW_SYSTEM]: Add prototype for
append_stretch_glyph.
(set_cursor_from_row) <cursor_x>: Remove unused variable. Fix
off-by-one error in computing x at end of text in the row.
(append_stretch_glyph): In reversed row, prepend the glyph rather
than append it. Set resolved_level and bidi_type of the glyph.
(extend_face_to_end_of_line): If the row is reversed, prepend a
stretch glyph whose width is such that the rightmost glyph will be
drawn at the right margin of the window. Fix off-by-one error on
TTY frames in testing whether a line needs face extension. Fix
face extension at ZV. If this is the last glyph row, use
DEFAULT_FACE_ID, to avoid painting the rest of the window with the
region face.
(set_cursor_from_row, display_line): Use
MATRIX_ROW_CONTINUATION_LINE_P instead of testing value of
row->continuation_lines_width.
(next_element_from_buffer): Don't call bidi_paragraph_init if we
are at ZV. Fixes a crash when reseated to ZV by
try_window_reusing_current_matrix.
(display_and_set_cursor, erase_phys_cursor): Handle negative HPOS,
which happens with R2L glyph rows. Fixes a crash when inserting a
character at end of an R2L line.
(set_cursor_from_row): Don't be fooled by truncated rows: don't
treat them as having zero-width characters. Improve comments.
Don't reverse pos_before and pos_after for reversed glyph rows.
Set cursor.x to negative value when the cursor might be on the
left fringe.
(IT_OVERFLOW_NEWLINE_INTO_FRINGE): For R2L lines, consider the
left fringe, not the right one.
(notice_overwritten_cursor, draw_phys_cursor_glyph)
(erase_phys_cursor): For reversed cursor_row, support cursor on
the left fringe.
fringe.c (update_window_fringes): For R2L rows, swap the bitmaps
of continuation indicators on the fringes.
(draw_fringe_bitmap): For reversed glyph rows, allow cursor on the
left fringe.
w32term.c (w32_draw_window_cursor): For reversed glyph rows,
draw cursor on the left fringe.
xterm.c (x_draw_window_cursor): For reversed glyph rows, draw
cursor on the left fringe.
dispnew.c (update_text_area): Handle reversed desired rows when
the cursor is on the left fringe.
(set_window_cursor_after_update): Limit cursor's hpos by -1 from
below, not by 0, for when the cursor is on the left fringe.
xdisp.c (unproduce_glyphs): New function.
(display_line): Use it when produced glyphs are discarded from R2L
glyph rows.
(append_composite_glyph): In R2L rows, prepend the glyph rather
than appending it.
term.c (append_composite_glyph): In R2L rows, prepend the glyph
rather than append it. Set up the resolved_level and bidi_type
attributes of the appended glyph.
(produce_special_glyphs): Mirror the backslash continuation
character in R2L lines.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Tue, 20 Apr 2010 16:31:28 +0300 |
parents | 1d1d5d9bd884 |
children | 99084f50aa8e 376148b31b5e |
line wrap: on
line source
/* unexec() support for Cygwin; complete rewrite of xemacs Cygwin unexec() code Copyright (C) 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/>. */ #include <config.h> #include <setjmp.h> #include <lisp.h> #include <stdio.h> #include <fcntl.h> #include <a.out.h> #include <unistd.h> #include <assert.h> #define DOTEXE ".exe" extern int bss_sbrk_did_unexec; /* emacs symbols that indicate where bss and data end for emacs internals */ extern char my_endbss[]; extern char my_edata[]; /* ** header for Windows executable files */ typedef struct { FILHDR file_header; PEAOUTHDR file_optional_header; SCNHDR section_header[32]; } exe_header_t; int debug_unexcw = 0; /* ** Read the header from the executable into memory so we can more easily access it. */ static exe_header_t * read_exe_header (int fd, exe_header_t * exe_header_buffer) { int i; int ret; assert (fd >= 0); assert (exe_header_buffer != 0); ret = lseek (fd, 0L, SEEK_SET); assert (ret != -1); ret = read (fd, &exe_header_buffer->file_header, sizeof (exe_header_buffer->file_header)); assert (ret == sizeof (exe_header_buffer->file_header)); assert (exe_header_buffer->file_header.e_magic == 0x5a4d); assert (exe_header_buffer->file_header.nt_signature == 0x4550); assert (exe_header_buffer->file_header.f_magic == 0x014c); assert (exe_header_buffer->file_header.f_nscns > 0); assert (exe_header_buffer->file_header.f_nscns <= sizeof (exe_header_buffer->section_header) / sizeof (exe_header_buffer->section_header[0])); assert (exe_header_buffer->file_header.f_opthdr > 0); ret = read (fd, &exe_header_buffer->file_optional_header, sizeof (exe_header_buffer->file_optional_header)); assert (ret == sizeof (exe_header_buffer->file_optional_header)); assert (exe_header_buffer->file_optional_header.magic == 0x010b); for (i = 0; i < exe_header_buffer->file_header.f_nscns; ++i) { ret = read (fd, &exe_header_buffer->section_header[i], sizeof (exe_header_buffer->section_header[i])); assert (ret == sizeof (exe_header_buffer->section_header[i])); } return (exe_header_buffer); } /* ** Fix the dumped emacs executable: ** ** - copy .data section data of interest from running executable into ** output .exe file ** ** - convert .bss section into an initialized data section (like ** .data) and copy .bss section data of interest from running ** executable into output .exe file */ static void fixup_executable (int fd) { exe_header_t exe_header_buffer; exe_header_t *exe_header; int i; int ret; int found_data = 0; int found_bss = 0; exe_header = read_exe_header (fd, &exe_header_buffer); assert (exe_header != 0); assert (exe_header->file_header.f_nscns > 0); for (i = 0; i < exe_header->file_header.f_nscns; ++i) { unsigned long start_address = exe_header->section_header[i].s_vaddr + exe_header->file_optional_header.ImageBase; unsigned long end_address = exe_header->section_header[i].s_vaddr + exe_header->file_optional_header.ImageBase + exe_header->section_header[i].s_paddr; if (debug_unexcw) printf ("%8s start 0x%08x end 0x%08x\n", exe_header->section_header[i].s_name, start_address, end_address); if (my_edata >= (char *) start_address && my_edata < (char *) end_address) { /* data section */ ret = lseek (fd, (long) (exe_header->section_header[i].s_scnptr), SEEK_SET); assert (ret != -1); ret = write (fd, (char *) start_address, my_edata - (char *) start_address); assert (ret == my_edata - (char *) start_address); ++found_data; if (debug_unexcw) printf (" .data, mem start 0x%08x mem length %d\n", start_address, my_edata - (char *) start_address); if (debug_unexcw) printf (" .data, file start %d file length %d\n", (int) exe_header->section_header[i].s_scnptr, (int) exe_header->section_header[i].s_paddr); } else if (my_endbss >= (char *) start_address && my_endbss < (char *) end_address) { /* bss section */ ++found_bss; if (exe_header->section_header[i].s_flags & 0x00000080) { /* convert uninitialized data section to initialized data section */ struct stat statbuf; ret = fstat (fd, &statbuf); assert (ret != -1); exe_header->section_header[i].s_flags &= ~0x00000080; exe_header->section_header[i].s_flags |= 0x00000040; exe_header->section_header[i].s_scnptr = (statbuf.st_size + exe_header->file_optional_header.FileAlignment) / exe_header->file_optional_header.FileAlignment * exe_header->file_optional_header.FileAlignment; exe_header->section_header[i].s_size = (exe_header->section_header[i].s_paddr + exe_header->file_optional_header.FileAlignment) / exe_header->file_optional_header.FileAlignment * exe_header->file_optional_header.FileAlignment; ret = lseek (fd, (long) (exe_header->section_header[i].s_scnptr + exe_header->section_header[i].s_size - 1), SEEK_SET); assert (ret != -1); ret = write (fd, "", 1); assert (ret == 1); ret = lseek (fd, (long) ((char *) &exe_header->section_header[i] - (char *) exe_header), SEEK_SET); assert (ret != -1); ret = write (fd, &exe_header->section_header[i], sizeof (exe_header->section_header[i])); assert (ret == sizeof (exe_header->section_header[i])); if (debug_unexcw) printf (" seek to %ld, write %d\n", (long) ((char *) &exe_header->section_header[i] - (char *) exe_header), sizeof (exe_header->section_header[i])); } /* write initialized data section */ ret = lseek (fd, (long) (exe_header->section_header[i].s_scnptr), SEEK_SET); assert (ret != -1); ret = write (fd, (char *) start_address, my_endbss - (char *) start_address); assert (ret == (my_endbss - (char *) start_address)); if (debug_unexcw) printf (" .bss, mem start 0x%08x mem length %d\n", start_address, my_endbss - (char *) start_address); if (debug_unexcw) printf (" .bss, file start %d file length %d\n", (int) exe_header->section_header[i].s_scnptr, (int) exe_header->section_header[i].s_paddr); } } assert (found_bss == 1); assert (found_data == 1); } /* ** Windows likes .exe suffixes on executables. */ static char * add_exe_suffix_if_necessary (const char *name, char *modified) { int i = strlen (name); if (i <= (sizeof (DOTEXE) - 1)) { sprintf (modified, "%s%s", name, DOTEXE); } else if (!strcasecmp (name + i - (sizeof (DOTEXE) - 1), DOTEXE)) { strcpy (modified, name); } else { sprintf (modified, "%s%s", name, DOTEXE); } return (modified); } int unexec (char *outfile, char *infile, unsigned start_data, unsigned d1, unsigned d2) { char infile_buffer[FILENAME_MAX]; char outfile_buffer[FILENAME_MAX]; int fd_in; int fd_out; int ret; int ret2; if (bss_sbrk_did_unexec) { /* can only dump once */ printf ("You can only dump Emacs once on this platform.\n"); return (1); } report_sheap_usage (1); infile = add_exe_suffix_if_necessary (infile, infile_buffer); outfile = add_exe_suffix_if_necessary (outfile, outfile_buffer); fd_in = open (infile, O_RDONLY | O_BINARY); assert (fd_in >= 0); fd_out = open (outfile, O_RDWR | O_TRUNC | O_CREAT | O_BINARY, 0755); assert (fd_out >= 0); for (;;) { char buffer[4096]; ret = read (fd_in, buffer, sizeof (buffer)); if (ret == 0) { /* eof */ break; } assert (ret > 0); /* data */ ret2 = write (fd_out, buffer, ret); assert (ret2 == ret); } ret = close (fd_in); assert (ret == 0); bss_sbrk_did_unexec = 1; fixup_executable (fd_out); bss_sbrk_did_unexec = 0; ret = close (fd_out); assert (ret == 0); return (0); } /* arch-tag: fc44f6c3-ca0a-45e0-a5a2-58b6101b1e65 (do not change this comment) */