Changeset 8a5b5a1

Timestamp:

Apr 2, 2010, 10:40:39 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

e2cbbbe

Parents:

66e409c

git-author:

Nelson Elhage <nelhage@mit.edu> (04/02/10 21:02:30)

git-committer:

Nelson Elhage <nelhage@mit.edu> (04/02/10 22:40:39)

Message:

Add option to smartnarrow to temporarily invert narrow-related.

Bind this to M-n and M-M.

Signed-off-by: Geoffrey Thomas <geofft@mit.edu>
[nelhage@mit.edu: Rename modnarrow → narrow-related]
Signed-off-by: Nelson Elhage <nelhage@mit.edu>

Files:

• commands.c (modified) (7 diffs)
• functions.c (modified) (2 diffs)
• keys.c (modified) (1 diff)

commands.c

@@ +1 @@
+#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -592 +593 @@
   OWLCMD_ARGS("smartnarrow", owl_command_smartnarrow, OWL_CTX_INTERACTIVE,
               "view only messages similar to the current message",
-              "smartnarrow [-i | --instance]",
+              "smartnarrow [-i | --instance]  [-r | --relatde]",
               "If the curmsg is a personal message narrow\n"
               "   to the conversation with that user.\n"
@@ -600 +601 @@
               "    to the class.\n"
               "If the curmsg is a class message and '-i' is specified\n"
-              "    then narrow to the class and instance.\n"),
+              "    then narrow to the class and instance.\n"
+              "If '-r' or '--related' is specified, behave as though the\n"
+              "    'narrow-related' variable was inverted."),
 
   OWLCMD_ARGS("smartfilter", owl_command_smartfilter, OWL_CTX_INTERACTIVE,
@@ -1238 +1241 @@
       argc-=2; argv+=2; 
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter")) {
-      filter = owl_function_smartfilter(0);
+      filter = owl_function_smartfilter(0, 0);
       argc-=2; argv+=2; 
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter-instance")) {
-      filter = owl_function_smartfilter(1);
+      filter = owl_function_smartfilter(1, 0);
       argc-=2; argv+=2; 
     } else {
@@ -1268 +1271 @@
       argc-=2; argv+=2; 
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter")) {
-      filter = owl_function_smartfilter(0);
+      filter = owl_function_smartfilter(0, 0);
       argc-=2; argv+=2; 
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter-instance")) {
-      filter = owl_function_smartfilter(1);
+      filter = owl_function_smartfilter(1, 0);
       argc-=2; argv+=2;  
    } else {
@@ -1287 +1290 @@
   char *filtname = NULL;
 
-  if (argc == 1) {
-    filtname = owl_function_smartfilter(0);
-  } else if (argc == 2 && (!strcmp(argv[1], "-i") || !strcmp(argv[1], "--instance"))) {
-    filtname = owl_function_smartfilter(1);
-  } else {
-    owl_function_makemsg("Wrong number of arguments for %s", argv[0]);    
-  }
+  char opt;
+  int instance = 0, related = 0, i;
+  char **tmp_argv = owl_malloc(sizeof(char *) * argc);
+
+  for (i = 0; i < argc; i++)
+    tmp_argv[i] = owl_strdup(argv[i]);
+
+  static struct option options[] = {
+    {"instance", 0, 0, 'i'},
+    {"related",  0, 0, 'r'},
+    {NULL,       0, 0, 0}};
+  while ((opt = getopt_long(argc, tmp_argv, "ir", options, NULL)) != -1) {
+    switch (opt) {
+      case 'i':
+        instance = 1;
+        break;
+      case 'r':
+        related = 1;
+        break;
+      default:
+        owl_function_makemsg("Wrong number of arguments for %s (%c)", argv[0], opt);
+        goto done;
+    }
+  }
+
+  for (i = 0; i < argc; i++)
+    owl_free(tmp_argv[i]);
+  owl_free(tmp_argv);
+
+  filtname = owl_function_smartfilter(instance, related);
+
   if (filtname) {
     owl_function_change_currentview_filter(filtname);
     owl_free(filtname);
   }
+
+done:
+  optind = 0; /* reset getopt */
   return NULL;
 }
@@ -1306 +1336 @@
 
   if (argc == 1) {
-    filtname = owl_function_smartfilter(0);
+    filtname = owl_function_smartfilter(0, 0);
   } else if (argc == 2 && (!strcmp(argv[1], "-i") || !strcmp(argv[1], "--instance"))) {
-    filtname = owl_function_smartfilter(1);
+    filtname = owl_function_smartfilter(1, 0);
   } else {
     owl_function_makemsg("Wrong number of arguments for %s", argv[0]);    

functions.c

@@ -2511 +2511 @@
  *    name to the AIM conversation with that user 
  */
-char *owl_function_smartfilter(int type)
+char *owl_function_smartfilter(int type, int invert_related)
 {
   const owl_view *v;
@@ -2517 +2517 @@
   char *zperson, *filtname=NULL;
   const char *argv[2];
-  int related = owl_global_is_narrow_related(&g);
-  
+  int related = owl_global_is_narrow_related(&g) ^ invert_related;
+
   v=owl_global_get_current_view(&g);
   m=owl_view_get_element(v, owl_global_get_curmsg(&g));

keys.c

@@ -246 +246 @@
   BIND_CMD("M-n", "smartnarrow",      "narrow to a view based on the current message");
   BIND_CMD("M-N", "smartnarrow -i",   "narrow to a view based on the current message, and consider instance pair");
+  BIND_CMD("M-m", "smartnarrow -r",   "like M-n but with 'narrow-related' temporarily flipped.");
+  BIND_CMD("M-M", "smartnarrow -ri",  "like M-N but with 'narrow-related' temporarily flipped.");
   BIND_CMD("M-p", "view personal", "");