diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-08-20 23:13:40 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-08-20 23:13:40 +0000 |
| commit | a098c2437e96d58c647559b46278bc92954e9bbe (patch) | |
| tree | f2b8db5b415e8b06f3c11b85d5cca9ed48ab7646 /openbox/frame.c | |
| parent | df79dc57677132bf581c9da17ce6d45e56996cdf (diff) | |
rename the 'root' context to 'desktop'
Diffstat (limited to 'openbox/frame.c')
| -rw-r--r-- | openbox/frame.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/openbox/frame.c b/openbox/frame.c index a38bcfbe..2f1fae30 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -603,8 +603,8 @@ static void layout_title(ObFrame *self) ObFrameContext frame_context_from_string(char *name) { - if (!g_ascii_strcasecmp("root", name)) - return OB_FRAME_CONTEXT_ROOT; + if (!g_ascii_strcasecmp("desktop", name)) + return OB_FRAME_CONTEXT_DESKTOP; else if (!g_ascii_strcasecmp("client", name)) return OB_FRAME_CONTEXT_CLIENT; else if (!g_ascii_strcasecmp("titlebar", name)) @@ -640,22 +640,23 @@ ObFrameContext frame_context(ObClient *client, Window win) { 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 (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 */ if (client->type == OB_CLIENT_TYPE_DESKTOP) - return OB_FRAME_CONTEXT_ROOT; + return OB_FRAME_CONTEXT_DESKTOP; return OB_FRAME_CONTEXT_CLIENT; } self = client->frame; 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 */ if (client->type == OB_CLIENT_TYPE_DESKTOP) - return OB_FRAME_CONTEXT_ROOT; + return OB_FRAME_CONTEXT_DESKTOP; return OB_FRAME_CONTEXT_CLIENT; } |