Mercurial > emacs
view src/unexcw.c @ 108027:2ba5d029fd5e
Gtk tool bars can be text, icons with text or just icons
* frames.texi (Tool Bars): Add tool-bar-style.
* vc-dir.el (vc-dir-tool-bar-map): Add :label on some tool bar items.
* tool-bar.el (tool-bar-setup): Add :label on some tool bar items.
* loadup.el: Load dynamic-setting.el if feature dynamic-setting
is present.
* info.el (info-tool-bar-map): Add labels.
* cus-start.el (all): Add tool-bar-style and tool-bar-max-label-size.
* cus-edit.el (custom-commands): Add labels for tool bar.
(custom-buffer-create-internal, Custom-mode): Adjust for
labels in custom-commands.
* dynamic-setting.el: Renamed from font-setting.el.
* xsettings.c: Qmonospace_font_name, Qtool_bar_style and
current_tool_bar_style are new.
(store_config_changed_event): Rename from store_font_changed_event.
(XSETTINGS_TOOL_BAR_STYLE): New define.
(SEEN_FONT, SEEN_TB_STYLE): New enum values.
(struct xsettings): Add font and tb_style, set xft stuff inside #ifdef
HAVE_XFT.
(something_changedCB): store_font_changed_event is now
store_config_changed_event
(parse_settings): Rename from parse_xft_settings. Read
non-xft xsettings outside #ifdef HAVE_XFT.
(read_settings): Renamed from read_xft_settings.
(apply_xft_settings): Take current settings as parameter. Do not
call read_(xft)_settings.
(read_and_apply_settings): New function.
(xft_settings_event): Do non-xft stuff out of HAVE_XFT. Call
read_and_apply_settings if there are settings to be read.
(init_xsettings): Renamed from init_xfd_settings.
Call read_and_apply_settings unconditionally.
(xsettings_initialize): Call init_xsettings.
(Ftool_bar_get_system_style): New function.
(syms_of_xsettings): Define Qmonospace_font_name and
Qtool_bar_style. Initialize current_tool_bar_style to nil.
defsubr Stool_bar_get_system_style. Fprovide on
dynamic-setting.
* xsettings.h (Ftool_bar_get_system_style): Declare.
* xdisp.c: Vtool_bar_style, tool_bar_max_label_size,
Qtext, Qboth, Qboth_horiz are new.
(syms_of_xdisp): Intern Qtext, Qboth, Qboth_horiz, DEFVAR
Vtool_bar_style, tool_bar_max_label_size.
* lisp.h: Extern declare Qtext, Qboth, Qboth_horiz.
* keyboard.c: QClabel is new.
(parse_tool_bar_item): Take out QClabel from tool bar items.
Try to construct a label if ther is no QClabel.
(syms_of_keyboard): Intern :label as QClabel.
* dispextern.h (tool_bar_item_idx): TOOL_BAR_ITEM_LABEL is new.
(Vtool_bar_style, tool_bar_max_label_size, DEFAULT_TOOL_BAR_LABEL_SIZE):
New.
* Makefile.in (SOME_MACHINE_LISP): font-setting.el renamed to
dynamic-setting.el.
* gtkutil.c (xg_tool_bar_menu_proxy): Handle label in tool bar item.
(xg_make_tool_item, xg_show_toolbar_item): New function.
(update_frame_tool_bar): Take label from TOOL_BAR_ITEM_LABEL.
Call xg_make_tool_item to make a tool bar item.
Call xg_show_toolbar_item. Use wtoolbar instead of x->toolbar_widget.
* xterm.c (x_draw_image_relief): Take Vtool_bar_button_margin
into account for toolbars.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Wed, 21 Apr 2010 18:26:09 +0200 |
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) */