Changeset 4148 for trunk/lisp/progmodes/gdb-ui.el

Timestamp:

08/18/06 08:35:31 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/progmodes/gdb-ui.el (modified) (22 diffs)

trunk/lisp/progmodes/gdb-ui.el

@@ -116 +116 @@
-(defvar gud-old-arrow nil)
-(defvar gdb-overlay-arrow-position nil)
+(defvar gdb-stack-position nil)
-(defvar gdb-server-prefix nil)
-(defvar gdb-flush-pending-output nil)
@@ -322 +323 @@
-
-(defcustom gdb-use-separate-io-buffer nil
-inferior
+debugged program
-  :type 'boolean
-  :group 'gud
@@ -354 +355 @@
-
-(defun gdb-use-separate-io-buffer (arg)
-inferior
+debugged program
-With arg, use separate IO iff arg is positive."
-  (interactive "P")
@@ -361 +362 @@
-            (not gdb-use-separate-io-buffer)
-          (> (prefix-numeric-value arg) 0)))
-inferior 
+
-                   (if gdb-use-separate-io-buffer "en" "dis")))
-  (if (and gud-comint-buffer
@@ -384 +385 @@
-                            (concat gdb-cpp-define-alist-program " "
-                                    gdb-cpp-define-alist-flags)))))
-
-
+
-    (setq gdb-define-alist nil)
-    (dolist (define define-list)
@@ -1031 +1031 @@
-
-(defun gdb-frame-separate-io-buffer ()
-inferior
+debugged program
-  (interactive)
-  (if gdb-use-separate-io-buffer
@@ -1297 +1297 @@
-        (setq gud-overlay-arrow-position nil)
-        (setq gdb-overlay-arrow-position nil)
+        (setq gdb-stack-position nil)
-        (if gdb-use-separate-io-buffer
-            (setq gdb-output-sink 'inferior))))
@@ -1331 +1332 @@
-  (setq gud-overlay-arrow-position nil)
-  (setq gdb-overlay-arrow-position nil)
+  (setq gdb-stack-position nil)
-  (setq gud-old-arrow nil)
-  (setq gdb-inferior-status "exited")
@@ -1777 +1779 @@
-        (while (< (point) (- (point-max) 1))
-          (forward-line 1)
-"[^\t].*?breakpoint"
+gdb-breakpoint-regexp
-              (progn
-                (looking-at "\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+\\(.\\)")
-                (setq bptno (match-string 1))
-                (setq flag (char-after (match-beginning 2)))
@@ -1787 +1788 @@
-                     '(face font-lock-warning-face)
-                   '(face font-lock-type-face)))
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                      (add-text-properties
-                       (match-beginning 1) (match-end 1)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-          (end-of-line))))))
-  (if (gdb-get-buffer 'gdb-assembler-buffer) (gdb-assembler-custom)))
@@ -2027 +2040 @@
-            (when (looking-at "^#\\([0-9]+\\)")
-              (when (string-equal (match-string 1) gdb-frame-number)
-
-
+
+
+
+
+
+
+
+
-              (when (re-search-forward
-                     (concat
@@ -2099 +2118 @@
-  (setq major-mode 'gdb-frames-mode)
-  (setq mode-name "Frames")
+  (setq gdb-stack-position nil)
+  (add-to-list 'overlay-arrow-variable-list 'gdb-stack-position)
-  (setq buffer-read-only t)
-  (use-local-map gdb-frames-mode-map)
@@ -2550 +2571 @@
-            (gdb-make-header-line-mouse-map
-             'mouse-1
-#'
-       
-       
-       
-       
-       
-  
-  
-  
-  
-  
-      
+
+      
+      
+      
+      
+      
+
+
+
+
+
+
-           "|"
-           (propertize "+"
@@ -2569 +2590 @@
-                       'local-map (gdb-make-header-line-mouse-map
-                                   'mouse-1
-#'
-  
-       
+
+
+      
-           "]: "
-           (propertize gdb-memory-address
@@ -2636 +2657 @@
-(defvar gdb-locals-watch-map
-  (let ((map (make-sparse-keymap)))
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    map)
- "Keymap to create watch expression of a complex data type local variable.")
@@ -2765 +2787 @@
-  (define-key menu [threads] '("Threads" . gdb-display-threads-buffer))
-  (define-key menu [inferior]
-Inferior
+Separate
-                :enable gdb-use-separate-io-buffer))
-  (define-key menu [memory] '("Memory" . gdb-display-memory-buffer))
@@ -2784 +2806 @@
-  (define-key menu [memory] '("Memory" . gdb-frame-memory-buffer))
-  (define-key menu [inferior]
-Inferior
+Separate
-                :enable gdb-use-separate-io-buffer))
-  (define-key menu [registers] '("Registers" . gdb-frame-registers-buffer))
@@ -2803 +2825 @@
-              :button (:toggle . gdb-find-source-frame)))
-  (define-key menu [gdb-use-separate-io]
-nferior I
+
-              :visible (eq gud-minor-mode 'gdba)
-inferior
+debugged program
-              :button (:toggle . gdb-use-separate-io-buffer)))
-  (define-key menu [gdb-many-windows]
@@ -2902 +2924 @@
-              (kill-local-variable 'tool-bar-map)
-              (kill-local-variable 'gdb-define-alist))))))
-
-
-
+
-  (setq overlay-arrow-variable-list
-        (delq 'gdb-overlay-arrow-position overlay-arrow-variable-list))
-  (setq fringe-indicator-alist '((overlay-arrow . right-triangle)))
+  (setq gdb-stack-position nil)
+  (setq overlay-arrow-variable-list
+        (delq 'gdb-stack-position overlay-arrow-variable-list))
-  (if (boundp 'speedbar-frame) (speedbar-timer-fn))
-  (setq gud-running nil)
@@ -3129 +3152 @@
-                    (or gdb-overlay-arrow-position
-                        (setq gdb-overlay-arrow-position (make-marker)))
-
-
+
-        ;; remove all breakpoint-icons in assembler buffer before updating.
-        (gdb-remove-breakpoint-icons (point-min) (point-max))))
@@ -3491 +3513 @@
-(defvar gdb-locals-watch-map-1
-  (let ((map (make-sparse-keymap)))
+    (suppress-keymap map)
+    (define-key map "\r" 'gud-watch)
-    (define-key map [mouse-2] 'gud-watch)
-    map)
- "Keymap to create watch expression of a complex data type local variable.")
+
+(defvar gdb-edit-locals-map-1
+  (let ((map (make-sparse-keymap)))
+    (suppress-keymap map)
+    (define-key map "\r" 'gdb-edit-locals-value)
+    (define-key map [mouse-2] 'gdb-edit-locals-value)
+    map)
+ "Keymap to edit value of a simple data type local variable.")
+
+(defun gdb-edit-locals-value (&optional event)
+  "Assign a value to a variable displayed in the locals buffer."
+  (interactive (list last-input-event))
+  (save-excursion
+    (if event (posn-set-point (event-end event)))
+    (beginning-of-line)
+    (let* ((var (current-word))
+           (value (read-string (format "New value (%s): " var))))
+      (gdb-enqueue-input
+       (list (concat  gdb-server-prefix"set variable " var " = " value "\n")
+             'ignore)))))
-
-;; Dont display values of arrays or structures.
@@ -3522 +3566 @@
-                          (start (window-start window))
-                          (p (window-point window))
-
+ (name) (value)
-                     (erase-buffer)
-                     (dolist (local locals-list)
-                       (setq name (car local))
-
-
+
+
+
-                           (add-text-properties 0 (length name)
-                                `(mouse-face highlight
-                                  help-echo "mouse-2: create watch expression"
-                                  local-map ,gdb-locals-watch-map-1)
-
+
+
+
+
+
+
-                       (insert
-                        (concat name "\t" (nth 1 local)