From 62d3caa9990e4fd936850341095da4dd1bf4c846 Mon Sep 17 00:00:00 2001 From: Anselm R Garbe Date: Sun, 30 May 2010 10:02:56 +0100 Subject: implemented better fullscreen handling, please test --- dwm.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 75 insertions(+), 30 deletions(-) diff --git a/dwm.c b/dwm.c index 5df4919..670afbe 100644 --- a/dwm.c +++ b/dwm.c @@ -57,7 +57,8 @@ /* enums */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ enum { ColBorder, ColFG, ColBG, ColLast }; /* color */ -enum { NetSupported, NetWMName, NetWMState, NetLast }; /* EWMH atoms */ +enum { NetSupported, NetWMName, NetWMState, + NetWMFullscreen, NetLast }; /* EWMH atoms */ enum { WMProtocols, WMDelete, WMState, WMLast }; /* default atoms */ enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, ClkRootWin, ClkLast }; /* clicks */ @@ -83,10 +84,11 @@ struct Client { char name[256]; float mina, maxa; int x, y, w, h; + int oldx, oldy, oldw, oldh; int basew, baseh, incw, inch, maxw, maxh, minw, minh; int bw, oldbw; unsigned int tags; - Bool isfixed, isfloating, isurgent; + Bool isfixed, isfloating, isurgent, oldstate; Client *next; Client *snext; Monitor *mon; @@ -161,6 +163,7 @@ static void checkotherwm(void); static void cleanup(void); static void cleanupmon(Monitor *mon); static void clearurgent(Client *c); +static void clientmessage(XEvent *e); static void configure(Client *c); static void configurenotify(XEvent *e); static void configurerequest(XEvent *e); @@ -200,6 +203,7 @@ static Monitor *ptrtomon(int x, int y); static void propertynotify(XEvent *e); static void quit(const Arg *arg); static void resize(Client *c, int x, int y, int w, int h, Bool interact); +static void resizeclient(Client *c, int x, int y, int w, int h); static void resizemouse(const Arg *arg); static void restack(Monitor *m); static void run(void); @@ -220,7 +224,7 @@ static void togglebar(const Arg *arg); static void togglefloating(const Arg *arg); static void toggletag(const Arg *arg); static void toggleview(const Arg *arg); -static void unfocus(Client *c); +static void unfocus(Client *c, Bool setfocus); static void unmanage(Client *c, Bool destroyed); static void unmapnotify(XEvent *e); static Bool updategeom(void); @@ -249,6 +253,7 @@ static int (*xerrorxlib)(Display *, XErrorEvent *); static unsigned int numlockmask = 0; static void (*handler[LASTEvent]) (XEvent *) = { [ButtonPress] = buttonpress, + [ClientMessage] = clientmessage, [ConfigureRequest] = configurerequest, [ConfigureNotify] = configurenotify, [DestroyNotify] = destroynotify, @@ -423,7 +428,7 @@ buttonpress(XEvent *e) { click = ClkRootWin; /* focus monitor if necessary */ if((m = wintomon(ev->window)) && m != selmon) { - unfocus(selmon->sel); + unfocus(selmon->sel, True); selmon = m; focus(NULL); } @@ -792,7 +797,7 @@ enternotify(XEvent *e) { if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root) return; if((m = wintomon(ev->window)) && m != selmon) { - unfocus(selmon->sel); + unfocus(selmon->sel, True); selmon = m; } if((c = wintoclient(ev->window))) @@ -814,8 +819,9 @@ void focus(Client *c) { if(!c || !ISVISIBLE(c)) for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext); - if(selmon->sel) - unfocus(selmon->sel); + /* was if(selmon->sel) */ + if(selmon->sel && selmon->sel != c) + unfocus(selmon->sel, False); if(c) { if(c->mon != selmon) selmon = c->mon; @@ -849,7 +855,7 @@ focusmon(const Arg *arg) { return; if((m = dirtomon(arg->i)) == selmon) return; - unfocus(selmon->sel); + unfocus(selmon->sel, True); selmon = m; focus(NULL); } @@ -901,15 +907,14 @@ getrootptr(int *x, int *y) { long getstate(Window w) { - int format, status; + int format; long result = -1; unsigned char *p = NULL; unsigned long n, extra; Atom real; - status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState], - &real, &format, &n, &extra, (unsigned char **)&p); - if(status != Success) + if(XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState], + &real, &format, &n, &extra, (unsigned char **)&p) != Success) return -1; if(n != 0) result = *p; @@ -1110,12 +1115,13 @@ manage(Window w, XWindowAttributes *wa) { applyrules(c); } /* geometry */ - c->x = wa->x + c->mon->wx; - c->y = wa->y + c->mon->wy; - c->w = wa->width; - c->h = wa->height; + c->x = c->oldx = wa->x + c->mon->wx; + c->y = c->oldy = wa->y + c->mon->wy; + c->w = c->oldw = wa->width; + c->h = c->oldh = wa->height; c->oldbw = wa->border_width; if(c->w == c->mon->mw && c->h == c->mon->mh) { + c->isfloating = 1; c->x = c->mon->mx; c->y = c->mon->my; c->bw = 0; @@ -1139,7 +1145,7 @@ manage(Window w, XWindowAttributes *wa) { XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask); grabbuttons(c, False); if(!c->isfloating) - c->isfloating = trans != None || c->isfixed; + c->isfloating = c->oldstate = trans != None || c->isfixed; if(c->isfloating) XRaiseWindow(dpy, c->win); attach(c); @@ -1291,6 +1297,39 @@ propertynotify(XEvent *e) { } } +void +clientmessage(XEvent *e) { + XClientMessageEvent *cme = &e->xclient; + Client *c; + + if((c = wintoclient(cme->window)) + && (cme->message_type == netatom[NetWMState] && cme->data.l[1] == netatom[NetWMFullscreen])) + { + if(cme->data.l[0]) { + XChangeProperty(dpy, cme->window, netatom[NetWMState], XA_ATOM, 32, + PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1); + c->oldstate = c->isfloating; + c->oldbw = c->bw; + c->bw = 0; + c->isfloating = 1; + resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh); + XRaiseWindow(dpy, c->win); + } + else { + XChangeProperty(dpy, cme->window, netatom[NetWMState], XA_ATOM, 32, + PropModeReplace, (unsigned char*)0, 0); + c->isfloating = c->oldstate; + c->bw = c->oldbw; + c->x = c->oldx; + c->y = c->oldy; + c->w = c->oldw; + c->h = c->oldh; + resizeclient(c, c->x, c->y, c->w, c->h); + arrange(c->mon); + } + } +} + void quit(const Arg *arg) { running = False; @@ -1298,18 +1337,22 @@ quit(const Arg *arg) { void resize(Client *c, int x, int y, int w, int h, Bool interact) { + if(applysizehints(c, &x, &y, &w, &h, interact)) + resizeclient(c, x, y, w, h); +} + +void +resizeclient(Client *c, int x, int y, int w, int h) { XWindowChanges wc; - if(applysizehints(c, &x, &y, &w, &h, interact)) { - c->x = wc.x = x; - c->y = wc.y = y; - c->w = wc.width = w; - c->h = wc.height = h; - wc.border_width = c->bw; - XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); - configure(c); - XSync(dpy, False); - } + c->oldx = c->x; c->x = wc.x = x; + c->oldy = c->y; c->y = wc.y = y; + c->oldw = c->w; c->w = wc.width = w; + c->oldh = c->h; c->h = wc.height = h; + wc.border_width = c->bw; + XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); + configure(c); + XSync(dpy, False); } void @@ -1427,7 +1470,7 @@ void sendmon(Client *c, Monitor *m) { if(c->mon == m) return; - unfocus(c); + unfocus(c, True); detach(c); detachstack(c); c->mon = m; @@ -1495,6 +1538,7 @@ setup(void) { netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False); netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False); netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False); + netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False); /* init cursors */ cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr); cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing); @@ -1663,12 +1707,13 @@ toggleview(const Arg *arg) { } void -unfocus(Client *c) { +unfocus(Client *c, Bool setfocus) { if(!c) return; grabbuttons(c, False); XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]); - XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); + if(setfocus) + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); } void -- cgit 1.4.1-2-gfad0 s' href='/akspecs/ranger/commit/ranger/ext/widestring.py?id=6110c8cc1bb26eaf8564976e796c301ce4ef4861'>6110c8cc ^ 
6e152710 ^

ab41c776 ^

f4558377 ^

d1a1173d ^




9bc886b2 ^

f4558377 ^

6e152710 ^

d1a1173d ^




6e152710 ^


6e152710 ^

d1a1173d ^





b3d031a9 ^



d1a1173d ^


ce657945 ^








b3d031a9 ^



d1a1173d ^


6e152710 ^


b3d031a9 ^

76791a70 ^

d1a1173d ^

c29059c8 ^





1687e0f4 ^

d1a1173d ^

















51ec08da ^

18223912 ^

d1a1173d ^









51ec08da ^

18223912 ^

d1a1173d ^







b3d031a9 ^

d1a1173d ^






















b3d031a9 ^





d1a1173d ^

b3d031a9 ^









d1a1173d ^












e2325c56 ^

d1a1173d ^









6e152710 ^



d1a1173d ^

9d82571b ^

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

164
165
166

167

168