Changeset 1683:f84adc4d0b0e

Timestamp:

11/26/08 21:16:11 (6 weeks ago)

Author:

Tobias Billep <t.billep@…>

Message:

fixed communication with emacs

Location:

pida

Files:

• editors/emacs/emacs.py (modified) (2 diffs)
• resources/data/pida_emacs_init.el (modified) (1 diff)
• utils/emacs/emacscom.py (modified) (5 diffs)

pida/editors/emacs/emacs.py

@@ -190 +190 @@
         listen_port = self._cb.bind()
         instance_id = 'pida-' + str(os.getpid())
-        self._client = EmacsClient(instance_id)
+        self._client = EmacsClient(instance_id, self)
 
         time.sleep(1)
@@ -282 +282 @@
     def goto_line(self, line):
         """Goto a line"""
-        self._client.goto_line(line + 1)
+        self._client.goto_line(line)
         self.grab_focus()
 

pida/resources/data/pida_emacs_init.el

@@ -156 +156 @@
   (pida-disconnect))
 
+;; pida-goto-line
+;;
+;; called by pida:  goto-line 
+(defun pida-goto-line (bufn line)
+  (set-buffer (get-file-buffer bufn))
+  (goto-line line))
+
+
+;; pida-save-buffer
+;; 
+;; called by pida to save buffer
+(defun pida-save-buffer (buffn)
+  (set-buffer (get-file-buffer buffn))
+  (save-buffer))
+
+;; pida-save-buffer-as
+;; 
+;; called by pida to save buffer as new file
+(defun pida-save-buffer (buffn filen)
+  (set-buffer (get-file-buffer buffn))
+  (write-file filen))
+
+;; pida-cut
+;; 
+;; called by pida to cut region
+(defun pida-cut (buffn)
+  (set-buffer (get-file-buffer buffn))
+  (kill-region (region-beginning) (region-end)))
+
+;; pida-copy
+;; 
+;; called by pida to copy region 
+(defun pida-copy (buffn)
+  (set-buffer (get-file-buffer buffn))
+  (kill-ring-save (region-beginning) (region-end)))
+
+;; pida-save-buffer-as
+;; 
+;; called by pida to paste 
+(defun pida-paste (buffn)
+  (set-buffer (get-file-buffer buffn))
+  (yank))
+
+
 (setq inhibit-splash-screen 1)

pida/utils/emacs/emacscom.py

@@ -8 +8 @@
     extracts a request name and arguments, and then tries to invoke the matching
     method on a EmacsCallback object (see editor/emacs/emacs.py).
-
+  
     :copyright: 2005-2008 by The PIDA Project
     :license: GPL 2 or later (see README/COPYING/LICENSE)
@@ -32 +32 @@
     """
     
-    def __init__(self, instance_id):
+    def __init__(self, instance_id, svc):
         """Constructor."""
         self._log = logging.getLogger('emacs')
@@ -39 +39 @@
         self._socket_path = _get_socket_path(self._instance_id)
         self._pending_commands = []
+        self._svc = svc
 
     def activate(self):
@@ -64 +65 @@
         
     def save_buffer(self):
-        self._send('(save-buffer)')
+        self._send('(pida-save-buffer "%s")' % self._svc.current_document.filename)
 
     def save_buffer_as(self, filename):
-        self._send('(write-file "%s"))' % filename)
+        self._send('(pida-save-buffer-as "%s" "%s"))' % (self._svc.current_document.filename, filename))
 
     def close_buffer(self, buffer):
@@ -76 +77 @@
 
     def cut(self):
-        self._send('(kill-region (region-beginning) (region-end))')
+        self._send('(pida-cut "%s")' % self._svc.current_document.filename)
 
     def copy(self):
-        self._send('(kill-ring-save (region-beginning) (region-end))')
+        self._send('(pida-copy "%s")' % self._svc.current_document.filename)
 
     def paste(self):
-        self._send('(yank)')
+        self._send('(pida-paste "%s")' % self._svc.current_document.filename)
 
     def goto_line(self, line):
-        self._send('(goto-line %s)' % line)
+        self._send('(pida-goto-line "%s" %s)' % (self._svc.current_document.filename, line))
 
     def revert_buffer(self):