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

use the new client_directional_edge_search for the movetoedge actions.

Browse source 
add new growtoedge actions.
This commit is contained in:
Dana Jansens 2003-08-12 08:46:21 +00:00
parent c1f0f7c40f
commit e7ae71db70
2 changed files with 109 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
openbox/action.c
View file

@ -232,6 +232,26 @@ void setup_action_movetoedge_west(ObAction *a)
a->data.diraction.direction = OB_DIRECTION_WEST;
}
void setup_action_growtoedge_north(ObAction *a)
{
a->data.diraction.direction = OB_DIRECTION_NORTH;
}
void setup_action_growtoedge_south(ObAction *a)
{
a->data.diraction.direction = OB_DIRECTION_SOUTH;
}
void setup_action_growtoedge_east(ObAction *a)
{
a->data.diraction.direction = OB_DIRECTION_EAST;
}
void setup_action_growtoedge_west(ObAction *a)
{
a->data.diraction.direction = OB_DIRECTION_WEST;
}
void setup_action_top_layer(ObAction *a)
{
a->data.layer.layer = 1;
@ -614,6 +634,26 @@ ActionString actionstrings[] =
action_movetoedge,
setup_action_movetoedge_east
},
{
"growtoedgenorth",
action_growtoedge,
setup_action_growtoedge_north
},
{
"growtoedgesouth",
action_growtoedge,
setup_action_growtoedge_south
},
{
"growtoedgewest",
action_growtoedge,
setup_action_growtoedge_west
},
{
"growtoedgeeast",
action_growtoedge,
setup_action_growtoedge_east
},
{
NULL,
NULL,
@ -1173,7 +1213,7 @@ void action_directional_focus(union ActionData *data)
void action_movetoedge(union ActionData *data)
{
int x, y, h, w;
int x, y;
ObClient *c = data->diraction.c;
if (!c)
@ -1181,20 +1221,20 @@ void action_movetoedge(union ActionData *data)
x = c->frame->area.x;
y = c->frame->area.y;
h = screen_area(c->desktop)->height;
w = screen_area(c->desktop)->width;
switch(data->diraction.direction) {
case OB_DIRECTION_NORTH:
y = 0;
y = client_directional_edge_search(c, OB_DIRECTION_NORTH);
break;
case OB_DIRECTION_WEST:
x = 0;
x = client_directional_edge_search(c, OB_DIRECTION_WEST);
break;
case OB_DIRECTION_SOUTH:
y = h - c->frame->area.height;
y = client_directional_edge_search(c, OB_DIRECTION_SOUTH) -
c->frame->area.height;
break;
case OB_DIRECTION_EAST:
x = w - c->frame->area.width;
x = client_directional_edge_search(c, OB_DIRECTION_EAST) -
c->frame->area.width;
break;
default:
g_assert_not_reached();
@ -1205,6 +1245,66 @@ void action_movetoedge(union ActionData *data)
}
void action_growtoedge(union ActionData *data)
{
int x, y, width, height, dest;
ObClient *c = data->diraction.c;
Rect *a = screen_area(c->desktop);
if (!c)
return;
x = c->frame->area.x;
y = c->frame->area.y;
width = c->frame->area.width;
height = c->frame->area.height;
switch(data->diraction.direction) {
case OB_DIRECTION_NORTH:
dest = client_directional_edge_search(c, OB_DIRECTION_NORTH);
if(a->y > (y - c->size_inc.height))
height = c->frame->area.height / 2;
else {
height = c->frame->area.y + c->frame->area.height - dest;
y = dest;
}
break;
case OB_DIRECTION_WEST:
dest = client_directional_edge_search(c, OB_DIRECTION_WEST);
if(a->x > (x - c->size_inc.width))
width = c->frame->area.width / 2;
else {
width = c->frame->area.x + c->frame->area.width - dest;
x = dest;
}
break;
case OB_DIRECTION_SOUTH:
dest = client_directional_edge_search(c, OB_DIRECTION_SOUTH);
if(a->y + a->height <
(y + c->frame->area.height + c->size_inc.height)) {
height = c->frame->area.height / 2;
y = a->y + a->height - height;
} else
height = dest - c->frame->area.y;
break;
case OB_DIRECTION_EAST:
dest = client_directional_edge_search(c, OB_DIRECTION_EAST);
if(a->x + a->width <
(x + c->frame->area.width + c->size_inc.width)) {
width = c->frame->area.width / 2;
x = a->x + a->width - width;
} else
width = dest - c->frame->area.x;
break;
default:
g_assert_not_reached();
}
frame_frame_gravity(c->frame, &x, &y);
width -= c->frame->size.left + c->frame->size.right;
height -= c->frame->size.top + c->frame->size.bottom;
client_configure(c, OB_CORNER_TOPLEFT, x, y, width, height, TRUE, TRUE);
}
void action_send_to_layer(union ActionData *data)
{
if (data->layer.c)

2
openbox/action.h
View file

@ -211,6 +211,8 @@ void action_cycle_windows(union ActionData *data);
void action_directional_focus(union ActionData *data);
/* DirectionalAction */
void action_movetoedge(union ActionData *data);
/* DirectionalAction */
void action_growtoedge(union ActionData *data);
/* Layer */
void action_send_to_layer(union ActionData *data);
/* Layer */