Changeset b950088 for commands.c

Timestamp:

Jun 29, 2002, 11:55:06 AM (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:

855ebe7

Parents:

61d27fb

Message:

* Added --no-move option to delete command.
        In particular, delete-and-always-move-down may now
	be implemented with
	'( delete --no-move ; next --skip-deleted )'.
* Folded the nextmsg and prevmsg commands and functions together into
        one command which takes arguments.
	Added '--filter <name>' option (eg, for next_personal),
	'--skip-deleted' option, and
	'--last-if-none'/'--first-if-none' options.
	Help updated accordingly.
	In particular, the 'personal' view is now used
	for 'next personal'.
* Updated examples/owlconf.erik with the above.

File:

• commands.c (modified) (7 diffs)

commands.c

@@ -193 +193 @@
               "Scrolls up if <numlines> is negative, else scrolls down.\n"),
 
-  OWLCMD_VOID("next", owl_command_next, OWL_CTX_INTERACTIVE,
-              "move the pointer to the next message", "", ""),
+  OWLCMD_ARGS("next", owl_command_next, OWL_CTX_INTERACTIVE,
+              "move the pointer to the next message",
+              "recv:next [ --filter <name> ] [ --skip-deleted ] [ --last-if-none ]",
+              "Moves the pointer to the next message in the current view.\n"
+              "If --filter is specified, will only consider messages in\n"
+              "the filter <name>.\n"
+              "If --skip-deleted is specified, deleted messages will\n"
+              "be skipped.\n"
+              "If --last-if-none is specified, will stop at last message\n"
+              "in the view if no other suitable messages are found.\n"),
   OWLCMD_ALIAS("recv:next", "next"),
 
-  OWLCMD_VOID("prev", owl_command_prev, OWL_CTX_INTERACTIVE,
-              "move the pointer to the previous message", "", ""),
+  OWLCMD_ARGS("prev", owl_command_prev, OWL_CTX_INTERACTIVE,
+              "move the pointer to the previous message",
+              "recv:prev [ --filter <name> ] [ --skip-deleted ] [ --first-if-none ]",
+              "Moves the pointer to the next message in the current view.\n"
+              "If --filter is specified, will only consider messages in\n"
+              "the filter <name>.\n"
+              "If --skip-deleted is specified, deleted messages will\n"
+              "be skipped.\n"
+              "If --first-if-none is specified, will stop at first message\n"
+              "in the view if no other suitable messages are found.\n"),
   OWLCMD_ALIAS("recv:prev", "prev"),
 
