Changeset f2e36b5

Timestamp:

Aug 4, 2002, 6:12:28 PM (22 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

8509c08

Parents:

aa2f33b3

Message:

* Page-down will not skip past the last message if its truncated.
* Added C-t binding for transposing characters.  (from jdaniel)

Files:

• ChangeLog (modified) (2 diffs)
• commands.c (modified) (1 diff)
• editwin.c (modified) (1 diff)
• functions.c (modified) (1 diff)
• keys.c (modified) (1 diff)
• mainwin.c (modified) (3 diffs)
• owl.h (modified) (2 diffs)

ChangeLog

@@ -1 +1 @@
 $Id$
 
+1.2.1-pre-4
+        Page-down will not skip past the last message if its truncated.
+        Added C-t binding for transposing characters.  (from jdaniel)
+        
 1.2.1-pre-3
         Variables now have a summary and a long description.
@@ -33 +37 @@
                            or bottom of the screen.  When it moves,
                            the screen will be paged up or down and
-                           the cursor will be near the center.\n",
+                           the cursor will be near the center.
 
 1.2.1-pre-2

commands.c

@@ -570 +570 @@
                   OWL_CTX_EDIT,
                   "deletes all of the contents of the buffer",
+                  "", ""),
+
+  OWLCMD_VOID_CTX("edit:transpose-chars", owl_editwin_transpose_chars,
+                  OWL_CTX_EDIT,
+                  "Interchange characters around point, moving forward one character.",
                   "", ""),
 

editwin.c

@@ -368 +368 @@
 }
 
+void owl_editwin_transpose_chars(owl_editwin *e) {
+  /* Swap the character at point with the character at point-1 and
+   * advance the pointer.  If point is at beginning of buffer do
+   * nothing.  If point is after the last character swap point-1 with
+   * point-2.  (Behaves as observed in tcsh and emacs).  
+   */
+
+  int z;
+  char tmp;
+
+  if (e->bufflen==0) return;
+  
+  /* get the cursor point */
+  z=_owl_editwin_get_index_from_xy(e);
+
+  if (z==e->bufflen) {
+    /* point is after last character */
+    z--;
+  }  
+
+  if (z-1 < e->lock) {
+    /* point is at beginning of buffer, do nothing */
+    return;
+  }
+
+  tmp=e->buff[z];
+  e->buff[z]=e->buff[z-1];
+  e->buff[z-1]=tmp;
+  owl_editwin_key_right(e);
+}
+
 void owl_editwin_insert_string(owl_editwin *e, char *string) {
   /* insert 'string' at the current point, later text is shifted

functions.c

@@ -1246 +1246 @@
   i=owl_mainwin_get_last_msg(owl_global_get_mainwin(&g));
   if (i<0) return;
-
+  if (owl_mainwin_is_last_msg_truncated(owl_global_get_mainwin(&g))
+      && (owl_global_get_curmsg(&g) < i)
+      && (i>0)) {
+    i--;
+  }
   owl_global_set_curmsg(&g, i);
   owl_function_nextmsg();

keys.c

@@ -69 +69 @@
 
   BIND_CMD("C-k",         "edit:delete-to-line-end", "");
+
+  BIND_CMD("C-t",         "edit:transpose-chars", "");
 
   BIND_CMD("M-q",         "edit:fill-paragraph", "");

mainwin.c

@@ -41 +41 @@
   isfull=0;
   mw->curtruncated=0;
+  mw->lasttruncated=0;
   j=owl_view_get_size(v);
   for (i=topmsg; i<j; i++) {
@@ -72 +73 @@
     /* if we'll fill the screen print a partial message */
     if ((y+lines > recwinlines) && (i==owl_global_get_curmsg(&g))) mw->curtruncated=1;
+    if (y+lines > recwinlines) mw->lasttruncated=1;
     if (y+lines > recwinlines-1) {
       isfull=1;
@@ -130 +132 @@
 }
 
+int owl_mainwin_is_last_msg_truncated(owl_mainwin *mw) {
+  if (mw->lasttruncated) return(1);
+  return(0);
+}
+
 int owl_mainwin_get_last_msg(owl_mainwin *mw) {
   /* return the number of the last message displayed. -1 if none */

owl.h

@@ -12 +12 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         1.2.1-pre-3
-#define OWL_VERSION_STRING "1.2.1-pre-3"
+#define OWL_VERSION         1.2.1-pre-4
+#define OWL_VERSION_STRING "1.2.1-pre-4"
 
 #define OWL_DEBUG 0
@@ -245 +245 @@
 typedef struct _owl_mainwin {
   int curtruncated;
+  int lasttruncated;
   int lastdisplayed;
 } owl_mainwin;