changeset 822:0dbb2be10975

Get rid of list.h We use glib functions instead.
author Mikael Berthe <mikael@lilotux.net>
date Sun, 23 Apr 2006 11:21:24 +0200
parents 8c64874c449e
children 19c615fd071e
files mcabber/src/Makefile.am mcabber/src/list.h mcabber/src/screen.c
diffstat 3 files changed, 45 insertions(+), 268 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/src/Makefile.am	Sun Apr 23 09:53:28 2006 +0200
+++ b/mcabber/src/Makefile.am	Sun Apr 23 11:21:24 2006 +0200
@@ -4,7 +4,7 @@
 		  commands.c commands.h compl.c compl.h \
 		  hbuf.c hbuf.h screen.c screen.h logprint.h \
 		  settings.c settings.h hooks.c hooks.h \
-		  histolog.c histolog.h utils.c utils.h list.h
+		  histolog.c histolog.h utils.c utils.h
 
 LDADD = $(GLIB_LIBS) -lncurses -lpanel \
 	../libjabber/liblibjabber.a ../connwrap/libconnwrap.a
--- a/mcabber/src/list.h	Sun Apr 23 09:53:28 2006 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,215 +0,0 @@
-#ifndef _LINUX_LIST_H
-#define _LINUX_LIST_H
-
-/*
- * Simple doubly linked list implementation.
- *
- * Some of the internal functions ("__xxx") are useful when
- * manipulating whole lists rather than single entries, as
- * sometimes we already know the next/prev entries and we can
- * generate better code by using them directly rather than
- * using the generic single-entry routines.
- */
-
-struct list_head {
-  struct list_head *next, *prev;
-};
-
-#define LIST_HEAD_INIT(name) { &(name), &(name) }
-
-#define LIST_HEAD(name) \
-	struct list_head name = LIST_HEAD_INIT(name)
-
-#define INIT_LIST_HEAD(ptr) do { \
-	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
-} while (0)
-
-/*
- * Insert a new entry between two known consecutive entries.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void
-__list_add(struct list_head *new,
-	   struct list_head *prev, struct list_head *next)
-{
-  next->prev = new;
-  new->next = next;
-  new->prev = prev;
-  prev->next = new;
-}
-
-/**
- * list_add - add a new entry
- * @new: new entry to be added
- * @head: list head to add it after
- *
- * Insert a new entry after the specified head.
- * This is good for implementing stacks.
- */
-static inline void list_add(struct list_head *new, struct list_head *head)
-{
-  __list_add(new, head, head->next);
-}
-
-/**
- * list_add_tail - add a new entry
- * @new: new entry to be added
- * @head: list head to add it before
- *
- * Insert a new entry before the specified head.
- * This is useful for implementing queues.
- */
-static inline void
-list_add_tail(struct list_head *new, struct list_head *head)
-{
-  __list_add(new, head->prev, head);
-}
-
-/*
- * Delete a list entry by making the prev/next entries
- * point to each other.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void
-__list_del(struct list_head *prev, struct list_head *next)
-{
-  next->prev = prev;
-  prev->next = next;
-}
-
-/**
- * list_del - deletes entry from list.
- * @entry: the element to delete from the list.
- * Note: list_empty on entry does not return true after this, the entry is
- *       in an undefined state.
- */
-static inline void list_del(struct list_head *entry)
-{
-  __list_del(entry->prev, entry->next);
-  entry->next = (void *) 0;
-  entry->prev = (void *) 0;
-}
-
-/**
- * list_del_init - deletes entry from list and reinitialize it.
- * @entry: the element to delete from the list.
- */
-static inline void list_del_init(struct list_head *entry)
-{
-  __list_del(entry->prev, entry->next);
-  INIT_LIST_HEAD(entry);
-}
-
-/**
- * list_move - delete from one list and add as another's head
- * @list: the entry to move
- * @head: the head that will precede our entry
- */
-static inline void
-list_move(struct list_head *list, struct list_head *head)
-{
-  __list_del(list->prev, list->next);
-  list_add(list, head);
-}
-
-/**
- * list_move_tail - delete from one list and add as another's tail
- * @list: the entry to move
- * @head: the head that will follow our entry
- */
-static inline void
-list_move_tail(struct list_head *list, struct list_head *head)
-{
-  __list_del(list->prev, list->next);
-  list_add_tail(list, head);
-}
-
-/**
- * list_empty - test whether a list is empty
- * @head: the list to test.
- */
-static inline int list_empty(struct list_head *head)
-{
-  return head->next == head;
-}
-
-static inline void
-__list_splice(struct list_head *list, struct list_head *head)
-{
-  struct list_head *first = list->next;
-  struct list_head *last = list->prev;
-  struct list_head *at = head->next;
-
-  first->prev = head;
-  head->next = first;
-
-  last->next = at;
-  at->prev = last;
-}
-
-/**
- * list_splice - join two lists
- * @list: the new list to add.
- * @head: the place to add it in the first list.
- */
-static inline void
-list_splice(struct list_head *list, struct list_head *head)
-{
-  if (!list_empty(list))
-    __list_splice(list, head);
-}
-
-/**
- * list_splice_init - join two lists and reinitialise the emptied list.
- * @list: the new list to add.
- * @head: the place to add it in the first list.
- *
- * The list at @list is reinitialised
- */
-static inline void
-list_splice_init(struct list_head *list, struct list_head *head)
-{
-  if (!list_empty(list)) {
-    __list_splice(list, head);
-    INIT_LIST_HEAD(list);
-  }
-}
-
-/**
- * list_entry - get the struct for this entry
- * @ptr:	the &struct list_head pointer.
- * @type:	the type of the struct this is embedded in.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_entry(ptr, type, member) \
-	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
-
-/**
- * list_for_each_safe - iterate over a list safe against removal of list entry
- * @pos:	the &struct list_head to use as a loop counter.
- * @n:		another &struct list_head to use as temporary storage
- * @head:	the head for your list.
- */
-#define list_for_each_safe(pos, n, head) \
-	for (pos = (head)->next, n = pos->next; pos != (head); \
-		pos = n, n = pos->next)
-
-/**
- * list_for_each_entry_safe - iterate over list of given type safe against
- *                            removal of list entry
- * @pos:	the type * to use as a loop counter.
- * @n:		another type * to use as temporary storage
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_for_each_entry_safe(pos, n, head, member)			\
-	for (pos = list_entry((head)->next, typeof(*pos), member),	\
-		n = list_entry(pos->member.next, typeof(*pos), member);	\
-	     &pos->member != (head); 					\
-	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
-
-#endif
--- a/mcabber/src/screen.c	Sun Apr 23 09:53:28 2006 +0200
+++ b/mcabber/src/screen.c	Sun Apr 23 11:21:24 2006 +0200
@@ -38,9 +38,7 @@
 #include "histolog.h"
 #include "settings.h"
 #include "utils.h"
-#include "list.h"
 
-#define window_entry(n) list_entry(n, window_entry_t, list)
 #define get_color(col)  (COLOR_PAIR(col)|COLOR_ATTRIB[col])
 
 #define DEFAULT_LOG_WIN_HEIGHT (5+2)
@@ -54,17 +52,16 @@
 
 static inline void check_offset(int);
 
-LIST_HEAD(window_list);
+static GSList *winbuflst;
 
-typedef struct _window_entry_t {
+typedef struct {
   WINDOW *win;
   PANEL  *panel;
   char   *name;
   GList  *hbuf;
   GList  *top;      // If top is NULL, we'll display the last lines
   char    cleared;  // For ex, user has issued a /clear command...
-  struct list_head list;
-} window_entry_t;
+} winbuf;
 
 
 static WINDOW *rosterWnd, *chatWnd, *inputWnd, *logWnd;
@@ -73,7 +70,7 @@
 static PANEL *mainstatusPanel, *chatstatusPanel;
 static PANEL *logPanel;
 static int maxY, maxX;
-static window_entry_t *currentWindow;
+static winbuf *currentWindow;
 
 static int roster_hidden;
 static int chatmode;
@@ -376,15 +373,15 @@
   g_free(buffer);
 }
 
-static window_entry_t *scr_CreateBuddyPanel(const char *title, int dont_show)
+static winbuf *scr_CreateBuddyPanel(const char *title, int dont_show)
 {
   int x;
   int y;
   int lines;
   int cols;
-  window_entry_t *tmp;
+  winbuf *tmp;
 
-  tmp = g_new0(window_entry_t, 1);
+  tmp = g_new0(winbuf, 1);
 
   // Dimensions
   x = Roster_Width;
@@ -415,24 +412,22 @@
   // Load buddy history from file (if enabled)
   hlog_read_history(title, &tmp->hbuf, maxX - Roster_Width - PREFIX_WIDTH);
 
-  list_add_tail(&tmp->list, &window_list);
-
+  winbuflst = g_slist_append(winbuflst, tmp);
   return tmp;
 }
 
-static window_entry_t *scr_SearchWindow(const char *winId)
+static winbuf *scr_SearchWindow(const char *winId)
 {
-  struct list_head *pos, *n;
-  window_entry_t *search_entry = NULL;
+  GSList *wblp;
+  winbuf *wbp;
 
   if (!winId) return NULL;
 
-  list_for_each_safe(pos, n, &window_list) {
-    search_entry = window_entry(pos);
-    if (search_entry->name) {
-      if (!strcasecmp(search_entry->name, winId)) {
-	return search_entry;
-      }
+  for (wblp = winbuflst; wblp; wblp = g_slist_next(wblp)) {
+    wbp = wblp->data;
+    if (wbp->name) {
+      if (!strcasecmp(wbp->name, winId))
+	return wbp;
     }
   }
   return NULL;
@@ -445,7 +440,7 @@
 
 //  scr_UpdateWindow()
 // (Re-)Display the given chat window.
-static void scr_UpdateWindow(window_entry_t *win_entry)
+static void scr_UpdateWindow(winbuf *win_entry)
 {
   int n;
   int width;
@@ -537,7 +532,7 @@
 // Display the chat window with the given identifier.
 static void scr_ShowWindow(const char *winId)
 {
-  window_entry_t *win_entry = scr_SearchWindow(winId);
+  winbuf *win_entry = scr_SearchWindow(winId);
 
   if (!win_entry)
     win_entry = scr_CreateBuddyPanel(winId, FALSE);
@@ -586,7 +581,7 @@
 void scr_WriteInWindow(const char *winId, const char *text, time_t timestamp,
         unsigned int prefix_flags, int force_show)
 {
-  window_entry_t *win_entry;
+  winbuf *win_entry;
   char *text_locale;
   int dont_show = FALSE;
 
@@ -787,9 +782,9 @@
 // - Rewrap lines in each buddy buffer
 void scr_Resize()
 {
-  struct list_head *pos, *n;
-  window_entry_t *search_entry;
   int x, y, lines, cols;
+  GSList *wblp;
+  winbuf *wbp;
 
   // First, update the global variables
   getmaxyx(stdscr, maxY, maxX);
@@ -808,25 +803,22 @@
   cols = maxX - Roster_Width;
   if (cols < 1) cols = 1;
 
-  list_for_each_safe(pos, n, &window_list) {
-    search_entry = window_entry(pos);
-    if (search_entry->win) {
+  for (wblp = winbuflst; wblp; wblp = g_slist_next(wblp)) {
+    wbp = wblp->data;
+    if (wbp->win) {
       GList *rescue_top;
       // Resize/move buddy window
-      wresize(search_entry->win, lines, cols);
-      mvwin(search_entry->win, 0, Roster_Width);
-      werase(search_entry->win);
+      wresize(wbp->win, lines, cols);
+      mvwin(wbp->win, 0, Roster_Width);
+      werase(wbp->win);
       // If a panel exists, replace the old window with the new
-      if (search_entry->panel) {
-        replace_panel(search_entry->panel, search_entry->win);
-      }
+      if (wbp->panel)
+        replace_panel(wbp->panel, wbp->win);
       // Redo line wrapping
-      rescue_top = hbuf_previous_persistent(search_entry->top);
-      hbuf_rebuild(&search_entry->hbuf,
-              maxX - Roster_Width - PREFIX_WIDTH);
-      if (g_list_position(g_list_first(search_entry->hbuf),
-                          search_entry->top) == -1) {
-        search_entry->top = rescue_top;
+      rescue_top = hbuf_previous_persistent(wbp->top);
+      hbuf_rebuild(&wbp->hbuf, maxX - Roster_Width - PREFIX_WIDTH);
+      if (g_list_position(g_list_first(wbp->hbuf), wbp->top) == -1) {
+        wbp->top = rescue_top;
       }
     }
   }
@@ -1340,7 +1332,7 @@
 // - up if updown == -1, down if updown == 1
 void scr_BufferScrollUpDown(int updown, unsigned int nblines)
 {
-  window_entry_t *win_entry;
+  winbuf *win_entry;
   int n, nbl;
   GList *hbuf_top;
 
@@ -1393,11 +1385,11 @@
 // Clear the current buddy window (used for the /clear command)
 void scr_BufferClear(void)
 {
-  window_entry_t *win_entry;
+  winbuf *win_entry;
 
   // Get win_entry
   if (!current_buddy) return;
-  win_entry  = scr_SearchWindow(CURRENT_JID);
+  win_entry = scr_SearchWindow(CURRENT_JID);
   if (!win_entry) return;
 
   win_entry->cleared = TRUE;
@@ -1416,11 +1408,11 @@
 // (top if topbottom == -1, bottom topbottom == 1)
 void scr_BufferTopBottom(int topbottom)
 {
-  window_entry_t *win_entry;
+  winbuf *win_entry;
 
   // Get win_entry
   if (!current_buddy) return;
-  win_entry  = scr_SearchWindow(CURRENT_JID);
+  win_entry = scr_SearchWindow(CURRENT_JID);
   if (!win_entry) return;
 
   win_entry->cleared = FALSE;
@@ -1442,12 +1434,12 @@
 // (backward search if direction == -1, forward if topbottom == 1)
 void scr_BufferSearch(int direction, const char *text)
 {
-  window_entry_t *win_entry;
+  winbuf *win_entry;
   GList *current_line, *search_res;
 
   // Get win_entry
   if (!current_buddy) return;
-  win_entry  = scr_SearchWindow(CURRENT_JID);
+  win_entry = scr_SearchWindow(CURRENT_JID);
   if (!win_entry) return;
 
   if (win_entry->top)
@@ -1475,12 +1467,12 @@
 // Jump to the specified position in the buffer, in %
 void scr_BufferPercent(int pc)
 {
-  window_entry_t *win_entry;
+  winbuf *win_entry;
   GList *search_res;
 
   // Get win_entry
   if (!current_buddy) return;
-  win_entry  = scr_SearchWindow(CURRENT_JID);
+  win_entry = scr_SearchWindow(CURRENT_JID);
   if (!win_entry) return;
 
   if (pc < 0 || pc > 100) {
@@ -1506,12 +1498,12 @@
 // t is a date in seconds since `00:00:00 1970-01-01 UTC'
 void scr_BufferDate(time_t t)
 {
-  window_entry_t *win_entry;
+  winbuf *win_entry;
   GList *search_res;
 
   // Get win_entry
   if (!current_buddy) return;
-  win_entry  = scr_SearchWindow(CURRENT_JID);
+  win_entry = scr_SearchWindow(CURRENT_JID);
   if (!win_entry) return;
 
   search_res = hbuf_jump_date(win_entry->hbuf, t);