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

prefix TRAN_GROUP to OB_TRAN_GROUP

Browse source
This commit is contained in:
Dana Jansens 2003-07-10 07:01:13 +00:00
parent 4736c257a5
commit e4be1f860b
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
openbox/client.c
View file

@ -89,7 +89,7 @@ void client_foreach_transient(ObClient *self, ObClientForeachFunc func, void *da
void client_foreach_ancestor(ObClient *self, ObClientForeachFunc func, void *data) void client_foreach_ancestor(ObClient *self, ObClientForeachFunc func, void *data)
{ {
if (self->transient_for) { if (self->transient_for) {
if (self->transient_for != TRAN_GROUP) { if (self->transient_for != OB_TRAN_GROUP) {
if (!func(self->transient_for, data)) return; if (!func(self->transient_for, data)) return;
client_foreach_ancestor(self->transient_for, func, data); client_foreach_ancestor(self->transient_for, func, data);
} else { } else {
@ -350,7 +350,7 @@ void client_unmanage(ObClient *self)
screen_update_areas(); screen_update_areas();
/* tell our parent(s) that we're gone */ /* tell our parent(s) that we're gone */
if (self->transient_for == TRAN_GROUP) { /* transient of group */ if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */
GSList *it; GSList *it;
for (it = self->group->members; it; it = it->next) for (it = self->group->members; it; it = it->next)
@ -364,7 +364,7 @@ void client_unmanage(ObClient *self)
/* tell our transients that we're gone */ /* tell our transients that we're gone */
for (it = self->transients; it != NULL; it = it->next) { for (it = self->transients; it != NULL; it = it->next) {
if (((ObClient*)it->data)->transient_for != TRAN_GROUP) { if (((ObClient*)it->data)->transient_for != OB_TRAN_GROUP) {
((ObClient*)it->data)->transient_for = NULL; ((ObClient*)it->data)->transient_for = NULL;
client_calc_layer(it->data); client_calc_layer(it->data);
} }
@ -599,7 +599,7 @@ static void client_get_desktop(ObClient *self)
gboolean trdesk = FALSE; gboolean trdesk = FALSE;
if (self->transient_for) { if (self->transient_for) {
if (self->transient_for != TRAN_GROUP) { if (self->transient_for != OB_TRAN_GROUP) {
self->desktop = self->transient_for->desktop; self->desktop = self->transient_for->desktop;
trdesk = TRUE; trdesk = TRUE;
} else { } else {
@ -702,7 +702,7 @@ void client_update_transient_for(ObClient *self)
t == None || t == None ||
t == ob_root) { t == ob_root) {
/* window is a transient for its group! */ /* window is a transient for its group! */
c = TRAN_GROUP; c = OB_TRAN_GROUP;
} }
} }
} }
@ -711,7 +711,7 @@ void client_update_transient_for(ObClient *self)
/* if anything has changed... */ /* if anything has changed... */
if (c != self->transient_for) { if (c != self->transient_for) {
if (self->transient_for == TRAN_GROUP) { /* transient of group */ if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */
GSList *it; GSList *it;
/* remove from old parents */ /* remove from old parents */
@ -726,7 +726,7 @@ void client_update_transient_for(ObClient *self)
g_slist_remove(self->transient_for->transients, self); g_slist_remove(self->transient_for->transients, self);
} }
self->transient_for = c; self->transient_for = c;
if (self->transient_for == TRAN_GROUP) { /* transient of group */ if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */
GSList *it; GSList *it;
/* add to new parents */ /* add to new parents */
@ -1155,7 +1155,7 @@ void client_update_wmhints(ObClient *self)
set up */ set up */
for (it = self->group->members; it; it = it->next) for (it = self->group->members; it; it = it->next)
if (it->data != self && if (it->data != self &&
((ObClient*)it->data)->transient_for == TRAN_GROUP) ((ObClient*)it->data)->transient_for == OB_TRAN_GROUP)
self->transients = g_slist_append(self->transients, self->transients = g_slist_append(self->transients,
it->data); it->data);
} }
@ -1460,7 +1460,7 @@ ObClient *client_search_focus_tree(ObClient *self)
ObClient *client_search_focus_tree_full(ObClient *self) ObClient *client_search_focus_tree_full(ObClient *self)
{ {
if (self->transient_for) { if (self->transient_for) {
if (self->transient_for != TRAN_GROUP) { if (self->transient_for != OB_TRAN_GROUP) {
return client_search_focus_tree_full(self->transient_for); return client_search_focus_tree_full(self->transient_for);
} else { } else {
GSList *it; GSList *it;
@ -2597,7 +2597,7 @@ ObClient *client_search_top_transient(ObClient *self)
{ {
/* move up the transient chain as far as possible */ /* move up the transient chain as far as possible */
if (self->transient_for) { if (self->transient_for) {
if (self->transient_for != TRAN_GROUP) { if (self->transient_for != OB_TRAN_GROUP) {
return client_search_top_transient(self->transient_for); return client_search_top_transient(self->transient_for);
} else { } else {
GSList *it; GSList *it;

2
openbox/client.h
View file

@ -18,7 +18,7 @@ typedef struct _ObClientIcon ObClientIcon;
/* The value in client.transient_for indicating it is a transient for its /* The value in client.transient_for indicating it is a transient for its
group instead of for a single window */ group instead of for a single window */
#define TRAN_GROUP ((void*)~0l) #define OB_TRAN_GROUP ((void*)~0l)
/*! Holds an icon in ARGB format */ /*! Holds an icon in ARGB format */
struct _ObClientIcon struct _ObClientIcon

4
openbox/focus.c
View file

@ -194,7 +194,7 @@ void focus_fallback(FallbackType type)
if (type == Fallback_Unfocusing && old) { if (type == Fallback_Unfocusing && old) {
/* try for transient relations */ /* try for transient relations */
if (old->transient_for) { if (old->transient_for) {
if (old->transient_for == TRAN_GROUP) { if (old->transient_for == OB_TRAN_GROUP) {
for (it = focus_order[screen_desktop]; it; it = it->next) { for (it = focus_order[screen_desktop]; it; it = it->next) {
GSList *sit; GSList *sit;
@ -262,7 +262,7 @@ static void popup_cycle(ObClient *c, gboolean show)
popup_size(focus_cycle_popup, 320, 48); popup_size(focus_cycle_popup, 320, 48);
/* use the transient's parent's title/icon */ /* use the transient's parent's title/icon */
while (p->transient_for && p->transient_for != TRAN_GROUP) while (p->transient_for && p->transient_for != OB_TRAN_GROUP)
p = p->transient_for; p = p->transient_for;
if (p == c) if (p == c)

2
openbox/stacking.c
View file

@ -292,7 +292,7 @@ void stacking_add_nonintrusive(ObWindow *win)
/* insert above its highest parent */ /* insert above its highest parent */
if (client->transient_for) { if (client->transient_for) {
if (client->transient_for != TRAN_GROUP) { if (client->transient_for != OB_TRAN_GROUP) {
parent = client->transient_for; parent = client->transient_for;
} else { } else {
GSList *sit; GSList *sit;