/
xfwm4-4.8.3-tiling.patch
163 lines (154 loc) · 5.28 KB
/
xfwm4-4.8.3-tiling.patch
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
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
diff -uNdr xfwm4-4.8.3.orig/src/client.c xfwm4-4.8.3/src/client.c
--- xfwm4-4.8.3.orig/src/client.c 2011-12-19 23:22:19.000000000 +0400
+++ xfwm4-4.8.3/src/client.c 2012-08-09 15:18:59.269434566 +0400
@@ -107,7 +107,7 @@
/* Forward decl */
static void
clientUpdateIconPix (Client * c);
-static void
+void
clientNewMaxSize (Client * c, XWindowChanges *wc);
Display *
@@ -3232,7 +3232,7 @@
wc->height = c->old_height;
}
-static void
+void
clientNewMaxSize (Client * c, XWindowChanges *wc)
{
ScreenInfo *screen_info;
@@ -3259,7 +3259,7 @@
full_h = MIN (screen_info->height - screen_info->params->xfwm_margins[STRUTS_BOTTOM],
rect.y + rect.height) - full_y;
- if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED))
+ if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED) || FLAG_TEST (c->flags, CLIENT_FLAG_TILED))
{
/* Adjust size to the largest size available, not covering struts */
clientMaxSpace (screen_info, &full_x, &full_y, &full_w, &full_h);
diff -uNdr xfwm4-4.8.3.orig/src/client.h xfwm4-4.8.3/src/client.h
--- xfwm4-4.8.3.orig/src/client.h 2011-12-19 23:22:19.000000000 +0400
+++ xfwm4-4.8.3/src/client.h 2012-08-09 15:09:54.373328161 +0400
@@ -162,6 +162,8 @@
#define CLIENT_FLAG_HAS_SHAPE (1L<<18)
#define CLIENT_FLAG_FULLSCREN_MONITORS (1L<<19)
+#define CLIENT_FLAG_TILED (1L<<20)
+
#define WM_FLAG_DELETE (1L<<0)
#define WM_FLAG_INPUT (1L<<1)
#define WM_FLAG_TAKEFOCUS (1L<<2)
@@ -338,6 +340,9 @@
extern Client *clients;
extern unsigned int client_count;
+void clientNewMaxSize (Client * c,
+ XWindowChanges *wc);
+
Display *clientGetXDisplay (Client *);
void clientClearLastOpTime (Client *);
void clientUpdateWinState (Client *,
diff -uNdr xfwm4-4.8.3.orig/src/moveresize.c xfwm4-4.8.3/src/moveresize.c
--- xfwm4-4.8.3.orig/src/moveresize.c 2011-12-19 23:22:19.000000000 +0400
+++ xfwm4-4.8.3/src/moveresize.c 2012-08-09 15:20:11.920648428 +0400
@@ -36,6 +36,7 @@
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
+#include "moveresize.h"
#include "client.h"
#include "focus.h"
#include "frame.h"
@@ -875,6 +876,75 @@
c->x = passdata->ox + (xevent->xmotion.x_root - passdata->mx);
c->y = passdata->oy + (xevent->xmotion.y_root - passdata->my);
+ if (!FLAG_TEST_ALL(c->flags, CLIENT_FLAG_MAXIMIZED))
+ {
+ if (xevent->xmotion.x_root < TILING_EDGE || xevent->xmotion.x_root > screen_info->width - TILING_EDGE)
+ {
+ XWindowChanges wc;
+ wc.x = c->x;
+ wc.y = c->y;
+ wc.width = c->width;
+ wc.height = c->height;
+
+ /*
+ if (c->old_x == -1)
+ c->old_x = c->x;
+ if (c->old_y == -1)
+ c->old_y = c->y;
+ */
+
+ if (c->old_width == -1)
+ c->old_width = c->width;
+ if (c->old_height == -1)
+ c->old_height = c->height;
+
+ FLAG_SET (c->flags, CLIENT_FLAG_TILED);
+ clientNewMaxSize(c, &wc);
+
+ if (xevent->xmotion.x_root < 20)
+ c->x = 0;
+ else
+ c->x = wc.width/2 + frameLeft(c);
+
+ c->y = wc.y;
+ c->width = wc.width/2 - frameRight(c);
+ c->height = wc.height;
+ }
+ else
+ {
+ /*
+ if (c->old_x != -1)
+ {
+ c->x = c->old_x;
+ c->old_x = -1;
+ }
+
+ if (c->old_y != -1)
+ {
+ c->y = c->old_y;
+ c->old_y = -1;
+ }
+ */
+
+ if (c->old_width != -1)
+ {
+ c->width = c->old_width;
+ c->old_width = -1;
+ }
+
+ if (c->old_height != -1)
+ {
+ c->height = c->old_height;
+ c->old_height = -1;
+ }
+
+ FLAG_UNSET (c->flags, CLIENT_FLAG_TILED);
+
+ }
+ passdata->move_resized = 1;
+ }
+
+
clientSnapPosition (c, prev_x, prev_y);
if (screen_info->params->restore_on_move)
{
@@ -1186,6 +1256,11 @@
status = EVENT_FILTER_STOP;
resizing = TRUE;
+ if (xevent->xmotion.x_root > TILING_EDGE || xevent->xmotion.x_root < screen_info->width - TILING_EDGE)
+ {
+ /* c->old_x = c->old_y =*/ c->old_width = c->old_height = -1;
+ }
+
frame_x = frameX (c);
frame_y = frameY (c);
frame_height = frameHeight (c);
diff -uNdr xfwm4-4.8.3.orig/src/moveresize.h xfwm4-4.8.3/src/moveresize.h
--- xfwm4-4.8.3.orig/src/moveresize.h 2011-12-06 21:14:44.000000000 +0400
+++ xfwm4-4.8.3/src/moveresize.h 2012-08-09 15:13:14.079164098 +0400
@@ -31,6 +31,8 @@
#include "screen.h"
#include "client.h"
+#define TILING_EDGE 20
+
#ifndef INC_MOVERESIZE_H
#define INC_MOVERESIZE_H
void clientSetWidth (Client *,