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

Avoid anonymous unions

Browse source 
Some compilers, like sun studio and clang don't support them.
This commit is contained in:
Mikael Magnusson 2009-03-29 22:34:50 +02:00
parent 4a15b96585
commit 264edb053d
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
openbox/actions/desktop.c
View file

@ -21,7 +21,7 @@ typedef struct {
gboolean wrap; gboolean wrap;
ObDirection dir; ObDirection dir;
} rel; } rel;
}; } u;
gboolean send; gboolean send;
gboolean follow; gboolean follow;
} Options; } Options;
@ -49,9 +49,9 @@ static gpointer setup_go_func(ObParseInst *i, xmlDocPtr doc,
o = g_new0(Options, 1); o = g_new0(Options, 1);
/* don't go anywhere if theres no options given */ /* don't go anywhere if theres no options given */
o->type = ABSOLUTE; o->type = ABSOLUTE;
o->abs.desktop = screen_desktop; o->u.abs.desktop = screen_desktop;
/* wrap by default - it's handy! */ /* wrap by default - it's handy! */
o->rel.wrap = TRUE; o->u.rel.wrap = TRUE;
if ((n = parse_find_node("to", node))) { if ((n = parse_find_node("to", node))) {
gchar *s = parse_string(doc, n); gchar *s = parse_string(doc, n);
@ -59,43 +59,43 @@ static gpointer setup_go_func(ObParseInst *i, xmlDocPtr doc,
o->type = LAST; o->type = LAST;
else if (!g_ascii_strcasecmp(s, "next")) { else if (!g_ascii_strcasecmp(s, "next")) {
o->type = RELATIVE; o->type = RELATIVE;
o->rel.linear = TRUE; o->u.rel.linear = TRUE;
o->rel.dir = OB_DIRECTION_EAST; o->u.rel.dir = OB_DIRECTION_EAST;
} }
else if (!g_ascii_strcasecmp(s, "previous")) { else if (!g_ascii_strcasecmp(s, "previous")) {
o->type = RELATIVE; o->type = RELATIVE;
o->rel.linear = TRUE; o->u.rel.linear = TRUE;
o->rel.dir = OB_DIRECTION_WEST; o->u.rel.dir = OB_DIRECTION_WEST;
} }
else if (!g_ascii_strcasecmp(s, "north") || else if (!g_ascii_strcasecmp(s, "north") ||
!g_ascii_strcasecmp(s, "up")) { !g_ascii_strcasecmp(s, "up")) {
o->type = RELATIVE; o->type = RELATIVE;
o->rel.dir = OB_DIRECTION_NORTH; o->u.rel.dir = OB_DIRECTION_NORTH;
} }
else if (!g_ascii_strcasecmp(s, "south") || else if (!g_ascii_strcasecmp(s, "south") ||
!g_ascii_strcasecmp(s, "down")) { !g_ascii_strcasecmp(s, "down")) {
o->type = RELATIVE; o->type = RELATIVE;
o->rel.dir = OB_DIRECTION_SOUTH; o->u.rel.dir = OB_DIRECTION_SOUTH;
} }
else if (!g_ascii_strcasecmp(s, "west") || else if (!g_ascii_strcasecmp(s, "west") ||
!g_ascii_strcasecmp(s, "left")) { !g_ascii_strcasecmp(s, "left")) {
o->type = RELATIVE; o->type = RELATIVE;
o->rel.dir = OB_DIRECTION_WEST; o->u.rel.dir = OB_DIRECTION_WEST;
} }
else if (!g_ascii_strcasecmp(s, "east") || else if (!g_ascii_strcasecmp(s, "east") ||
!g_ascii_strcasecmp(s, "right")) { !g_ascii_strcasecmp(s, "right")) {
o->type = RELATIVE; o->type = RELATIVE;
o->rel.dir = OB_DIRECTION_EAST; o->u.rel.dir = OB_DIRECTION_EAST;
} }
else { else {
o->type = ABSOLUTE; o->type = ABSOLUTE;
o->abs.desktop = atoi(s) - 1; o->u.abs.desktop = atoi(s) - 1;
} }
g_free(s); g_free(s);
} }
if ((n = parse_find_node("wrap", node))) if ((n = parse_find_node("wrap", node)))
o->rel.wrap = parse_bool(doc, n); o->u.rel.wrap = parse_bool(doc, n);
return o; return o;
} }
@ -127,11 +127,11 @@ static gboolean run_func(ObActionsData *data, gpointer options)
d = screen_last_desktop; d = screen_last_desktop;
break; break;
case ABSOLUTE: case ABSOLUTE:
d = o->abs.desktop; d = o->u.abs.desktop;
break; break;
case RELATIVE: case RELATIVE:
d = screen_find_desktop(screen_desktop, d = screen_find_desktop(screen_desktop,
o->rel.dir, o->rel.wrap, o->rel.linear); o->u.rel.dir, o->u.rel.wrap, o->u.rel.linear);
break; break;
} }