Mercurial > emacs
view lisp/url/url-ns.el @ 108027:2ba5d029fd5e
Gtk tool bars can be text, icons with text or just icons
* frames.texi (Tool Bars): Add tool-bar-style.
* vc-dir.el (vc-dir-tool-bar-map): Add :label on some tool bar items.
* tool-bar.el (tool-bar-setup): Add :label on some tool bar items.
* loadup.el: Load dynamic-setting.el if feature dynamic-setting
is present.
* info.el (info-tool-bar-map): Add labels.
* cus-start.el (all): Add tool-bar-style and tool-bar-max-label-size.
* cus-edit.el (custom-commands): Add labels for tool bar.
(custom-buffer-create-internal, Custom-mode): Adjust for
labels in custom-commands.
* dynamic-setting.el: Renamed from font-setting.el.
* xsettings.c: Qmonospace_font_name, Qtool_bar_style and
current_tool_bar_style are new.
(store_config_changed_event): Rename from store_font_changed_event.
(XSETTINGS_TOOL_BAR_STYLE): New define.
(SEEN_FONT, SEEN_TB_STYLE): New enum values.
(struct xsettings): Add font and tb_style, set xft stuff inside #ifdef
HAVE_XFT.
(something_changedCB): store_font_changed_event is now
store_config_changed_event
(parse_settings): Rename from parse_xft_settings. Read
non-xft xsettings outside #ifdef HAVE_XFT.
(read_settings): Renamed from read_xft_settings.
(apply_xft_settings): Take current settings as parameter. Do not
call read_(xft)_settings.
(read_and_apply_settings): New function.
(xft_settings_event): Do non-xft stuff out of HAVE_XFT. Call
read_and_apply_settings if there are settings to be read.
(init_xsettings): Renamed from init_xfd_settings.
Call read_and_apply_settings unconditionally.
(xsettings_initialize): Call init_xsettings.
(Ftool_bar_get_system_style): New function.
(syms_of_xsettings): Define Qmonospace_font_name and
Qtool_bar_style. Initialize current_tool_bar_style to nil.
defsubr Stool_bar_get_system_style. Fprovide on
dynamic-setting.
* xsettings.h (Ftool_bar_get_system_style): Declare.
* xdisp.c: Vtool_bar_style, tool_bar_max_label_size,
Qtext, Qboth, Qboth_horiz are new.
(syms_of_xdisp): Intern Qtext, Qboth, Qboth_horiz, DEFVAR
Vtool_bar_style, tool_bar_max_label_size.
* lisp.h: Extern declare Qtext, Qboth, Qboth_horiz.
* keyboard.c: QClabel is new.
(parse_tool_bar_item): Take out QClabel from tool bar items.
Try to construct a label if ther is no QClabel.
(syms_of_keyboard): Intern :label as QClabel.
* dispextern.h (tool_bar_item_idx): TOOL_BAR_ITEM_LABEL is new.
(Vtool_bar_style, tool_bar_max_label_size, DEFAULT_TOOL_BAR_LABEL_SIZE):
New.
* Makefile.in (SOME_MACHINE_LISP): font-setting.el renamed to
dynamic-setting.el.
* gtkutil.c (xg_tool_bar_menu_proxy): Handle label in tool bar item.
(xg_make_tool_item, xg_show_toolbar_item): New function.
(update_frame_tool_bar): Take label from TOOL_BAR_ITEM_LABEL.
Call xg_make_tool_item to make a tool bar item.
Call xg_show_toolbar_item. Use wtoolbar instead of x->toolbar_widget.
* xterm.c (x_draw_image_relief): Take Vtool_bar_button_margin
into account for toolbars.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Wed, 21 Apr 2010 18:26:09 +0200 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
line wrap: on
line source
;;; url-ns.el --- Various netscape-ish functions for proxy definitions ;; Copyright (C) 1997, 1998, 1999, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia ;; 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/>. ;;; Code: (require 'url-gw) ;;;###autoload (defun isPlainHostName (host) (not (string-match "\\." host))) ;;;###autoload (defun dnsDomainIs (host dom) (string-match (concat (regexp-quote dom) "$") host)) ;;;###autoload (defun dnsResolve (host) (url-gateway-nslookup-host host)) ;;;###autoload (defun isResolvable (host) (if (string-match "^[0-9.]+$" host) t (not (string= host (url-gateway-nslookup-host host))))) ;;;###autoload (defun isInNet (ip net mask) (let ((netc (split-string ip "\\.")) (ipc (split-string net "\\.")) (maskc (split-string mask "\\."))) (if (or (/= (length netc) (length ipc)) (/= (length ipc) (length maskc))) nil (setq netc (mapcar 'string-to-number netc) ipc (mapcar 'string-to-number ipc) maskc (mapcar 'string-to-number maskc)) (and (= (logand (nth 0 netc) (nth 0 maskc)) (logand (nth 0 ipc) (nth 0 maskc))) (= (logand (nth 1 netc) (nth 1 maskc)) (logand (nth 1 ipc) (nth 1 maskc))) (= (logand (nth 2 netc) (nth 2 maskc)) (logand (nth 2 ipc) (nth 2 maskc))) (= (logand (nth 3 netc) (nth 3 maskc)) (logand (nth 3 ipc) (nth 3 maskc))))))) ;; Netscape configuration file parsing (defvar url-ns-user-prefs nil "Internal, do not use.") ;;;###autoload (defun url-ns-prefs (&optional file) (if (not file) (setq file (expand-file-name "~/.netscape/preferences.js"))) (if (not (and (file-exists-p file) (file-readable-p file))) (message "Could not open %s for reading" file) (save-excursion (let ((false nil) (true t)) (setq url-ns-user-prefs (make-hash-table :size 13 :test 'equal)) (set-buffer (get-buffer-create " *ns-parse*")) (erase-buffer) (insert-file-contents file) (goto-char (point-min)) (while (re-search-forward "^//" nil t) (replace-match ";;")) (goto-char (point-min)) (while (re-search-forward "^user_pref(" nil t) (replace-match "(url-ns-set-user-pref ")) (goto-char (point-min)) (while (re-search-forward "\"," nil t) (replace-match "\"")) (goto-char (point-min)) (eval-buffer))))) (defun url-ns-set-user-pref (key val) (puthash key val url-ns-user-prefs)) ;;;###autoload (defun url-ns-user-pref (key &optional default) (gethash key url-ns-user-prefs default)) (provide 'url-ns) ;; arch-tag: 69520992-cf97-40b4-9ad1-c866d3cae5bf ;;; url-ns.el ends here