Changeset 5f8ec6b

Timestamp:

Jan 5, 2011, 10:09:33 AM (13 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

569f0bd

Parents:

c23f678

git-author:

Adam Glasgall <adam@crossproduct.net> (01/04/11 21:47:10)

git-committer:

Nelson Elhage <nelhage@mit.edu> (01/05/11 10:09:33)

Message:

Replace per-editwin killbuf with a global one.

Right now, the kill buffer is part of a struct _owl_editwin, which
means that it goes away when the editwin does - rather inconvenient if
you realize mid-paragraph that you're sending to the wrong class. This
patch adds a global for the killbuf (and its accessors), modifies the
editwin kill/yank functions to use it, and removes the old per-editwin
killbuf.

Files:

• editwin.c (modified) (5 diffs)
• global.c (modified) (2 diffs)
• owl.h (modified) (1 diff)

editwin.c

@@ -24 +24 @@
   int index;
   int mark;
-  char *killbuf;
   int goal_column;
   int topindex;
@@ -88 +87 @@
   }
   owl_free(e->buff);
-  owl_free(e->killbuf);
   /* just in case someone forgot to clean up */
   while (e->excursions) {
@@ -132 +130 @@
   oe_set_index(e, 0);
   oe_set_mark(e, -1);
-  if (e->killbuf != NULL)
-    owl_free(e->killbuf);
-  e->killbuf = NULL;
   e->goal_column = -1;
   e->column = -1;
@@ -1066 +1061 @@
 void owl_editwin_yank(owl_editwin *e)
 {
-  if (e->killbuf != NULL)
-    owl_editwin_replace(e, 0, e->killbuf);
+  char *killbuf = owl_global_get_kill_buffer(&g);
+
+  if (killbuf != NULL)
+    owl_editwin_replace(e, 0, killbuf);
 }
 
@@ -1073 +1070 @@
 {
   char *p;
+  char *killbuf = owl_global_get_kill_buffer(&g);
 
   p = owl_malloc(len + 1);
 
   if (p != NULL) {
-    owl_free(e->killbuf);
-    e->killbuf = p;
-    memcpy(e->killbuf, buf, len);
-    e->killbuf[len] = 0;
+    owl_free(killbuf);
+    memcpy(p, buf, len);
+    p[len] = 0;
+    owl_global_set_kill_buffer(&g,p);
   }
 

global.c

@@ -125 +125 @@
   g->timerlist = NULL;
   g->interrupted = FALSE;
+  g->kill_buffer = NULL;
 }
 
@@ -989 +990 @@
   return g->debug_file;
 }
+
+char *owl_global_get_kill_buffer(owl_global *g) {
+  return g->kill_buffer;
+}
+
+void owl_global_set_kill_buffer(owl_global *g,char *kill) {
+  g->kill_buffer = kill;
+}

owl.h

@@ -651 +651 @@
   volatile sig_atomic_t interrupted;
   FILE *debug_file;
+  char *kill_buffer;
 } owl_global;