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

move logic for add/remove desktop into screen.c

Browse source
This commit is contained in:
Dana Jansens 2007-06-23 16:15:46 +00:00
parent b1a50affe5
commit 8bcd349e4e
3 changed files with 75 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
openbox/actions/addremovedesktop.c
View file

@ -1,7 +1,5 @@
#include "openbox/actions.h"
#include "openbox/screen.h"
#include "openbox/client.h"
#include "openbox/debug.h"
#include <glib.h>
typedef struct {
@ -78,66 +76,10 @@ static gboolean run_func(ObActionsData *data, gpointer options)
actions_client_move(data, FALSE);
if (o->add) {
screen_set_num_desktops(screen_num_desktops+1);
/* move all the clients over */
if (o->current) {
GList *it;
for (it = client_list; it; it = g_list_next(it)) {
ObClient *c = it->data;
if (c->desktop != DESKTOP_ALL && c->desktop >= screen_desktop)
client_set_desktop(c, c->desktop+1, FALSE, TRUE);
}
}
}
else if (screen_num_desktops > 1) {
guint rmdesktop, movedesktop;
GList *it, *stacking_copy;
/* what desktop are we removing and moving to? */
if (o->current)
rmdesktop = screen_desktop;
else
rmdesktop = screen_num_desktops - 1;
if (rmdesktop < screen_num_desktops - 1)
movedesktop = rmdesktop + 1;
else
movedesktop = rmdesktop;
/* make a copy of the list cuz we're changing it */
stacking_copy = g_list_copy(stacking_list);
for (it = g_list_last(stacking_copy); it; it = g_list_previous(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *c = it->data;
guint d = c->desktop;
if (d != DESKTOP_ALL && d >= movedesktop) {
client_set_desktop(c, c->desktop - 1, TRUE, TRUE);
ob_debug("moving window %s\n", c->title);
}
/* raise all the windows that are on the current desktop which
is being merged */
if ((screen_desktop == rmdesktop - 1 ||
screen_desktop == rmdesktop) &&
(d == DESKTOP_ALL || d == screen_desktop))
{
stacking_raise(CLIENT_AS_WINDOW(c));
ob_debug("raising window %s\n", c->title);
}
}
}
/* act like we're changing desktops */
if (screen_desktop < screen_num_desktops - 1) {
gint d = screen_desktop;
screen_desktop = screen_last_desktop;
screen_set_desktop(d, TRUE);
ob_debug("fake desktop change\n");
}
screen_set_num_desktops(screen_num_desktops-1);
}
if (o->add)
screen_add_desktop(o->current);
else
screen_remove_desktop(o->current);
actions_client_move(data, TRUE);

66
openbox/screen.c
View file

@ -635,6 +635,72 @@ void screen_set_desktop(guint num, gboolean dofocus)
screen_desktop_user_time = event_curtime;
}
void screen_add_desktop(gboolean current)
{
screen_set_num_desktops(screen_num_desktops+1);
/* move all the clients over */
if (current) {
GList *it;
for (it = client_list; it; it = g_list_next(it)) {
ObClient *c = it->data;
if (c->desktop != DESKTOP_ALL && c->desktop >= screen_desktop)
client_set_desktop(c, c->desktop+1, FALSE, TRUE);
}
}
}
void screen_remove_desktop(gboolean current)
{
guint rmdesktop, movedesktop;
GList *it, *stacking_copy;
if (screen_num_desktops <= 1) return;
/* what desktop are we removing and moving to? */
if (current)
rmdesktop = screen_desktop;
else
rmdesktop = screen_num_desktops - 1;
if (rmdesktop < screen_num_desktops - 1)
movedesktop = rmdesktop + 1;
else
movedesktop = rmdesktop;
/* make a copy of the list cuz we're changing it */
stacking_copy = g_list_copy(stacking_list);
for (it = g_list_last(stacking_copy); it; it = g_list_previous(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *c = it->data;
guint d = c->desktop;
if (d != DESKTOP_ALL && d >= movedesktop) {
client_set_desktop(c, c->desktop - 1, TRUE, TRUE);
ob_debug("moving window %s\n", c->title);
}
/* raise all the windows that are on the current desktop which
is being merged */
if ((screen_desktop == rmdesktop - 1 ||
screen_desktop == rmdesktop) &&
(d == DESKTOP_ALL || d == screen_desktop))
{
stacking_raise(CLIENT_AS_WINDOW(c));
ob_debug("raising window %s\n", c->title);
}
}
}
/* act like we're changing desktops */
if (screen_desktop < screen_num_desktops - 1) {
gint d = screen_desktop;
screen_desktop = screen_last_desktop;
screen_set_desktop(d, TRUE);
ob_debug("fake desktop change\n");
}
screen_set_num_desktops(screen_num_desktops-1);
}
static void get_row_col(guint d, guint *r, guint *c)
{
switch (screen_desktop_layout.orientation) {

5
openbox/screen.h
View file

@ -67,6 +67,11 @@ void screen_resize();
void screen_set_num_desktops(guint num);
/*! Change the current desktop */
void screen_set_desktop(guint num, gboolean dofocus);
/*! Add a new desktop either at the end or inserted at the current desktop */
void screen_add_desktop(gboolean current);
/*! Remove a desktop, either at the end or the current desktop */
void screen_remove_desktop(gboolean current);
/*! Interactively change desktops */
guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
gboolean dialog, gboolean done, gboolean cancel);