Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

s/msgqueuehead/msgqueue

  • Loading branch information...
commit 78ba452469cb53bc6c9eac778c05546f805cd6d6 1 parent 747c90b
@knopwob knopwob authored
Showing with 13 additions and 13 deletions.
  1. +11 −11 dunst.c
  2. +2 −2 dunst_dbus.c
View
22 dunst.c
@@ -45,7 +45,7 @@ static Bool topbar = True;
static DC *dc;
static Window win;
static double global_timeout = 10;
-static msg_queue_t *msgqueuehead = NULL;
+static msg_queue_t *msgqueue = NULL;
static time_t now;
static int listen_to_dbus = True;
static int visible = False;
@@ -160,11 +160,11 @@ handleXEvents(void) {
void
next_win(void) {
- if(msgqueuehead == NULL) {
+ if(msgqueue == NULL) {
return;
}
- msgqueuehead = pop(msgqueuehead);
- if(msgqueuehead == NULL) {
+ msgqueue = pop(msgqueue);
+ if(msgqueue == NULL) {
/* hide window */
if(!visible) {
/* window is already hidden */
@@ -175,7 +175,7 @@ next_win(void) {
XFlush(dc->dpy);
visible = False;
} else {
- drawmsg(msgqueuehead->msg);
+ drawmsg(msgqueue->msg);
}
}
@@ -188,9 +188,9 @@ run(void) {
dbus_poll();
}
now = time(&now);
- if(msgqueuehead != NULL) {
+ if(msgqueue != NULL) {
show_win();
- if(difftime(now, msgqueuehead->start) > global_timeout) {
+ if(difftime(now, msgqueue->start) > global_timeout) {
next_win();
}
handleXEvents();
@@ -263,7 +263,7 @@ show_win(void) {
/* window is already visible */
return;
}
- if(msgqueuehead == NULL) {
+ if(msgqueue == NULL) {
/* there's nothing to show */
return;
}
@@ -271,7 +271,7 @@ show_win(void) {
XGrabButton(dc->dpy, AnyButton, AnyModifier, win, False,
BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
XFlush(dc->dpy);
- drawmsg(msgqueuehead->msg);
+ drawmsg(msgqueue->msg);
visible = True;
}
@@ -315,7 +315,7 @@ main(int argc, char *argv[]) {
else if(!strcmp(argv[i], "-to"))
global_timeout = atoi(argv[++i]);
else if(!strcmp(argv[i], "-msg")) {
- msgqueuehead = append(msgqueuehead, argv[++i]);
+ msgqueue = append(msgqueue, argv[++i]);
listen_to_dbus = False;
}
else if(!strcmp(argv[i], "-mon")) {
@@ -363,7 +363,7 @@ main(int argc, char *argv[]) {
dc = initdc();
initfont(dc, font);
setup();
- if(msgqueuehead != NULL) {
+ if(msgqueue != NULL) {
show_win();
}
run();
View
4 dunst_dbus.c
@@ -47,7 +47,7 @@ dbus_poll(void) {
/* make timeout smaller if we are displaying a message
* to improve responsivness for mouse clicks
*/
- if(msgqueuehead == NULL) {
+ if(msgqueue == NULL) {
dbus_connection_read_write(dbus_conn, DBUS_POLL_TIMEOUT);
} else {
dbus_connection_read_write(dbus_conn, 100);
@@ -199,7 +199,7 @@ notify(DBusMessage *dmsg) {
sprintf(msg, "%s: %s", appname, summary);
}
- msgqueuehead = append(msgqueuehead, msg);
+ msgqueue = append(msgqueue, msg);
reply = dbus_message_new_method_return(dmsg);
Please sign in to comment.
Something went wrong with that request. Please try again.