X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/439e15d09f6fa9271d3b49ef97194f0c80ebe161..896f08d7d553f7def3877648c113cf03e6ca546a:/event.c
diff --git a/event.c b/event.c
index d6977d3..ba41f55 100644
--- a/event.c
+++ b/event.c
@@ -7,22 +7,24 @@
#include <stdlib.h>
#include <string.h>
#include <X11/keysym.h>
+#include <X11/Xatom.h>
#include "wm.h"
/* local functions */
+static void buttonpress(XEvent *e);
static void configurerequest(XEvent *e);
static void destroynotify(XEvent *e);
static void enternotify(XEvent *e);
static void leavenotify(XEvent *e);
static void expose(XEvent *e);
-static void keypress(XEvent *e);
static void keymapnotify(XEvent *e);
static void maprequest(XEvent *e);
static void propertynotify(XEvent *e);
static void unmapnotify(XEvent *e);
void (*handler[LASTEvent]) (XEvent *) = {
+ [ButtonPress] = buttonpress,
[ConfigureRequest] = configurerequest,
[DestroyNotify] = destroynotify,
[EnterNotify] = enternotify,
@@ -36,7 +38,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
};
unsigned int
-flush_masked_events(long even_mask)
+discard_events(long even_mask)
{
XEvent ev;
unsigned int n = 0;
@@ -44,119 +46,86 @@ flush_masked_events(long even_mask)
return n;
}
+static void
+buttonpress(XEvent *e)
+{
+ XButtonPressedEvent *ev = &e->xbutton;
+ Client *c;
+
+ if((c = getclient(ev->window))) {
+ switch(ev->button) {
+ default:
+ break;
+ case Button1:
+ mmove(c);
+ break;
+ case Button2:
+ XLowerWindow(dpy, c->win);
+ break;
+ case Button3:
+ mresize(c);
+ break;
+ }
+ }
+}
+
static void
configurerequest(XEvent *e)
{
-#if 0
XConfigureRequestEvent *ev = &e->xconfigurerequest;
XWindowChanges wc;
- XRectangle *frect;
Client *c;
- c = client_of_win(ev->window);
ev->value_mask &= ~CWSibling;
- if(c) {
- gravitate_client(c, True);
-
+ if((c = getclient(ev->window))) {
if(ev->value_mask & CWX)
- c->rect.x = ev->x;
+ c->x = ev->x;
if(ev->value_mask & CWY)
- c->rect.y = ev->y;
+ c->y = ev->y;
if(ev->value_mask & CWWidth)
- c->rect.width = ev->width;
+ c->w = ev->width;
if(ev->value_mask & CWHeight)
- c->rect.height = ev->height;
- if(ev->value_mask & CWBorderWidth)
- c->border = ev->border_width;
-
- gravitate_client(c, False);
-
- if(c->frame) {
- if(c->sel->area->floating)
- frect=&c->sel->rect;
- else
- frect=&c->sel->revert;
-
- if(c->rect.width >= screen->rect.width && c->rect.height >= screen->rect.height) {
- frect->y = wc.y = -height_of_bar();
- frect->x = wc.x = -def.border;
- }
- else {
- frect->y = wc.y = c->rect.y - height_of_bar();
- frect->x = wc.x = c->rect.x - def.border;
- }
- frect->width = wc.width = c->rect.width + 2 * def.border;
- frect->height = wc.height = c->rect.height + def.border
- + height_of_bar();
- wc.border_width = 1;
- wc.sibling = None;
- wc.stack_mode = ev->detail;
- if(c->sel->area->view != screen->sel)
- wc.x += 2 * screen->rect.width;
- if(c->sel->area->floating) {
- XConfigureWindow(dpy, c->framewin, ev->value_mask, &wc);
- configure_client(c);
- }
- }
+ c->h = ev->height;
}
wc.x = ev->x;
wc.y = ev->y;
wc.width = ev->width;
wc.height = ev->height;
-
- if(c && c->frame) {
- wc.x = def.border;
- wc.y = height_of_bar();
- wc.width = c->sel->rect.width - 2 * def.border;
- wc.height = c->sel->rect.height - def.border - height_of_bar();
- }
-
wc.border_width = 0;
wc.sibling = None;
wc.stack_mode = Above;
ev->value_mask &= ~CWStackMode;
ev->value_mask |= CWBorderWidth;
XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-
XFlush(dpy);
-#endif
}
static void
destroynotify(XEvent *e)
{
-#if 0
Client *c;
XDestroyWindowEvent *ev = &e->xdestroywindow;
- if((c = client_of_win(ev->window)))
- destroy_client(c);
-#endif
+ if((c = getclient(ev->window)))
+ unmanage(c);
}
static void
enternotify(XEvent *e)
{
-#if 0
XCrossingEvent *ev = &e->xcrossing;
Client *c;
if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
return;
- if((c = client_of_win(ev->window))) {
- Frame *f = c->sel;
- Area *a = f->area;
- if(a->mode == Colmax)
- c = a->sel->client;
- focus(c, False);
- }
+ if((c = getclient(ev->window)))
+ focus(c);
else if(ev->window == root) {
sel_screen = True;
- draw_frames();
+ /*draw_frames();*/
}
-#endif
}
static void
@@ -174,51 +143,25 @@ static void
expose(XEvent *e)
{
XExposeEvent *ev = &e->xexpose;
+ Client *c;
if(ev->count == 0) {
- if(ev->window == barwin)
+ if((c = getclient(ev->window)))
+ draw_client(c);
+ else if(ev->window == barwin)
draw_bar();
}
}
-static void
-keypress(XEvent *e)
-{
-#if 0
- XKeyEvent *ev = &e->xkey;
- KeySym k = 0;
- char buf[32];
- int n;
- static Frame *f;
-
-
- ev->state &= valid_mask;
- if((f = frame_of_win(ev->window))) {
- buf[0] = 0;
- n = XLookupString(ev, buf, sizeof(buf), &k, 0);
- if(IsFunctionKey(k) || IsKeypadKey(k) || IsMiscFunctionKey(k)
- || IsPFKey(k) || IsPrivateKeypadKey(k))
- return;
- buf[n] = 0;
- blitz_kpress_input(&f->tagbar, ev->state, k, buf);
- }
- else
- key(root, ev->state, (KeyCode) ev->keycode);
-#endif
-}
-
static void
keymapnotify(XEvent *e)
{
-#if 0
update_keys();
-#endif
}
static void
maprequest(XEvent *e)
{
-#if 0
XMapRequestEvent *ev = &e->xmaprequest;
static XWindowAttributes wa;
@@ -231,34 +174,50 @@ maprequest(XEvent *e)
return;
}
- if(!client_of_win(ev->window))
- manage_client(create_client(ev->window, &wa));
-#endif
+ if(!getclient(ev->window))
+ manage(ev->window, &wa);
}
static void
propertynotify(XEvent *e)
{
-#if 0
XPropertyEvent *ev = &e->xproperty;
Client *c;
if(ev->state == PropertyDelete)
return; /* ignore */
- if((c = client_of_win(ev->window)))
- prop_client(c, ev);
-#endif
+ if(ev->atom == wm_atom[WMProtocols]) {
+ c->proto = win_proto(c->win);
+ return;
+ }
+ if((c = getclient(ev->window))) {
+ switch (ev->atom) {
+ default: break;
+ case XA_WM_TRANSIENT_FOR:
+ XGetTransientForHint(dpy, c->win, &c->trans);
+ break;
+ update_size(c);
+ case XA_WM_NORMAL_HINTS:
+ update_size(c);
+ break;
+ }
+ if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) {
+ update_name(c);
+ if(c == stack)
+ draw_bar();
+ else
+ draw_client(c);
+ }
+ }
}
static void
unmapnotify(XEvent *e)
{
-#if 0
Client *c;
XUnmapEvent *ev = &e->xunmap;
- if((c = client_of_win(ev->window)))
- destroy_client(c);
-#endif
+ if((c = getclient(ev->window)))
+ unmanage(c);
}