Mercurial > emacs
annotate lisp/hex-util.el @ 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 | 8d09094063d0 376148b31b5e |
rev | line source |
---|---|
86919 | 1 ;;; hex-util.el --- Functions to encode/decode hexadecimal string. |
2 | |
3 ;; Copyright (C) 1999, 2001, 2002, 2003, 2004, | |
106815 | 4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
86919 | 5 |
6 ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp> | |
7 ;; Keywords: data | |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
86919 | 12 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
14 ;; (at your option) any later version. |
86919 | 15 |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
86919 | 23 |
24 ;;; Commentary: | |
25 | |
26 ;;; Code: | |
27 | |
28 (eval-when-compile | |
29 (defmacro hex-char-to-num (chr) | |
30 `(let ((chr ,chr)) | |
31 (cond | |
32 ((and (<= ?a chr)(<= chr ?f)) (+ (- chr ?a) 10)) | |
33 ((and (<= ?A chr)(<= chr ?F)) (+ (- chr ?A) 10)) | |
34 ((and (<= ?0 chr)(<= chr ?9)) (- chr ?0)) | |
35 (t (error "Invalid hexadecimal digit `%c'" chr))))) | |
36 (defmacro num-to-hex-char (num) | |
37 `(aref "0123456789abcdef" ,num))) | |
38 | |
39 (defun decode-hex-string (string) | |
40 "Decode hexadecimal STRING to octet string." | |
41 (let* ((len (length string)) | |
42 (dst (make-string (/ len 2) 0)) | |
43 (idx 0)(pos 0)) | |
44 (while (< pos len) | |
45 ;; logior and lsh are not byte-coded. | |
46 ;; (aset dst idx (logior (lsh (hex-char-to-num (aref string pos)) 4) | |
47 ;; (hex-char-to-num (aref string (1+ pos))))) | |
48 (aset dst idx (+ (* (hex-char-to-num (aref string pos)) 16) | |
49 (hex-char-to-num (aref string (1+ pos))))) | |
50 (setq idx (1+ idx) | |
51 pos (+ 2 pos))) | |
52 dst)) | |
53 | |
54 (defun encode-hex-string (string) | |
55 "Encode octet STRING to hexadecimal string." | |
56 (let* ((len (length string)) | |
57 (dst (make-string (* len 2) 0)) | |
58 (idx 0)(pos 0)) | |
59 (while (< pos len) | |
60 ;; logand and lsh are not byte-coded. | |
61 ;; (aset dst idx (num-to-hex-char (logand (lsh (aref string pos) -4) 15))) | |
62 (aset dst idx (num-to-hex-char (/ (aref string pos) 16))) | |
63 (setq idx (1+ idx)) | |
64 ;; (aset dst idx (num-to-hex-char (logand (aref string pos) 15))) | |
65 (aset dst idx (num-to-hex-char (% (aref string pos) 16))) | |
66 (setq idx (1+ idx) | |
67 pos (1+ pos))) | |
68 dst)) | |
69 | |
70 (provide 'hex-util) | |
71 | |
72 ;; arch-tag: fe8aaa79-6c86-400e-813f-5a8cc4cb3859 | |
73 ;;; hex-util.el ends here |