diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..97c261f --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +*~ +.*.swp +wmsystray/main.o +wmsystray/systray.o +wmsystray/ui.o +wmsystray/wmsystray +wmsystray/xpms.o +xembed/xembed.o +ID +tags + diff --git a/Rules.make b/Rules.make index 2b8fba5..04d0996 100644 --- a/Rules.make +++ b/Rules.make @@ -3,11 +3,3 @@ # 2 is more verbose. TRACE_LEVEL = 0 -# -# X11 install location. -X11_PREFIX = /usr/X11R6 - -# -# X compiler and linker flags. -X11CFLAGS = -I${X11_PREFIX}/include -X11LDFLAGS = -L${X11_PREFIX}/lib -lX11 diff --git a/wmsystray/Makefile b/wmsystray/Makefile index f404534..4978a5b 100644 --- a/wmsystray/Makefile +++ b/wmsystray/Makefile @@ -1,8 +1,8 @@ include ../Rules.make CC = gcc -CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -Wall -g -LDFLAGS = ${X11LDFLAGS} -lXpm +CFLAGS = -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -Wall +LDFLAGS = -lXpm OBJS = main.o ui.o systray.o xpms.o XEMBED_OBJS = ../xembed/xembed.o @@ -12,3 +12,9 @@ wmsystray: ${OBJS} ${XEMBED_OBJS} clean: rm -f wmsystray ${OBJS} + +main.o: main.c ui.h systray.h list.h trace.h version.h +systray.o: systray.c list.h trace.h systray.h ui.h +ui.o: ui.c trace.h systray.h list.h ui.h +xpms.o: xpms.c + diff --git a/wmsystray/list.h b/wmsystray/list.h index 1367716..bb25bd4 100644 --- a/wmsystray/list.h +++ b/wmsystray/list.h @@ -1,63 +1,53 @@ -/****************************************************************************** - list.h +#ifndef _LIST_H +#define _LIST_H - BSD-derived (or so I hear) doubly-linked list implementation. From Linux - v2.6.0-test11-mm1, modified to remove RCU-protected list stuff and to - generally "sanitize" for userspace use. +#include +#include - General list implementation from include/linux/list.h; container_of macro - adapted from the list_entry in 2.4.23-pre7's include/linux/list.h header. - (v2.6's container_of depends on the GCC typeof extension.) - *****************************************************************************/ +#include "trace.h" -#ifndef _LINUX_LIST_H -#define _LINUX_LIST_H +/* + * + * list.h taken from Linus Linux git v2.6.36-rc6-84-gc6ea21e + * + */ -#include "trace.h" +struct list_head { + struct list_head *next, *prev; +}; -// #ifdef __KERNEL__ +struct hlist_head { + struct hlist_node *first; +}; + +struct hlist_node { + struct hlist_node *next, **pprev; +}; + +#define LIST_POISON1 ((void *) 0x00100100) +#define LIST_POISON2 ((void *) 0x00200200) + +#define prefetch(x) __builtin_prefetch(x) /** * container_of - cast a member of a structure out to the containing structure - * - * @ptr: the pointer to the member. - * @type: the type of the container struct this is embedded in. - * @member: the name of the member within the struct. + * @ptr: the pointer to the member. + * @type: the type of the container struct this is embedded in. + * @member: the name of the member within the struct. * */ -#define container_of(ptr, type, member) \ - ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member))) - -#if 0 -#define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ +#define container_of(ptr, type, member) ({ \ + const typeof( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) -#endif -#define BUG_ON(x) \ - do { \ - if ((x) != 0) { \ - TRACE2((stderr, "Bad usage in %s:%d", __FILE__, \ +#define BUG_ON(x) \ + do { \ + if ((x) != 0) { \ + TRACE2((stderr, "Bad usage in %s:%d", __FILE__, \ __LINE__)); \ - } \ + } \ } while (0); -#define prefetch(x) - -/* -#include -#include -#include -*/ - -/* - * These are non-NULL pointers that will result in page faults - * under normal circumstances, used to verify that nobody uses - * non-initialized list entries. - */ -#define LIST_POISON1 ((void *) 0x00100100) -#define LIST_POISON2 ((void *) 0x00200200) - /* * Simple doubly linked list implementation. * @@ -68,21 +58,19 @@ * 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) +static inline void INIT_LIST_HEAD(struct list_head *list) +{ + list->next = list; + list->prev = list; +} /* - * Insert a new entry between two known consecutive entries. + * Insert a new entry between two known consecutive entries. * * This is only for internal list manipulation where we know * the prev/next entries already! @@ -110,6 +98,7 @@ 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 @@ -139,7 +128,7 @@ static inline void __list_del(struct list_head * prev, struct list_head * 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 + * 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) @@ -152,13 +141,36 @@ static inline void list_del(struct list_head *entry) } /** + * list_replace - replace old entry by new one + * @old : the element to be replaced + * @new : the new element to insert + * + * If @old was empty, it will be overwritten. + */ +static inline void list_replace(struct list_head *old, + struct list_head *new) +{ + new->next = old->next; + new->next->prev = new; + new->prev = old->prev; + new->prev->next = new; +} + +static inline void list_replace_init(struct list_head *old, + struct list_head *new) +{ + list_replace(old, new); + INIT_LIST_HEAD(old); +} + +/** * 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); + INIT_LIST_HEAD(entry); } /** @@ -168,8 +180,8 @@ static inline void list_del_init(struct list_head *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_del(list->prev, list->next); + list_add(list, head); } /** @@ -180,8 +192,19 @@ static inline void list_move(struct list_head *list, struct list_head *head) 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_del(list->prev, list->next); + list_add_tail(list, head); +} + +/** + * list_is_last - tests whether @list is the last entry in list @head + * @list: the entry to test + * @head: the head of the list + */ +static inline int list_is_last(const struct list_head *list, + const struct list_head *head) +{ + return list->next == head; } /** @@ -194,16 +217,17 @@ static inline int list_empty(const struct list_head *head) } /** - * list_empty_careful - tests whether a list is - * empty _and_ checks that no other CPU might be - * in the process of still modifying either member + * list_empty_careful - tests whether a list is empty and not being modified + * @head: the list to test + * + * Description: + * tests whether a list is empty _and_ checks that no other CPU might be + * in the process of modifying either member (next or prev) * * NOTE: using list_empty_careful() without synchronization * can only be safe if the only activity that can happen * to the list entry is list_del_init(). Eg. it cannot be used * if another CPU could re-list_add() it. - * - * @head: the list to test. */ static inline int list_empty_careful(const struct list_head *head) { @@ -211,29 +235,105 @@ static inline int list_empty_careful(const struct list_head *head) return (next == head) && (next == head->prev); } -static inline void __list_splice(struct list_head *list, - struct list_head *head) +/** + * list_rotate_left - rotate the list to the left + * @head: the head of the list + */ +static inline void list_rotate_left(struct list_head *head) +{ + struct list_head *first; + + if (!list_empty(head)) { + first = head->next; + list_move_tail(first, head); + } +} + +/** + * list_is_singular - tests whether a list has just one entry. + * @head: the list to test. + */ +static inline int list_is_singular(const struct list_head *head) +{ + return !list_empty(head) && (head->next == head->prev); +} + +static inline void __list_cut_position(struct list_head *list, + struct list_head *head, struct list_head *entry) +{ + struct list_head *new_first = entry->next; + list->next = head->next; + list->next->prev = list; + list->prev = entry; + entry->next = list; + head->next = new_first; + new_first->prev = head; +} + +/** + * list_cut_position - cut a list into two + * @list: a new list to add all removed entries + * @head: a list with entries + * @entry: an entry within head, could be the head itself + * and if so we won't cut the list + * + * This helper moves the initial part of @head, up to and + * including @entry, from @head to @list. You should + * pass on @entry an element you know is on @head. @list + * should be an empty list or a list you do not care about + * losing its data. + * + */ +static inline void list_cut_position(struct list_head *list, + struct list_head *head, struct list_head *entry) +{ + if (list_empty(head)) + return; + if (list_is_singular(head) && + (head->next != entry && head != entry)) + return; + if (entry == head) + INIT_LIST_HEAD(list); + else + __list_cut_position(list, head, entry); +} + +static inline void __list_splice(const struct list_head *list, + struct list_head *prev, + struct list_head *next) { struct list_head *first = list->next; struct list_head *last = list->prev; - struct list_head *at = head->next; - first->prev = head; - head->next = first; + first->prev = prev; + prev->next = first; - last->next = at; - at->prev = last; + last->next = next; + next->prev = last; } /** - * list_splice - join two lists + * list_splice - join two lists, this is designed for stacks * @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) +static inline void list_splice(const struct list_head *list, + struct list_head *head) { if (!list_empty(list)) - __list_splice(list, head); + __list_splice(list, head, head->next); +} + +/** + * list_splice_tail - join two lists, each list being a queue + * @list: the new list to add. + * @head: the place to add it in the first list. + */ +static inline void list_splice_tail(struct list_head *list, + struct list_head *head) +{ + if (!list_empty(list)) + __list_splice(list, head->prev, head); } /** @@ -247,7 +347,24 @@ static inline void list_splice_init(struct list_head *list, struct list_head *head) { if (!list_empty(list)) { - __list_splice(list, head); + __list_splice(list, head, head->next); + INIT_LIST_HEAD(list); + } +} + +/** + * list_splice_tail_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. + * + * Each of the lists is a queue. + * The list at @list is reinitialised + */ +static inline void list_splice_tail_init(struct list_head *list, + struct list_head *head) +{ + if (!list_empty(list)) { + __list_splice(list, head->prev, head); INIT_LIST_HEAD(list); } } @@ -262,18 +379,28 @@ static inline void list_splice_init(struct list_head *list, container_of(ptr, type, member) /** + * list_first_entry - get the first element from a list + * @ptr: the list head to take the element from. + * @type: the type of the struct this is embedded in. + * @member: the name of the list_struct within the struct. + * + * Note, that list is expected to be not empty. + */ +#define list_first_entry(ptr, type, member) \ + list_entry((ptr)->next, type, member) + +/** * list_for_each - iterate over a list - * @pos: the &struct list_head to use as a loop counter. + * @pos: the &struct list_head to use as a loop cursor. * @head: the head for your list. -#define list_for_each(pos, head) \ - for (pos = (head)->next, prefetch(pos->next); pos != (head); \ - pos = pos->next, prefetch(pos->next)) */ -#define list_for_each(pos, head) __list_for_each(pos, head) +#define list_for_each(pos, head) \ + for (pos = (head)->next; prefetch(pos->next), pos != (head); \ + pos = pos->next) /** * __list_for_each - iterate over a list - * @pos: the &struct list_head to use as a loop counter. + * @pos: the &struct list_head to use as a loop cursor. * @head: the head for your list. * * This variant differs from list_for_each() in that it's the @@ -286,16 +413,16 @@ static inline void list_splice_init(struct list_head *list, /** * list_for_each_prev - iterate over a list backwards - * @pos: the &struct list_head to use as a loop counter. + * @pos: the &struct list_head to use as a loop cursor. * @head: the head for your list. */ #define list_for_each_prev(pos, head) \ - for (pos = (head)->prev, prefetch(pos->prev); pos != (head); \ - pos = pos->prev, prefetch(pos->prev)) - + for (pos = (head)->prev; prefetch(pos->prev), pos != (head); \ + pos = pos->prev) + /** - * 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. + * list_for_each_safe - iterate over a list safe against removal of list entry + * @pos: the &struct list_head to use as a loop cursor. * @n: another &struct list_head to use as temporary storage * @head: the head for your list. */ @@ -304,48 +431,92 @@ static inline void list_splice_init(struct list_head *list, pos = n, n = pos->next) /** + * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry + * @pos: the &struct list_head to use as a loop cursor. + * @n: another &struct list_head to use as temporary storage + * @head: the head for your list. + */ +#define list_for_each_prev_safe(pos, n, head) \ + for (pos = (head)->prev, n = pos->prev; \ + prefetch(pos->prev), pos != (head); \ + pos = n, n = pos->prev) + +/** * list_for_each_entry - iterate over list of given type - * @pos: the type * to use as a loop counter. + * @pos: the type * to use as a loop cursor. * @head: the head for your list. * @member: the name of the list_struct within the struct. */ #define list_for_each_entry(pos, head, member) \ - for (pos = list_entry((head)->next, typeof(*pos), member), \ - prefetch(pos->member.next); \ - &pos->member != (head); \ - pos = list_entry(pos->member.next, typeof(*pos), member), \ - prefetch(pos->member.next)) + for (pos = list_entry((head)->next, typeof(*pos), member); \ + prefetch(pos->member.next), &pos->member != (head); \ + pos = list_entry(pos->member.next, typeof(*pos), member)) /** * list_for_each_entry_reverse - iterate backwards over list of given type. - * @pos: the type * to use as a loop counter. + * @pos: the type * to use as a loop cursor. * @head: the head for your list. * @member: the name of the list_struct within the struct. */ #define list_for_each_entry_reverse(pos, head, member) \ - for (pos = list_entry((head)->prev, typeof(*pos), member), \ - prefetch(pos->member.prev); \ - &pos->member != (head); \ - pos = list_entry(pos->member.prev, typeof(*pos), member), \ - prefetch(pos->member.prev)) + for (pos = list_entry((head)->prev, typeof(*pos), member); \ + prefetch(pos->member.prev), &pos->member != (head); \ + pos = list_entry(pos->member.prev, typeof(*pos), member)) + +/** + * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue() + * @pos: the type * to use as a start point + * @head: the head of the list + * @member: the name of the list_struct within the struct. + * + * Prepares a pos entry for use as a start point in list_for_each_entry_continue(). + */ +#define list_prepare_entry(pos, head, member) \ + ((pos) ? : list_entry(head, typeof(*pos), member)) /** - * list_for_each_entry_continue - iterate over list of given type - * continuing after existing point - * @pos: the type * to use as a loop counter. + * list_for_each_entry_continue - continue iteration over list of given type + * @pos: the type * to use as a loop cursor. * @head: the head for your list. * @member: the name of the list_struct within the struct. + * + * Continue to iterate over list of given type, continuing after + * the current position. */ #define list_for_each_entry_continue(pos, head, member) \ - for (pos = list_entry(pos->member.next, typeof(*pos), member), \ - prefetch(pos->member.next); \ - &pos->member != (head); \ - pos = list_entry(pos->member.next, typeof(*pos), member), \ - prefetch(pos->member.next)) + for (pos = list_entry(pos->member.next, typeof(*pos), member); \ + prefetch(pos->member.next), &pos->member != (head); \ + pos = list_entry(pos->member.next, typeof(*pos), member)) + +/** + * list_for_each_entry_continue_reverse - iterate backwards from the given point + * @pos: the type * to use as a loop cursor. + * @head: the head for your list. + * @member: the name of the list_struct within the struct. + * + * Start to iterate over list of given type backwards, continuing after + * the current position. + */ +#define list_for_each_entry_continue_reverse(pos, head, member) \ + for (pos = list_entry(pos->member.prev, typeof(*pos), member); \ + prefetch(pos->member.prev), &pos->member != (head); \ + pos = list_entry(pos->member.prev, typeof(*pos), member)) + +/** + * list_for_each_entry_from - iterate over list of given type from the current point + * @pos: the type * to use as a loop cursor. + * @head: the head for your list. + * @member: the name of the list_struct within the struct. + * + * Iterate over list of given type, continuing from current position. + */ +#define list_for_each_entry_from(pos, head, member) \ + for (; prefetch(pos->member.next), &pos->member != (head); \ + pos = list_entry(pos->member.next, typeof(*pos), member)) /** * 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. + * @pos: the type * to use as a loop cursor. * @n: another type * to use as temporary storage * @head: the head for your list. * @member: the name of the list_struct within the struct. @@ -356,102 +527,176 @@ static inline void list_splice_init(struct list_head *list, &pos->member != (head); \ pos = n, n = list_entry(n->member.next, typeof(*n), member)) -/* - * Double linked lists with a single pointer list head. - * Mostly useful for hash tables where the two pointer list head is - * too wasteful. - * You lose the ability to access the tail in O(1). - */ +/** + * list_for_each_entry_safe_continue - continue list iteration safe against removal + * @pos: the type * to use as a loop cursor. + * @n: another type * to use as temporary storage + * @head: the head for your list. + * @member: the name of the list_struct within the struct. + * + * Iterate over list of given type, continuing after current point, + * safe against removal of list entry. + */ +#define list_for_each_entry_safe_continue(pos, n, head, member) \ + for (pos = list_entry(pos->member.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)) + +/** + * list_for_each_entry_safe_from - iterate over list from current point safe against removal + * @pos: the type * to use as a loop cursor. + * @n: another type * to use as temporary storage + * @head: the head for your list. + * @member: the name of the list_struct within the struct. + * + * Iterate over list of given type from current point, safe against + * removal of list entry. + */ +#define list_for_each_entry_safe_from(pos, n, head, member) \ + for (n = list_entry(pos->member.next, typeof(*pos), member); \ + &pos->member != (head); \ + pos = n, n = list_entry(n->member.next, typeof(*n), member)) -struct hlist_head { - struct hlist_node *first; -}; +/** + * list_for_each_entry_safe_reverse - iterate backwards over list safe against removal + * @pos: the type * to use as a loop cursor. + * @n: another type * to use as temporary storage + * @head: the head for your list. + * @member: the name of the list_struct within the struct. + * + * Iterate backwards over list of given type, safe against removal + * of list entry. + */ +#define list_for_each_entry_safe_reverse(pos, n, head, member) \ + for (pos = list_entry((head)->prev, typeof(*pos), member), \ + n = list_entry(pos->member.prev, typeof(*pos), member); \ + &pos->member != (head); \ + pos = n, n = list_entry(n->member.prev, typeof(*n), member)) + +/** + * list_safe_reset_next - reset a stale list_for_each_entry_safe loop + * @pos: the loop cursor used in the list_for_each_entry_safe loop + * @n: temporary storage used in list_for_each_entry_safe + * @member: the name of the list_struct within the struct. + * + * list_safe_reset_next is not safe to use in general if the list may be + * modified concurrently (eg. the lock is dropped in the loop body). An + * exception to this is if the cursor element (pos) is pinned in the list, + * and list_safe_reset_next is called after re-taking the lock and before + * completing the current iteration of the loop body. + */ +#define list_safe_reset_next(pos, n, member) \ + n = list_entry(pos->member.next, typeof(*pos), member) -struct hlist_node { - struct hlist_node *next, **pprev; -}; +/* + * Double linked lists with a single pointer list head. + * Mostly useful for hash tables where the two pointer list head is + * too wasteful. + * You lose the ability to access the tail in O(1). + */ -#define HLIST_HEAD_INIT { .first = NULL } +#define HLIST_HEAD_INIT { .first = NULL } #define HLIST_HEAD(name) struct hlist_head name = { .first = NULL } -#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL) -#define INIT_HLIST_NODE(ptr) ((ptr)->next = NULL, (ptr)->pprev = NULL) +#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL) +static inline void INIT_HLIST_NODE(struct hlist_node *h) +{ + h->next = NULL; + h->pprev = NULL; +} -static __inline__ int hlist_unhashed(const struct hlist_node *h) -{ +static inline int hlist_unhashed(const struct hlist_node *h) +{ return !h->pprev; -} +} -static __inline__ int hlist_empty(const struct hlist_head *h) -{ +static inline int hlist_empty(const struct hlist_head *h) +{ return !h->first; -} +} -static __inline__ void __hlist_del(struct hlist_node *n) +static inline void __hlist_del(struct hlist_node *n) { struct hlist_node *next = n->next; struct hlist_node **pprev = n->pprev; - *pprev = next; - if (next) + *pprev = next; + if (next) next->pprev = pprev; -} +} -static __inline__ void hlist_del(struct hlist_node *n) +static inline void hlist_del(struct hlist_node *n) { __hlist_del(n); n->next = LIST_POISON1; n->pprev = LIST_POISON2; } -static __inline__ void hlist_del_init(struct hlist_node *n) +static inline void hlist_del_init(struct hlist_node *n) { - if (n->pprev) { + if (!hlist_unhashed(n)) { __hlist_del(n); INIT_HLIST_NODE(n); } -} +} -static __inline__ void hlist_add_head(struct hlist_node *n, struct hlist_head *h) -{ +static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h) +{ struct hlist_node *first = h->first; - n->next = first; - if (first) + n->next = first; + if (first) first->pprev = &n->next; - h->first = n; - n->pprev = &h->first; -} + h->first = n; + n->pprev = &h->first; +} /* next must be != NULL */ -static __inline__ void hlist_add_before(struct hlist_node *n, struct hlist_node *next) +static inline void hlist_add_before(struct hlist_node *n, + struct hlist_node *next) { n->pprev = next->pprev; - n->next = next; - next->pprev = &n->next; + n->next = next; + next->pprev = &n->next; *(n->pprev) = n; } -static __inline__ void hlist_add_after(struct hlist_node *n, - struct hlist_node *next) +static inline void hlist_add_after(struct hlist_node *n, + struct hlist_node *next) { - next->next = n->next; - *(next->pprev) = n; - n->next = next; + next->next = n->next; + n->next = next; + next->pprev = &n->next; + + if(next->next) + next->next->pprev = &next->next; +} + +/* + * Move a list from one list head to another. Fixup the pprev + * reference of the first entry if it exists. + */ +static inline void hlist_move_list(struct hlist_head *old, + struct hlist_head *new) +{ + new->first = old->first; + if (new->first) + new->first->pprev = &new->first; + old->first = NULL; } #define hlist_entry(ptr, type, member) container_of(ptr,type,member) -/* Cannot easily do prefetch unfortunately */ #define hlist_for_each(pos, head) \ for (pos = (head)->first; pos && ({ prefetch(pos->next); 1; }); \ - pos = pos->next) + pos = pos->next) #define hlist_for_each_safe(pos, n, head) \ - for (pos = (head)->first; n = pos ? pos->next : 0, pos; \ + for (pos = (head)->first; pos && ({ n = pos->next; 1; }); \ pos = n) /** * hlist_for_each_entry - iterate over list of given type - * @tpos: the type * to use as a loop counter. - * @pos: the &struct hlist_node to use as a loop counter. + * @tpos: the type * to use as a loop cursor. + * @pos: the &struct hlist_node to use as a loop cursor. * @head: the head for your list. * @member: the name of the hlist_node within the struct. */ @@ -462,9 +707,9 @@ static __inline__ void hlist_add_after(struct hlist_node *n, pos = pos->next) /** - * hlist_for_each_entry_continue - iterate over a hlist continuing after existing point - * @tpos: the type * to use as a loop counter. - * @pos: the &struct hlist_node to use as a loop counter. + * hlist_for_each_entry_continue - iterate over a hlist continuing after current point + * @tpos: the type * to use as a loop cursor. + * @pos: the &struct hlist_node to use as a loop cursor. * @member: the name of the hlist_node within the struct. */ #define hlist_for_each_entry_continue(tpos, pos, member) \ @@ -474,9 +719,9 @@ static __inline__ void hlist_add_after(struct hlist_node *n, pos = pos->next) /** - * hlist_for_each_entry_from - iterate over a hlist continuing from existing point - * @tpos: the type * to use as a loop counter. - * @pos: the &struct hlist_node to use as a loop counter. + * hlist_for_each_entry_from - iterate over a hlist continuing from current point + * @tpos: the type * to use as a loop cursor. + * @pos: the &struct hlist_node to use as a loop cursor. * @member: the name of the hlist_node within the struct. */ #define hlist_for_each_entry_from(tpos, pos, member) \ @@ -486,8 +731,8 @@ static __inline__ void hlist_add_after(struct hlist_node *n, /** * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry - * @tpos: the type * to use as a loop counter. - * @pos: the &struct hlist_node to use as a loop counter. + * @tpos: the type * to use as a loop cursor. + * @pos: the &struct hlist_node to use as a loop cursor. * @n: another &struct hlist_node to use as temporary storage * @head: the head for your list. * @member: the name of the hlist_node within the struct. @@ -497,7 +742,6 @@ static __inline__ void hlist_add_after(struct hlist_node *n, pos && ({ n = pos->next; 1; }) && \ ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ pos = n) -//#else -//#warning "don't include kernel headers in userspace" -// #endif /* __KERNEL__ */ + #endif + diff --git a/wmsystray/systray.c b/wmsystray/systray.c index 733ada0..de3a6f3 100644 --- a/wmsystray/systray.c +++ b/wmsystray/systray.c @@ -136,7 +136,7 @@ int systray_property_update (struct systray_item *item) { TRACE((stderr, "ENTERING: systray_property_update\n")); - xembed_get_info (main_disp, item->window_id, &info); + if (xembed_get_info (main_disp, item->window_id, &info)) return -1; flags_changed = info.flags ^ item->info.flags; if (flags_changed == 0) return -1; @@ -338,7 +338,7 @@ int handle_dock_request (Window embed_wind) { XReparentWindow (main_disp, embed_wind, DefaultRootWindow(main_disp), 0, 0); TRACE((stderr, "REJECTED!\n")); - return; + return 0; } XSelectInput (main_disp, embed_wind, StructureNotifyMask | @@ -361,6 +361,7 @@ int handle_dock_request (Window embed_wind) { /*SelectInput was here*/ status = xembed_get_info (main_disp, embed_wind, &info); XSync (main_disp, False); + if (status) return -1; if (info.version < XEMBED_VERSION) version = info.version; diff --git a/wmsystray/systray.h b/wmsystray/systray.h index 019bc9d..42fbbf0 100644 --- a/wmsystray/systray.h +++ b/wmsystray/systray.h @@ -22,6 +22,8 @@ struct systray_item { extern struct list_head systray_list; extern int systray_item_count; +extern struct systray_item *find_systray_item(Window); +extern int systray_property_update (struct systray_item *); /* * System tray message opcodes. (From the freedesktop.org specification.) diff --git a/wmsystray/ui.c b/wmsystray/ui.c index 6814137..591897b 100644 --- a/wmsystray/ui.c +++ b/wmsystray/ui.c @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -33,7 +34,6 @@ int wmaker = 1; int loop_program = 1; static GC main_gc; - XRectangle active_area = { .x = 8, .y = 4, .width = 48, .height = 48 }; @@ -273,6 +273,10 @@ void wmsystray_event_loop() { Window cover; struct list_head *n; struct systray_item *item; + struct timespec req = { + .tv_sec = 0, + .tv_nsec = 100000000 + }; while (loop_program) { while (XPending(main_disp)) { @@ -404,6 +408,6 @@ void wmsystray_event_loop() { } } - usleep(100000L); + nanosleep(&req, NULL); } } diff --git a/wmsystray/ui.h b/wmsystray/ui.h index d0c566c..d25d994 100644 --- a/wmsystray/ui.h +++ b/wmsystray/ui.h @@ -24,5 +24,6 @@ extern char *geometry_string; extern Display *main_disp; extern Window main_wind, icon_wind, sel_wind, draw_wind; extern char * wmsystray_xpm[]; +extern void draw_ui_elements(void); #endif diff --git a/xembed/Makefile b/xembed/Makefile index cdc43d3..7fbac33 100644 --- a/xembed/Makefile +++ b/xembed/Makefile @@ -1,9 +1,11 @@ include ../Rules.make -CFLAGS = -DTRACE_LEVEL=${TRACE_LEVEL} ${X11CFLAGS} -Wall -g +CFLAGS = -DTRACE_LEVEL=${TRACE_LEVEL} ${X11CFLAGS} -Wall LDFLAGS = ${X11LDFLAGS} all: xembed.o +xembed.o: xembed.c xembed.h ../wmsystray/trace.h + clean: rm -f xembed.o diff --git a/xembed/xembed.c b/xembed/xembed.c index a1ab827..d13fceb 100644 --- a/xembed/xembed.c +++ b/xembed/xembed.c @@ -4,6 +4,7 @@ #include #include +#include #include "xembed.h" #include "../wmsystray/trace.h" @@ -119,6 +120,7 @@ int xembed_get_info (Display *disp, Window wind, struct xembed_info *info) { XSync (disp, False); if (status != Success) { + return -1; } if (type == None) { @@ -131,8 +133,14 @@ int xembed_get_info (Display *disp, Window wind, struct xembed_info *info) { } data_long = (unsigned long *) data; - info->version = data_long[0]; - info->flags = data_long[1] & XEMBED_INFO_FLAGS_ALL; + if (data_long == NULL) { + info->version = 0; + info->flags = 0; + } else { + info->version = data_long[0]; + info->flags = data_long[1] & XEMBED_INFO_FLAGS_ALL; + XFree(data); + } TRACE((stderr, "LEAVING: xembed_get_info %x %x\n", info->version, info->flags));