Changeset ef56a67

Timestamp:

Jun 22, 2003, 9:38:21 AM (22 years ago)

Author:

James M. Kretchmar <kretch@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:

f1cbb7a

Parents:

3723f31

Message:

added the 'show view' command.
removed the style variable
 A style is now part of a view, the view command has been revamped

Files:

• ChangeLog (modified) (1 diff)
• commands.c (modified) (5 diffs)
• functions.c (modified) (2 diffs)
• global.c (modified) (1 diff)
• message.c (modified) (1 diff)
• owl.c (modified) (1 diff)
• style.c (modified) (2 diffs)
• variable.c (modified) (1 diff)
• view.c (modified) (3 diffs)

ChangeLog

@@ -12 +12 @@
         New 'sepbar_disable' variable can turn off sepbar info
         Updated contributor info
+        added the 'show view' command.
+        removed 'set style'
+        A style is now part of a view, the view command has been revamped
 
 2.0.4-pre-1

commands.c

@@ -486 +486 @@
   OWLCMD_ARGS("view", owl_command_view, OWL_CTX_INTERACTIVE,
               "view messages matching a filter",
+              "view [<viewname>] [-f <filter> | --home ] [-s <style>]\n"
               "view <filter>\n"
               "view -d <expression>\n"
               "view --home",
-              "In the first usage, The view command sets the current view to\n"
-              "the specified filter.   This causes only messages matching\n"
-              "that filter to be displayed.\n"
+              "The view command sets information associated with a particular view,\n"
+              "such as view's filter or style.  In the first general usage listed\n"
+              "above <viewname> is the name of the view to be changed.  If not\n"
+              "specified the default view 'main' will be used.  A filter can be set\n"
+              "for the view by listing a named filter after the -f argument.  If\n"
+              "the --home argument is used the filter will be set to the filter named\n"
+              "by the\n 'view_home' variable.  The style can be set by listing the\n"
+              "name style after the -s argument.\n"
               "\n"
-              "In the second usage a filter expression\n"
-              "and be specified directly\n"
-              "after -d.  Owl will build an internal filter based on this\n"
-              "filter and change the current view to use it.\n\n"
-              "If --home is specified, switches to the view specified by\n"
-              "the 'view_home' variable.\n\n"
+              "The other usages listed above are abbreivated forms that simply set\n"
+              "the filter of the current view. The -d option allows you to write a\n"
+              "filter expression that will be dynamically created by owl and then\n"
+              "applied as the view's filter\n"
               "SEE ALSO: filter, viewclass, viewuser\n"),
 
@@ -558 +562 @@
               "show terminal\n"
               "show version\n"
+              "show view [<view>]\n"
               "show status\n",
 
