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

prefix/capitalize the mouse actions enum

Browse source
This commit is contained in:
Dana Jansens 2003-08-12 18:12:17 +00:00
parent 555e3384ff
commit 8b67ce7030
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
openbox/config.c
View file

@ -133,22 +133,22 @@ static void parse_mouse(xmlDocPtr doc, xmlNodePtr node, void *d)
if (!parse_attr_string("button", nbut, &buttonstr)) if (!parse_attr_string("button", nbut, &buttonstr))
goto next_nbut; goto next_nbut;
if (parse_attr_contains("press", nbut, "action")) if (parse_attr_contains("press", nbut, "action"))
mact = MouseAction_Press; mact = OB_MOUSE_ACTION_PRESS;
else if (parse_attr_contains("release", nbut, "action")) else if (parse_attr_contains("release", nbut, "action"))
mact = MouseAction_Release; mact = OB_MOUSE_ACTION_RELEASE;
else if (parse_attr_contains("click", nbut, "action")) else if (parse_attr_contains("click", nbut, "action"))
mact = MouseAction_Click; mact = OB_MOUSE_ACTION_CLICK;
else if (parse_attr_contains("doubleclick", nbut,"action")) else if (parse_attr_contains("doubleclick", nbut,"action"))
mact = MouseAction_DClick; mact = OB_MOUSE_ACTION_DOUBLE_CLICK;
else if (parse_attr_contains("drag", nbut, "action")) else if (parse_attr_contains("drag", nbut, "action"))
mact = MouseAction_Motion; mact = OB_MOUSE_ACTION_MOTION;
else else
goto next_nbut; goto next_nbut;
nact = parse_find_node("action", nbut->xmlChildrenNode); nact = parse_find_node("action", nbut->xmlChildrenNode);
while (nact) { while (nact) {
if ((action = action_parse(doc, nact))) { if ((action = action_parse(doc, nact))) {
/* validate that its okay for a mouse binding*/ /* validate that its okay for a mouse binding*/
if (mact == MouseAction_Motion) { if (mact == OB_MOUSE_ACTION_MOTION) {
if (action->func != action_moveresize || if (action->func != action_moveresize ||
action->data.moveresize.corner == action->data.moveresize.corner ==
prop_atoms.net_wm_moveresize_move_keyboard || prop_atoms.net_wm_moveresize_move_keyboard ||

14
openbox/mouse.c
View file

@ -14,7 +14,7 @@
typedef struct { typedef struct {
guint state; guint state;
guint button; guint button;
GSList *actions[NUM_MOUSEACTION]; /* lists of Action pointers */ GSList *actions[OB_MOUSE_NUM_ACTIONS]; /* lists of Action pointers */
} ObMouseBinding; } ObMouseBinding;
/* Array of GSList*s of PointerBinding*s. */ /* Array of GSList*s of PointerBinding*s. */
@ -70,7 +70,7 @@ static void clearall()
int j; int j;
ObMouseBinding *b = it->data; ObMouseBinding *b = it->data;
for (j = 0; j < NUM_MOUSEACTION; ++j) { for (j = 0; j < OB_MOUSE_NUM_ACTIONS; ++j) {
GSList *it; GSList *it;
for (it = b->actions[j]; it; it = it->next) { for (it = b->actions[j]; it; it = it->next) {
action_free(it->data); action_free(it->data);
@ -204,7 +204,7 @@ void mouse_event(ObClient *client, ObFrameContext context, XEvent *e)
button = e->xbutton.button; button = e->xbutton.button;
state = e->xbutton.state; state = e->xbutton.state;
fire_button(MouseAction_Press, context, fire_button(OB_MOUSE_ACTION_PRESS, context,
client, e->xbutton.state, client, e->xbutton.state,
e->xbutton.button, e->xbutton.button,
e->xbutton.x_root, e->xbutton.y_root); e->xbutton.x_root, e->xbutton.y_root);
@ -249,18 +249,18 @@ void mouse_event(ObClient *client, ObFrameContext context, XEvent *e)
state = 0; state = 0;
ltime = e->xbutton.time; ltime = e->xbutton.time;
} }
fire_button(MouseAction_Release, context, fire_button(OB_MOUSE_ACTION_RELEASE, context,
client, e->xbutton.state, client, e->xbutton.state,
e->xbutton.button, e->xbutton.button,
e->xbutton.x_root, e->xbutton.y_root); e->xbutton.x_root, e->xbutton.y_root);
if (click) if (click)
fire_button(MouseAction_Click, context, fire_button(OB_MOUSE_ACTION_CLICK, context,
client, e->xbutton.state, client, e->xbutton.state,
e->xbutton.button, e->xbutton.button,
e->xbutton.x_root, e->xbutton.x_root,
e->xbutton.y_root); e->xbutton.y_root);
if (dclick) if (dclick)
fire_button(MouseAction_DClick, context, fire_button(OB_MOUSE_ACTION_DOUBLE_CLICK, context,
client, e->xbutton.state, client, e->xbutton.state,
e->xbutton.button, e->xbutton.button,
e->xbutton.x_root, e->xbutton.x_root,
@ -302,7 +302,7 @@ void mouse_event(ObClient *client, ObFrameContext context, XEvent *e)
client->area.height + client->area.height +
client->frame->size.top + client->frame->size.top +
client->frame->size.bottom); client->frame->size.bottom);
fire_motion(MouseAction_Motion, context, fire_motion(OB_MOUSE_ACTION_MOTION, context,
client, state, button, px, py, corner); client, state, button, px, py, corner);
button = 0; button = 0;
state = 0; state = 0;

12
openbox/mouse.h
View file

@ -7,12 +7,12 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
typedef enum { typedef enum {
MouseAction_Press, OB_MOUSE_ACTION_PRESS,
MouseAction_Release, OB_MOUSE_ACTION_RELEASE,
MouseAction_Click, OB_MOUSE_ACTION_CLICK,
MouseAction_DClick, OB_MOUSE_ACTION_DOUBLE_CLICK,
MouseAction_Motion, OB_MOUSE_ACTION_MOTION,
NUM_MOUSEACTION OB_MOUSE_NUM_ACTIONS
} ObMouseAction; } ObMouseAction;
void mouse_startup(); void mouse_startup();