X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=5b1fcd6c20e8b4cfa01d2fa6e3c160cacdad3899;hb=06ed8ab6c03337710acba8d6a70781456e979384;hp=2288dcb9886762ffcbbb3436093e0b98ada7ec62;hpb=bb0fd965c50289c02619113f113927294fa5be23;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 2288dcb9..5b1fcd6c 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -39,36 +39,7 @@ #include -static gulong ignore_start = 0; -static void client_action_start(union ActionData *data) -{ - ignore_start = event_start_ignore_all_enters(); -} - -static void client_action_end(union ActionData *data, gboolean allow_enters) -{ - if (config_focus_follow) - if (data->any.context != OB_FRAME_CONTEXT_CLIENT) { - if (!data->any.button && data->any.c && !allow_enters) { - event_end_ignore_all_enters(ignore_start); - } else { - ObClient *c; - - /* usually this is sorta redundant, but with a press action - that moves windows our from under the cursor, the enter - event will come as a GrabNotify which is ignored, so this - makes a fake enter event - */ - if ((c = client_under_pointer()) && c != data->any.c) { - ob_debug_type(OB_DEBUG_FOCUS, - "Generating fake enter because we did a " - "mouse-event action"); - event_enter_client(c); - } - } - } -} typedef struct { @@ -416,16 +387,6 @@ void setup_action_bottom_layer(ObAction **a, ObUserAction uact) (*a)->data.layer.layer = -1; } -void setup_action_move(ObAction **a, ObUserAction uact) -{ - (*a)->data.moveresize.any.client_action = OB_CLIENT_ACTION_ALWAYS; - (*a)->data.moveresize.keyboard = - (uact == OB_USER_ACTION_NONE || - uact == OB_USER_ACTION_KEYBOARD_KEY || - uact == OB_USER_ACTION_MENU_SELECTION); - (*a)->data.moveresize.corner = 0; -} - void setup_action_resize(ObAction **a, ObUserAction uact) { (*a)->data.moveresize.any.client_action = OB_CLIENT_ACTION_ALWAYS; @@ -493,41 +454,6 @@ ActionString actionstrings[] = action_directional_focus, setup_action_directional_focus_northwest }, - { - "unfocus", - action_unfocus, - setup_client_action - }, - { - "iconify", - action_iconify, - setup_client_action - }, - { - "focustobottom", - action_focus_order_to_bottom, - setup_client_action - }, - { - "raiselower", - action_raiselower, - setup_client_action - }, - { - "raise", - action_raise, - setup_client_action - }, - { - "lower", - action_lower, - setup_client_action - }, - { - "close", - action_close, - setup_client_action - }, { "kill", action_kill, @@ -598,21 +524,6 @@ ActionString actionstrings[] = action_resize_relative, setup_client_action }, - { - "maximizefull", - action_maximize_full, - setup_client_action - }, - { - "unmaximizefull", - action_unmaximize_full, - setup_client_action - }, - { - "togglemaximizefull", - action_toggle_maximize_full, - setup_client_action - }, { "maximizehorz", action_maximize_horz, @@ -643,11 +554,6 @@ ActionString actionstrings[] = action_toggle_maximize_vert, setup_client_action }, - { - "togglefullscreen", - action_toggle_fullscreen, - setup_client_action - }, { "sendtodesktop", action_send_to_desktop, @@ -723,11 +629,6 @@ ActionString actionstrings[] = action_toggle_decorations, setup_client_action }, - { - "move", - action_move, - setup_action_move - }, { "resize", action_resize, @@ -982,12 +883,6 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, prop_atoms.net_wm_moveresize_size_bottomright; g_free(s); } - } else if (act->func == action_raise || - act->func == action_lower || - act->func == action_raiselower || - act->func == action_shadelower || - act->func == action_unshaderaise) { - } INTERACTIVE_LIMIT(act, uact); } g_free(actname); @@ -1095,40 +990,6 @@ void action_run_string(const gchar *name, struct _ObClient *c, Time time) action_run(l, c, 0, time); } -void action_unfocus (union ActionData *data) -{ - if (data->client.any.c == focus_client) - focus_fallback(FALSE, FALSE, TRUE); -} - -void action_iconify(union ActionData *data) -{ - client_action_start(data); - client_iconify(data->client.any.c, TRUE, TRUE, FALSE); - client_action_end(data, config_focus_under_mouse); -} - -void action_focus_order_to_bottom(union ActionData *data) -{ - focus_order_to_bottom(data->client.any.c); -} - -void action_raiselower(union ActionData *data) -{ - ObClient *c = data->client.any.c; - - client_action_start(data); - stacking_restack_request(c, NULL, Opposite); - client_action_end(data, config_focus_under_mouse); -} - -void action_raise(union ActionData *data) -{ - client_action_start(data); - stacking_raise(CLIENT_AS_WINDOW(data->client.any.c)); - client_action_end(data, config_focus_under_mouse); -} - void action_unshaderaise(union ActionData *data) { if (data->client.any.c->shaded) @@ -1145,18 +1006,6 @@ void action_shadelower(union ActionData *data) action_shade(data); } -void action_lower(union ActionData *data) -{ - client_action_start(data); - stacking_lower(CLIENT_AS_WINDOW(data->client.any.c)); - client_action_end(data, config_focus_under_mouse); -} - -void action_close(union ActionData *data) -{ - client_close(data->client.any.c); -} - void action_kill(union ActionData *data) { client_kill(data->client.any.c); @@ -1278,66 +1127,6 @@ void action_resize_relative(union ActionData *data) client_action_end(data, FALSE); } -void action_maximize_full(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, TRUE, 0); - client_action_end(data, config_focus_under_mouse); -} - -void action_unmaximize_full(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, FALSE, 0); - client_action_end(data, config_focus_under_mouse); -} - -void action_toggle_maximize_full(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, - !(data->client.any.c->max_horz || - data->client.any.c->max_vert), - 0); - client_action_end(data, config_focus_under_mouse); -} - -void action_maximize_horz(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, TRUE, 1); - client_action_end(data, config_focus_under_mouse); -} - -void action_unmaximize_horz(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, FALSE, 1); - client_action_end(data, config_focus_under_mouse); -} - -void action_toggle_maximize_horz(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, - !data->client.any.c->max_horz, 1); - client_action_end(data, config_focus_under_mouse); -} - -void action_maximize_vert(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, TRUE, 2); - client_action_end(data, config_focus_under_mouse); -} - -void action_unmaximize_vert(union ActionData *data) -{ - client_action_start(data); - client_maximize(data->client.any.c, FALSE, 2); - client_action_end(data, config_focus_under_mouse); -} - void action_toggle_maximize_vert(union ActionData *data) { client_action_start(data); @@ -1346,13 +1135,6 @@ void action_toggle_maximize_vert(union ActionData *data) client_action_end(data, config_focus_under_mouse); } -void action_toggle_fullscreen(union ActionData *data) -{ - client_action_start(data); - client_fullscreen(data->client.any.c, !(data->client.any.c->fullscreen)); - client_action_end(data, config_focus_under_mouse); -} - void action_send_to_desktop(union ActionData *data) { ObClient *c = data->sendto.any.c; @@ -1545,19 +1327,6 @@ static guint32 pick_corner(gint x, gint y, gint cx, gint cy, gint cw, gint ch, #undef d } -void action_move(union ActionData *data) -{ - ObClient *c = data->moveresize.any.c; - guint32 corner; - - if (data->moveresize.keyboard) - corner = prop_atoms.net_wm_moveresize_move_keyboard; - else - corner = prop_atoms.net_wm_moveresize_move; - - moveresize_start(c, data->any.x, data->any.y, data->any.button, corner); -} - void action_resize(union ActionData *data) { ObClient *c = data->moveresize.any.c;