@@ -1651 +1656 @@
 
 char *owl_command_view(int argc, char **argv, char *buff) {
-  if (argc<2) {
-    owl_function_makemsg("Wrong number of arguments to view command");
-    return NULL;
-  }
-
+
+  /* Backwards compatability has made this kind of complicated:
+   * view [<viewname>] [-f <filter> | -d <expression> | --home ] [-s <style>]
+   * view <filter>
+   * view -d <expression>
+   * view --home
+   */
+
+  /* First take the 'view --home' case */
   if (argc == 2 && !strcmp(argv[1], "--home")) {
     owl_function_change_view(owl_global_get_view_home(&g));
-    return NULL;
-  }
-
-  /* is it a dynamic filter? */
-  if (!strcmp(argv[1], "-d")) {
+    return(NULL);
+  }
+
+  /* Now look for 'view <filter>' */
+  if (argc==2) {
+    owl_function_change_view(argv[1]);
+    return(NULL);
+  }
+
+  /* Now get 'view -d <expression>' */
+  if (argc==3 && !strcmp(argv[1], "-d")) {
     char **myargv;
     int i;
@@ -1678 +1693 @@
   }
 
-  /* otherwise it's a normal view command */
-  if (argc>2) {
-    owl_function_makemsg("Wrong number of arguments to view command");
-    return NULL;
-  }
-  owl_function_change_view(argv[1]);
-  return NULL;
+  /* Finally handle the general case */
+  if (argc<3) {
+    owl_function_makemsg("Too few arguments to the view command.");
+    return(NULL);
+  }
+  argc--;
+  argv++;
+  if (strcmp(argv[0], "-f") && strcmp(argv[0], "-d") && strcmp(argv[0], "--home") && strcmp(argv[0], "-s")) {
+    if (strcmp(argv[0], "main")) {
+      owl_function_makemsg("No view named '%s'", argv[0]);
+      return(NULL);
+    }
+    argc--;
+    argv++;
+  }
+  while (argc) {
+    if (!strcmp(argv[0], "-f")) {
+      if (argc<2) {
+        owl_function_makemsg("Too few argments to the view command");
+        return(NULL);
+      }
+      owl_function_change_view(argv[1]);
+      argc-=2;
+      argv+=2;
+    } else if (!strcmp(argv[0], "--home")) {
+      owl_function_change_view(owl_global_get_view_home(&g));
+      argc--;
+      argv++;
+    } else if (!strcmp(argv[0], "-s")) {
+      if (argc<2) {
+        owl_function_makemsg("Too few argments to the view command");
+        return(NULL);
+      }
+      owl_function_change_style(owl_global_get_current_view(&g), argv[1]);
+      argc-=2;
+      argv+=2;
+    } else {
+      owl_function_makemsg("Too few argments to the view command");
+      return(NULL);
+    }
+    
+  }
+  return(NULL);
 }
 
@@ -1722 +1773 @@
       owl_function_show_keymap(argv[2]);
     }
+  } else if (!strcmp(argv[1], "view")) {
+    if (argc==3) {
+      owl_function_show_view(argv[2]);
+    } else {
+      owl_function_show_view(NULL);
+    }
   } else if (!strcmp(argv[1], "colors")) {
     owl_function_show_colors();

functions.c

@@ -59 +59 @@
   owl_fmtext_free(&fm);
 }
+
+
+void owl_function_show_view(char *viewname)
+{
+  owl_view *v;
+  owl_fmtext fm;
+
+  /* we only have the one view right now */
+  v=owl_global_get_current_view(&g);
+  if (viewname && strcmp(viewname, owl_view_get_name(v))) {
+    owl_function_makemsg("No view named '%s'", viewname);
+    return;
+  }
+
+  owl_fmtext_init_null(&fm);
+  owl_view_to_fmtext(v, &fm);
+  owl_function_popless_fmtext(&fm);
+  owl_fmtext_free(&fm);
+}
+
 
 char *owl_function_cmd_describe(void *name)
@@ -3019 +3039 @@
 }
 
+
+void owl_function_change_style(owl_view *v, char *stylename)
+{
+  owl_view_set_style(v, owl_global_get_style_by_name(&g, stylename));
+  owl_messagelist_invalidate_formats(owl_global_get_msglist(&g));
+  owl_function_calculate_topmsg(OWL_DIRECTION_DOWNWARDS);
+  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+  
+}
+
 void owl_function_toggleoneline()
 {
-  char *style;
-
-  style=owl_global_get_style(&g);
-
-  if (strcmp(style, "oneline")) {
-    owl_global_set_style(&g, "oneline");
+  owl_view *v;
+  owl_style *s;
+
+  v=owl_global_get_current_view(&g);
+  s=owl_view_get_style(v);
+
+  if (!owl_style_matches_name(s, "oneline")) {
+    owl_function_change_style(v, "oneline");
   } else {
-    owl_global_set_style(&g, owl_global_get_default_style(&g));
-  }
-}
+    owl_function_change_style(v, owl_global_get_default_style(&g));
+  }
+
+  owl_messagelist_invalidate_formats(owl_global_get_msglist(&g));
+  owl_function_calculate_topmsg(OWL_DIRECTION_DOWNWARDS);
+  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+}

