Mercurial > emacs
view admin/charsets/compact.awk @ 107804:24c4451bcaf7
Lucid menus can now use Xft for fonts.
* xsettings.c (current_font, SYSTEM_FONT, XSETTINGS_FONT_NAME): New.
(parse_xft_settings): Also check for XSETTINGS_FONT_NAME and save that
in current_font.
(init_gconf): Read value of SYSTEM_FONT and save it in current_font.
(Ffont_get_system_normal_font, xsettings_get_system_normal_font): New
functions.
(syms_of_xsettings): Initialize current_font. defsubr
Sfont_get_system_normal_font.
* xsettings.h (Ffont_get_system_normal_font,
xsettings_get_system_normal_font): Declare.
* xfns.c (extern xlwmenu_default_font): Remove.
(Fx_create_frame): Remove setting of xlwmenu_default_font, moved
to xlwmenu.c.
* menu.c (digest_single_submenu): If USE_LUCID and HAVE_XFT, encode
menu items in UTF-8.
* xmenu.c: include xsettings.h and xlwmenu.h if USE_LUCID.
(apply_systemfont_to_menu): New function.
(set_frame_menubar, create_and_show_popup_menu): Call
apply_systemfont_to_menu.
* xlwmenu.c (xlwmenu_default_font): Make static.
(xlwMenuResources): Add XtNfaceName and XtNdefaultFace.
(string_width): Use XftTextExtentsUtf8 if HAVE_XFT.
(MENU_FONT_HEIGHT, MENU_FONT_ASCENT): Add versions for
HAVE_XFT.
(size_menu): Set max_rest_width in window_state structure.
(display_menu_item): If HAVE_XFT and xft_draw is set, use
XftDrawRect and XftDrawStringUtf8 to draw text.
(make_windows_if_needed): Set max_rest_width and xft_draw
in windows[i].
(openXftFont): New.
(XlwMenuInitialize): Call openXftFont if HAVE_XFT. If mw->menu.font
is not set, load font fixed and save it in xlwmenu_default_font.
(XlwMenuInitialize): Set max_rest_width and xft_draw in windows[0].
(XlwMenuClassInitialize): Initialize xlwmenu_default_font.
(XlwMenuRealize): Set xft_fg, xft_bg, xft_disabled_fg and
windows[0].xft_draw if xft_font is set.
(XlwMenuDestroy): Destroy all xft_draw and close xft_font.
(facename_changed): New.
(XlwMenuSetValues): Call facename_changed. If face name did change,
close old fonts and destroy xft_draw:s. Then create new ones.
* xlwmenu.h (XtNfaceName, XtCFaceName, XtNdefaultFace,
XtCDefaultFace): New.
* xlwmenuP.h (_window_state): Add max_rest_width and xft_draw.
(_XlwMenu_part): Add faceName,xft_fg, xft_bg, xft_disabled_fg and
xft_font.
* xresources.texi (Lucid Resources): Mention faceName to set Xft fonts.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Thu, 08 Apr 2010 18:20:32 +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