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

Timestamp:

05/13/06 11:31:18 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

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

trunk/lisp/progmodes/gdb-ui.el

@@ -115 +115 @@
-where STATUS is nil (unchanged), `changed' or `out-of-scope', FP the frame
-address for root variables.")
-(defvar gdb-force-update t
- "Non-nil means that view of watch expressions will be updated in the speedbar.")
-(defvar gdb-main-file nil "Source file from which program execution begins.")
-(defvar gdb-overlay-arrow-position nil)
@@ -528 +526 @@
-        gdb-frame-number nil
-        gdb-var-list nil
-        gdb-force-update t
-        gdb-main-file nil
-        gdb-first-post-prompt t
@@ -698 +695 @@
-                         (buffer-substring (region-beginning) (region-end))
-                       (tooltip-identifier-from-point (point))))))
+              (speedbar 1)
-              (catch 'already-watched
-                (dolist (var gdb-var-list)
@@ -729 +727 @@
-                  nil nil gdb-frame-address)))
-        (push var gdb-var-list)
-        (speedbar 1)
-        (unless (string-equal
-                 speedbar-initial-expansion-list-name "GUD")
@@ -736 +733 @@
-         (list
-          (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
-
+0
-                      (car var) "\"\n")
-
+0
-          `(lambda () (gdb-var-evaluate-expression-handler
-                       ,(car var) nil)))))
@@ -745 +742 @@
-      (message-box "No symbol \"%s\" in current context." expr))))
-
+(defun gdb-speedbar-update ()
+  (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
+    ;; Dummy command to update speedbar even when idle.
+    (gdb-enqueue-input (list "server pwd\n" 'gdb-speedbar-timer-fn))
+    ;; Keep gdb-pending-triggers non-nil till end.
+    (push 'gdb-speedbar-timer gdb-pending-triggers)))
+
+(defun gdb-speedbar-timer-fn ()
+  (setq gdb-pending-triggers
+        (delq 'gdb-speedbar-timer gdb-pending-triggers))
+  (speedbar-timer-fn))
+
-(defun gdb-var-evaluate-expression-handler (varnum changed)
-  (goto-char (point-min))
-
+
+
+
-  (let ((var (assoc varnum gdb-var-list)))
-    (when var
-      (if changed (setcar (nthcdr 5 var) 'changed))
-
+
+
-
-(defun gdb-var-list-children (varnum)
@@ -782 +794 @@
-                   (list
-                    (concat
-
+0
-                     (car varchild) "\"\n")
-                    `(lambda () (gdb-var-evaluate-expression-handler
@@ -804 +816 @@
-    (setcar (nthcdr 5 var) nil))
-  (goto-char (point-min))
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  (setq gdb-pending-triggers
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-(defun gdb-var-delete ()
@@ -837 +838 @@
-            '(gdbmi gdba))
-      (let ((text (speedbar-line-text)))
-
+
+
+
-        (let ((expr (match-string 1 text)) var varnum)
-          (catch 'expr-found
@@ -1382 +1385 @@
-      ;; Only needed/used with speedbar/watch expressions.
-      (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
-        (setq gdb-force-update t)
-        (if (string-equal gdb-version "pre-6.4")
-            (gdb-var-update)
@@ -1917 +1919 @@
-                         (if (file-exists-p file) file
-                           (cdr (assoc bptno gdb-location-alist)))))
-unless
+or
-                               (display-buffer buffer))))
-              (setq gdb-source-window window)
@@ -2759 +2761 @@
-           ;; can't find a source file.
-           (list-buffers-noselect))))
+  (setq gdb-source-window (selected-window))
-  (when gdb-use-separate-io-buffer
-    (split-window-horizontally)
@@ -2786 +2789 @@
-           (gud-find-file (car gud-last-last-frame))
-         (gud-find-file gdb-main-file)))
+      (setq gdb-source-window (selected-window))
-      (other-window 1))))
-
@@ -2807 +2811 @@
-        (delq 'gdb-overlay-arrow-position overlay-arrow-variable-list))
-  (setq fringe-indicator-alist '((overlay-arrow . right-triangle)))
-
-
+
-  (setq gud-running nil)
-  (setq gdb-active-process nil)
@@ -3167 +3170 @@
-      (let ((buffer (marker-buffer gud-overlay-arrow-position))
-            (position (marker-position gud-overlay-arrow-position)))
-
+
+
+
-          (with-current-buffer buffer
-            (setq fringe-indicator-alist
@@ -3234 +3239 @@
-                  (push varchild var-list))))
-          (push var var-list)))
-
+
+
-
-; Uses "-var-update --all-values".  Needs GDB 6.4 onwards.
@@ -3267 +3273 @@
-  (setq gdb-pending-triggers
-   (delq 'gdb-var-update gdb-pending-triggers))
-
-
-
-
-
+
-
-;; Registers buffer.