about summary refs log tree commit diff stats
path: root/view.c
diff options
context:
space:
mode:
Diffstat (limited to 'view.c')
-rw-r--r--view.c24
1 files changed, 10 insertions, 14 deletions
diff --git a/view.c b/view.c
index 1bce54a..61144df 100644
--- a/view.c
+++ b/view.c
@@ -4,8 +4,6 @@
  */
 #include "dwm.h"
 
-#define MINDIM			100
-
 /* static */
 
 static Client *
@@ -106,6 +104,7 @@ dofloat(Arg *arg) {
 void
 dotile(Arg *arg) {
 	int i, n, stackw, stackh, tw, th;
+	unsigned int md = ((stackpos == StackBottom ? sh - bh : sw) * master) / 100;
 	Client *c;
 
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
@@ -113,10 +112,10 @@ dotile(Arg *arg) {
 
 	if(stackpos == StackBottom) {
 		stackw = sw;
-		stackh = sh - bh - master;
+		stackh = sh - bh - md;
 	}
 	else {
-		stackw = sw - master;
+		stackw = sw - md;
 		stackh = sh - bh;
 	}
 
@@ -145,18 +144,18 @@ dotile(Arg *arg) {
 				switch(stackpos) {
 				case StackLeft:
 				case StackRight:
-					c->w = master - 2 * BORDERPX;
+					c->w = md - 2 * BORDERPX;
 					c->h = sh - bh - 2 * BORDERPX;
 					break;
 				case StackBottom:
 					c->w = sw - 2 * BORDERPX;
-					c->h = master - 2 * BORDERPX;
+					c->h = md - 2 * BORDERPX;
 					break;
 				}
 			}
 			else {  /* tile window */
 				if(stackpos == StackRight)
-					c->x += master;
+					c->x += md;
 				if(th > bh) {
 					switch(stackpos) {
 					case StackLeft:
@@ -166,7 +165,7 @@ dotile(Arg *arg) {
 							c->h = sh - c->y - 2 * BORDERPX;
 						break;
 					case StackBottom:
-						c->y = sy + master + (i - 1) * th + bh;
+						c->y = sy + md + (i - 1) * th + bh;
 						if(i + 1 == n)
 							c->h = sh - c->y - 2 * BORDERPX;
 						break;
@@ -176,7 +175,7 @@ dotile(Arg *arg) {
 				}
 				else { /* fallback if th < bh */
 					if(stackpos == StackBottom)
-						c->y += master;
+						c->y += md;
 					c->w = stackw - 2 * BORDERPX;
 					c->h = stackh - 2 * BORDERPX;
 				}
@@ -238,7 +237,6 @@ isvisible(Client *c) {
 
 void
 resizecol(Arg *arg) {
-	int s;
 	unsigned int n;
 	Client *c;
 
@@ -248,14 +246,13 @@ resizecol(Arg *arg) {
 	if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
 		return;
 
-	s = stackpos == StackBottom ? sh - bh : sw;
 	if(sel == getnext(clients)) {
-		if(master + arg->i > s - MINDIM || master + arg->i < MINDIM)
+		if(master + arg->i > 95 || master + arg->i < 5)
 			return;
 		master += arg->i;
 	}
 	else {
-		if(master - arg->i > s - MINDIM || master - arg->i < MINDIM)
+		if(master - arg->i > 95 || master - arg->i < 5)
 			return;
 		master -= arg->i;
 	}
@@ -321,7 +318,6 @@ togglestackpos(Arg *arg) {
 		stackpos = STACKPOS;
 	else
 		stackpos = StackBottom;
-	master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100;
 	arrange(NULL);
 }
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-07-25 10:27:45 +0000
e='Blame the previous revision' href='/akkartik/mu/blame/cpp/001test?h=hlt&id=b1bbe92da37dd44df458ffa122e052612bb9eff3'>^ 
51530916 ^










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






















                                                                              

                                                           
















                                                                                                                  
                    
                                             
              
















                                                                     

           





                                                                    
                
   
 
 






                          





                                           






                                                      









                        
// A simple test harness. To create new tests define functions starting with
// 'test_'. To run all tests so defined, run:
//   $ wart test
//
// So far it seems tasteful for layers to never ever reach back to modify
// previously-defined tests. Every test is a contract once written, and should
// pass as-is if it is included, regardless of how much later layers change
// the program. Avoid writing 'temporary' tests that only work with some
// subsets of the program.

:(before "End Types")
typedef void (*test_fn)(void);

:(before "End Globals")
const test_fn Tests[] = {
  #include "test_list"  // auto-generated; see makefile
};

bool Passed = true;

long Num_failures = 0;

#define TEST(name) void test_##name() { Trace_file = #name;

#define CHECK(X) \
  if (!(X)) { \
    ++Num_failures; \
    cerr << "\nF " << __FUNCTION__ << "(" << __FILE__ << ":" << __LINE__ << "): " << #X << '\n'; \
    Passed = false; \
    return; \
  }

#define CHECK_EQ(X, Y) \
  if ((X) != (Y)) { \
    ++Num_failures; \
    cerr << "\nF " << __FUNCTION__ << "(" << __FILE__ << ":" << __LINE__ << "): " << #X << " == " << #Y << '\n'; \
    cerr << "  got " << (X) << '\n';  /* BEWARE: multiple eval */ \
    Passed = false; \
    return; \
  }

:(before "End Main")
if (argc == 2 && is_equal(argv[1], "test")) {
  run_tests();
  cerr << '\n';
  if (Num_failures > 0)
    cerr << Num_failures << " failure"
         << (Num_failures > 1 ? "s" : "")
         << '\n';
  return 0;
}
// pass in a set of line numbers in test_file to run just those tests
if (argc > 2 && is_equal(argv[1], "test")) {
  for (int i = 2; i < argc; ++i) {
    run_test(to_int(argv[i])-1);
  }
  cerr << '\n';
  if (Num_failures > 0)
    cerr << Num_failures << " failure"
         << (Num_failures > 1 ? "s" : "")
         << '\n';
  return 0;
}

:(code)
void run_tests() {
  time_t t; time(&t);
  cerr << "C tests: " << ctime(&t);
  for (unsigned long i=0; i < sizeof(Tests)/sizeof(Tests[0]); ++i) {
    run_test(i);
  }
}

void run_test(int i) {
  setup();
  // End Test Setup
  (*Tests[i])();
  if (Passed) cerr << ".";
  // Test Teardown
  // End Test Teardown
}

bool is_equal(char* s, const char* lit) {
  return strncmp(s, lit, strlen(lit)) == 0;
}

int to_int(string n) {
  char* end = NULL;
  int result = strtol(n.c_str(), &end, /*any base*/0);
  assert(*end == '\0');
  return result;
}

:(before "End Includes")
#include<iostream>
using std::istream;
using std::ostream;
using std::iostream;
using std::cin;
using std::cout;
using std::cerr;

#include<cstring>
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-07-25 10:27:46 +0000