Mercurial > emacs
view lisp/cedet/cedet-idutils.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 | 280c8ae2476d b150a06c6999 |
line wrap: on
line source
;;; cedet-idutils.el --- ID Utils support for CEDET. ;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <eric@siege-engine.com> ;; Version: 0.2 ;; Keywords: OO, lisp ;; 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: ;; ;; Basic support calling ID Utils functions, and checking version ;; numbers. ;;; Code: (declare-function inversion-check-version "inversion") (defvar cedet-idutils-min-version "4.0" "Minimum version of ID Utils required.") (defcustom cedet-idutils-file-command "fnid" "Command name for the ID Utils executable for searching file names." :type 'string :group 'cedet) (defcustom cedet-idutils-token-command "lid" "Command name for the ID Utils executable for searching for tokens." :type 'string :group 'cedet) (defun cedet-idutils-search (searchtext texttype type scope) "Perform a search with ID Utils, return the created buffer. SEARCHTEXT is text to find. TEXTTYPE is the type of text, such as 'regexp, 'string, 'tagname, 'tagregexp, or 'tagcompletions. TYPE is the type of search, meaning that SEARCHTEXT is compared to filename, tagname (tags table), references (uses of a tag) , or symbol (uses of something not in the tag table.) SCOPE is the scope of the search, such as 'project or 'subdirs. Note: Scope is not yet supported." (if (eq type 'file) ;; Calls for file stuff is very simple. (cedet-idutils-fnid-call (list searchtext)) ;; Calls for text searches is more complex. (let* ((resultflg (if (eq texttype 'tagcompletions) (list "--key=token") (list "--result=grep"))) (scopeflgs nil) ; (cond ((eq scope 'project) "" ) ((eq scope 'target) "l"))) (stflag (cond ((or (eq texttype 'tagname) (eq texttype 'tagregexp)) (list "-r" "-w")) ((eq texttype 'tagcompletions) ;; Add regex to search text for beginning of char. (setq searchtext (concat "^" searchtext)) (list "-r" "-s" )) ((eq texttype 'regexp) (list "-r")) ;; t means 'symbol (t (list "-l" "-w")))) ) (cedet-idutils-lid-call (append resultflg scopeflgs stflag (list searchtext)))))) (defun cedet-idutils-fnid-call (flags) "Call ID Utils fnid with the list of FLAGS. Return the created buffer with with program output." (let ((b (get-buffer-create "*CEDET fnid*")) (cd default-directory) ) (with-current-buffer b (setq default-directory cd) (erase-buffer)) (apply 'call-process cedet-idutils-file-command nil b nil flags) b)) (defun cedet-idutils-lid-call (flags) "Call ID Utils lid with the list of FLAGS. Return the created buffer with with program output." (let ((b (get-buffer-create "*CEDET lid*")) (cd default-directory) ) (with-current-buffer b (setq default-directory cd) (erase-buffer)) (apply 'call-process cedet-idutils-token-command nil b nil flags) b)) ;;; UTIL CALLS ;; (defun cedet-idutils-expand-filename (filename) "Expand the FILENAME with ID Utils. Return a filename relative to the default directory." (interactive "sFile: ") (let ((ans (with-current-buffer (cedet-idutils-fnid-call (list filename)) (goto-char (point-min)) (if (looking-at "[^ \n]*fnid: ") (error "ID Utils not available") (split-string (buffer-string) "\n" t))))) (setq ans (mapcar 'expand-file-name ans)) (when (called-interactively-p 'interactive) (if ans (if (= (length ans) 1) (message "%s" (car ans)) (message "%s + %d others" (car ans) (length (cdr ans)))) (error "No file found"))) ans)) (defun cedet-idutils-support-for-directory (&optional dir) "Return non-nil if ID Utils has a support file for DIR. If DIR is not supplied, use the current default directory. This works by running lid on a bogus symbol, and looking for the error code." (save-excursion (let ((default-directory (or dir default-directory))) (condition-case nil (progn (set-buffer (cedet-idutils-fnid-call '("moose"))) (goto-char (point-min)) (if (looking-at "[^ \n]*fnid: ") nil t)) (error nil))))) (defun cedet-idutils-version-check (&optional noerror) "Check the version of the installed ID Utils command. If optional programatic argument NOERROR is non-nil, then instead of throwing an error if Global isn't available, then return nil." (interactive) (require 'inversion) (let ((b (condition-case nil (cedet-idutils-fnid-call (list "--version")) (error nil))) (rev nil)) (if (not b) (progn (when (called-interactively-p 'interactive) (message "ID Utils not found.")) nil) (with-current-buffer b (goto-char (point-min)) (re-search-forward "fnid - \\([0-9.]+\\)" nil t) (setq rev (match-string 1)) (if (inversion-check-version rev nil cedet-idutils-min-version) (if noerror nil (error "Version of ID Utils is %s. Need at least %s" rev cedet-idutils-min-version)) ;; Else, return TRUE, as in good enough. (when (called-interactively-p 'interactive) (message "ID Utils %s - Good enough for CEDET." rev)) t))))) (provide 'cedet-idutils) ;; arch-tag: 663ca082-5b3d-4384-8710-cc74f990b501 ;;; cedet-idutils.el ends here