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

rm a redundant actiondata struct

Browse source
This commit is contained in:
Dana Jansens 2003-03-29 20:59:20 +00:00
parent 2309520b48
commit b6b514c477
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
openbox/action.c
View file

@ -365,17 +365,17 @@ void action_toggle_maximize_vert(union ActionData *data)
void action_send_to_desktop(union ActionData *data) void action_send_to_desktop(union ActionData *data)
{ {
if (data->sendto.c) if (data->desktop.c)
if (data->sendto.desktop < screen_num_desktops || if (data->desktop.desk < screen_num_desktops ||
data->sendto.desktop == DESKTOP_ALL) data->desktop.desk == DESKTOP_ALL)
client_set_desktop(data->sendto.c, data->sendto.desktop, TRUE); client_set_desktop(data->desktop.c, data->desktop.desk, TRUE);
} }
void action_send_to_next_desktop(union ActionData *data) void action_send_to_next_desktop(union ActionData *data)
{ {
guint d; guint d;
if (!data->sendto.c) return; if (!data->sendtonextprev.c) return;
d = screen_desktop + 1; d = screen_desktop + 1;
if (d >= screen_num_desktops) { if (d >= screen_num_desktops) {
@ -390,7 +390,7 @@ void action_send_to_previous_desktop(union ActionData *data)
{ {
guint d; guint d;
if (!data->sendto.c) return; if (!data->sendtonextprev.c) return;
d = screen_desktop - 1; d = screen_desktop - 1;
if (d >= screen_num_desktops) { if (d >= screen_num_desktops) {

8
openbox/action.h
View file

@ -26,11 +26,6 @@ struct MoveResizeRelative {
int delta; int delta;
}; };
struct SendToDesktop {
Client *c;
guint desktop;
};
struct SendToNextPreviousDesktop { struct SendToNextPreviousDesktop {
Client *c; Client *c;
gboolean wrap; gboolean wrap;
@ -72,7 +67,6 @@ union ActionData {
struct Execute execute; struct Execute execute;
struct ClientAction client; struct ClientAction client;
struct MoveResizeRelative relative; struct MoveResizeRelative relative;
struct SendToDesktop sendto;
struct SendToNextPreviousDesktop sendtonextprev; struct SendToNextPreviousDesktop sendtonextprev;
struct Desktop desktop; struct Desktop desktop;
struct NextPreviousDesktop nextprevdesktop; struct NextPreviousDesktop nextprevdesktop;
@ -161,7 +155,7 @@ void action_maximize_vert(union ActionData *data);
void action_unmaximize_vert(union ActionData *data); void action_unmaximize_vert(union ActionData *data);
/* ClientAction */ /* ClientAction */
void action_toggle_maximize_vert(union ActionData *data); void action_toggle_maximize_vert(union ActionData *data);
/* SendToDesktop */ /* Desktop */
void action_send_to_desktop(union ActionData *data); void action_send_to_desktop(union ActionData *data);
/* SendToNextPreviousDesktop */ /* SendToNextPreviousDesktop */
void action_send_to_next_desktop(union ActionData *data); void action_send_to_next_desktop(union ActionData *data);