Changes in / [8b293ea:1c01cdf7]

Files:

• commands.c (modified) (5 diffs)
• functions.c (modified) (1 diff)
• global.c (modified) (1 diff)
• history.c (modified) (4 diffs)
• owl.h (modified) (1 diff)

commands.c

@@ -2632 +2632 @@
   ptr = skiptokens(buff, 1);
   hist = owl_global_get_cmd_history(&g);
-  owl_history_store(hist, ptr);
-  owl_history_reset(hist);
+  owl_history_store(hist, ptr, false);
   /* owl_function_makemsg("History '%s' stored successfully", ptr+1); */
   return NULL;
@@ -2655 +2654 @@
 
   hist = owl_global_get_cmd_history(&g);
-  owl_history_store(hist, ptr);
-  owl_history_reset(hist);
+  owl_history_store(hist, ptr, false);
   return owl_function_command(ptr);
 }
@@ -2739 +2737 @@
 
   hist = owl_editwin_get_history(e);
-  if (hist) {
-    owl_history_store(hist, owl_editwin_get_text(e));
-    owl_history_reset(hist);
-  }
+  if (hist)
+    owl_history_store(hist, owl_editwin_get_text(e), false);
 
   owl_global_pop_context(&g);
@@ -2755 +2751 @@
   if (!hist)
     return;
-  if (!owl_history_is_touched(hist)) {
-    owl_history_store(hist, owl_editwin_get_text(e));
-    owl_history_set_partial(hist);
-  }
+  if (!owl_history_is_touched(hist))
+    owl_history_store(hist, owl_editwin_get_text(e), true);
   ptr=owl_history_get_prev(hist);
   if (ptr) {
@@ -2796 +2790 @@
   owl_history *hist=owl_editwin_get_history(e);
 
-  if (hist) {
-    owl_history_store(hist, owl_editwin_get_text(e));
-    owl_history_reset(hist);
-  }
+  if (hist)
+    owl_history_store(hist, owl_editwin_get_text(e), false);
 
   /* Take a reference to the editwin, so that it survives the pop

functions.c

@@ -1841 +1841 @@
     if (enter) {
       owl_history *hist = owl_global_get_cmd_history(&g);
-      owl_history_store(hist, buff);
-      owl_history_reset(hist);
+      owl_history_store(hist, buff, false);
       owl_function_command_norv(buff);
     } else {

global.c

@@ -65 +65 @@
   owl_history_init(&(g->msghist));
   owl_history_init(&(g->cmdhist));
-  owl_history_set_norepeats(&(g->cmdhist));
   g->nextmsgid=0;
 

history.c

@@ -3 +3 @@
 void owl_history_init(owl_history *h)
 {
-  owl_list_create(&(h->hist));
-  h->cur=0;                     /* current position in history */
-  h->touched=0;                 /* whether we've gone into history */
-  h->partial=0;                 /* is the 0th element is partially composed? */
-  h->repeats=1;                 /* by default we'll allow repeat entries */
-}
-
-void owl_history_set_norepeats(owl_history *h)
-{
-  h->repeats=0;
+  g_queue_init(&h->hist);
+  h->cur = h->hist.tail;        /* current position in history */
+  h->partial = false;           /* is the 0th element is partially composed? */
 }
 
 const char *owl_history_get_prev(owl_history *h)
 {
+  if (!h) return NULL;
 
-  if (!h) return NULL;
-  h->touched=1;
+  if (h->cur == NULL || g_list_previous(h->cur) == NULL) return NULL;
 
-  if (owl_list_get_size(&(h->hist))==0) return(NULL);
-
-  if (h->cur == owl_list_get_size(&(h->hist))-1) {
-    return(NULL);
-  }
-
-  h->cur++;
-
-  return(owl_list_get_element(&(h->hist), h->cur));
+  h->cur = g_list_previous(h->cur);
+  return h->cur->data;
 }
 
@@ -35 +21 @@
 {
   if (!h) return NULL;
-  if (owl_list_get_size(&(h->hist))==0) return(NULL);
-  if (h->cur==0) {
-    return(NULL);
-  }
 
-  h->cur--;
-  return(owl_list_get_element(&(h->hist), h->cur));
+  if (h->cur == NULL || g_list_next(h->cur) == NULL) return NULL;
+
+  h->cur = g_list_next(h->cur);
+  return h->cur->data;
 }
 
-void owl_history_store(owl_history *h, const char *line)
+void owl_history_store(owl_history *h, const char *line, bool partial)
 {
-  int size;
+  if (!h) return;
 
-  if (!h) return;
-  size=owl_list_get_size(&(h->hist));
+  owl_history_reset(h);
 
-  /* if partial is set, remove the first entry first */
-  if (h->partial) {
-    g_free(owl_list_get_element(&(h->hist), 0));
-    owl_list_remove_element(&(h->hist), 0);
-  }
-
-  /* if repeats are disallowed, check if the line is the same as the last */
-  if (owl_list_get_size(&(h->hist))>0) {
-    if (!strcmp(line, owl_list_get_element(&(h->hist), 0))) return;
-  }
+  /* check if the line is the same as the last */
+  if (!partial && !g_queue_is_empty(&h->hist) &&
+      strcmp(line, g_queue_peek_tail(&h->hist)) == 0)
+    return;
 
   /* if we've reached the max history size, pop off the last element */
-  if (size>OWL_HISTORYSIZE) {
-    g_free(owl_list_get_element(&(h->hist), size-1));
-    owl_list_remove_element(&(h->hist), size-1);
-  }
+  if (g_queue_get_length(&h->hist) > OWL_HISTORYSIZE)
+    g_free(g_queue_pop_head(&h->hist));
 
   /* add the new line */
-  owl_list_prepend_element(&(h->hist), g_strdup(line));
-}
-
-void owl_history_set_partial(owl_history *h)
-{
-  if (!h) return;
-  h->partial=1;
+  g_queue_push_tail(&h->hist, g_strdup(line));
+  h->partial = partial;
+  h->cur = h->hist.tail;
 }
 
@@ -81 +52 @@
 {
   if (!h) return;
-  h->cur=0;
-  h->touched=0;
-  h->partial=0;
+
+  /* if partial is set, remove the first entry first */
+  if (h->partial) {
+    g_free(g_queue_pop_tail(&h->hist));
+    h->partial = false;
+  }
+
+  h->cur = h->hist.tail;
 }
 
@@ -89 +65 @@
 {
   if (!h) return(0);
-  if (h->touched) return(1);
-  return(0);
+  return h->cur != NULL && g_list_next(h->cur) != NULL;
 }

owl.h

@@ -455 +455 @@
 
 typedef struct _owl_history {
-  owl_list hist;
-  int cur;
-  int touched;
-  int partial;
-  int repeats;
+  GQueue hist;
+  GList *cur;
+  bool partial;
 } owl_history;