-  OWLCMD_VOID("next-notdel", owl_command_next_notdeleted, OWL_CTX_INTERACTIVE,
-              "move the pointer to the next non-deleted message", "", ""),
-  OWLCMD_ALIAS("recv:next-notdel", "next-notdel"),
-
-  OWLCMD_VOID("prev-notdel", owl_command_prev_notdeleted, OWL_CTX_INTERACTIVE,
-              "move the pointer to the previous non-deleted message", "", ""),
-  OWLCMD_ALIAS("recv:prev-notdel", "prev-notdel"),
-
-  OWLCMD_VOID("recv:next-personal", owl_function_next_personal, 
-              OWL_CTX_INTERACTIVE,
-              "move the pointer to the next personal message", "", ""),
-
-  OWLCMD_VOID("recv:prev-personal", owl_function_prev_personal, 
-              OWL_CTX_INTERACTIVE,
-              "move the pointer to the previous personal message", "", ""),
+  OWLCMD_ALIAS("recv:next-notdel", "recv:next --skip-deleted --last-if-none"),
+  OWLCMD_ALIAS("next-notdel",      "recv:next --skip-deleted --last-if-none"),
+
+  OWLCMD_ALIAS("recv:prev-notdel", "recv:prev --skip-deleted --first-if-none"),
+  OWLCMD_ALIAS("prev-notdel",      "recv:prev --skip-deleted --first-if-none"),
+
+  OWLCMD_ALIAS("recv:next-personal", "recv:next --filter personal"),
+
+  OWLCMD_ALIAS("recv:prev-personal", "recv:prev --filter personal"),
 
   OWLCMD_VOID("first", owl_command_first, OWL_CTX_INTERACTIVE,
@@ -417 +427 @@
   OWLCMD_ARGS("delete", owl_command_delete, OWL_CTX_INTERACTIVE,
               "mark a message for deletion",
-              "delete [ -id msgid ]\n"
+              "delete [ -id msgid ] [ --no-move ]\n"
               "delete view\n"
               "delete trash",
@@ -423 +433 @@
               "for deletion.  Otherwise the message with the given message\n"
               "id is marked for deltion.\n"
+              "If '--no-move' is specified, don't move after deletion.\n"
               "If 'trash' is specified, deletes all trash/auto messages\n"
               "in the current view.\n"
@@ -431 +442 @@
   OWLCMD_ARGS("undelete", owl_command_undelete, OWL_CTX_INTERACTIVE,
               "unmark a message for deletion",
-              "undelete [ -id msgid ]\n"
+              "undelete [ -id msgid ] [ --no-move ]\n"
               "undelete view",
               "If no message id is specified the current message is\n"
               "unmarked for deletion.  Otherwise the message with the\n"
               "given message id is marked for undeltion.\n"
+              "If '--no-move' is specified, don't move after deletion.\n"
               "If 'view' is specified, undeletes all messages\n"
               "in the current view.\n"),
@@ -649 +661 @@
 }
 
-void owl_command_next() {
-  owl_function_nextmsg();
-}
-
-void owl_command_prev() {
-  owl_function_prevmsg();
-}
-
-void owl_command_next_notdeleted() {
-  owl_function_nextmsg_notdeleted();
-}
-
-void owl_command_prev_notdeleted() {
-  owl_function_prevmsg_notdeleted();
+char *owl_command_next(int argc, char **argv, char *buff) {
+  char *filter=NULL;
+  int skip_deleted=0, last_if_none=0;
+  while (argc>1) {
+    if (argc>=1 && !strcmp(argv[1], "--skip-deleted")) {
+      skip_deleted=1;
+      argc-=1; argv+=1; 
+    } else if (argc>=1 && !strcmp(argv[1], "--last-if-none")) {
+      last_if_none=1;
+      argc-=1; argv+=1; 
+    } else if (argc>=2 && !strcmp(argv[1], "--filter")) {
+      filter = argv[2];
+      argc-=2; argv+=2; 
+    } else {
+      owl_function_makemsg("Invalid arguments to command 'next'.");
+      return(NULL);
+    }
+  }
+  owl_function_nextmsg_full(filter, skip_deleted, last_if_none);
+  return(NULL);
+}
+
+char *owl_command_prev(int argc, char **argv, char *buff) {
+  char *filter=NULL;
+  int skip_deleted=0, first_if_none=0;
+  while (argc>1) {
+    if (argc>=1 && !strcmp(argv[1], "--skip-deleted")) {
+      skip_deleted=1;
+      argc-=1; argv+=1; 
+    } else if (argc>=1 && !strcmp(argv[1], "--first-if-none")) {
+      first_if_none=1;
+      argc-=1; argv+=1; 
+    } else if (argc>=2 && !strcmp(argv[1], "--filter")) {
+      filter = argv[2];
+      argc-=2; argv+=2; 
+    } else {
+      owl_function_makemsg("Invalid arguments to command 'prev'.");
+      return(NULL);
+    }
+  }
+  owl_function_prevmsg_full(filter, skip_deleted, first_if_none);
+  return(NULL);
 }
 
@@ -1170 +1210 @@
 
 char *owl_command_delete(int argc, char **argv, char *buff) {
+  int move_after = 1;
+
+  if (!strcmp(argv[1], "--no-move")) {
+    move_after = 0;
+    argc--; 
+    argv++;
+  }
+
   if (argc==1) {
-    owl_function_deletecur();
+    owl_function_deletecur(move_after);
     return NULL;
   }
@@ -1195 +1243 @@
 
 char *owl_command_undelete(int argc, char **argv, char *buff) {
+  int move_after = 1;
+
+  if (!strcmp(argv[1], "--no-move")) {
+    move_after = 0;
+    argc--; 
+    argv++;
+  }
+
   if (argc==1) {
-    owl_function_undeletecur();
+    owl_function_undeletecur(move_after);
     return NULL;
   }