X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.h;h=c6a04838e25c6f0ebddca8fbaffdd35ff933bca4;hb=75c8bec464d73f6efe4d0ea3517fff6270f95a78;hp=95d152829ed0ced663183997ede3e5bc3ee8bf8f;hpb=e7ae71db7008c2418090608e9860da024f1c1464;p=chaz%2Fopenbox diff --git a/openbox/action.h b/openbox/action.h index 95d15282..c6a04838 100644 --- a/openbox/action.h +++ b/openbox/action.h @@ -13,63 +13,72 @@ typedef struct _ObAction ObAction; struct AnyAction { struct _ObClient *c; + gboolean interactive; +}; + +struct InteractiveAction { + struct AnyAction any; + gboolean final; + gboolean cancel; }; struct DirectionalAction{ - struct _ObClient *c; + struct AnyAction any; ObDirection direction; }; struct Execute { - struct _ObClient *c; + struct AnyAction any; char *path; }; struct ClientAction { - struct _ObClient *c; + struct AnyAction any; +}; + +struct Activate { + struct AnyAction any; + gboolean here; /* bring it to the current desktop */ }; struct MoveResizeRelative { - struct _ObClient *c; + struct AnyAction any; int delta; }; struct SendToDesktop { - struct _ObClient *c; + struct AnyAction any; guint desk; gboolean follow; }; struct SendToDesktopDirection { - struct _ObClient *c; + struct InteractiveAction inter; ObDirection dir; gboolean wrap; gboolean linear; - gboolean final; - gboolean cancel; + gboolean follow; }; struct Desktop { - struct _ObClient *c; + struct AnyAction any; guint desk; }; struct Layer { - struct _ObClient *c; + struct AnyAction any; int layer; /* < 0 = below, 0 = normal, > 0 = above */ }; struct DesktopDirection { - struct _ObClient *c; + struct InteractiveAction inter; ObDirection dir; gboolean wrap; gboolean linear; - gboolean final; - gboolean cancel; }; struct MoveResize { - struct _ObClient *c; + struct AnyAction any; int x; int y; guint32 corner; /* prop_atoms.net_wm_moveresize_* */ @@ -77,25 +86,25 @@ struct MoveResize { }; struct ShowMenu { - struct _ObClient *c; + struct AnyAction any; char *name; int x; int y; }; struct CycleWindows { - struct _ObClient *c; + struct InteractiveAction inter; gboolean linear; gboolean forward; - gboolean final; - gboolean cancel; }; union ActionData { struct AnyAction any; + struct InteractiveAction inter; struct DirectionalAction diraction; struct Execute execute; struct ClientAction client; + struct Activate activate; struct MoveResizeRelative relative; struct SendToDesktop sendto; struct SendToDesktopDirection sendtodir; @@ -130,11 +139,13 @@ ObAction *action_new(void (*func)(union ActionData *data)); */ ObAction *action_from_string(char *name); -ObAction *action_parse(xmlDocPtr doc, xmlNodePtr node); +ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node); void action_free(ObAction *a); /* Execute */ void action_execute(union ActionData *data); +/* ActivateAction */ +void action_activate(union ActionData *data); /* ClientAction */ void action_focus(union ActionData *data); /* ClientAction */ @@ -142,6 +153,8 @@ void action_unfocus(union ActionData *data); /* ClientAction */ void action_iconify(union ActionData *data); /* ClientAction */ +void action_raiselower(union ActionData *data); +/* ClientAction */ void action_raise(union ActionData *data); /* ClientAction */ void action_lower(union ActionData *data);