global.c

@@ -748 +748 @@
 }
 
-owl_style *owl_global_get_current_style(owl_global *g) {
-  return(owl_global_get_style_by_name(g, owl_global_get_style(g)));
-}
-
 void owl_global_add_style(owl_global *g, owl_style *s) {
   owl_list_append_element(&(g->stylelist), s);

message.c

@@ -114 +114 @@
 {
   owl_style *s;
+  owl_view *v;
 
   if (m->invalid_format) {
+    /* for now we assume there's jsut the one view and use that style */
+    v=owl_global_get_current_view(&g);
+    s=owl_view_get_style(v);
+
     owl_fmtext_free(&(m->fmtext));
     owl_fmtext_init_null(&(m->fmtext));
-    s=owl_global_get_current_style(&g);
     owl_style_get_formattext(s, &(m->fmtext), m);
     m->invalid_format=0;

owl.c

@@ -271 +271 @@
    *  formatting function */
   if (owl_global_is_config_format(&g)) {
-    owl_global_set_style(&g, "perl");
+    owl_view_set_style(owl_global_get_current_view(&g), owl_global_get_style_by_name(&g, "perl"));
   } else if (owl_global_is_userclue(&g, OWL_USERCLUE_CLASSES)) {
-    owl_global_set_style(&g, "default");
+    owl_view_set_style(owl_global_get_current_view(&g), owl_global_get_style_by_name(&g, "default"));
   } else {
-    owl_global_set_style(&g, "basic");
+    owl_view_set_style(owl_global_get_current_view(&g), owl_global_get_style_by_name(&g, "basic"));
   }
 

style.c

@@ -23 +23 @@
   if (!strcmp(s->name, name)) return(1);
   return(0);
+}
+
+char *owl_style_get_name(owl_style *s)
+{
+  return(s->name);
 }
 
@@ -50 +55 @@
 }
 
-char *owl_style_get_name(owl_style *s)
-{
-  return(s->name);
-}
-
 void owl_style_free(owl_style *s)
 {

variable.c

@@ -201 +201 @@
   OWLVAR_STRING_FULL( "tty" /* %OwlVarStub */, "", "tty name for zephyr location", "",
                       NULL, owl_variable_tty_set, NULL),
-
-  OWLVAR_STRING_FULL( "style" /* %OwlVarStub */, "default", "name of the current formatting style",
-                      "This sets the current message formatting style. Possbile\n"
-                      "values include 'default' 'basic' 'oneline' and if\n"
-                      "available, 'perl'\n",
-                      NULL, owl_variable_style_set, NULL),
 
   OWLVAR_STRING( "default_style" /* %OwlVarStub */, "default",

view.c

@@ -13 +13 @@
 }
 
+char *owl_view_get_name(owl_view *v)
+{
+  return(v->name);
+}
 
 /* if the message matches the filter then add to view */
@@ -58 +62 @@
 {
   v->style=s;
+}
+
+owl_style *owl_view_get_style(owl_view *v)
+{
+  return(v->style);
 }
 
@@ -113 +122 @@
 }
 
+/* fmtext should already be initialized */
+void owl_view_to_fmtext(owl_view *v, owl_fmtext *fm)
+{
+  owl_fmtext_append_normal(fm, "Name: ");
+  owl_fmtext_append_normal(fm, v->name);
+  owl_fmtext_append_normal(fm, "\n");
+
+  owl_fmtext_append_normal(fm, "Filter: ");
+  owl_fmtext_append_normal(fm, owl_filter_get_name(v->filter));
+  owl_fmtext_append_normal(fm, "\n");
+
+  owl_fmtext_append_normal(fm, "Style: ");
+  owl_fmtext_append_normal(fm, owl_style_get_name(v->style));
+  owl_fmtext_append_normal(fm, "\n");
+}
+
 char *owl_view_get_filtname(owl_view *v)
 {