Mercurial > emacs
view admin/make-emacs @ 109581:06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
* lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu-customize-enable-left)
(menu-bar-showhide-tool-bar-menu-customize-disable)
(menu-bar-showhide-tool-bar-menu-customize-enable-right)
(menu-bar-showhide-tool-bar-menu-customize-enable-top)
(menu-bar-showhide-tool-bar-menu-customize-enable-bottom): New functions
(menu-bar-showhide-tool-bar-menu): If tool bar is moveable,
make a menu for Options => toolbar that can move it.
* src/frame.c (Qtool_bar_position): New variable.
(make_frame): Set tool_bar_position to Qtop.
(frame_parms): Add tool-bar-position.
(x_report_frame_params): Store tool_bar_position.
(x_set_fringe_width): Reset wm size hint after fringe changes.
* src/frame.h (struct frame): Add tool_bar_position.
(Qbottom): Declare.
* src/gtkutil.c (FRAME_TOTAL_PIXEL_WIDTH): New macro.
(xg_frame_set_char_size): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
(xg_height_or_width_changed): Use FRAME_TOTAL_PIXEL_WIDTH.
(xg_create_frame_widgets): Create a hobox for placing widgets
vertically. Use gtk_box_pack_start.
(xg_height_or_width_changed): Renamed from xg_height_changed.
(x_wm_set_size_hint): Add FRAME_TOOLBAR_WIDTH to base_width.
(xg_update_frame_menubar, free_frame_menubar): Change to
xg_height_or_width_changed.
(xg_tool_bar_detach_callback): Update left/right/top/bottom tool bar
size correctly. Remove hardcoded 4, instead use handlebox size -
toolbar size.
(xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar
size correctly. Use handlebox size + toolbar size as additional
size.
(xg_pack_tool_bar): POS is a new parameter.
Set orientation of tool bar based on pos.
Only make handlebox_widget if NULL.
Check if tool bar goes to vbox or hbox depending on pos.
(xg_update_tool_bar_sizes): New function.
(update_frame_tool_bar): Remove old_req, new_req. Do not get tool bar
height, call xg_update_tool_bar_sizes instead.
(free_frame_tool_bar): Remove from hbox or vbox depending on
toolbar_in_hbox, Set all FRAME_TOOLBAR_*_(WIDTH|HEIGHT) to zero.
(xg_change_toolbar_position): New function.
* src/gtkutil.h (xg_change_toolbar_position): Declare.
* src/window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT
and FRAME_TOOLBAR_LEFT_WIDTH.
* src/xfns.c (x_set_tool_bar_position): New function.
(xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT.
(x_frame_parm_handlers): Add x_set_tool_bar_position.
(syms_of_xfns): if USE_GTK, provide move-toolbar.
* src/xterm.c (x_set_window_size_1): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
* src/xterm.h (struct x_output): Add toolbar_top_height,
toolbar_bottom_height, toolbar_left_width, toolbar_right_width. Remove
toolbar_height.
if USE_GTK: Add hbox_widget and toolbar_in_hbox.
(FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT)
(FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros.
(FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Thu, 29 Jul 2010 18:49:59 +0200 |
| parents | 1d1d5d9bd884 |
| children | 376148b31b5e |
line wrap: on
line source
#! /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
