Mercurial > emacs
view admin/charsets/compact.awk @ 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
# compact.awk -- Make charset map compact. # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 # 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/>. # Commentary: # Make a charset map compact by changing this kind of line sequence: # 0x00 0x0000 # 0x01 0x0001 # ... # 0x7F 0x007F # to one line of this format: # 0x00-0x7F 0x0000 BEGIN { tohex["0"] = 1; tohex["1"] = 2; tohex["2"] = 3; tohex["3"] = 4; tohex["4"] = 5; tohex["5"] = 6; tohex["6"] = 7; tohex["7"] = 8; tohex["8"] = 9; tohex["9"] = 10; tohex["A"] = 11; tohex["B"] = 12; tohex["C"] = 13; tohex["D"] = 14; tohex["E"] = 15; tohex["F"] = 16; tohex["a"] = 11; tohex["b"] = 12; tohex["c"] = 13; tohex["d"] = 14; tohex["e"] = 15; tohex["f"] = 16; from_code = 0; to_code = -1; to_unicode = 0; from_unicode = 0; } function decode_hex(str, idx) { n = 0; len = length(str); for (i = idx; i <= len; i++) { c = tohex[substr (str, i, 1)]; if (c == 0) break; n = n * 16 + c - 1; } return n; } /^\#/ { print; next; } { code = decode_hex($1, 3); unicode = decode_hex($2, 3); if ((code == to_code + 1) && (unicode == to_unicode + 1)) { to_code++; to_unicode++; } else { if (to_code < 256) { if (from_code == to_code) printf "0x%02X 0x%04X\n", from_code, from_unicode; else if (from_code < to_code) printf "0x%02X-0x%02X 0x%04X\n", from_code, to_code, from_unicode; } else { if (from_code == to_code) printf "0x%04X 0x%04X\n", from_code, from_unicode; else if (from_code < to_code) printf "0x%04X-0x%04X 0x%04X\n", from_code, to_code, from_unicode; } from_code = to_code = code; from_unicode = to_unicode = unicode; } } END { if (to_code < 256) { if (from_code == to_code) printf "0x%02X 0x%04X\n", from_code, from_unicode; else printf "0x%02X-0x%02X 0x%04X\n", from_code, to_code, from_unicode; } else { if (from_code == to_code) printf "0x%04X 0x%04X\n", from_code, from_unicode; else printf "0x%04X-0x%04X 0x%04X\n", from_code, to_code, from_unicode; } } # arch-tag: 7e6f57c3-8e62-4af3-8916-ca67bca3a0ce
