#include "kernel/client.h"
#include "kernel/prop.h"
#include "kernel/grab.h"
-#include "kernel/parse.h"
#include "kernel/frame.h"
+#include "parser/parse.h"
#include "translate.h"
#include "mouse.h"
-#include "mouseparse.h"
#include <glib.h>
static int threshold;
static int dclicktime;
+/*
-static void parse_assign(char *name, ParseToken *value)
+<context name="Titlebar">
+ <mousebind button="Left" action="Press">
+ <action name="Raise"></action>
+ </mousebind>
+</context>
+
+*/
+
+static void parse_xml(xmlDocPtr doc, xmlNodePtr node, void *d)
{
- if (!g_ascii_strcasecmp(name, "dragthreshold")) {
- if (value->type != TOKEN_INTEGER)
- yyerror("invalid value");
- else {
- if (value->data.integer >= 0)
- threshold = value->data.integer;
- }
- } else if (!g_ascii_strcasecmp(name, "doubleclicktime")) {
- if (value->type != TOKEN_INTEGER)
- yyerror("invalid value");
- else {
- if (value->data.integer >= 0)
- dclicktime = value->data.integer;
+ xmlNodePtr n, nbut, nact;
+ char *buttonstr;
+ char *contextstr;
+ MouseAction mact;
+ Action *action;
+
+ if ((n = parse_find_node("dragThreshold", node)))
+ threshold = parse_int(doc, n);
+ if ((n = parse_find_node("doubleClickTime", node)))
+ dclicktime = parse_int(doc, n);
+
+ n = parse_find_node("context", node);
+ while (n) {
+ if (!parse_attr_string("name", n, &contextstr))
+ goto next_n;
+ nbut = parse_find_node("mousebind", n->xmlChildrenNode);
+ while (nbut) {
+ if (!parse_attr_string("button", nbut, &buttonstr))
+ goto next_nbut;
+ if (parse_attr_contains("press", nbut, "action"))
+ mact = MouseAction_Press;
+ else if (parse_attr_contains("release", nbut, "action"))
+ mact = MouseAction_Release;
+ else if (parse_attr_contains("click", nbut, "action"))
+ mact = MouseAction_Click;
+ else if (parse_attr_contains("doubleclick", nbut,"action"))
+ mact = MouseAction_DClick;
+ else if (parse_attr_contains("drag", nbut, "action"))
+ mact = MouseAction_Motion;
+ else
+ goto next_nbut;
+ nact = parse_find_node("action", nbut->xmlChildrenNode);
+ while (nact) {
+ if ((action = action_parse(doc, nact))) {
+ /* validate that its okay for a mouse binding*/
+ if (mact == MouseAction_Motion) {
+ if (action->func != action_moveresize ||
+ action->data.moveresize.corner ==
+ prop_atoms.net_wm_moveresize_move_keyboard ||
+ action->data.moveresize.corner ==
+ prop_atoms.net_wm_moveresize_size_keyboard) {
+ action_free(action);
+ action = NULL;
+ }
+ } else {
+ if (action->func == action_moveresize &&
+ action->data.moveresize.corner !=
+ prop_atoms.net_wm_moveresize_move_keyboard &&
+ action->data.moveresize.corner !=
+ prop_atoms.net_wm_moveresize_size_keyboard) {
+ action_free(action);
+ action = NULL;
+ }
+ }
+ if (action)
+ mbind(buttonstr, contextstr, mact, action);
+ }
+ nact = parse_find_node("action", nact->next);
+ }
+ g_free(buttonstr);
+ next_nbut:
+ nbut = parse_find_node("mousebind", nbut->next);
}
- } else
- yyerror("invalid option");
- parse_free_token(value);
+ g_free(contextstr);
+ next_n:
+ n = parse_find_node("context", n->next);
+ }
}
void plugin_setup_config()
{
threshold = 3;
dclicktime = 200;
- parse_reg_section("mouse", mouseparse, parse_assign);
+ parse_register("mouse", parse_xml, NULL);
}
/* Array of GSList*s of PointerBinding*s. */
static GSList *bound_contexts[NUM_CONTEXTS];
-static void grab_for_client(Client *client, gboolean grab)
+static void grab_for_client(ObClient *client, gboolean grab)
{
int i;
GSList *it;
} else continue;
if (grab)
- grab_button(b->button, b->state, win, mask, mode);
+ grab_button_full(b->button, b->state, win, mask, mode, None);
else
ungrab_button(b->button, b->state, win);
}
int j;
MouseBinding *b = it->data;
- for (j = 0; j < NUM_MOUSEACTION; ++j)
- if (b->action[j] != NULL)
- action_free(b->action[j]);
+ for (j = 0; j < NUM_MOUSEACTION; ++j) {
+ GSList *it;
+ for (it = b->actions[j]; it; it = it->next) {
+ action_free(it->data);
+ }
+ g_slist_free(b->actions[j]);
+ }
g_free(b);
}
g_slist_free(bound_contexts[i]);
}
}
-static void fire_button(MouseAction a, Context context, Client *c, guint state,
+static void fire_button(MouseAction a, Context context, ObClient *c, guint state,
guint button, int x, int y)
{
GSList *it;
/* if not bound, then nothing to do! */
if (it == NULL) return;
- if (b->action[a] != NULL && b->action[a]->func != NULL) {
- b->action[a]->data.any.c = c;
+ for (it = b->actions[a]; it; it = it->next) {
+ Action *act = it->data;
+ if (act->func != NULL) {
+ act->data.any.c = c;
- g_assert(b->action[a]->func != action_moveresize);
+ g_assert(act->func != action_moveresize);
- if (b->action[a]->func == action_showmenu) {
- b->action[a]->data.showmenu.x = x;
- b->action[a]->data.showmenu.y = y;
- }
+ if (act->func == action_showmenu) {
+ act->data.showmenu.x = x;
+ act->data.showmenu.y = y;
+ }
- b->action[a]->func(&b->action[a]->data);
+ act->func(&act->data);
+ }
}
}
-static void fire_motion(MouseAction a, Context context, Client *c,
+static void fire_motion(MouseAction a, Context context, ObClient *c,
guint state, guint button, int x_root, int y_root,
guint32 corner)
{
/* if not bound, then nothing to do! */
if (it == NULL) return;
- if (b->action[a] != NULL && b->action[a]->func != NULL) {
- b->action[a]->data.any.c = c;
-
- if (b->action[a]->func == action_moveresize) {
- b->action[a]->data.moveresize.x = x_root;
- b->action[a]->data.moveresize.y = y_root;
- b->action[a]->data.moveresize.button = button;
- if (!(b->action[a]->data.moveresize.corner ==
- prop_atoms.net_wm_moveresize_move ||
- b->action[a]->data.moveresize.corner ==
- prop_atoms.net_wm_moveresize_move_keyboard ||
- b->action[a]->data.moveresize.corner ==
- prop_atoms.net_wm_moveresize_size_keyboard))
- b->action[a]->data.moveresize.corner = corner;
- } else
- g_assert_not_reached();
+ for (it = b->actions[a]; it; it = it->next) {
+ Action *act = it->data;
+ if (act->func != NULL) {
+ act->data.any.c = c;
+
+ if (act->func == action_moveresize) {
+ act->data.moveresize.x = x_root;
+ act->data.moveresize.y = y_root;
+ act->data.moveresize.button = button;
+ if (!(act->data.moveresize.corner ==
+ prop_atoms.net_wm_moveresize_move ||
+ act->data.moveresize.corner ==
+ prop_atoms.net_wm_moveresize_move_keyboard ||
+ act->data.moveresize.corner ==
+ prop_atoms.net_wm_moveresize_size_keyboard))
+ act->data.moveresize.corner = corner;
+ } else
+ g_assert_not_reached();
- b->action[a]->func(&b->action[a]->data);
+ act->func(&act->data);
+ }
}
}
context = frame_context(e->data.x.client,
e->data.x.e->xbutton.window);
- if (!button) {
- px = e->data.x.e->xbutton.x_root;
- py = e->data.x.e->xbutton.y_root;
- button = e->data.x.e->xbutton.button;
- state = e->data.x.e->xbutton.state;
- }
+ px = e->data.x.e->xbutton.x_root;
+ py = e->data.x.e->xbutton.y_root;
+ button = e->data.x.e->xbutton.button;
+ state = e->data.x.e->xbutton.state;
fire_button(MouseAction_Press, context,
e->data.x.client, e->data.x.e->xbutton.state,
e->data.x.e->xbutton.window);
if (e->data.x.e->xbutton.button == button) {
/* clicks are only valid if its released over the window */
- int junk;
+ int junk1, junk2;
Window wjunk;
guint ujunk, b, w, h;
XGetGeometry(ob_display, e->data.x.e->xbutton.window,
- &wjunk, &junk, &junk, &w, &h, &b, &ujunk);
+ &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk);
if (e->data.x.e->xbutton.x >= (signed)-b &&
e->data.x.e->xbutton.y >= (signed)-b &&
e->data.x.e->xbutton.x < (signed)(w+b) &&
ABS(e->data.x.e->xmotion.y_root - py) >= threshold) {
guint32 corner;
+ context = frame_context(e->data.x.client,
+ e->data.x.e->xmotion.window);
+
+ /* You can't drag on buttons */
+ if (context == Context_Maximize ||
+ context == Context_AllDesktops ||
+ context == Context_Shade ||
+ context == Context_Iconify ||
+ context == Context_Icon ||
+ context == Context_Close)
+ break;
+
if (!e->data.x.client)
- corner = prop_atoms.net_am_moveresize_size_bottomright;
+ corner = prop_atoms.net_wm_moveresize_size_bottomright;
else
corner =
pick_corner(e->data.x.e->xmotion.x_root,
e->data.x.client->area.height +
e->data.x.client->frame->size.top +
e->data.x.client->frame->size.bottom);
- context = frame_context(e->data.x.client,
- e->data.x.e->xmotion.window);
fire_motion(MouseAction_Motion, context,
e->data.x.client, state, button,
e->data.x.e->xmotion.x_root,
for (it = bound_contexts[context]; it != NULL; it = it->next){
b = it->data;
if (b->state == state && b->button == button) {
- /* already bound */
- if (b->action[mact] != NULL) {
- g_warning("duplicate binding");
- return FALSE;
- }
- b->action[mact] = action;
+ b->actions[mact] = g_slist_append(b->actions[mact], action);
return TRUE;
}
}
b = g_new0(MouseBinding, 1);
b->state = state;
b->button = button;
- b->action[mact] = action;
+ b->actions[mact] = g_slist_append(NULL, action);
bound_contexts[context] = g_slist_append(bound_contexts[context], b);
grab_all_clients(TRUE);
projects / chaz / openbox / blobdiff