* hexl mode update
@ 2009-02-07 1:20 Vivek Dasmohapatra
[not found] ` <jwvljmo364c.fsf-monnier+emacs@gnu.org>
0 siblings, 1 reply; 4+ messages in thread
From: Vivek Dasmohapatra @ 2009-02-07 1:20 UTC (permalink / raw)
To: Lennart Borgman
[-- Attachment #1: Type: TEXT/PLAIN, Size: 593 bytes --]
This patch should apply cleanly to the current head of hexl.el, I've
included a copy of hexl.el with the patch applied.
It allows hexl.el to take advantage of the fact that the hexl binary can
emit hexlified data with varying word sizes.
I originally did this work in emacs21 for an arm linux kernel hacker
I know, I guess it might be useful to others.
It didn't get into emacs22 because emacs22 was about to go out and new
features were not being accepted.
hexl.el doesn't appear to have changed much between 22 and 23, so hopefully
it can be considered for inclusion this time around.
[-- Attachment #2: Type: TEXT/PLAIN, Size: 46066 bytes --]
;;; hexl.el --- edit a file in a hex dump format using the hexl filter
;; Copyright (C) 1989, 1994, 1998, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu>
;; Maintainer: FSF
;; Keywords: data
;; 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:
;; This package implements a major mode for editing binary files. It uses
;; a program called hexl, supplied with the GNU Emacs distribution, that
;; can filter a binary into an editable format or from the format back into
;; binary. For full instructions, invoke `hexl-mode' on an empty buffer and
;; do M-x `describe-mode'.
;;
;; NOTE: Remember to change `hexl-program' or `hexl-options' if needed.
;;
;; Currently hexl only supports big endian hex output with 16 bit
;; grouping.
;;
;; -iso in `hexl-options' will allow iso characters to display in the
;; ASCII region of the screen (if your Emacs supports this) instead of
;; changing them to dots.
;;; Code:
(require 'eldoc)
;;
;; vars here
;;
(defgroup hexl nil
"Edit a file in a hex dump format using the hexl filter."
:group 'data)
(defcustom hexl-bits 16
"The bit grouping that hexl will use"
:type '(choice (const 8 )
(const 16)
(const 32)
(const 64))
:group 'hexl)
(defcustom hexl-program "hexl"
"The program that will hexlify and dehexlify its stdin.
`hexl-program' will always be concatenated with `hexl-options'
and \"-de\" when dehexlifying a buffer."
:type 'string
:group 'hexl)
(defcustom hexl-iso ""
"If your Emacs can handle ISO characters, this should be set to
\"-iso\" otherwise it should be \"\"."
:type 'string
:group 'hexl)
(defcustom hexl-options (format "-hex %s" hexl-iso)
"Space separated options to `hexl-program' that suit your needs.
Quoting cannot be used, so the arguments cannot themselves contain spaces."
:type 'string
:group 'hexl)
(defcustom hexl-follow-ascii t
"If non-nil then highlight the ASCII character corresponding to point."
:type 'boolean
:group 'hexl
:version "20.3")
(defcustom hexl-mode-hook '(hexl-follow-line hexl-activate-ruler)
"Normal hook run when entering Hexl mode."
:type 'hook
:options '(hexl-follow-line hexl-activate-ruler turn-on-eldoc-mode)
:group 'hexl)
(defface hexl-address-region
'((t (:inherit header-line)))
"Face used in address area of hexl-mode buffer."
:group 'hexl)
(defface hexl-ascii-region
'((t (:inherit header-line)))
"Face used in ascii area of hexl-mode buffer."
:group 'hexl)
(defvar hexl-max-address 0
"Maximum offset into hexl buffer.")
(defvar hexl-mode-map nil)
;; Variable declarations for suppressing warnings from the byte-compiler.
(defvar ruler-mode)
(defvar ruler-mode-ruler-function)
(defvar hl-line-mode)
(defvar hl-line-range-function)
(defvar hl-line-face)
;; Variables where the original values are stored to.
(defvar hexl-mode-old-hl-line-mode)
(defvar hexl-mode-old-hl-line-range-function)
(defvar hexl-mode-old-hl-line-face)
(defvar hexl-mode-old-local-map)
(defvar hexl-mode-old-mode-name)
(defvar hexl-mode-old-major-mode)
(defvar hexl-mode-old-ruler-mode)
(defvar hexl-mode-old-ruler-function)
(defvar hexl-mode-old-isearch-search-fun-function)
(defvar hexl-mode-old-require-final-newline)
(defvar hexl-mode-old-syntax-table)
(defvar hexl-mode-old-font-lock-keywords)
(defvar hexl-mode-old-eldoc-documentation-function)
(defvar hexl-ascii-overlay nil
"Overlay used to highlight ASCII element corresponding to current point.")
(make-variable-buffer-local 'hexl-ascii-overlay)
(defvar hexl-font-lock-keywords
'(("^\\([0-9a-f]+:\\).\\{40\\} \\(.+$\\)"
;; "^\\([0-9a-f]+:\\).+ \\(.+$\\)"
(1 'hexl-address-region t t)
(2 'hexl-ascii-region t t)))
"Font lock keywords used in `hexl-mode'.")
;; routines
(put 'hexl-mode 'mode-class 'special)
;; 10 chars for the "address: "
;; 32 chars for the hexlified bytes
;; 1 char for the space
;; 16 chars for the character display
;; X chars for the spaces (128 bits divided by the hexl-bits)
;; 1 char for the newline.
(defun hexl-line-displen ()
(+ 60 (/ 128 (or hexl-bits 16))))
;;;###autoload
(defun hexl-mode (&optional arg)
"\\<hexl-mode-map>A mode for editing binary files in hex dump format.
This is not an ordinary major mode; it alters some aspects
of the current mode's behavior, but not all; also, you can exit
Hexl mode and return to the previous mode using `hexl-mode-exit'.
This function automatically converts a buffer into the hexl format
using the function `hexlify-buffer'.
Each line in the buffer has an \"address\" (displayed in hexadecimal)
representing the offset into the file that the characters on this line
are at and 16 characters from the file (displayed as hexadecimal
values grouped every 16 bits) and as their ASCII values.
If any of the characters (displayed as ASCII characters) are
unprintable (control or meta characters) they will be replaced as
periods.
If `hexl-mode' is invoked with an argument the buffer is assumed to be
in hexl format.
A sample format:
HEX ADDR: 0001 0203 0405 0607 0809 0a0b 0c0d 0e0f ASCII-TEXT
-------- ---- ---- ---- ---- ---- ---- ---- ---- ----------------
00000000: 5468 6973 2069 7320 6865 786c 2d6d 6f64 This is hexl-mod
00000010: 652e 2020 4561 6368 206c 696e 6520 7265 e. Each line re
00000020: 7072 6573 656e 7473 2031 3620 6279 7465 presents 16 byte
00000030: 7320 6173 2068 6578 6164 6563 696d 616c s as hexadecimal
00000040: 2041 5343 4949 0a61 6e64 2070 7269 6e74 ASCII.and print
00000050: 6162 6c65 2041 5343 4949 2063 6861 7261 able ASCII chara
00000060: 6374 6572 732e 2020 416e 7920 636f 6e74 cters. Any cont
00000070: 726f 6c20 6f72 206e 6f6e 2d41 5343 4949 rol or non-ASCII
00000080: 2063 6861 7261 6374 6572 730a 6172 6520 characters.are
00000090: 6469 7370 6c61 7965 6420 6173 2070 6572 displayed as per
000000a0: 696f 6473 2069 6e20 7468 6520 7072 696e iods in the prin
000000b0: 7461 626c 6520 6368 6172 6163 7465 7220 table character
000000c0: 7265 6769 6f6e 2e0a region..
Movement is as simple as movement in a normal Emacs text buffer. Most
cursor movement bindings are the same (ie. Use \\[hexl-backward-char], \\[hexl-forward-char], \\[hexl-next-line], and \\[hexl-previous-line]
to move the cursor left, right, down, and up).
Advanced cursor movement commands (ala \\[hexl-beginning-of-line], \\[hexl-end-of-line], \\[hexl-beginning-of-buffer], and \\[hexl-end-of-buffer]) are
also supported.
There are several ways to change text in hexl mode:
ASCII characters (character between space (0x20) and tilde (0x7E)) are
bound to self-insert so you can simply type the character and it will
insert itself (actually overstrike) into the buffer.
\\[hexl-quoted-insert] followed by another keystroke allows you to insert the key even if
it isn't bound to self-insert. An octal number can be supplied in place
of another key to insert the octal number's ASCII representation.
\\[hexl-insert-hex-char] will insert a given hexadecimal value (if it is between 0 and 0xFF)
into the buffer at the current point.
\\[hexl-insert-octal-char] will insert a given octal value (if it is between 0 and 0377)
into the buffer at the current point.
\\[hexl-insert-decimal-char] will insert a given decimal value (if it is between 0 and 255)
into the buffer at the current point.
\\[hexl-mode-exit] will exit hexl-mode.
Note: saving the file with any of the usual Emacs commands
will actually convert it back to binary format while saving.
You can use \\[hexl-find-file] to visit a file in Hexl mode.
\\[describe-bindings] for advanced commands."
(interactive "p")
(unless (eq major-mode 'hexl-mode)
(let ((modified (buffer-modified-p))
(inhibit-read-only t)
(original-point (- (point) (point-min)))
max-address)
(and (eobp) (not (bobp))
(setq original-point (1- original-point)))
(if (not (memq arg '(1 nil)))
;; if no argument then we guess at hexl-max-address
(setq max-address
(+ (* (/ (1- (buffer-size)) (hexl-line-displen)) 16) 15))
(setq max-address (1- (buffer-size)))
;; If the buffer's EOL type is -dos, we need to account for
;; extra CR characters added when hexlify-buffer writes the
;; buffer to a file.
;; FIXME: This doesn't take into account multibyte coding systems.
(when (eq (coding-system-eol-type buffer-file-coding-system) 1)
(setq max-address (+ (count-lines (point-min) (point-max))
max-address))
;; But if there's no newline at the last line, we are off by
;; one; adjust.
(or (eq (char-before (point-max)) ?\n)
(setq max-address (1- max-address)))
(setq original-point (+ (count-lines (point-min) (point))
original-point))
(or (bolp) (setq original-point (1- original-point))))
(hexlify-buffer)
(restore-buffer-modified-p modified))
(make-local-variable 'hexl-max-address)
(setq hexl-max-address max-address)
(condition-case nil
(hexl-goto-address original-point)
(error nil)))
;; We do not turn off the old major mode; instead we just
;; override most of it. That way, we can restore it perfectly.
(make-local-variable 'hexl-mode-old-local-map)
(setq hexl-mode-old-local-map (current-local-map))
(use-local-map hexl-mode-map)
(make-local-variable 'hexl-mode-old-mode-name)
(setq hexl-mode-old-mode-name mode-name)
(setq mode-name "Hexl")
(set (make-local-variable 'hexl-mode-old-isearch-search-fun-function)
isearch-search-fun-function)
(set (make-local-variable 'isearch-search-fun-function)
'hexl-isearch-search-function)
(make-local-variable 'hexl-mode-old-major-mode)
(setq hexl-mode-old-major-mode major-mode)
(setq major-mode 'hexl-mode)
(make-local-variable 'hexl-mode-old-ruler-mode)
(setq hexl-mode-old-ruler-mode
(and (boundp 'ruler-mode) ruler-mode))
(make-local-variable 'hexl-mode-old-hl-line-mode)
(setq hexl-mode-old-hl-line-mode
(and (boundp 'hl-line-mode) hl-line-mode))
(make-local-variable 'hexl-mode-old-syntax-table)
(setq hexl-mode-old-syntax-table (syntax-table))
(set-syntax-table (standard-syntax-table))
(add-hook 'write-contents-functions 'hexl-save-buffer nil t)
(make-local-variable 'hexl-mode-old-require-final-newline)
(setq hexl-mode-old-require-final-newline require-final-newline)
(make-local-variable 'require-final-newline)
(setq require-final-newline nil)
(make-local-variable 'hexl-mode-old-font-lock-keywords)
(setq hexl-mode-old-font-lock-keywords font-lock-defaults)
(setq font-lock-defaults '(hexl-font-lock-keywords t))
;; Add hooks to rehexlify or dehexlify on various events.
(add-hook 'before-revert-hook 'hexl-before-revert-hook nil t)
(add-hook 'after-revert-hook 'hexl-after-revert-hook nil t)
(add-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer nil t)
;; Set a callback function for eldoc.
(make-local-variable 'hexl-mode-old-eldoc-documentation-function)
(setq hexl-mode-old-eldoc-documentation-function
(bound-and-true-p eldoc-documentation-function))
(set (make-local-variable 'eldoc-documentation-function)
'hexl-print-current-point-info)
(eldoc-add-command-completions "hexl-")
(eldoc-remove-command "hexl-save-buffer"
"hexl-current-address")
(if hexl-follow-ascii (hexl-follow-ascii 1)))
(run-mode-hooks 'hexl-mode-hook))
(defun hexl-isearch-search-function ()
(if (and (not isearch-regexp) (not isearch-word))
(lambda (string &optional bound noerror count)
(funcall
(if isearch-forward 're-search-forward 're-search-backward)
(let ((textre
(if (> (length string) 80)
(regexp-quote string)
(mapconcat (lambda (c) (regexp-quote (string c))) string
"\\(?:\n\\(?:[:a-f0-9]+ \\)+ \\)?"))))
(if (string-match "\\` ?\\([a-f0-9]+ \\)*[a-f0-9]+ ?\\'" string)
(concat textre "\\|"
(mapconcat 'regexp-quote (split-string string " ")
" \\(?: .+\n[a-f0-9]+: \\)?"))
textre))
bound noerror count))
(let ((isearch-search-fun-function nil))
(isearch-search-fun))))
(defun hexl-before-revert-hook ()
(remove-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer t))
(defun hexl-after-revert-hook ()
(hexl-mode))
(defvar hexl-in-save-buffer nil)
(defun hexl-save-buffer ()
"Save a hexl format buffer as binary in visited file if modified."
(interactive)
(if hexl-in-save-buffer nil
(restore-buffer-modified-p
(if (buffer-modified-p)
(let ((buf (generate-new-buffer " hexl"))
(name (buffer-name))
(start (point-min))
(end (point-max))
modified)
(with-current-buffer buf
(insert-buffer-substring name start end)
(set-buffer name)
(dehexlify-buffer)
;; Prevent infinite recursion.
(let ((hexl-in-save-buffer t))
(save-buffer))
(setq modified (buffer-modified-p))
(delete-region (point-min) (point-max))
(insert-buffer-substring buf start end)
(kill-buffer buf)
modified))
(message "(No changes need to be saved)")
nil))
;; Return t to indicate we have saved t
t))
;;;###autoload
(defun hexl-find-file (filename)
"Edit file FILENAME as a binary file in hex dump format.
Switch to a buffer visiting file FILENAME, creating one if none exists,
and edit the file in `hexl-mode'."
(interactive
(list
(let ((completion-ignored-extensions nil))
(read-file-name "Filename: " nil nil 'ret-must-match))))
;; Ignore the user's setting of default-major-mode.
(let ((default-major-mode 'fundamental-mode))
(find-file-literally filename))
(if (not (eq major-mode 'hexl-mode))
(hexl-mode)))
(defun hexl-mode-exit (&optional arg)
"Exit Hexl mode, returning to previous mode.
With arg, don't unhexlify buffer."
(interactive "p")
(if (or (eq arg 1) (not arg))
(let ((modified (buffer-modified-p))
(inhibit-read-only t)
(original-point (1+ (hexl-current-address))))
(dehexlify-buffer)
(remove-hook 'write-contents-functions 'hexl-save-buffer t)
(restore-buffer-modified-p modified)
(goto-char original-point)
;; Maybe adjust point for the removed CR characters.
(when (eq (coding-system-eol-type buffer-file-coding-system) 1)
(setq original-point (- original-point
(count-lines (point-min) (point))))
(or (bobp) (setq original-point (1+ original-point))))
(goto-char original-point)))
(remove-hook 'before-revert-hook 'hexl-before-revert-hook t)
(remove-hook 'after-revert-hook 'hexl-after-revert-hook t)
(remove-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer t)
(remove-hook 'post-command-hook 'hexl-follow-ascii-find t)
(setq hexl-ascii-overlay nil)
(if (and (boundp 'ruler-mode) ruler-mode (not hexl-mode-old-ruler-mode))
(ruler-mode 0))
(when (boundp 'hexl-mode-old-ruler-function)
(setq ruler-mode-ruler-function hexl-mode-old-ruler-function))
(if (and (boundp 'hl-line-mode) hl-line-mode (not hexl-mode-old-hl-line-mode))
(hl-line-mode 0))
(when (boundp 'hexl-mode-old-hl-line-range-function)
(setq hl-line-range-function hexl-mode-old-hl-line-range-function))
(when (boundp 'hexl-mode-old-hl-line-face)
(setq hl-line-face hexl-mode-old-hl-line-face))
(when (boundp 'hexl-mode-old-eldoc-documentation-function)
(setq eldoc-documentation-function
hexl-mode-old-eldoc-documentation-function))
(setq require-final-newline hexl-mode-old-require-final-newline)
(setq mode-name hexl-mode-old-mode-name)
(setq isearch-search-fun-function hexl-mode-old-isearch-search-fun-function)
(use-local-map hexl-mode-old-local-map)
(set-syntax-table hexl-mode-old-syntax-table)
(setq font-lock-defaults hexl-mode-old-font-lock-keywords)
(setq major-mode hexl-mode-old-major-mode)
(force-mode-line-update))
(defun hexl-maybe-dehexlify-buffer ()
"Convert a hexl format buffer to binary.
Ask the user for confirmation."
(if (y-or-n-p "Convert contents back to binary format? ")
(let ((modified (buffer-modified-p))
(inhibit-read-only t)
(original-point (1+ (hexl-current-address))))
(dehexlify-buffer)
(remove-hook 'write-contents-functions 'hexl-save-buffer t)
(restore-buffer-modified-p modified)
(goto-char original-point))))
(defun hexl-current-address (&optional validate)
"Return current hexl-address."
(interactive)
(let ((current-column
(- (% (- (point) (point-min) -1) (hexl-line-displen)) 11))
(hexl-address 0))
(if (< current-column 0)
(if validate
(error "Point is not on a character in the file")
(setq current-column 0)))
(setq hexl-address
(+ (* (/ (- (point) (point-min) -1)
(hexl-line-displen)) 16)
(if (>= current-column (- (hexl-ascii-start-column) 10))
(- current-column (- (hexl-ascii-start-column) 10))
(/ (- current-column
(/ current-column (1+ (/ hexl-bits 4)))) 2) )) )
(when (interactive-p)
(message "Current address is [column: %d] %d/0x%08x"
current-column hexl-address hexl-address))
hexl-address))
(defun hexl-print-current-point-info ()
"Return current hexl-address in string.
This function is intended to be used as eldoc callback."
(let ((addr (hexl-current-address)))
(format "Current address is %d/0x%08x" addr addr)))
(defun hexl-ascii-start-column ()
"Column at which the ascii display starts."
(+ 43 (/ 128 hexl-bits)))
(defun hexl-address-to-marker (address)
"Return buffer position for ADDRESS."
(interactive "nAddress: ")
(let ((N (* (% address 16) 2)))
(+ (* (/ address 16) (hexl-line-displen)) ; hexl line no * display length
10 ; 10 chars for the "address: " prefix
(point-min) ; base offset (point usually starts at 1, not 0)
(+ N (/ N (/ hexl-bits 4))) )) ) ; char offset into hexl display line
(defun hexl-goto-address (address)
"Go to hexl-mode (decimal) address ADDRESS.
Signal error if ADDRESS is out of range."
(interactive "nAddress: ")
(if (or (< address 0) (> address hexl-max-address))
(error "Out of hexl region"))
(goto-char (hexl-address-to-marker address)))
(defun hexl-goto-hex-address (hex-address)
"Go to hexl-mode address (hex string) HEX-ADDRESS.
Signal error if HEX-ADDRESS is out of range."
(interactive "sHex Address: ")
(hexl-goto-address (hexl-hex-string-to-integer hex-address)))
(defun hexl-hex-string-to-integer (hex-string)
"Return decimal integer for HEX-STRING."
(interactive "sHex number: ")
(let ((hex-num 0))
(while (not (equal hex-string ""))
(setq hex-num (+ (* hex-num 16)
(hexl-hex-char-to-integer (string-to-char hex-string))))
(setq hex-string (substring hex-string 1)))
hex-num))
(defun hexl-octal-string-to-integer (octal-string)
"Return decimal integer for OCTAL-STRING."
(interactive "sOctal number: ")
(let ((oct-num 0))
(while (not (equal octal-string ""))
(setq oct-num (+ (* oct-num 8)
(hexl-oct-char-to-integer
(string-to-char octal-string))))
(setq octal-string (substring octal-string 1)))
oct-num))
;; move point functions
(defun hexl-backward-char (arg)
"Move to left ARG bytes (right if ARG negative) in hexl-mode."
(interactive "p")
(hexl-goto-address (- (hexl-current-address) arg)))
(defun hexl-forward-char (arg)
"Move right ARG bytes (left if ARG negative) in hexl-mode."
(interactive "p")
(hexl-goto-address (+ (hexl-current-address) arg)))
(defun hexl-backward-short (arg)
"Move to left ARG shorts (right if ARG negative) in hexl-mode."
(interactive "p")
(hexl-goto-address (let ((address (hexl-current-address)))
(if (< arg 0)
(progn
(setq arg (- arg))
(while (> arg 0)
(if (not (equal address (logior address 3)))
(if (> address hexl-max-address)
(progn
(message "End of buffer.")
(setq address hexl-max-address))
(setq address (logior address 3)))
(if (> address hexl-max-address)
(progn
(message "End of buffer.")
(setq address hexl-max-address))
(setq address (+ address 4))))
(setq arg (1- arg)))
(if (> address hexl-max-address)
(progn
(message "End of buffer.")
(setq address hexl-max-address))
(setq address (logior address 3))))
(while (> arg 0)
(if (not (equal address (logand address -4)))
(setq address (logand address -4))
(if (not (equal address 0))
(setq address (- address 4))
(message "Beginning of buffer.")))
(setq arg (1- arg))))
address)))
(defun hexl-forward-short (arg)
"Move right ARG shorts (left if ARG negative) in hexl-mode."
(interactive "p")
(hexl-backward-short (- arg)))
(defun hexl-backward-word (arg)
"Move to left ARG words (right if ARG negative) in hexl-mode."
(interactive "p")
(hexl-goto-address (let ((address (hexl-current-address)))
(if (< arg 0)
(progn
(setq arg (- arg))
(while (> arg 0)
(if (not (equal address (logior address 7)))
(if (> address hexl-max-address)
(progn
(message "End of buffer.")
(setq address hexl-max-address))
(setq address (logior address 7)))
(if (> address hexl-max-address)
(progn
(message "End of buffer.")
(setq address hexl-max-address))
(setq address (+ address 8))))
(setq arg (1- arg)))
(if (> address hexl-max-address)
(progn
(message "End of buffer.")
(setq address hexl-max-address))
(setq address (logior address 7))))
(while (> arg 0)
(if (not (equal address (logand address -8)))
(setq address (logand address -8))
(if (not (equal address 0))
(setq address (- address 8))
(message "Beginning of buffer.")))
(setq arg (1- arg))))
address)))
(defun hexl-forward-word (arg)
"Move right ARG words (left if ARG negative) in hexl-mode."
(interactive "p")
(hexl-backward-word (- arg)))
(defun hexl-previous-line (arg)
"Move vertically up ARG lines [16 bytes] (down if ARG negative) in hexl-mode.
If there is no byte at the target address move to the last byte in that line."
(interactive "p")
(hexl-next-line (- arg)))
(defun hexl-next-line (arg)
"Move vertically down ARG lines [16 bytes] (up if ARG negative) in hexl-mode.
If there is no byte at the target address move to the last byte in that line."
(interactive "p")
(hexl-goto-address (let ((address (+ (hexl-current-address) (* arg 16))))
(if (and (< arg 0) (< address 0))
(progn (message "Out of hexl region.")
(setq address
(% (hexl-current-address) 16)))
(if (and (> address hexl-max-address)
(< (% hexl-max-address 16) (% address 16)))
(setq address hexl-max-address)
(if (> address hexl-max-address)
(progn (message "Out of hexl region.")
(setq
address
(+ (logand hexl-max-address -16)
(% (hexl-current-address) 16)))))))
address)))
(defun hexl-beginning-of-buffer (arg)
"Move to the beginning of the hexl buffer.
Leaves `hexl-mark' at previous position.
With prefix arg N, puts point N bytes of the way from the true beginning."
(interactive "p")
(push-mark (point))
(hexl-goto-address (+ 0 (1- arg))))
(defun hexl-end-of-buffer (arg)
"Go to `hexl-max-address' minus ARG."
(interactive "p")
(push-mark (point))
(hexl-goto-address (- hexl-max-address (1- arg))))
(defun hexl-beginning-of-line ()
"Goto beginning of line in hexl mode."
(interactive)
(goto-char (+ (* (/ (point) (hexl-line-displen)) (hexl-line-displen)) 11)))
(defun hexl-end-of-line ()
"Goto end of line in hexl mode."
(interactive)
(hexl-goto-address (let ((address (logior (hexl-current-address) 15)))
(if (> address hexl-max-address)
(setq address hexl-max-address))
address)))
(defun hexl-scroll-down (arg)
"Scroll hexl buffer window upward ARG lines; or near full window if no ARG."
(interactive "P")
(if (null arg)
(setq arg (1- (window-height)))
(setq arg (prefix-numeric-value arg)))
(hexl-scroll-up (- arg)))
(defun hexl-scroll-up (arg)
"Scroll hexl buffer window upward ARG lines; or near full window if no ARG.
If there's no byte at the target address, move to the first or last line."
(interactive "P")
(if (null arg)
(setq arg (1- (window-height)))
(setq arg (prefix-numeric-value arg)))
(let* ((movement (* arg 16))
(address (hexl-current-address))
(dest (+ address movement)))
(cond
;; If possible, try to stay at the same offset from the beginning
;; of the 16-byte group, even if we move to the first or last
;; group.
((and (> dest hexl-max-address)
(>= (% hexl-max-address 16) (% address 16)))
(setq dest (+ (logand hexl-max-address -16) (% address 16))))
((> dest hexl-max-address)
(setq dest hexl-max-address))
((< dest 0)
(setq dest (% address 16))))
(if (/= dest (+ address movement))
(message "Out of hexl region."))
(hexl-goto-address dest)
(recenter 0)))
(defun hexl-beginning-of-1k-page ()
"Go to the beginning of the current 1kiB block"
(interactive)
(hexl-goto-address (logand (hexl-current-address) -1024)))
(defun hexl-end-of-1k-page ()
"Go to the end of the current 1kiB block."
(interactive)
(hexl-goto-address (let ((address (logior (hexl-current-address) 1023)))
(if (> address hexl-max-address)
(setq address hexl-max-address))
address)))
(defun hexl-beginning-of-512b-page ()
"Go to beginning of 512 byte boundary."
(interactive)
(hexl-goto-address (logand (hexl-current-address) -512)))
(defun hexl-end-of-512b-page ()
"Go to end of 512 byte boundary."
(interactive)
(hexl-goto-address (let ((address (logior (hexl-current-address) 511)))
(if (> address hexl-max-address)
(setq address hexl-max-address))
address)))
(defun hexl-quoted-insert (arg)
"Read next input character and insert it.
Useful for inserting control characters and non-ASCII characters given their
numerical code.
You may also type octal digits, to insert a character with that code."
(interactive "p")
(hexl-insert-multibyte-char (read-quoted-char) arg))
;00000000: 0011 2233 4455 6677 8899 aabb ccdd eeff 0123456789ABCDEF
(defun hexl-options (&optional test)
(let ((opts (or test hexl-options)))
(when (memq hexl-bits '(8 16 32 64))
(when (string-match "\\(.*\\)-group-by-[0-9]+-bits\\(.*\\)" opts)
(setq opts (concat (match-string 1 opts)
(match-string 2 opts))) )
(setq opts (format "%s -group-by-%d-bits " opts hexl-bits)) )
opts))
;;;###autoload
(defun hexlify-buffer ()
"Convert a binary buffer to hexl format.
This discards the buffer's undo information."
(interactive)
(and (consp buffer-undo-list)
(or (y-or-n-p "Converting to hexl format discards undo info; ok? ")
(error "Aborted"))
(setq buffer-undo-list nil))
;; Don't decode text in the ASCII part of `hexl' program output.
(let ((coding-system-for-read 'raw-text)
(coding-system-for-write buffer-file-coding-system)
(buffer-undo-list t))
(apply 'call-process-region (point-min) (point-max)
(expand-file-name hexl-program exec-directory)
t t nil
;; Manually encode the args, otherwise they're encoded using
;; coding-system-for-write (i.e. buffer-file-coding-system) which
;; may not be what we want (e.g. utf-16 on a non-utf-16 system).
(mapcar (lambda (s)
(if (not (multibyte-string-p s)) s
(encode-coding-string s locale-coding-system)))
(split-string (hexl-options))))
(if (> (point) (hexl-address-to-marker hexl-max-address))
(hexl-goto-address hexl-max-address))))
(defun dehexlify-buffer ()
"Convert a hexl format buffer to binary.
This discards the buffer's undo information."
(interactive)
(and (consp buffer-undo-list)
(or (y-or-n-p "Converting from hexl format discards undo info; ok? ")
(error "Aborted"))
(setq buffer-undo-list nil))
(let ((coding-system-for-write 'raw-text)
(coding-system-for-read buffer-file-coding-system)
(buffer-undo-list t))
(apply 'call-process-region (point-min) (point-max)
(expand-file-name hexl-program exec-directory)
t t nil "-de" (split-string (hexl-options)))))
(defun hexl-char-after-point ()
"Return char for ASCII hex digits at point."
(hexl-htoi (char-after (point))
(char-after (1+ (point)))))
(defun hexl-htoi (lh rh)
"Hex (char) LH (char) RH to integer."
(+ (* (hexl-hex-char-to-integer lh) 16)
(hexl-hex-char-to-integer rh)))
(defun hexl-hex-char-to-integer (character)
"Take a char and return its value as if it was a hex digit."
(if (and (>= character ?0) (<= character ?9))
(- character ?0)
(let ((ch (logior character 32)))
(if (and (>= ch ?a) (<= ch ?f))
(- ch (- ?a 10))
(error "Invalid hex digit `%c'" ch)))))
(defun hexl-oct-char-to-integer (character)
"Take a char and return its value as if it was a octal digit."
(if (and (>= character ?0) (<= character ?7))
(- character ?0)
(error "Invalid octal digit `%c'" character)))
(defun hexl-printable-character (ch)
"Return a displayable string for character CH."
(format "%c" (if hexl-iso
(if (or (< ch 32) (and (>= ch 127) (< ch 160)))
46
ch)
(if (or (< ch 32) (>= ch 127))
46
ch))))
(defun hexl-insert-multibyte-char (ch num)
"Insert a possibly multibyte character CH NUM times.
Non-ASCII characters are first encoded with `buffer-file-coding-system',
and their encoded form is inserted byte by byte."
(let ((charset (char-charset ch))
(coding (if (or (null buffer-file-coding-system)
;; coding-system-type equals t means undecided.
(eq (coding-system-type buffer-file-coding-system) t))
default-buffer-file-coding-system
buffer-file-coding-system)))
(cond ((and (> ch 0) (< ch 256))
(hexl-insert-char ch num))
((eq charset 'unknown)
(error
"0x%x -- invalid character code; use \\[hexl-insert-hex-string]"
ch))
(t
(let ((encoded (encode-coding-char ch coding))
(internal (string-as-unibyte (char-to-string ch)))
internal-hex)
;; If encode-coding-char returns nil, it means our character
;; cannot be safely encoded with buffer-file-coding-system.
;; In that case, we offer to insert the internal representation
;; of that character, byte by byte.
(when (null encoded)
(setq internal-hex
(mapconcat (function (lambda (c) (format "%x" c)))
internal " "))
(if (yes-or-no-p
(format
"Insert char 0x%x's internal representation \"%s\"? "
ch internal-hex))
(setq encoded internal)
(error
"Can't encode `0x%x' with this buffer's coding system; try \\[hexl-insert-hex-string]"
ch)))
(while (> num 0)
(mapc
(function (lambda (c) (hexl-insert-char c 1))) encoded)
(setq num (1- num))))))))
(defun hexl-self-insert-command (arg)
"Insert this character.
Interactively, with a numeric argument, insert this character that many times.
Non-ASCII characters are first encoded with `buffer-file-coding-system',
and their encoded form is inserted byte by byte."
(interactive "p")
(hexl-insert-multibyte-char last-command-event arg))
(defun hexl-insert-char (ch num)
"Insert the character CH NUM times in a hexl buffer.
CH must be a unibyte character whose value is between 0 and 255."
(if (or (< ch 0) (> ch 255))
(error "Invalid character 0x%x -- must be in the range [0..255]" ch))
(let ((address (hexl-current-address t)))
(while (> num 0)
(let ((hex-position
(+ (* (/ address 16) (hexl-line-displen))
10 (point-min)
(* 2 (% address 16))
(/ (% address 16) 2)))
(ascii-position
(+ (* (/ address 16) (hexl-line-displen))
(hexl-ascii-start-column)
(point-min)
(% address 16)))
at-ascii-position)
(if (= (point) ascii-position)
(setq at-ascii-position t))
(goto-char hex-position)
(delete-char 2)
(insert (format "%02x" ch))
(goto-char ascii-position)
(delete-char 1)
(insert (hexl-printable-character ch))
(or (eq address hexl-max-address)
(setq address (1+ address)))
(hexl-goto-address address)
(if at-ascii-position
(progn
(beginning-of-line)
(forward-char (hexl-ascii-start-column))
(forward-char (% address 16)))))
(setq num (1- num)))))
;; hex conversion
(defun hexl-insert-hex-char (arg)
"Insert a character given by its hexadecimal code ARG times at point."
(interactive "p")
(let ((num (hexl-hex-string-to-integer (read-string "Hex number: "))))
(if (< num 0)
(error "Hex number out of range")
(hexl-insert-multibyte-char num arg))))
(defun hexl-insert-hex-string (str arg)
"Insert hexadecimal string STR at point ARG times.
Embedded whitespace, dashes, and periods in the string are ignored."
(interactive "sHex string: \np")
(setq str (replace-regexp-in-string "[- \t.]" "" str))
(let ((chars '()))
(let ((len (length str))
(idx 0))
(if (eq (logand len 1) 1)
(let ((num (hexl-hex-string-to-integer (substring str 0 1))))
(setq chars (cons num chars))
(setq idx 1)))
(while (< idx len)
(let* ((nidx (+ idx 2))
(num (hexl-hex-string-to-integer (substring str idx nidx))))
(setq chars (cons num chars))
(setq idx nidx))))
(setq chars (nreverse chars))
(while (> arg 0)
(let ((chars chars))
(while chars
(hexl-insert-char (car chars) 1)
(setq chars (cdr chars))))
(setq arg (- arg 1)))))
(defun hexl-insert-decimal-char (arg)
"Insert a character given by its decimal code ARG times at point."
(interactive "p")
(let ((num (string-to-number (read-string "Decimal Number: "))))
(if (< num 0)
(error "Decimal number out of range")
(hexl-insert-multibyte-char num arg))))
(defun hexl-insert-octal-char (arg)
"Insert a character given by its octal code ARG times at point."
(interactive "p")
(let ((num (hexl-octal-string-to-integer (read-string "Octal Number: "))))
(if (< num 0)
(error "Decimal number out of range")
(hexl-insert-multibyte-char num arg))))
(defun hexl-follow-ascii (&optional arg)
"Toggle following ASCII in Hexl buffers.
With prefix ARG, turn on following if and only if ARG is positive.
When following is enabled, the ASCII character corresponding to the
element under the point is highlighted.
Customize the variable `hexl-follow-ascii' to disable this feature."
(interactive "P")
(let ((on-p (if arg
(> (prefix-numeric-value arg) 0)
(not hexl-ascii-overlay))))
(if on-p
;; turn it on
(if (not hexl-ascii-overlay)
(progn
(setq hexl-ascii-overlay (make-overlay 1 1)
hexl-follow-ascii t)
(overlay-put hexl-ascii-overlay 'face 'highlight)
(add-hook 'post-command-hook 'hexl-follow-ascii-find nil t)))
;; turn it off
(if hexl-ascii-overlay
(progn
(delete-overlay hexl-ascii-overlay)
(setq hexl-ascii-overlay nil
hexl-follow-ascii nil)
(remove-hook 'post-command-hook 'hexl-follow-ascii-find t)
)))))
(defun hexl-activate-ruler ()
"Activate `ruler-mode'."
(require 'ruler-mode)
(unless (boundp 'hexl-mode-old-ruler-function)
(set (make-local-variable 'hexl-mode-old-ruler-function)
ruler-mode-ruler-function))
(set (make-local-variable 'ruler-mode-ruler-function)
'hexl-mode-ruler)
(ruler-mode 1))
(defun hexl-follow-line ()
"Activate `hl-line-mode'."
(require 'hl-line)
(unless (boundp 'hexl-mode-old-hl-line-range-function)
(set (make-local-variable 'hexl-mode-old-hl-line-range-function)
hl-line-range-function))
(unless (boundp 'hexl-mode-old-hl-line-face)
(set (make-local-variable 'hexl-mode-old-hl-line-face)
hl-line-face))
(set (make-local-variable 'hl-line-range-function)
'hexl-highlight-line-range)
(set (make-local-variable 'hl-line-face)
'highlight)
(hl-line-mode 1))
(defun hexl-highlight-line-range ()
"Return the range of address region for the point.
This function is assumed to be used as callback function for `hl-line-mode'."
(cons
(line-beginning-position)
;; 9 stands for (length "87654321:")
(+ (line-beginning-position) 9)))
(defun hexl-follow-ascii-find ()
"Find and highlight the ASCII element corresponding to current point."
(let ((pos (+ (hexl-ascii-start-column)
(- (point) (current-column))
(mod (hexl-current-address) 16))))
(move-overlay hexl-ascii-overlay pos (1+ pos))
))
(defun hexl-mode-ruler ()
"Return a string ruler for hexl mode."
(let* ((highlight (mod (hexl-current-address) 16))
(s " 87654321 0011 2233 4455 6677 8899 aabb ccdd eeff 0123456789abcdef")
(pos 0))
(set-text-properties 0 (length s) nil s)
;; Turn spaces in the header into stretch specs so they work
;; regardless of the header-line face.
(while (string-match "[ \t]+" s pos)
(setq pos (match-end 0))
(put-text-property (match-beginning 0) pos 'display
;; Assume fixed-size chars
`(space :align-to ,(1- pos))
s))
;; Highlight the current column.
(put-text-property (+ 11 (/ (* 5 highlight) 2))
(+ 13 (/ (* 5 highlight) 2))
'face 'highlight s)
;; Highlight the current ascii column
(put-text-property (+ 13 39 highlight) (+ 13 40 highlight)
'face 'highlight s)
s))
;; startup stuff.
(if hexl-mode-map
nil
(setq hexl-mode-map (make-keymap))
;; Make all self-inserting keys go through hexl-self-insert-command,
;; because we need to convert them to unibyte characters before
;; inserting them into the buffer.
(define-key hexl-mode-map [remap self-insert-command] 'hexl-self-insert-command)
(define-key hexl-mode-map "\C-m" 'hexl-self-insert-command)
(define-key hexl-mode-map [left] 'hexl-backward-char)
(define-key hexl-mode-map [right] 'hexl-forward-char)
(define-key hexl-mode-map [up] 'hexl-previous-line)
(define-key hexl-mode-map [down] 'hexl-next-line)
(define-key hexl-mode-map [M-left] 'hexl-backward-short)
(define-key hexl-mode-map [?\e left] 'hexl-backward-short)
(define-key hexl-mode-map [M-right] 'hexl-forward-short)
(define-key hexl-mode-map [?\e right] 'hexl-forward-short)
(define-key hexl-mode-map [next] 'hexl-scroll-up)
(define-key hexl-mode-map [prior] 'hexl-scroll-down)
(define-key hexl-mode-map [home] 'hexl-beginning-of-line)
(define-key hexl-mode-map [end] 'hexl-end-of-line)
(define-key hexl-mode-map [C-home] 'hexl-beginning-of-buffer)
(define-key hexl-mode-map [C-end] 'hexl-end-of-buffer)
(define-key hexl-mode-map [deletechar] 'undefined)
(define-key hexl-mode-map [deleteline] 'undefined)
(define-key hexl-mode-map [insertline] 'undefined)
(define-key hexl-mode-map [S-delete] 'undefined)
(define-key hexl-mode-map "\177" 'undefined)
(define-key hexl-mode-map "\C-a" 'hexl-beginning-of-line)
(define-key hexl-mode-map "\C-b" 'hexl-backward-char)
(define-key hexl-mode-map "\C-d" 'undefined)
(define-key hexl-mode-map "\C-e" 'hexl-end-of-line)
(define-key hexl-mode-map "\C-f" 'hexl-forward-char)
(if (not (memq (key-binding (char-to-string help-char))
'(help-command ehelp-command)))
(define-key hexl-mode-map (char-to-string help-char) 'undefined))
(define-key hexl-mode-map "\C-k" 'undefined)
(define-key hexl-mode-map "\C-n" 'hexl-next-line)
(define-key hexl-mode-map "\C-o" 'undefined)
(define-key hexl-mode-map "\C-p" 'hexl-previous-line)
(define-key hexl-mode-map "\C-q" 'hexl-quoted-insert)
(define-key hexl-mode-map "\C-t" 'undefined)
(define-key hexl-mode-map "\C-v" 'hexl-scroll-up)
(define-key hexl-mode-map "\C-w" 'undefined)
(define-key hexl-mode-map "\C-y" 'undefined)
(fset 'hexl-ESC-prefix (copy-keymap 'ESC-prefix))
(define-key hexl-mode-map "\e" 'hexl-ESC-prefix)
(define-key hexl-mode-map "\e\C-a" 'hexl-beginning-of-512b-page)
(define-key hexl-mode-map "\e\C-b" 'hexl-backward-short)
(define-key hexl-mode-map "\e\C-d" 'hexl-insert-decimal-char)
(define-key hexl-mode-map "\e\C-e" 'hexl-end-of-512b-page)
(define-key hexl-mode-map "\e\C-f" 'hexl-forward-short)
(define-key hexl-mode-map "\e\C-i" 'undefined)
(define-key hexl-mode-map "\e\C-j" 'undefined)
(define-key hexl-mode-map "\e\C-k" 'undefined)
(define-key hexl-mode-map "\e\C-o" 'hexl-insert-octal-char)
(define-key hexl-mode-map "\e\C-q" 'undefined)
(define-key hexl-mode-map "\e\C-t" 'undefined)
(define-key hexl-mode-map "\e\C-x" 'hexl-insert-hex-char)
(define-key hexl-mode-map "\eb" 'hexl-backward-word)
(define-key hexl-mode-map "\ec" 'undefined)
(define-key hexl-mode-map "\ed" 'undefined)
(define-key hexl-mode-map "\ef" 'hexl-forward-word)
(define-key hexl-mode-map "\eg" 'hexl-goto-hex-address)
(define-key hexl-mode-map "\ei" 'undefined)
(define-key hexl-mode-map "\ej" 'hexl-goto-address)
(define-key hexl-mode-map "\ek" 'undefined)
(define-key hexl-mode-map "\el" 'undefined)
(define-key hexl-mode-map "\eq" 'undefined)
(define-key hexl-mode-map "\es" 'undefined)
(define-key hexl-mode-map "\et" 'undefined)
(define-key hexl-mode-map "\eu" 'undefined)
(define-key hexl-mode-map "\ev" 'hexl-scroll-down)
(define-key hexl-mode-map "\ey" 'undefined)
(define-key hexl-mode-map "\ez" 'undefined)
(define-key hexl-mode-map "\e<" 'hexl-beginning-of-buffer)
(define-key hexl-mode-map "\e>" 'hexl-end-of-buffer)
(fset 'hexl-C-c-prefix (copy-keymap mode-specific-map))
(define-key hexl-mode-map "\C-c" 'hexl-C-c-prefix)
(define-key hexl-mode-map "\C-c\C-c" 'hexl-mode-exit)
(fset 'hexl-C-x-prefix (copy-keymap 'Control-X-prefix))
(define-key hexl-mode-map "\C-x" 'hexl-C-x-prefix)
(define-key hexl-mode-map "\C-x[" 'hexl-beginning-of-1k-page)
(define-key hexl-mode-map "\C-x]" 'hexl-end-of-1k-page)
(define-key hexl-mode-map "\C-x\C-p" 'undefined)
(define-key hexl-mode-map "\C-x\C-s" 'hexl-save-buffer)
(define-key hexl-mode-map "\C-x\C-t" 'undefined))
(easy-menu-define hexl-menu hexl-mode-map "Hexl Mode menu"
`("Hexl"
:help "Hexl-specific Features"
["Backward short" hexl-backward-short
:help "Move to left a short"]
["Forward short" hexl-forward-short
:help "Move to right a short"]
["Backward word" hexl-backward-short
:help "Move to left a word"]
["Forward word" hexl-forward-short
:help "Move to right a word"]
"-"
["Beginning of 512b page" hexl-beginning-of-512b-page
:help "Go to beginning of 512 byte boundary"]
["End of 512b page" hexl-end-of-512b-page
:help "Go to end of 512 byte boundary"]
["Beginning of 1K page" hexl-beginning-of-1k-page
:help "Go to beginning of 1KB boundary"]
["End of 1K page" hexl-end-of-1k-page
:help "Go to end of 1KB boundary"]
"-"
["Go to address" hexl-goto-address
:help "Go to hexl-mode (decimal) address"]
["Go to address" hexl-goto-hex-address
:help "Go to hexl-mode (hex string) address"]
"-"
["Insert decimal char" hexl-insert-decimal-char
:help "Insert a character given by its decimal code"]
["Insert hex char" hexl-insert-hex-char
:help "Insert a character given by its hexadecimal code"]
["Insert octal char" hexl-insert-octal-char
:help "Insert a character given by its octal code"]
"-"
["Exit hexl mode" hexl-mode-exit
:help "Exit hexl mode returning to previous mode"]))
(provide 'hexl)
;; arch-tag: d5a7aa8a-9bce-480b-bcff-6c4c7ca5ea4a
;;; hexl.el ends here
[-- Attachment #3: Type: TEXT/x-diff, Size: 9361 bytes --]
--- hexl.orig.el 2009-02-07 00:40:49.000000000 +0000
+++ hexl.el 2009-02-07 01:08:55.000000000 +0000
@@ -51,6 +51,13 @@
"Edit a file in a hex dump format using the hexl filter."
:group 'data)
+(defcustom hexl-bits 16
+ "The bit grouping that hexl will use"
+ :type '(choice (const 8 )
+ (const 16)
+ (const 32)
+ (const 64))
+ :group 'hexl)
(defcustom hexl-program "hexl"
"The program that will hexlify and dehexlify its stdin.
@@ -135,6 +142,15 @@
(put 'hexl-mode 'mode-class 'special)
+;; 10 chars for the "address: "
+;; 32 chars for the hexlified bytes
+;; 1 char for the space
+;; 16 chars for the character display
+;; X chars for the spaces (128 bits divided by the hexl-bits)
+;; 1 char for the newline.
+(defun hexl-line-displen ()
+ (+ 60 (/ 128 (or hexl-bits 16))))
+
;;;###autoload
(defun hexl-mode (&optional arg)
"\\<hexl-mode-map>A mode for editing binary files in hex dump format.
@@ -213,27 +229,33 @@
(unless (eq major-mode 'hexl-mode)
(let ((modified (buffer-modified-p))
(inhibit-read-only t)
- (original-point (- (point) (point-min))))
+ (original-point (- (point) (point-min)))
+ max-address)
(and (eobp) (not (bobp))
(setq original-point (1- original-point)))
- ;; If `hexl-mode' is invoked with an argument the buffer is assumed to
- ;; be in hexl format.
- (when (memq arg '(1 nil))
+ (if (not (memq arg '(1 nil)))
+ ;; if no argument then we guess at hexl-max-address
+ (setq max-address
+ (+ (* (/ (1- (buffer-size)) (hexl-line-displen)) 16) 15))
+ (setq max-address (1- (buffer-size)))
;; If the buffer's EOL type is -dos, we need to account for
;; extra CR characters added when hexlify-buffer writes the
;; buffer to a file.
;; FIXME: This doesn't take into account multibyte coding systems.
(when (eq (coding-system-eol-type buffer-file-coding-system) 1)
- (setq original-point (+ (count-lines (point-min) (point))
+ (setq max-address (+ (count-lines (point-min) (point-max))
+ max-address))
+ ;; But if there's no newline at the last line, we are off by
+ ;; one; adjust.
+ (or (eq (char-before (point-max)) ?\n)
+ (setq max-address (1- max-address)))
+ (setq original-point (+ (count-lines (point-min) (point))
original-point))
(or (bolp) (setq original-point (1- original-point))))
(hexlify-buffer)
(restore-buffer-modified-p modified))
- (set (make-local-variable 'hexl-max-address)
- (let* ((full-lines (/ (buffer-size) 68))
- (last-line (% (buffer-size) 68))
- (last-line-bytes (% last-line 52)))
- (+ last-line-bytes (* full-lines 16) -1)))
+ (make-local-variable 'hexl-max-address)
+ (setq hexl-max-address max-address)
(condition-case nil
(hexl-goto-address original-point)
(error nil)))
@@ -436,19 +458,23 @@
(defun hexl-current-address (&optional validate)
"Return current hexl-address."
(interactive)
- (let ((current-column (- (% (- (point) (point-min) -1) 68) 11))
+ (let ((current-column
+ (- (% (- (point) (point-min) -1) (hexl-line-displen)) 11))
(hexl-address 0))
(if (< current-column 0)
(if validate
(error "Point is not on a character in the file")
(setq current-column 0)))
(setq hexl-address
- (+ (* (/ (- (point) (point-min) -1) 68) 16)
- (if (>= current-column 41)
- (- current-column 41)
- (/ (- current-column (/ current-column 5)) 2))))
+ (+ (* (/ (- (point) (point-min) -1)
+ (hexl-line-displen)) 16)
+ (if (>= current-column (- (hexl-ascii-start-column) 10))
+ (- current-column (- (hexl-ascii-start-column) 10))
+ (/ (- current-column
+ (/ current-column (1+ (/ hexl-bits 4)))) 2) )) )
(when (interactive-p)
- (message "Current address is %d/0x%08x" hexl-address hexl-address))
+ (message "Current address is [column: %d] %d/0x%08x"
+ current-column hexl-address hexl-address))
hexl-address))
(defun hexl-print-current-point-info ()
@@ -457,10 +483,18 @@
(let ((addr (hexl-current-address)))
(format "Current address is %d/0x%08x" addr addr)))
+(defun hexl-ascii-start-column ()
+ "Column at which the ascii display starts."
+ (+ 43 (/ 128 hexl-bits)))
+
(defun hexl-address-to-marker (address)
"Return buffer position for ADDRESS."
(interactive "nAddress: ")
- (+ (* (/ address 16) 68) 10 (point-min) (/ (* (% address 16) 5) 2)))
+ (let ((N (* (% address 16) 2)))
+ (+ (* (/ address 16) (hexl-line-displen)) ; hexl line no * display length
+ 10 ; 10 chars for the "address: " prefix
+ (point-min) ; base offset (point usually starts at 1, not 0)
+ (+ N (/ N (/ hexl-bits 4))) )) ) ; char offset into hexl display line
(defun hexl-goto-address (address)
"Go to hexl-mode (decimal) address ADDRESS.
@@ -505,7 +539,7 @@
(hexl-goto-address (- (hexl-current-address) arg)))
(defun hexl-forward-char (arg)
- "Move to right ARG bytes (left if ARG negative) in hexl-mode."
+ "Move right ARG bytes (left if ARG negative) in hexl-mode."
(interactive "p")
(hexl-goto-address (+ (hexl-current-address) arg)))
@@ -544,7 +578,7 @@
address)))
(defun hexl-forward-short (arg)
- "Move to right ARG shorts (left if ARG negative) in hexl-mode."
+ "Move right ARG shorts (left if ARG negative) in hexl-mode."
(interactive "p")
(hexl-backward-short (- arg)))
@@ -583,7 +617,7 @@
address)))
(defun hexl-forward-word (arg)
- "Move to right ARG words (left if ARG negative) in hexl-mode."
+ "Move right ARG words (left if ARG negative) in hexl-mode."
(interactive "p")
(hexl-backward-word (- arg)))
@@ -630,7 +664,7 @@
(defun hexl-beginning-of-line ()
"Goto beginning of line in hexl mode."
(interactive)
- (goto-char (+ (* (/ (point) 68) 68) 11)))
+ (goto-char (+ (* (/ (point) (hexl-line-displen)) (hexl-line-displen)) 11)))
(defun hexl-end-of-line ()
"Goto end of line in hexl mode."
@@ -675,12 +709,12 @@
(recenter 0)))
(defun hexl-beginning-of-1k-page ()
- "Go to beginning of 1KB boundary."
+ "Go to the beginning of the current 1kiB block"
(interactive)
(hexl-goto-address (logand (hexl-current-address) -1024)))
(defun hexl-end-of-1k-page ()
- "Go to end of 1KB boundary."
+ "Go to the end of the current 1kiB block."
(interactive)
(hexl-goto-address (let ((address (logior (hexl-current-address) 1023)))
(if (> address hexl-max-address)
@@ -710,6 +744,15 @@
;00000000: 0011 2233 4455 6677 8899 aabb ccdd eeff 0123456789ABCDEF
+(defun hexl-options (&optional test)
+ (let ((opts (or test hexl-options)))
+ (when (memq hexl-bits '(8 16 32 64))
+ (when (string-match "\\(.*\\)-group-by-[0-9]+-bits\\(.*\\)" opts)
+ (setq opts (concat (match-string 1 opts)
+ (match-string 2 opts))) )
+ (setq opts (format "%s -group-by-%d-bits " opts hexl-bits)) )
+ opts))
+
;;;###autoload
(defun hexlify-buffer ()
"Convert a binary buffer to hexl format.
@@ -732,7 +775,7 @@
(mapcar (lambda (s)
(if (not (multibyte-string-p s)) s
(encode-coding-string s locale-coding-system)))
- (split-string hexl-options)))
+ (split-string (hexl-options))))
(if (> (point) (hexl-address-to-marker hexl-max-address))
(hexl-goto-address hexl-max-address))))
@@ -749,7 +792,7 @@
(buffer-undo-list t))
(apply 'call-process-region (point-min) (point-max)
(expand-file-name hexl-program exec-directory)
- t t nil "-de" (split-string hexl-options))))
+ t t nil "-de" (split-string (hexl-options)))))
(defun hexl-char-after-point ()
"Return char for ASCII hex digits at point."
@@ -846,12 +889,15 @@
(let ((address (hexl-current-address t)))
(while (> num 0)
(let ((hex-position
- (+ (* (/ address 16) 68)
+ (+ (* (/ address 16) (hexl-line-displen))
10 (point-min)
(* 2 (% address 16))
(/ (% address 16) 2)))
(ascii-position
- (+ (* (/ address 16) 68) 51 (point-min) (% address 16)))
+ (+ (* (/ address 16) (hexl-line-displen))
+ (hexl-ascii-start-column)
+ (point-min)
+ (% address 16)))
at-ascii-position)
(if (= (point) ascii-position)
(setq at-ascii-position t))
@@ -867,7 +913,7 @@
(if at-ascii-position
(progn
(beginning-of-line)
- (forward-char 51)
+ (forward-char (hexl-ascii-start-column))
(forward-char (% address 16)))))
(setq num (1- num)))))
@@ -985,7 +1031,7 @@
(defun hexl-follow-ascii-find ()
"Find and highlight the ASCII element corresponding to current point."
- (let ((pos (+ 51
+ (let ((pos (+ (hexl-ascii-start-column)
(- (point) (current-column))
(mod (hexl-current-address) 16))))
(move-overlay hexl-ascii-overlay pos (1+ pos))
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: hexl mode update
[not found] ` <jwvocrkc9hs.fsf-monnier+emacs@gnu.org>
@ 2009-07-21 0:44 ` Vivek Dasmohapatra
2009-11-18 0:52 ` hexl mode update (variable word size for hexl mode) Vivek Dasmohapatra
0 siblings, 1 reply; 4+ messages in thread
From: Vivek Dasmohapatra @ 2009-07-21 0:44 UTC (permalink / raw)
To: emacs-devel
[-- Attachment #1: Type: TEXT/PLAIN, Size: 1183 bytes --]
On Thu, 16 Jul 2009, Stefan Monnier wrote:
>>> Now would be a good time to submit it,
>> Ok. Is there any particular branch/repo/etc you'd like a patch against?
>
> CVS trunk. Note that I haven't looked at your code yet. Please send it
> to emacs-devel@gnu.org.
Here it is. The user can select the "word size" hexl will use with defcustom
(it currently screws up if you change this size behind hexl's back, ie
after hexlifying a buffer but before unhexlifying it: this could be fixed
by saving the word size used in a a local variable in the hexl buffer,
let me know if you think this is important enough to add). Other than that,
the hexl code doesn't seem to have changed since I last updated the patch
from emacs 22 to emacs 23.
The word-size could also be chosen at invocation time via a prefix arg, but
I have not done this yet either: Again, let me know if you think it's
worth adding.
I originally prepared this patch for a friend who was debugging something
and needed other word sizes: Upon investigation I discovered that the
hexl binary had support for the word sizes 8, 16, 32 and 64 bits but the
hexl mode code only supported one of those - hence this patch.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: TEXT/x-diff; name=hexl.variable-word-size.2009-07-21.patch, Size: 10260 bytes --]
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 2cdd449..0eebe55 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -51,6 +51,13 @@
"Edit a file in a hex dump format using the hexl filter."
:group 'data)
+(defcustom hexl-bits 16
+ "The bit grouping that hexl will use"
+ :type '(choice (const 8 )
+ (const 16)
+ (const 32)
+ (const 64))
+ :group 'hexl)
(defcustom hexl-program "hexl"
"The program that will hexlify and dehexlify its stdin.
@@ -135,6 +142,15 @@ Quoting cannot be used, so the arguments cannot themselves contain spaces."
(put 'hexl-mode 'mode-class 'special)
+;; 10 chars for the "address: "
+;; 32 chars for the hexlified bytes
+;; 1 char for the space
+;; 16 chars for the character display
+;; X chars for the spaces (128 bits divided by the hexl-bits)
+;; 1 char for the newline.
+(defun hexl-line-displen ()
+ (+ 60 (/ 128 (or hexl-bits 16))))
+
;;;###autoload
(defun hexl-mode (&optional arg)
"\\<hexl-mode-map>A mode for editing binary files in hex dump format.
@@ -213,27 +229,33 @@ You can use \\[hexl-find-file] to visit a file in Hexl mode.
(unless (eq major-mode 'hexl-mode)
(let ((modified (buffer-modified-p))
(inhibit-read-only t)
- (original-point (- (point) (point-min))))
+ (original-point (- (point) (point-min)))
+ max-address)
(and (eobp) (not (bobp))
(setq original-point (1- original-point)))
- ;; If `hexl-mode' is invoked with an argument the buffer is assumed to
- ;; be in hexl format.
- (when (memq arg '(1 nil))
+ (if (not (memq arg '(1 nil)))
+ ;; if no argument then we guess at hexl-max-address
+ (setq max-address
+ (+ (* (/ (1- (buffer-size)) (hexl-line-displen)) 16) 15))
+ (setq max-address (1- (buffer-size)))
;; If the buffer's EOL type is -dos, we need to account for
;; extra CR characters added when hexlify-buffer writes the
;; buffer to a file.
;; FIXME: This doesn't take into account multibyte coding systems.
(when (eq (coding-system-eol-type buffer-file-coding-system) 1)
- (setq original-point (+ (count-lines (point-min) (point))
+ (setq max-address (+ (count-lines (point-min) (point-max))
+ max-address))
+ ;; But if there's no newline at the last line, we are off by
+ ;; one; adjust.
+ (or (eq (char-before (point-max)) ?\n)
+ (setq max-address (1- max-address)))
+ (setq original-point (+ (count-lines (point-min) (point))
original-point))
(or (bolp) (setq original-point (1- original-point))))
(hexlify-buffer)
(restore-buffer-modified-p modified))
- (set (make-local-variable 'hexl-max-address)
- (let* ((full-lines (/ (buffer-size) 68))
- (last-line (% (buffer-size) 68))
- (last-line-bytes (% last-line 52)))
- (+ last-line-bytes (* full-lines 16) -1)))
+ (make-local-variable 'hexl-max-address)
+ (setq hexl-max-address max-address)
(condition-case nil
(hexl-goto-address original-point)
(error nil)))
@@ -436,19 +458,23 @@ Ask the user for confirmation."
(defun hexl-current-address (&optional validate)
"Return current hexl-address."
(interactive)
- (let ((current-column (- (% (- (point) (point-min) -1) 68) 11))
+ (let ((current-column
+ (- (% (- (point) (point-min) -1) (hexl-line-displen)) 11))
(hexl-address 0))
(if (< current-column 0)
(if validate
(error "Point is not on a character in the file")
(setq current-column 0)))
(setq hexl-address
- (+ (* (/ (- (point) (point-min) -1) 68) 16)
- (if (>= current-column 41)
- (- current-column 41)
- (/ (- current-column (/ current-column 5)) 2))))
+ (+ (* (/ (- (point) (point-min) -1)
+ (hexl-line-displen)) 16)
+ (if (>= current-column (- (hexl-ascii-start-column) 10))
+ (- current-column (- (hexl-ascii-start-column) 10))
+ (/ (- current-column
+ (/ current-column (1+ (/ hexl-bits 4)))) 2) )) )
(when (interactive-p)
- (message "Current address is %d/0x%08x" hexl-address hexl-address))
+ (message "Current address is [column: %d] %d/0x%08x"
+ current-column hexl-address hexl-address))
hexl-address))
(defun hexl-print-current-point-info ()
@@ -457,10 +483,18 @@ This function is intended to be used as eldoc callback."
(let ((addr (hexl-current-address)))
(format "Current address is %d/0x%08x" addr addr)))
+(defun hexl-ascii-start-column ()
+ "Column at which the ascii display starts."
+ (+ 43 (/ 128 hexl-bits)))
+
(defun hexl-address-to-marker (address)
"Return buffer position for ADDRESS."
(interactive "nAddress: ")
- (+ (* (/ address 16) 68) 10 (point-min) (/ (* (% address 16) 5) 2)))
+ (let ((N (* (% address 16) 2)))
+ (+ (* (/ address 16) (hexl-line-displen)) ; hexl line no * display length
+ 10 ; 10 chars for the "address: " prefix
+ (point-min) ; base offset (point usually starts at 1, not 0)
+ (+ N (/ N (/ hexl-bits 4))) )) ) ; char offset into hexl display line
(defun hexl-goto-address (address)
"Go to hexl-mode (decimal) address ADDRESS.
@@ -505,7 +539,7 @@ Signal error if HEX-ADDRESS is out of range."
(hexl-goto-address (- (hexl-current-address) arg)))
(defun hexl-forward-char (arg)
- "Move to right ARG bytes (left if ARG negative) in hexl-mode."
+ "Move right ARG bytes (left if ARG negative) in hexl-mode."
(interactive "p")
(hexl-goto-address (+ (hexl-current-address) arg)))
@@ -544,7 +578,7 @@ Signal error if HEX-ADDRESS is out of range."
address)))
(defun hexl-forward-short (arg)
- "Move to right ARG shorts (left if ARG negative) in hexl-mode."
+ "Move right ARG shorts (left if ARG negative) in hexl-mode."
(interactive "p")
(hexl-backward-short (- arg)))
@@ -583,7 +617,7 @@ Signal error if HEX-ADDRESS is out of range."
address)))
(defun hexl-forward-word (arg)
- "Move to right ARG words (left if ARG negative) in hexl-mode."
+ "Move right ARG words (left if ARG negative) in hexl-mode."
(interactive "p")
(hexl-backward-word (- arg)))
@@ -630,7 +664,7 @@ With prefix arg N, puts point N bytes of the way from the true beginning."
(defun hexl-beginning-of-line ()
"Goto beginning of line in hexl mode."
(interactive)
- (goto-char (+ (* (/ (point) 68) 68) 11)))
+ (goto-char (+ (* (/ (point) (hexl-line-displen)) (hexl-line-displen)) 11)))
(defun hexl-end-of-line ()
"Goto end of line in hexl mode."
@@ -675,12 +709,12 @@ If there's no byte at the target address, move to the first or last line."
(recenter 0)))
(defun hexl-beginning-of-1k-page ()
- "Go to beginning of 1KB boundary."
+ "Go to the beginning of the current 1 KiB block"
(interactive)
(hexl-goto-address (logand (hexl-current-address) -1024)))
(defun hexl-end-of-1k-page ()
- "Go to end of 1KB boundary."
+ "Go to the end of the current 1 KiB block."
(interactive)
(hexl-goto-address (let ((address (logior (hexl-current-address) 1023)))
(if (> address hexl-max-address)
@@ -710,6 +744,15 @@ You may also type octal digits, to insert a character with that code."
;00000000: 0011 2233 4455 6677 8899 aabb ccdd eeff 0123456789ABCDEF
+(defun hexl-options (&optional test)
+ (let ((opts (or test hexl-options)))
+ (when (memq hexl-bits '(8 16 32 64))
+ (when (string-match "\\(.*\\)-group-by-[0-9]+-bits\\(.*\\)" opts)
+ (setq opts (concat (match-string 1 opts)
+ (match-string 2 opts))) )
+ (setq opts (format "%s -group-by-%d-bits " opts hexl-bits)) )
+ opts))
+
;;;###autoload
(defun hexlify-buffer ()
"Convert a binary buffer to hexl format.
@@ -732,7 +775,7 @@ This discards the buffer's undo information."
(mapcar (lambda (s)
(if (not (multibyte-string-p s)) s
(encode-coding-string s locale-coding-system)))
- (split-string hexl-options)))
+ (split-string (hexl-options))))
(if (> (point) (hexl-address-to-marker hexl-max-address))
(hexl-goto-address hexl-max-address))))
@@ -749,7 +792,7 @@ This discards the buffer's undo information."
(buffer-undo-list t))
(apply 'call-process-region (point-min) (point-max)
(expand-file-name hexl-program exec-directory)
- t t nil "-de" (split-string hexl-options))))
+ t t nil "-de" (split-string (hexl-options)))))
(defun hexl-char-after-point ()
"Return char for ASCII hex digits at point."
@@ -846,12 +889,15 @@ CH must be a unibyte character whose value is between 0 and 255."
(let ((address (hexl-current-address t)))
(while (> num 0)
(let ((hex-position
- (+ (* (/ address 16) 68)
+ (+ (* (/ address 16) (hexl-line-displen))
10 (point-min)
(* 2 (% address 16))
(/ (% address 16) 2)))
(ascii-position
- (+ (* (/ address 16) 68) 51 (point-min) (% address 16)))
+ (+ (* (/ address 16) (hexl-line-displen))
+ (hexl-ascii-start-column)
+ (point-min)
+ (% address 16)))
at-ascii-position)
(if (= (point) ascii-position)
(setq at-ascii-position t))
@@ -867,7 +913,7 @@ CH must be a unibyte character whose value is between 0 and 255."
(if at-ascii-position
(progn
(beginning-of-line)
- (forward-char 51)
+ (forward-char (hexl-ascii-start-column))
(forward-char (% address 16)))))
(setq num (1- num)))))
@@ -985,7 +1031,7 @@ This function is assumed to be used as callback function for `hl-line-mode'."
(defun hexl-follow-ascii-find ()
"Find and highlight the ASCII element corresponding to current point."
- (let ((pos (+ 51
+ (let ((pos (+ (hexl-ascii-start-column)
(- (point) (current-column))
(mod (hexl-current-address) 16))))
(move-overlay hexl-ascii-overlay pos (1+ pos))
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: hexl mode update (variable word size for hexl mode)
2009-07-21 0:44 ` Vivek Dasmohapatra
@ 2009-11-18 0:52 ` Vivek Dasmohapatra
2009-11-18 1:35 ` Glenn Morris
0 siblings, 1 reply; 4+ messages in thread
From: Vivek Dasmohapatra @ 2009-11-18 0:52 UTC (permalink / raw)
To: emacs-devel
[-- Attachment #1: Type: TEXT/PLAIN, Size: 968 bytes --]
There was no response to this last time, so I'm re-posting it:
The user can select the "word size" hexl will use with defcustom (it
currently screws up if you change this size behind hexl's back, ie after
hexlifying a buffer but before unhexlifying it: this could be fixed by
saving the word size used in a a local variable in the hexl buffer, let
me know if you think this is important enough to add). Other than that,
the hexl code doesn't seem to have changed since I last updated the patch
from emacs 22 to emacs 23.
The word-size could also be chosen at invocation time via a prefix arg, but I
have not done this yet either: Again, let me know if you think it's
worth adding.
I originally prepared this patch for a friend who was debugging something and
needed other word sizes: Upon investigation I discovered that the
hexl binary had support for the word sizes 8, 16, 32 and 64 bits but the
hexl mode code only supported one of those - hence this patch.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: TEXT/x-diff; name=hexl.variable-word-size.2009-07-21.patch, Size: 10509 bytes --]
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 2cdd449..0eebe55 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -51,6 +51,13 @@
"Edit a file in a hex dump format using the hexl filter."
:group 'data)
+(defcustom hexl-bits 16
+ "The bit grouping that hexl will use"
+ :type '(choice (const 8 )
+ (const 16)
+ (const 32)
+ (const 64))
+ :group 'hexl)
(defcustom hexl-program "hexl"
"The program that will hexlify and dehexlify its stdin.
@@ -135,6 +142,15 @@ Quoting cannot be used, so the arguments cannot themselves contain spaces."
(put 'hexl-mode 'mode-class 'special)
+;; 10 chars for the "address: "
+;; 32 chars for the hexlified bytes
+;; 1 char for the space
+;; 16 chars for the character display
+;; X chars for the spaces (128 bits divided by the hexl-bits)
+;; 1 char for the newline.
+(defun hexl-line-displen ()
+ (+ 60 (/ 128 (or hexl-bits 16))))
+
;;;###autoload
(defun hexl-mode (&optional arg)
"\\<hexl-mode-map>A mode for editing binary files in hex dump format.
@@ -213,27 +229,33 @@ You can use \\[hexl-find-file] to visit a file in Hexl mode.
(unless (eq major-mode 'hexl-mode)
(let ((modified (buffer-modified-p))
(inhibit-read-only t)
- (original-point (- (point) (point-min))))
+ (original-point (- (point) (point-min)))
+ max-address)
(and (eobp) (not (bobp))
(setq original-point (1- original-point)))
- ;; If `hexl-mode' is invoked with an argument the buffer is assumed to
- ;; be in hexl format.
- (when (memq arg '(1 nil))
+ (if (not (memq arg '(1 nil)))
+ ;; if no argument then we guess at hexl-max-address
+ (setq max-address
+ (+ (* (/ (1- (buffer-size)) (hexl-line-displen)) 16) 15))
+ (setq max-address (1- (buffer-size)))
;; If the buffer's EOL type is -dos, we need to account for
;; extra CR characters added when hexlify-buffer writes the
;; buffer to a file.
;; FIXME: This doesn't take into account multibyte coding systems.
(when (eq (coding-system-eol-type buffer-file-coding-system) 1)
- (setq original-point (+ (count-lines (point-min) (point))
+ (setq max-address (+ (count-lines (point-min) (point-max))
+ max-address))
+ ;; But if there's no newline at the last line, we are off by
+ ;; one; adjust.
+ (or (eq (char-before (point-max)) ?\n)
+ (setq max-address (1- max-address)))
+ (setq original-point (+ (count-lines (point-min) (point))
original-point))
(or (bolp) (setq original-point (1- original-point))))
(hexlify-buffer)
(restore-buffer-modified-p modified))
- (set (make-local-variable 'hexl-max-address)
- (let* ((full-lines (/ (buffer-size) 68))
- (last-line (% (buffer-size) 68))
- (last-line-bytes (% last-line 52)))
- (+ last-line-bytes (* full-lines 16) -1)))
+ (make-local-variable 'hexl-max-address)
+ (setq hexl-max-address max-address)
(condition-case nil
(hexl-goto-address original-point)
(error nil)))
@@ -436,19 +458,23 @@ Ask the user for confirmation."
(defun hexl-current-address (&optional validate)
"Return current hexl-address."
(interactive)
- (let ((current-column (- (% (- (point) (point-min) -1) 68) 11))
+ (let ((current-column
+ (- (% (- (point) (point-min) -1) (hexl-line-displen)) 11))
(hexl-address 0))
(if (< current-column 0)
(if validate
(error "Point is not on a character in the file")
(setq current-column 0)))
(setq hexl-address
- (+ (* (/ (- (point) (point-min) -1) 68) 16)
- (if (>= current-column 41)
- (- current-column 41)
- (/ (- current-column (/ current-column 5)) 2))))
+ (+ (* (/ (- (point) (point-min) -1)
+ (hexl-line-displen)) 16)
+ (if (>= current-column (- (hexl-ascii-start-column) 10))
+ (- current-column (- (hexl-ascii-start-column) 10))
+ (/ (- current-column
+ (/ current-column (1+ (/ hexl-bits 4)))) 2) )) )
(when (interactive-p)
- (message "Current address is %d/0x%08x" hexl-address hexl-address))
+ (message "Current address is [column: %d] %d/0x%08x"
+ current-column hexl-address hexl-address))
hexl-address))
(defun hexl-print-current-point-info ()
@@ -457,10 +483,18 @@ This function is intended to be used as eldoc callback."
(let ((addr (hexl-current-address)))
(format "Current address is %d/0x%08x" addr addr)))
+(defun hexl-ascii-start-column ()
+ "Column at which the ascii display starts."
+ (+ 43 (/ 128 hexl-bits)))
+
(defun hexl-address-to-marker (address)
"Return buffer position for ADDRESS."
(interactive "nAddress: ")
- (+ (* (/ address 16) 68) 10 (point-min) (/ (* (% address 16) 5) 2)))
+ (let ((N (* (% address 16) 2)))
+ (+ (* (/ address 16) (hexl-line-displen)) ; hexl line no * display length
+ 10 ; 10 chars for the "address: " prefix
+ (point-min) ; base offset (point usually starts at 1, not 0)
+ (+ N (/ N (/ hexl-bits 4))) )) ) ; char offset into hexl display line
(defun hexl-goto-address (address)
"Go to hexl-mode (decimal) address ADDRESS.
@@ -505,7 +539,7 @@ Signal error if HEX-ADDRESS is out of range."
(hexl-goto-address (- (hexl-current-address) arg)))
(defun hexl-forward-char (arg)
- "Move to right ARG bytes (left if ARG negative) in hexl-mode."
+ "Move right ARG bytes (left if ARG negative) in hexl-mode."
(interactive "p")
(hexl-goto-address (+ (hexl-current-address) arg)))
@@ -544,7 +578,7 @@ Signal error if HEX-ADDRESS is out of range."
address)))
(defun hexl-forward-short (arg)
- "Move to right ARG shorts (left if ARG negative) in hexl-mode."
+ "Move right ARG shorts (left if ARG negative) in hexl-mode."
(interactive "p")
(hexl-backward-short (- arg)))
@@ -583,7 +617,7 @@ Signal error if HEX-ADDRESS is out of range."
address)))
(defun hexl-forward-word (arg)
- "Move to right ARG words (left if ARG negative) in hexl-mode."
+ "Move right ARG words (left if ARG negative) in hexl-mode."
(interactive "p")
(hexl-backward-word (- arg)))
@@ -630,7 +664,7 @@ With prefix arg N, puts point N bytes of the way from the true beginning."
(defun hexl-beginning-of-line ()
"Goto beginning of line in hexl mode."
(interactive)
- (goto-char (+ (* (/ (point) 68) 68) 11)))
+ (goto-char (+ (* (/ (point) (hexl-line-displen)) (hexl-line-displen)) 11)))
(defun hexl-end-of-line ()
"Goto end of line in hexl mode."
@@ -675,12 +709,12 @@ If there's no byte at the target address, move to the first or last line."
(recenter 0)))
(defun hexl-beginning-of-1k-page ()
- "Go to beginning of 1KB boundary."
+ "Go to the beginning of the current 1 KiB block"
(interactive)
(hexl-goto-address (logand (hexl-current-address) -1024)))
(defun hexl-end-of-1k-page ()
- "Go to end of 1KB boundary."
+ "Go to the end of the current 1 KiB block."
(interactive)
(hexl-goto-address (let ((address (logior (hexl-current-address) 1023)))
(if (> address hexl-max-address)
@@ -710,6 +744,15 @@ You may also type octal digits, to insert a character with that code."
;00000000: 0011 2233 4455 6677 8899 aabb ccdd eeff 0123456789ABCDEF
+(defun hexl-options (&optional test)
+ (let ((opts (or test hexl-options)))
+ (when (memq hexl-bits '(8 16 32 64))
+ (when (string-match "\\(.*\\)-group-by-[0-9]+-bits\\(.*\\)" opts)
+ (setq opts (concat (match-string 1 opts)
+ (match-string 2 opts))) )
+ (setq opts (format "%s -group-by-%d-bits " opts hexl-bits)) )
+ opts))
+
;;;###autoload
(defun hexlify-buffer ()
"Convert a binary buffer to hexl format.
@@ -732,7 +775,7 @@ This discards the buffer's undo information."
(mapcar (lambda (s)
(if (not (multibyte-string-p s)) s
(encode-coding-string s locale-coding-system)))
- (split-string hexl-options)))
+ (split-string (hexl-options))))
(if (> (point) (hexl-address-to-marker hexl-max-address))
(hexl-goto-address hexl-max-address))))
@@ -749,7 +792,7 @@ This discards the buffer's undo information."
(buffer-undo-list t))
(apply 'call-process-region (point-min) (point-max)
(expand-file-name hexl-program exec-directory)
- t t nil "-de" (split-string hexl-options))))
+ t t nil "-de" (split-string (hexl-options)))))
(defun hexl-char-after-point ()
"Return char for ASCII hex digits at point."
@@ -846,12 +889,15 @@ CH must be a unibyte character whose value is between 0 and 255."
(let ((address (hexl-current-address t)))
(while (> num 0)
(let ((hex-position
- (+ (* (/ address 16) 68)
+ (+ (* (/ address 16) (hexl-line-displen))
10 (point-min)
(* 2 (% address 16))
(/ (% address 16) 2)))
(ascii-position
- (+ (* (/ address 16) 68) 51 (point-min) (% address 16)))
+ (+ (* (/ address 16) (hexl-line-displen))
+ (hexl-ascii-start-column)
+ (point-min)
+ (% address 16)))
at-ascii-position)
(if (= (point) ascii-position)
(setq at-ascii-position t))
@@ -867,7 +913,7 @@ CH must be a unibyte character whose value is between 0 and 255."
(if at-ascii-position
(progn
(beginning-of-line)
- (forward-char 51)
+ (forward-char (hexl-ascii-start-column))
(forward-char (% address 16)))))
(setq num (1- num)))))
@@ -985,7 +1031,7 @@ This function is assumed to be used as callback function for `hl-line-mode'."
(defun hexl-follow-ascii-find ()
"Find and highlight the ASCII element corresponding to current point."
- (let ((pos (+ 51
+ (let ((pos (+ (hexl-ascii-start-column)
(- (point) (current-column))
(mod (hexl-current-address) 16))))
(move-overlay hexl-ascii-overlay pos (1+ pos))
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: hexl mode update (variable word size for hexl mode)
2009-11-18 0:52 ` hexl mode update (variable word size for hexl mode) Vivek Dasmohapatra
@ 2009-11-18 1:35 ` Glenn Morris
0 siblings, 0 replies; 4+ messages in thread
From: Glenn Morris @ 2009-11-18 1:35 UTC (permalink / raw)
To: Vivek Dasmohapatra; +Cc: emacs-devel
Vivek Dasmohapatra wrote:
> There was no response to this last time, so I'm re-posting it:
I already filed it as
http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=4941
so it less likely to get lost.
I strongly recommend reporting such things as wishlist items in the
"bug" tracker rather than on emacs-devel.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-11-18 1:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-07 1:20 hexl mode update Vivek Dasmohapatra
[not found] ` <jwvljmo364c.fsf-monnier+emacs@gnu.org>
[not found] ` <alpine.DEB.2.00.0907161901001.28562@octopus.pepperfish.net>
[not found] ` <jwvocrkc9hs.fsf-monnier+emacs@gnu.org>
2009-07-21 0:44 ` Vivek Dasmohapatra
2009-11-18 0:52 ` hexl mode update (variable word size for hexl mode) Vivek Dasmohapatra
2009-11-18 1:35 ` Glenn Morris
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).