Mercurial > emacs
annotate update-subdirs @ 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 |
rev | line source |
---|---|
25856 | 1 #!/bin/sh |
2 # Write into $1/subdirs.el a list of subdirs of directory $1. | |
36219 | 3 |
74370 | 4 # Copyright (C) 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004, 2005, |
106815 | 5 # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
94719
1a762a842f80
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
6 |
36219 | 7 # This file is part of GNU Emacs. |
94719
1a762a842f80
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
8 |
1a762a842f80
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
9 # GNU Emacs is free software: you can redistribute it and/or modify |
36219 | 10 # it under the terms of the GNU General Public License as published by |
94719
1a762a842f80
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
11 # the Free Software Foundation, either version 3 of the License, or |
1a762a842f80
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
12 # (at your option) any later version. |
1a762a842f80
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
13 |
36219 | 14 # GNU Emacs is distributed in the hope that it will be useful, |
15 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 # GNU General Public License for more details. | |
94719
1a762a842f80
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
18 |
36219 | 19 # You should have received a copy of the GNU General Public License |
94719
1a762a842f80
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
20 # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
1a762a842f80
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
21 |
36219 | 22 |
25856 | 23 cd $1 |
24 for file in *; do | |
25 case $file in | |
25931
3ede6c50d7f5
also ignore CVS subdirs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25856
diff
changeset
|
26 *.elc | *.el | term | RCS | CVS | Old | . | .. | =* | *~ | *.orig | *.rej) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47727
diff
changeset
|
27 ;; |
25856 | 28 *) |
29 if [ -d $file ]; then | |
99260
80b866cd08a3
Put obsolete directory last.
Chong Yidong <cyd@stupidchicken.com>
parents:
95369
diff
changeset
|
30 if [ "$file" = "obsolete" ]; then |
80b866cd08a3
Put obsolete directory last.
Chong Yidong <cyd@stupidchicken.com>
parents:
95369
diff
changeset
|
31 subdirs="$subdirs \"$file\"" |
80b866cd08a3
Put obsolete directory last.
Chong Yidong <cyd@stupidchicken.com>
parents:
95369
diff
changeset
|
32 else |
80b866cd08a3
Put obsolete directory last.
Chong Yidong <cyd@stupidchicken.com>
parents:
95369
diff
changeset
|
33 subdirs="\"$file\" $subdirs" |
80b866cd08a3
Put obsolete directory last.
Chong Yidong <cyd@stupidchicken.com>
parents:
95369
diff
changeset
|
34 fi |
25856 | 35 fi |
99260
80b866cd08a3
Put obsolete directory last.
Chong Yidong <cyd@stupidchicken.com>
parents:
95369
diff
changeset
|
36 ;; |
25856 | 37 esac |
38 done | |
39 | |
40 if [ "x$subdirs" = x ]; then | |
41 rm -f subdirs.el | |
42 else | |
86200
aa0de1ea4215
Atomically update subdirs.el.
Andreas Schwab <schwab@suse.de>
parents:
78277
diff
changeset
|
43 rm -f subdirs.el~ |
aa0de1ea4215
Atomically update subdirs.el.
Andreas Schwab <schwab@suse.de>
parents:
78277
diff
changeset
|
44 echo ";; -*- no-byte-compile: t -*- |
aa0de1ea4215
Atomically update subdirs.el.
Andreas Schwab <schwab@suse.de>
parents:
78277
diff
changeset
|
45 ;; In load-path, after this directory should come |
aa0de1ea4215
Atomically update subdirs.el.
Andreas Schwab <schwab@suse.de>
parents:
78277
diff
changeset
|
46 ;; certain of its subdirectories. Here we specify them. |
aa0de1ea4215
Atomically update subdirs.el.
Andreas Schwab <schwab@suse.de>
parents:
78277
diff
changeset
|
47 (normal-top-level-add-to-load-path '($subdirs)) |
54489
fbc008c6f0cc
Add local variables to prevent byte-compiling.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
48 ;; Local" "Variables: |
fbc008c6f0cc
Add local variables to prevent byte-compiling.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
49 ;; version-control: never |
fbc008c6f0cc
Add local variables to prevent byte-compiling.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
50 ;; no-byte-compile: t |
86200
aa0de1ea4215
Atomically update subdirs.el.
Andreas Schwab <schwab@suse.de>
parents:
78277
diff
changeset
|
51 ;; End:" > subdirs.el~ |
95369
d147ddeb05f9
Don't touch subdirs.el if it is unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94719
diff
changeset
|
52 if cmp "subdirs.el" "subdirs.el~" >/dev/null 2>&1; then |
d147ddeb05f9
Don't touch subdirs.el if it is unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94719
diff
changeset
|
53 :; # echo "subdirs.el unchanged"; |
d147ddeb05f9
Don't touch subdirs.el if it is unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94719
diff
changeset
|
54 else |
86200
aa0de1ea4215
Atomically update subdirs.el.
Andreas Schwab <schwab@suse.de>
parents:
78277
diff
changeset
|
55 mv subdirs.el~ subdirs.el |
95369
d147ddeb05f9
Don't touch subdirs.el if it is unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94719
diff
changeset
|
56 fi |
25856 | 57 fi |
52401 | 58 |
59 # arch-tag: 56ebcf1b-5c30-4934-b0b4-72d374064704 |