nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make the inner window work like the plate used to for actions

Browse source
This commit is contained in:
Dana Jansens 2007-04-24 20:42:34 +00:00
parent 79cd7b4b2c
commit d3ca984e93
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
openbox/frame.c
View file

@ -29,8 +29,7 @@
#include "moveresize.h" #include "moveresize.h"
#include "render/theme.h" #include "render/theme.h"
#define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask | \ #define PLATE_EVENTMASK (SubstructureRedirectMask | FocusChangeMask)
FocusChangeMask)
#define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \ #define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
ButtonPressMask | ButtonReleaseMask) ButtonPressMask | ButtonReleaseMask)
#define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \ #define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
@ -40,8 +39,7 @@
If it does get them, then it needs its own context for enter events If it does get them, then it needs its own context for enter events
because sloppy focus will focus the window when you enter the inner window because sloppy focus will focus the window when you enter the inner window
from the frame. */ from the frame. */
#define INNER_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \ #define INNER_EVENTMASK (ButtonPressMask)
ButtonMotionMask)
#define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \ #define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
f->cbwidth_y) f->cbwidth_y)
@ -830,7 +828,7 @@ ObFrameContext frame_context(ObClient *client, Window win)
} }
self = client->frame; self = client->frame;
if (win == self->plate) { if (win == self->inner) {
/* conceptually, this is the desktop, as far as users are /* conceptually, this is the desktop, as far as users are
concerned */ concerned */
if (client->type == OB_CLIENT_TYPE_DESKTOP) if (client->type == OB_CLIENT_TYPE_DESKTOP)
@ -838,8 +836,8 @@ ObFrameContext frame_context(ObClient *client, Window win)
return OB_FRAME_CONTEXT_CLIENT; return OB_FRAME_CONTEXT_CLIENT;
} }
if (win == self->plate) return OB_FRAME_CONTEXT_CLIENT;
if (win == self->window) return OB_FRAME_CONTEXT_FRAME; if (win == self->window) return OB_FRAME_CONTEXT_FRAME;
if (win == self->inner) return OB_FRAME_CONTEXT_FRAME;
if (win == self->title) return OB_FRAME_CONTEXT_TITLEBAR; if (win == self->title) return OB_FRAME_CONTEXT_TITLEBAR;
if (win == self->label) return OB_FRAME_CONTEXT_TITLEBAR; if (win == self->label) return OB_FRAME_CONTEXT_TITLEBAR;
if (win == self->handle) return OB_FRAME_CONTEXT_HANDLE; if (win == self->handle) return OB_FRAME_CONTEXT_HANDLE;