about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorarg@10ksloc.org <unknown>2006-07-19 13:36:04 +0200
committerarg@10ksloc.org <unknown>2006-07-19 13:36:04 +0200
commit79cd408844c62963aa0eec45bb0414ed66f06f6f (patch)
tree8f0bd94042ea3bc5e536918f047fb4cb1995f4ca
parent18be893b660025985508d6fcf5c9abdf42ce9929 (diff)
downloaddwm-79cd408844c62963aa0eec45bb0414ed66f06f6f.tar.gz
implemented fallback for too many clients in stacked mode
Diffstat
-rw-r--r--client.c5


-rw-r--r--tag.c8


2 files changed, 10 insertions, 3 deletions
diff --git a/client.c b/client.c
index 9944a05..52e623a 100644
--- a/client.c
+++ b/client.c
@@ -201,8 +201,6 @@ manage(Window w, XWindowAttributes *wa)
 	c->win = w;
 	c->bx = c->fx = c->tx = wa->x;
 	c->by = c->fy = c->ty = wa->y;
-	if(c->fy < bh)
-		c->by = c->fy = c->ty += bh;
 	c->bw = c->fw = c->tw = wa->width;
 	c->fh = c->th = wa->height;
 	c->bh = bh;
@@ -212,6 +210,9 @@ manage(Window w, XWindowAttributes *wa)
 	diff = sh - c->fh - bh;
 	c->fy = random() % (diff ? diff : 1);
 
+	if(c->fy < bh)
+		c->by = c->fy = c->ty = bh;
+
 	c->border = 1;
 	c->proto = getproto(c->win);
 	setsize(c);
diff --git a/tag.c b/tag.c
index 1bfedb2..c9eec90 100644
--- a/tag.c
+++ b/tag.c
@@ -96,12 +96,18 @@ dotile(Arg *arg)
 				*c->w = mw - 2 * c->border;
 				*c->h = sh - 2 * c->border - bh;
 			}
-			else {
+			else if(h > bh) {
 				*c->x = sx + mw;
 				*c->y = sy + (i - 1) * h + bh;
 				*c->w = w - 2 * c->border;
 				*c->h = h - 2 * c->border;
 			}
+			else { /* fallback if h < bh */
+				*c->x = sx + mw;
+				*c->y = sy + bh;
+				*c->w = w - 2 * c->border;
+				*c->h = sh - 2 * c->border - bh;
+			}
 			resize(c, False, TopLeft);
 			i++;
 		}

 

generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-09-27 04:09:41 +0000


 


81'>^



7f98e013 ^



f9a7e350 ^







7f98e013 ^



f9a7e350 ^











7f98e013 ^

f9a7e350 ^







7f98e013 ^



f9a7e350 ^






1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19

20
21
22

23
24
25
26
27
28
29

30
31
32

33
34
35
36
37
38
39
40
41
42
43
44
45

46
47
48

49
50
51
52
53
54
55

56
57
58

59
60
61
62
63
64
65
66
67
68
69

70
71

72
73
74

75
76
77

78
79
80
81
82
83
84

85
86
87

88
89
90
91
92
93
94
95
96
97
98

99

100
101
102
103
104
105
106

107
108
109

110
111
112
113





















                                       


                                                                         






                                            


                                                     












                                                                       


                                                                              






                                                  


                                                          










                                                                               

                                                            


                                       


                                                                      






                                                  


                                                                      










                                                                            
                                                            






                                                                                    


                                                              



                      
#include <glib.h>
#include <stdarg.h>
#include <stddef.h>
#include <setjmp.h>
#include <cmocka.h>
#include <stdlib.h>
#include <string.h>

#include <stabber.h>
#include <expect.h>

#include "proftest.h"

void
sends_new_item(void **state)
{
    prof_connect();

    stbbr_for_query("jabber:iq:roster",
        "<iq type='set' from='stabber@localhost'>"
            "<query xmlns='jabber:iq:roster'>"
                "<item jid='bob@localhost' subscription='none' name=''/>"
            "</query>"
        "</iq>"
    );

    prof_input("/roster add bob@localhost");

    assert_true(stbbr_received(
        "<iq type='set' id='*'>"
            "<query xmlns='jabber:iq:roster'>"
                "<item jid='bob@localhost' name=''/>"
            "</query>"
        "</iq>"
    ));

    assert_true(prof_output_exact("Roster item added: bob@localhost"));
}

void
sends_new_item_nick(void **state)
{
    prof_connect();

    stbbr_for_query("jabber:iq:roster",
        "<iq type='set' from='stabber@localhost'>"
            "<query xmlns='jabber:iq:roster'>"
                "<item jid='bob@localhost' subscription='none' name='Bobby'/>"
            "</query>"
        "</iq>"
    );

    prof_input("/roster add bob@localhost Bobby");

    assert_true(stbbr_received(
        "<iq type='set' id='*'>"
            "<query xmlns='jabber:iq:roster'>"
                "<item jid='bob@localhost' name='Bobby'/>"
            "</query>"
        "</iq>"
    ));

    assert_true(prof_output_exact("Roster item added: bob@localhost (Bobby)"));
}

void
sends_remove_item(void **state)
{
    prof_connect_with_roster(
        "<item jid='buddy1@localhost' subscription='both'/>"
        "<item jid='buddy2@localhost' subscription='both'/>"
    );

    stbbr_for_query("jabber:iq:roster",
        "<iq id='*' type='set'>"
            "<query xmlns='jabber:iq:roster'>"
                "<item jid='buddy1@localhost' subscription='remove'/>"
            "</query>"
        "</iq>"
    );

    prof_input("/roster remove buddy1@localhost");

    assert_true(stbbr_received(
        "<iq type='set' id='*'>"
            "<query xmlns='jabber:iq:roster'>"
                "<item jid='buddy1@localhost' subscription='remove'/>"
            "</query>"
        "</iq>"
    ));

    assert_true(prof_output_exact("Roster item removed: buddy1@localhost"));
}

void
sends_nick_change(void **state)
{
    prof_connect_with_roster(
        "<item jid='buddy1@localhost' subscription='both'/>"
    );

    prof_input("/roster nick buddy1@localhost Buddy1");

    assert_true(prof_output_exact("Nickname for buddy1@localhost set to: Buddy1."));

    assert_true(stbbr_received(
        "<iq type='set' id='*'>"
            "<query xmlns='jabber:iq:roster'>"
                "<item jid='buddy1@localhost' name='Buddy1'/>"
            "</query>"
        "</iq>"
    ));
}