[Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el

[Nick Roberts]

Index: emacs/lisp/progmodes/gdb-ui.el
diff -c emacs/lisp/progmodes/gdb-ui.el:1.33 emacs/lisp/progmodes/gdb-ui.el:1.34
*** emacs/lisp/progmodes/gdb-ui.el:1.33 Wed Nov 24 10:31:15 2004
--- emacs/lisp/progmodes/gdb-ui.el      Thu Nov 25 02:00:53 2004
***************
*** 317,323 ****
      (goto-char (point-min))
      (re-search-forward ".*value=\"\\(.*?\\)\"" nil t)
      (catch 'var-found
!       (let ((var-list nil) (num 0))
        (dolist (var gdb-var-list)
          (if (string-equal varnum (cadr var))
              (progn
--- 317,323 ----
      (goto-char (point-min))
      (re-search-forward ".*value=\"\\(.*?\\)\"" nil t)
      (catch 'var-found
!       (let ((num 0))
        (dolist (var gdb-var-list)
          (if (string-equal varnum (cadr var))
              (progn
***************
*** 1123,1129 ****
  
  ;;-put breakpoint icons in relevant margins (even those set in the GUD buffer)
  (defun gdb-info-breakpoints-custom ()
!   (let ((flag)(address))
      ;;
      ;; remove all breakpoint-icons in source buffers but not assembler buffer
      (dolist (buffer (buffer-list))
--- 1123,1129 ----
  
  ;;-put breakpoint icons in relevant margins (even those set in the GUD buffer)
  (defun gdb-info-breakpoints-custom ()
!   (let ((flag))
      ;;
      ;; remove all breakpoint-icons in source buffers but not assembler buffer
      (dolist (buffer (buffer-list))
***************
*** 1199,1207 ****
  (defun gdb-frame-breakpoints-buffer ()
    "Display status of user-settable breakpoints in a new frame."
    (interactive)
!   (select-frame (make-frame gdb-frame-parameters))
!   (switch-to-buffer (gdb-get-create-buffer 'gdb-breakpoints-buffer))
!   (set-window-dedicated-p (selected-window) t))
  
  (defvar gdb-breakpoints-mode-map
    (let ((map (make-sparse-keymap))
--- 1199,1206 ----
  (defun gdb-frame-breakpoints-buffer ()
    "Display status of user-settable breakpoints in a new frame."
    (interactive)
!   (let ((special-display-regexps (append special-display-regexps '(".*"))))
!     (pop-to-buffer (gdb-get-create-buffer 'gdb-breakpoints-buffer))))
  
  (defvar gdb-breakpoints-mode-map
    (let ((map (make-sparse-keymap))
***************
*** 1214,1219 ****
--- 1213,1219 ----
      (define-key map [menu-bar breakpoints] (cons "Breakpoints" menu))
      (define-key map " " 'gdb-toggle-breakpoint)
      (define-key map "d" 'gdb-delete-breakpoint)
+     (define-key map "q" 'kill-this-buffer)
      (define-key map "\r" 'gdb-goto-breakpoint)
      (define-key map [mouse-2] 'gdb-mouse-goto-breakpoint)
      map))
***************
*** 1342,1347 ****
--- 1342,1348 ----
  (defvar gdb-frames-mode-map
    (let ((map (make-sparse-keymap)))
      (suppress-keymap map)
+     (define-key map "q" 'kill-this-buffer)
      (define-key map "\r" 'gdb-frames-select)
      (define-key map [mouse-2] 'gdb-frames-mouse-select)
      map))
***************
*** 1423,1428 ****
--- 1424,1430 ----
  (defvar gdb-threads-mode-map
    (let ((map (make-sparse-keymap)))
      (suppress-keymap map)
+     (define-key map "q" 'kill-this-buffer)
      (define-key map "\r" 'gdb-threads-select)
      (define-key map [mouse-2] 'gdb-threads-mouse-select)
      map))
***************
*** 1475,1481 ****
  (defvar gdb-registers-mode-map
    (let ((map (make-sparse-keymap)))
      (suppress-keymap map)
!     map))
  
  (defun gdb-registers-mode ()
    "Major mode for gdb registers.
--- 1477,1484 ----
  (defvar gdb-registers-mode-map
    (let ((map (make-sparse-keymap)))
      (suppress-keymap map)
!     (define-key map "q" 'kill-this-buffer)
!      map))
  
  (defun gdb-registers-mode ()
    "Major mode for gdb registers.
***************
*** 1551,1557 ****
  (defvar gdb-locals-mode-map
    (let ((map (make-sparse-keymap)))
      (suppress-keymap map)
!     map))
  
  (defun gdb-locals-mode ()
    "Major mode for gdb locals.
--- 1554,1561 ----
  (defvar gdb-locals-mode-map
    (let ((map (make-sparse-keymap)))
      (suppress-keymap map)
!     (define-key map "q" 'kill-this-buffer)
!      map))
  
  (defun gdb-locals-mode ()
    "Major mode for gdb locals.
***************
*** 1587,1602 ****
  
  ;;;; Window management
  (defun gdb-display-buffer (buf &optional size)
!   (let ((must-split nil)
!       (answer nil))
!     (setq answer (get-buffer-window buf 'visible))
!     (if (not answer)
        (let ((window (get-lru-window)))
          (if window
              (progn
                (set-window-buffer window buf)
                (setq answer window))
!           (setq must-split t))))
      (if must-split
        (let* ((largest (get-largest-window))
               (cur-size (window-height largest))
--- 1591,1608 ----
  
  ;;;; Window management
  (defun gdb-display-buffer (buf &optional size)
!   (let ((answer (get-buffer-window buf 0))
!       (must-split nil))
!     (if answer
!       (display-buffer answer)         ;Raise the frame if necessary.
!       ;; The buffer is not yet displayed.
!       (pop-to-buffer gud-comint-buffer)       ;Select the right frame.
        (let ((window (get-lru-window)))
          (if window
              (progn
                (set-window-buffer window buf)
                (setq answer window))
!         (setq must-split t)))
      (if must-split
        (let* ((largest (get-largest-window))
               (cur-size (window-height largest))
***************
*** 1604,1610 ****
          (setq answer (split-window largest new-size))
          (set-window-buffer answer buf)))
      (set-window-dedicated-p answer t)
!     answer))
  
  (defun gdb-display-source-buffer (buffer)
    (if (eq gdb-selected-view 'source)
--- 1610,1616 ----
          (setq answer (split-window largest new-size))
          (set-window-buffer answer buf)))
      (set-window-dedicated-p answer t)
!       answer)))
  
  (defun gdb-display-source-buffer (buffer)
    (if (eq gdb-selected-view 'source)
***************
*** 1680,1688 ****
    (interactive)
    (if gdb-view-source
        (gdb-display-buffer
!        (if gud-last-last-frame
!          (gud-find-file (car gud-last-last-frame))
!        (gud-find-file gdb-main-file))))
    (setq gdb-selected-view 'source))
  
  (defun gdb-view-assembler()
--- 1686,1694 ----
    (interactive)
    (if gdb-view-source
        (gdb-display-buffer
!        (gud-find-file (if gud-last-last-frame
!                         (car gud-last-last-frame)
!                       gdb-main-file))))
    (setq gdb-selected-view 'source))
  
  (defun gdb-view-assembler()
***************
*** 1702,1711 ****
    :group 'gud
    :version "21.4")
  
! (defun dedicated-switch-to-buffer (name)
!   (set-window-dedicated-p 
!    (get-buffer-window
!     (switch-to-buffer name)) t))
  
  (defun gdb-setup-windows ()
    "Layout the window pattern for gdb-many-windows."
--- 1708,1716 ----
    :group 'gud
    :version "21.4")
  
! (defun gdb-set-window-buffer (name)
!   (set-window-buffer (selected-window) (get-buffer name))
!   (set-window-dedicated-p (selected-window) t))
  
  (defun gdb-setup-windows ()
    "Layout the window pattern for gdb-many-windows."
***************
*** 1714,1727 ****
    (delete-other-windows)
    (gdb-display-breakpoints-buffer)
    (delete-other-windows)
!   (dedicated-switch-to-buffer gud-comint-buffer)
    (split-window nil ( / ( * (window-height) 3) 4))
    (split-window nil ( / (window-height) 3))
    (split-window-horizontally)
    (other-window 1)
!   (dedicated-switch-to-buffer (gdb-locals-buffer-name))
    (other-window 1)
!   (dedicated-switch-to-buffer
     (if (and gdb-view-source
            (eq gdb-selected-view 'source))
         (if gud-last-last-frame
--- 1719,1732 ----
    (delete-other-windows)
    (gdb-display-breakpoints-buffer)
    (delete-other-windows)
!   (gdb-set-window-buffer gud-comint-buffer)
    (split-window nil ( / ( * (window-height) 3) 4))
    (split-window nil ( / (window-height) 3))
    (split-window-horizontally)
    (other-window 1)
!   (gdb-set-window-buffer (gdb-locals-buffer-name))
    (other-window 1)
!   (gdb-set-window-buffer
     (if (and gdb-view-source
            (eq gdb-selected-view 'source))
         (if gud-last-last-frame
***************
*** 1731,1742 ****
    (when gdb-use-inferior-io-buffer
      (split-window-horizontally)
      (other-window 1)
!     (dedicated-switch-to-buffer (gdb-inferior-io-name)))
    (other-window 1)
!   (dedicated-switch-to-buffer (gdb-stack-buffer-name))
    (split-window-horizontally)
    (other-window 1)
!   (dedicated-switch-to-buffer (gdb-breakpoints-buffer-name))
    (other-window 1))
  
  (defcustom gdb-many-windows nil
--- 1736,1747 ----
    (when gdb-use-inferior-io-buffer
      (split-window-horizontally)
      (other-window 1)
!     (gdb-set-window-buffer (gdb-inferior-io-name)))
    (other-window 1)
!   (gdb-set-window-buffer (gdb-stack-buffer-name))
    (split-window-horizontally)
    (other-window 1)
!   (gdb-set-window-buffer (gdb-breakpoints-buffer-name))
    (other-window 1))
  
  (defcustom gdb-many-windows nil
***************
*** 1764,1779 ****
    "Restore the basic arrangement of windows used by gdba.
  This arrangement depends on the value of `gdb-many-windows'."
    (interactive)
!   (if gdb-many-windows
!       (progn
!       (switch-to-buffer gud-comint-buffer)
!       (delete-other-windows)
!       (gdb-setup-windows))
!     (switch-to-buffer gud-comint-buffer)
      (delete-other-windows)
      (split-window)
      (other-window 1)
!     (dedicated-switch-to-buffer
       (if (and gdb-view-source
              (eq gdb-selected-view 'source))
         (if gud-last-last-frame
--- 1769,1781 ----
    "Restore the basic arrangement of windows used by gdba.
  This arrangement depends on the value of `gdb-many-windows'."
    (interactive)
!   (pop-to-buffer gud-comint-buffer)   ;Select the right window and frame.
      (delete-other-windows)
+   (if gdb-many-windows
+       (gdb-setup-windows)
      (split-window)
      (other-window 1)
!     (gdb-set-window-buffer
       (if (and gdb-view-source
              (eq gdb-selected-view 'source))
         (if gud-last-last-frame
***************
*** 1819,1833 ****
        (gdb-setup-windows)
      (gdb-get-create-buffer 'gdb-breakpoints-buffer)
      (when gdb-show-main
!       (switch-to-buffer gud-comint-buffer)
!       (delete-other-windows)
!       (split-window)
!       (other-window 1)
!       (switch-to-buffer
         (if gdb-view-source
           (gud-find-file gdb-main-file)
!        (gdb-get-create-buffer 'gdb-assembler-buffer)))
!       (other-window 1))))
  
  ;;from put-image
  (defun gdb-put-string (putstring pos &optional dprop)
--- 1821,1831 ----
        (gdb-setup-windows)
      (gdb-get-create-buffer 'gdb-breakpoints-buffer)
      (when gdb-show-main
!       (let ((pop-up-windows t))
!       (display-buffer
         (if gdb-view-source
           (gud-find-file gdb-main-file)
!          (gdb-get-create-buffer 'gdb-assembler-buffer)))))))
  
  ;;from put-image
  (defun gdb-put-string (putstring pos &optional dprop)
***************
*** 1971,1977 ****
  (defvar gdb-assembler-mode-map
    (let ((map (make-sparse-keymap)))
      (suppress-keymap map)
!     map))
  
  (defvar gdb-assembler-font-lock-keywords
    '(;; <__function.name+n>
--- 1969,1976 ----
  (defvar gdb-assembler-mode-map
    (let ((map (make-sparse-keymap)))
      (suppress-keymap map)
!     (define-key map "q" 'kill-this-buffer)
!      map))
  
  (defvar gdb-assembler-font-lock-keywords
    '(;; <__function.name+n>
***************
*** 2037,2043 ****
          (progn
            ;; take previous disassemble command off the queue
            (with-current-buffer gud-comint-buffer
!             (let ((queue gdb-input-queue) (item))
                (dolist (item queue)
                  (if (equal (cdr item) '(gdb-assembler-handler))
                      (setq gdb-input-queue
--- 2036,2042 ----
          (progn
            ;; take previous disassemble command off the queue
            (with-current-buffer gud-comint-buffer
!             (let ((queue gdb-input-queue))
                (dolist (item queue)
                  (if (equal (cdr item) '(gdb-assembler-handler))
                      (setq gdb-input-queue