Mercurial > emacs
annotate lisp/url/url-proxy.el @ 107805:bcbdb43a80e2
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:21:25 +0200 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
rev | line source |
---|---|
54695 | 1 ;;; url-proxy.el --- Proxy server support |
57612 | 2 |
106815 | 3 ;; Copyright (C) 1999, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
57612 | 4 |
54695 | 5 ;; Keywords: comm, data, processes, hypermedia |
6 | |
57612 | 7 ;; This file is part of GNU Emacs. |
8 | |
94668
8259d0d8e107
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
9 ;; GNU Emacs is free software: you can redistribute it and/or modify |
57612 | 10 ;; it under the terms of the GNU General Public License as published by |
94668
8259d0d8e107
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
11 ;; the Free Software Foundation, either version 3 of the License, or |
8259d0d8e107
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
12 ;; (at your option) any later version. |
57612 | 13 |
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. | |
18 | |
19 ;; You should have received a copy of the GNU General Public License | |
94668
8259d0d8e107
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
20 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
57612 | 21 |
22 ;;; Code: | |
54695 | 23 |
24 (require 'url-parse) | |
25 (autoload 'url-warn "url") | |
26 | |
27 (defun url-default-find-proxy-for-url (urlobj host) | |
28 (cond | |
29 ((or (and (assoc "no_proxy" url-proxy-services) | |
30 (string-match | |
31 (cdr | |
32 (assoc "no_proxy" url-proxy-services)) | |
33 host)) | |
34 (equal "www" (url-type urlobj))) | |
35 "DIRECT") | |
36 ((cdr (assoc (url-type urlobj) url-proxy-services)) | |
37 (concat "PROXY " (cdr (assoc (url-type urlobj) url-proxy-services)))) | |
38 ;; | |
39 ;; Should check for socks | |
40 ;; | |
41 (t | |
42 "DIRECT"))) | |
43 | |
44 (defvar url-proxy-locator 'url-default-find-proxy-for-url) | |
45 | |
46 (defun url-find-proxy-for-url (url host) | |
47 (let ((proxies (split-string (funcall url-proxy-locator url host) " *; *")) | |
48 (proxy nil) | |
49 (case-fold-search t)) | |
50 ;; Not sure how I should handle gracefully degrading from one proxy to | |
51 ;; another, so for now just deal with the first one | |
52 ;; (while proxies | |
53 (if (listp proxies) | |
54 (setq proxy (car proxies)) | |
55 (setq proxy proxies)) | |
56 (cond | |
57 ((string-match "^direct" proxy) nil) | |
58 ((string-match "^proxy +" proxy) | |
59 (concat "http://" (substring proxy (match-end 0)) "/")) | |
60 ((string-match "^socks +" proxy) | |
61 (concat "socks://" (substring proxy (match-end 0)))) | |
62 (t | |
63 (url-warn 'url (format "Unknown proxy directive: %s" proxy) 'critical) | |
64 nil)))) | |
65 | |
66 (defun url-proxy (url callback &optional cbargs) | |
67 ;; Retrieve URL from a proxy. | |
68 ;; Expects `url-using-proxy' to be bound to the specific proxy to use." | |
69 (setq url-using-proxy (url-generic-parse-url url-using-proxy)) | |
70 | |
75235
48337b29e3b6
(url-proxy-object): Remove.
Magnus Henoch <mange@freemail.hu>
parents:
74476
diff
changeset
|
71 (cond |
48337b29e3b6
(url-proxy-object): Remove.
Magnus Henoch <mange@freemail.hu>
parents:
74476
diff
changeset
|
72 ((string= (url-type url-using-proxy) "http") |
48337b29e3b6
(url-proxy-object): Remove.
Magnus Henoch <mange@freemail.hu>
parents:
74476
diff
changeset
|
73 (url-http url callback cbargs)) |
48337b29e3b6
(url-proxy-object): Remove.
Magnus Henoch <mange@freemail.hu>
parents:
74476
diff
changeset
|
74 (t |
48337b29e3b6
(url-proxy-object): Remove.
Magnus Henoch <mange@freemail.hu>
parents:
74476
diff
changeset
|
75 (error "Don't know how to use proxy `%s'" url-using-proxy)))) |
48337b29e3b6
(url-proxy-object): Remove.
Magnus Henoch <mange@freemail.hu>
parents:
74476
diff
changeset
|
76 |
54695 | 77 (provide 'url-proxy) |
54699 | 78 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79720
diff
changeset
|
79 ;; arch-tag: 4ff8882e-e498-42b7-abc5-acb449cdbc62 |
57612 | 80 ;;; url-proxy.el ends here |