nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix handling of geometry.h

Browse Source
This commit is contained in:
Sascha Kruse 2012-06-27 03:36:17 +02:00
parent 0e45d6cea6
commit ca0f41a775
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dunst.c
View File

@ -246,13 +246,24 @@ void update_lists()
{ {
l_node *to_move; l_node *to_move;
notification *n; notification *n;
int limit;
check_timeouts(); check_timeouts();
/* move notifications from queue to displayed */ if (geometry.h == 0) {
while (l_length(displayed_notifications) < height_limit limit = 0;
&& !l_is_empty(notification_queue)) { } else if (geometry.h == 1) {
limit = 1;
} else if (indicate_hidden) {
limit = geometry.h - 1;
} else {
limit = geometry.h;
}
if (l_length(displayed_notifications) >= height_limit) { /* move notifications from queue to displayed */
while (!l_is_empty(notification_queue)) {
if (limit > 0 && l_length(displayed_notifications) >= limit) {
/* the list is full */ /* the list is full */
break; break;
} }
@ -285,13 +296,12 @@ void draw_win(void)
dc->y = 0; dc->y = 0;
dc->h = 0; dc->h = 0;
/* a height of 0 doesn't make sense, so we define it as 1 */
if (geometry.h == 0) { if (geometry.h == 0) {
geometry.h = 1; height = len;
} else {
height = MIN(geometry.h, len);
} }
height = MIN(geometry.h, len);
if (indicate_hidden && !l_is_empty(notification_queue)) { if (indicate_hidden && !l_is_empty(notification_queue)) {
sprintf(hidden, "(%d more)", l_length(notification_queue)); sprintf(hidden, "(%d more)", l_length(notification_queue));
height++; height++;
@ -1180,7 +1190,6 @@ int main(int argc, char *argv[])
color_strings[ColBG][CRIT] = critbgcolor; color_strings[ColBG][CRIT] = critbgcolor;
setup(); setup();
height_limit = indicate_hidden ? geometry.h - 1 : geometry.h;
run(); run();
return 0; return 0;
} }