Mercurial > emacs
view lisp/gnus/gnus-logic.el @ 109581:06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
* lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu-customize-enable-left)
(menu-bar-showhide-tool-bar-menu-customize-disable)
(menu-bar-showhide-tool-bar-menu-customize-enable-right)
(menu-bar-showhide-tool-bar-menu-customize-enable-top)
(menu-bar-showhide-tool-bar-menu-customize-enable-bottom): New functions
(menu-bar-showhide-tool-bar-menu): If tool bar is moveable,
make a menu for Options => toolbar that can move it.
* src/frame.c (Qtool_bar_position): New variable.
(make_frame): Set tool_bar_position to Qtop.
(frame_parms): Add tool-bar-position.
(x_report_frame_params): Store tool_bar_position.
(x_set_fringe_width): Reset wm size hint after fringe changes.
* src/frame.h (struct frame): Add tool_bar_position.
(Qbottom): Declare.
* src/gtkutil.c (FRAME_TOTAL_PIXEL_WIDTH): New macro.
(xg_frame_set_char_size): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
(xg_height_or_width_changed): Use FRAME_TOTAL_PIXEL_WIDTH.
(xg_create_frame_widgets): Create a hobox for placing widgets
vertically. Use gtk_box_pack_start.
(xg_height_or_width_changed): Renamed from xg_height_changed.
(x_wm_set_size_hint): Add FRAME_TOOLBAR_WIDTH to base_width.
(xg_update_frame_menubar, free_frame_menubar): Change to
xg_height_or_width_changed.
(xg_tool_bar_detach_callback): Update left/right/top/bottom tool bar
size correctly. Remove hardcoded 4, instead use handlebox size -
toolbar size.
(xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar
size correctly. Use handlebox size + toolbar size as additional
size.
(xg_pack_tool_bar): POS is a new parameter.
Set orientation of tool bar based on pos.
Only make handlebox_widget if NULL.
Check if tool bar goes to vbox or hbox depending on pos.
(xg_update_tool_bar_sizes): New function.
(update_frame_tool_bar): Remove old_req, new_req. Do not get tool bar
height, call xg_update_tool_bar_sizes instead.
(free_frame_tool_bar): Remove from hbox or vbox depending on
toolbar_in_hbox, Set all FRAME_TOOLBAR_*_(WIDTH|HEIGHT) to zero.
(xg_change_toolbar_position): New function.
* src/gtkutil.h (xg_change_toolbar_position): Declare.
* src/window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT
and FRAME_TOOLBAR_LEFT_WIDTH.
* src/xfns.c (x_set_tool_bar_position): New function.
(xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT.
(x_frame_parm_handlers): Add x_set_tool_bar_position.
(syms_of_xfns): if USE_GTK, provide move-toolbar.
* src/xterm.c (x_set_window_size_1): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
* src/xterm.h (struct x_output): Add toolbar_top_height,
toolbar_bottom_height, toolbar_left_width, toolbar_right_width. Remove
toolbar_height.
if USE_GTK: Add hbox_widget and toolbar_in_hbox.
(FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT)
(FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros.
(FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Thu, 29 Jul 2010 18:49:59 +0200 |
parents | 1d1d5d9bd884 |
children | 8d09094063d0 376148b31b5e |
line wrap: on
line source
;;; gnus-logic.el --- advanced scoring code for Gnus ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Keywords: news ;; 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: ;;; Code: (eval-when-compile (require 'cl)) (require 'gnus) (require 'gnus-score) (require 'gnus-util) ;;; Internal variables. (defvar gnus-advanced-headers nil) ;; To avoid having 8-bit characters in the source file. (defvar gnus-advanced-not (intern (format "%c" 172))) (defconst gnus-advanced-index ;; Name to index alist. '(("number" 0 gnus-advanced-integer) ("subject" 1 gnus-advanced-string) ("from" 2 gnus-advanced-string) ("date" 3 gnus-advanced-date) ("message-id" 4 gnus-advanced-string) ("references" 5 gnus-advanced-string) ("chars" 6 gnus-advanced-integer) ("lines" 7 gnus-advanced-integer) ("xref" 8 gnus-advanced-string) ("head" nil gnus-advanced-body) ("body" nil gnus-advanced-body) ("all" nil gnus-advanced-body))) (autoload 'parse-time-string "parse-time") (defun gnus-score-advanced (rule &optional trace) "Apply advanced scoring RULE to all the articles in the current group." (let (new-score score multiple) (dolist (gnus-advanced-headers gnus-newsgroup-headers) (when (setq multiple (gnus-advanced-score-rule (car rule))) (setq new-score (or (nth 1 rule) gnus-score-interactive-default-score)) (when (numberp multiple) (setq new-score (* multiple new-score))) ;; This rule was successful, so we add the score to this ;; article. (if (setq score (assq (mail-header-number gnus-advanced-headers) gnus-newsgroup-scored)) (setcdr score (+ (cdr score) new-score)) (push (cons (mail-header-number gnus-advanced-headers) new-score) gnus-newsgroup-scored) (when trace (push (cons "A file" rule) ;; Must be synced with `gnus-score-edit-file-at-point'. gnus-score-trace))))))) (defun gnus-advanced-score-rule (rule) "Apply RULE to `gnus-advanced-headers'." (let ((type (car rule))) (cond ;; "And" rule. ((or (eq type '&) (eq type 'and)) (pop rule) (if (not rule) t ; Empty rule is true. (while (and rule (gnus-advanced-score-rule (car rule))) (pop rule)) ;; If all the rules were true, then `rule' should be nil. (not rule))) ;; "Or" rule. ((or (eq type '|) (eq type 'or)) (pop rule) (if (not rule) nil (while (and rule (not (gnus-advanced-score-rule (car rule)))) (pop rule)) ;; If one of the rules returned true, then `rule' should be non-nil. rule)) ;; "Not" rule. ((or (eq type '!) (eq type 'not) (eq type gnus-advanced-not)) (not (gnus-advanced-score-rule (nth 1 rule)))) ;; This is a `1-'-type redirection rule. ((and (symbolp type) (string-match "^[0-9]+-$\\|^\\^+$" (symbol-name type))) (let ((gnus-advanced-headers (gnus-parent-headers gnus-advanced-headers (if (string-match "^\\([0-9]+\\)-$" (symbol-name type)) ;; 1- type redirection. (string-to-number (substring (symbol-name type) (match-beginning 1) (match-end 1))) ;; ^^^ type redirection. (length (symbol-name type)))))) (when gnus-advanced-headers (gnus-advanced-score-rule (nth 1 rule))))) ;; Plain scoring rule. ((stringp type) (gnus-advanced-score-article rule)) ;; Bug-out time! (t (error "Unknown advanced score type: %s" rule))))) (defun gnus-advanced-score-article (rule) ;; `rule' is a semi-normal score rule, so we find out what function ;; that's supposed to do the actual processing. (let* ((header (car rule)) (func (assoc (downcase header) gnus-advanced-index))) (if (not func) (error "No such header: %s" rule) ;; Call the score function. (funcall (caddr func) (or (cadr func) header) (cadr rule) (caddr rule))))) (defun gnus-advanced-string (index match type) "See whether string MATCH of TYPE matches `gnus-advanced-headers' in INDEX." (let* ((type (or type 's)) (case-fold-search (not (eq (downcase (symbol-name type)) (symbol-name type)))) (header (or (aref gnus-advanced-headers index) ""))) (cond ((memq type '(r R regexp Regexp)) (string-match match header)) ((memq type '(s S string String)) (string-match (regexp-quote match) header)) ((memq type '(e E exact Exact)) (string= match header)) ((memq type '(f F fuzzy Fuzzy)) (string-match (regexp-quote (gnus-simplify-subject-fuzzy match)) header)) (t (error "No such string match type: %s" type))))) (defun gnus-advanced-integer (index match type) (if (not (memq type '(< > <= >= =))) (error "No such integer score type: %s" type) (funcall type (or (aref gnus-advanced-headers index) 0) match))) (defun gnus-advanced-date (index match type) (let ((date (apply 'encode-time (parse-time-string (aref gnus-advanced-headers index)))) (match (apply 'encode-time (parse-time-string match)))) (cond ((eq type 'at) (equal date match)) ((eq type 'before) (time-less-p match date)) ((eq type 'after) (time-less-p date match)) (t (error "No such date score type: %s" type))))) (defun gnus-advanced-body (header match type) (when (string= header "all") (setq header "article")) (save-excursion (set-buffer nntp-server-buffer) (let* ((request-func (cond ((string= "head" header) 'gnus-request-head) ((string= "body" header) 'gnus-request-body) (t 'gnus-request-article))) ofunc article) ;; Not all backends support partial fetching. In that case, we ;; just fetch the entire article. (unless (gnus-check-backend-function (intern (concat "request-" header)) gnus-newsgroup-name) (setq ofunc request-func) (setq request-func 'gnus-request-article)) (setq article (mail-header-number gnus-advanced-headers)) (gnus-message 7 "Scoring article %s..." article) (when (funcall request-func article gnus-newsgroup-name) (goto-char (point-min)) ;; If just parts of the article is to be searched and the ;; backend didn't support partial fetching, we just narrow to ;; the relevant parts. (when ofunc (if (eq ofunc 'gnus-request-head) (narrow-to-region (point) (or (search-forward "\n\n" nil t) (point-max))) (narrow-to-region (or (search-forward "\n\n" nil t) (point)) (point-max)))) (let* ((case-fold-search (not (eq (downcase (symbol-name type)) (symbol-name type)))) (search-func (cond ((memq type '(r R regexp Regexp)) 're-search-forward) ((memq type '(s S string String)) 'search-forward) (t (error "Invalid match type: %s" type))))) (goto-char (point-min)) (prog1 (funcall search-func match nil t) (widen))))))) (provide 'gnus-logic) ;; arch-tag: 9651a100-4a59-4b69-a55b-e511e67c0f8d ;;; gnus-logic.el ends here