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

rename the 'root' context to 'desktop'

Browse source
This commit is contained in:
Dana Jansens 2003-08-20 23:13:40 +00:00
parent df79dc5767
commit a098c2437e
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/rc3
View file

@ -297,7 +297,7 @@
<action name="close"/> <action name="close"/>
</mousebind> </mousebind>
</context> </context>
<context name="root"> <context name="desktop">
<mousebind button="A-Up" action="click"> <mousebind button="A-Up" action="click">
<action name="desktopright"/> <action name="desktopright"/>
</mousebind> </mousebind>

15
openbox/frame.c
View file

@ -603,8 +603,8 @@ static void layout_title(ObFrame *self)
ObFrameContext frame_context_from_string(char *name) ObFrameContext frame_context_from_string(char *name)
{ {
if (!g_ascii_strcasecmp("root", name)) if (!g_ascii_strcasecmp("desktop", name))
return OB_FRAME_CONTEXT_ROOT; return OB_FRAME_CONTEXT_DESKTOP;
else if (!g_ascii_strcasecmp("client", name)) else if (!g_ascii_strcasecmp("client", name))
return OB_FRAME_CONTEXT_CLIENT; return OB_FRAME_CONTEXT_CLIENT;
else if (!g_ascii_strcasecmp("titlebar", name)) else if (!g_ascii_strcasecmp("titlebar", name))
@ -640,22 +640,23 @@ ObFrameContext frame_context(ObClient *client, Window win)
{ {
ObFrame *self; ObFrame *self;
if (win == RootWindow(ob_display, ob_screen)) return OB_FRAME_CONTEXT_ROOT; if (win == RootWindow(ob_display, ob_screen))
return OB_FRAME_CONTEXT_DESKTOP;
if (client == NULL) return OB_FRAME_CONTEXT_NONE; if (client == NULL) return OB_FRAME_CONTEXT_NONE;
if (win == client->window) { if (win == client->window) {
/* conceptually, this is the root window, 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)
return OB_FRAME_CONTEXT_ROOT; return OB_FRAME_CONTEXT_DESKTOP;
return OB_FRAME_CONTEXT_CLIENT; return OB_FRAME_CONTEXT_CLIENT;
} }
self = client->frame; self = client->frame;
if (win == self->plate) { if (win == self->plate) {
/* conceptually, this is the root window, 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)
return OB_FRAME_CONTEXT_ROOT; return OB_FRAME_CONTEXT_DESKTOP;
return OB_FRAME_CONTEXT_CLIENT; return OB_FRAME_CONTEXT_CLIENT;
} }

2
openbox/frame.h
View file

@ -10,7 +10,7 @@ struct _ObClient;
typedef enum { typedef enum {
OB_FRAME_CONTEXT_NONE, OB_FRAME_CONTEXT_NONE,
OB_FRAME_CONTEXT_ROOT, OB_FRAME_CONTEXT_DESKTOP,
OB_FRAME_CONTEXT_CLIENT, OB_FRAME_CONTEXT_CLIENT,
OB_FRAME_CONTEXT_TITLEBAR, OB_FRAME_CONTEXT_TITLEBAR,
OB_FRAME_CONTEXT_HANDLE, OB_FRAME_CONTEXT_HANDLE,

2
openbox/mouse.c
View file

@ -19,7 +19,7 @@ typedef struct {
} ObMouseBinding; } ObMouseBinding;
#define CLIENT_CONTEXT(co, cl) ((cl && cl->type == OB_CLIENT_TYPE_DESKTOP) ? \ #define CLIENT_CONTEXT(co, cl) ((cl && cl->type == OB_CLIENT_TYPE_DESKTOP) ? \
co == OB_FRAME_CONTEXT_ROOT : \ co == OB_FRAME_CONTEXT_DESKTOP : \
co == OB_FRAME_CONTEXT_CLIENT) co == OB_FRAME_CONTEXT_CLIENT)
/* Array of GSList*s of PointerBinding*s. */ /* Array of GSList*s of PointerBinding*s. */