Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use linked list instead of tabs for mouse bindings

This commit is contained in:
Julien Danjou 2007-11-12 13:21:28 +01:00
parent ab1b1ed46e
commit ef7034b0b8
7 changed files with 77 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
awesome.c
View File

@ -55,6 +55,7 @@ void
cleanup_screen(awesome_config *awesomeconf) cleanup_screen(awesome_config *awesomeconf)
{ {
int i; int i;
Button *b, *bn;
XftFontClose(awesomeconf->display, awesomeconf->font); XftFontClose(awesomeconf->display, awesomeconf->font);
XUngrabKey(awesomeconf->display, AnyKey, AnyModifier, RootWindow(awesomeconf->display, awesomeconf->phys_screen)); XUngrabKey(awesomeconf->display, AnyKey, AnyModifier, RootWindow(awesomeconf->display, awesomeconf->phys_screen));
@ -67,10 +68,29 @@ cleanup_screen(awesome_config *awesomeconf)
p_delete(&awesomeconf->tags[i].name); p_delete(&awesomeconf->tags[i].name);
for(i = 0; i < awesomeconf->nkeys; i++) for(i = 0; i < awesomeconf->nkeys; i++)
p_delete(&awesomeconf->keys[i].arg); p_delete(&awesomeconf->keys[i].arg);
for(i = 0; i< awesomeconf->buttons.ntitle; i++) for(b = awesomeconf->buttons.tag; b; b = bn)
p_delete(&awesomeconf->buttons.title[i].arg); {
for(i = 0; i< awesomeconf->buttons.nlayout; i++) bn = b->next;
p_delete(&awesomeconf->buttons.layout[i].arg); p_delete(&b);
}
for(b = awesomeconf->buttons.title; b; b = bn)
{
bn = b->next;
p_delete(&b->arg);
p_delete(&b);
}
for(b = awesomeconf->buttons.layout; b; b = bn)
{
bn = b->next;
p_delete(&b->arg);
p_delete(&b);
}
for(b = awesomeconf->buttons.root; b; b = bn)
{
bn = b->next;
p_delete(&b->arg);
p_delete(&b);
}
for(i = 0; i < awesomeconf->nlayouts; i++) for(i = 0; i < awesomeconf->nlayouts; i++)
p_delete(&awesomeconf->layouts[i].symbol); p_delete(&awesomeconf->layouts[i].symbol);
for(i = 0; i < awesomeconf->nrules; i++) for(i = 0; i < awesomeconf->nrules; i++)
@ -82,9 +102,6 @@ cleanup_screen(awesome_config *awesomeconf)
p_delete(&awesomeconf->layouts); p_delete(&awesomeconf->layouts);
p_delete(&awesomeconf->rules); p_delete(&awesomeconf->rules);
p_delete(&awesomeconf->keys); p_delete(&awesomeconf->keys);
p_delete(&awesomeconf->buttons.tag);
p_delete(&awesomeconf->buttons.title);
p_delete(&awesomeconf->buttons.layout);
p_delete(&awesomeconf->configpath); p_delete(&awesomeconf->configpath);
} }

6
client.c
View File

@ -189,7 +189,7 @@ focus(Client *c, Bool selscreen, awesome_config *awesomeconf)
window_grabbuttons(awesomeconf->tags[i].client_sel->display, window_grabbuttons(awesomeconf->tags[i].client_sel->display,
awesomeconf->tags[i].client_sel->phys_screen, awesomeconf->tags[i].client_sel->phys_screen,
awesomeconf->tags[i].client_sel->win, awesomeconf->tags[i].client_sel->win,
False, True, awesomeconf->buttons.root, awesomeconf->buttons.nroot, False, True, awesomeconf->buttons.root,
awesomeconf->modkey, awesomeconf->numlockmask); awesomeconf->modkey, awesomeconf->numlockmask);
XSetWindowBorder(awesomeconf->tags[i].client_sel->display, XSetWindowBorder(awesomeconf->tags[i].client_sel->display,
awesomeconf->tags[i].client_sel->win, awesomeconf->tags[i].client_sel->win,
@ -201,7 +201,7 @@ focus(Client *c, Bool selscreen, awesome_config *awesomeconf)
{ {
XSetWindowBorder(awesomeconf->display, c->win, awesomeconf->colors_selected[ColBorder].pixel); XSetWindowBorder(awesomeconf->display, c->win, awesomeconf->colors_selected[ColBorder].pixel);
window_grabbuttons(c->display, c->phys_screen, c->win, window_grabbuttons(c->display, c->phys_screen, c->win,
True, True, awesomeconf->buttons.root, awesomeconf->buttons.nroot, True, True, awesomeconf->buttons.root,
awesomeconf->modkey, awesomeconf->numlockmask); awesomeconf->modkey, awesomeconf->numlockmask);
} }
if(!selscreen) if(!selscreen)
@ -326,7 +326,7 @@ client_manage(Window w, XWindowAttributes *wa, awesome_config *awesomeconf)
/* grab buttons */ /* grab buttons */
window_grabbuttons(c->display, c->phys_screen, c->win, window_grabbuttons(c->display, c->phys_screen, c->win,
False, True, awesomeconf->buttons.root, awesomeconf->buttons.nroot, False, True, awesomeconf->buttons.root,
awesomeconf->modkey, awesomeconf->numlockmask); awesomeconf->modkey, awesomeconf->numlockmask);
/* update window title */ /* update window title */

45
config.c
View File

@ -172,28 +172,41 @@ mouse_button_lookup(const char *button)
return 0; return 0;
} }
static void static Button *
parse_mouse_bindings(cfg_t * cfg, const char *secname, Button **buttons, int *n, Bool handle_arg) parse_mouse_bindings(cfg_t * cfg, const char *secname, Bool handle_arg)
{ {
int i; unsigned int i, j;
unsigned int j;
cfg_t *cfgsectmp; cfg_t *cfgsectmp;
Button *b = NULL, *head = NULL;
/* Mouse: layout click bindings */ /* Mouse: layout click bindings */
*n = cfg_size(cfg, secname); for(i = 0; i < cfg_size(cfg, secname); i++)
*buttons = p_new(Button, *n);
for(i = 0; i < *n; i++)
{ {
/* init first elem */
if(i == 0)
head = b = p_new(Button, 1);
cfgsectmp = cfg_getnsec(cfg, secname, i); cfgsectmp = cfg_getnsec(cfg, secname, i);
for(j = 0; j < cfg_size(cfgsectmp, "modkey"); j++) for(j = 0; j < cfg_size(cfgsectmp, "modkey"); j++)
(*buttons)[i].mod |= key_mask_lookup(cfg_getnstr(cfgsectmp, "modkey", j)); b->mod |= key_mask_lookup(cfg_getnstr(cfgsectmp, "modkey", j));
(*buttons)[i].button = mouse_button_lookup(cfg_getstr(cfgsectmp, "button")); b->button = mouse_button_lookup(cfg_getstr(cfgsectmp, "button"));
(*buttons)[i].func = name_func_lookup(cfg_getstr(cfgsectmp, "command"), UicbList); b->func = name_func_lookup(cfg_getstr(cfgsectmp, "command"), UicbList);
if(handle_arg) if(handle_arg)
(*buttons)[i].arg = a_strdup(cfg_getstr(cfgsectmp, "arg")); b->arg = a_strdup(cfg_getstr(cfgsectmp, "arg"));
else else
(*buttons)[i].arg = NULL; b->arg = NULL;
/* switch to next elem or finalize the list */
if(i < cfg_size(cfg, secname) - 1)
{
b->next = p_new(Button, 1);
b = b->next;
} }
else
b->next = NULL;
}
return head;
} }
/** Parse configuration file and initialize some stuff /** Parse configuration file and initialize some stuff
@ -472,16 +485,16 @@ parse_config(const char *confpatharg, awesome_config *awesomeconf)
awesomeconf->modkey = Mod4Mask; awesomeconf->modkey = Mod4Mask;
/* Mouse: tags click bindings */ /* Mouse: tags click bindings */
parse_mouse_bindings(cfg_mouse, "tag", &awesomeconf->buttons.tag, &awesomeconf->buttons.ntag, False); awesomeconf->buttons.tag = parse_mouse_bindings(cfg_mouse, "tag", False);
/* Mouse: layout click bindings */ /* Mouse: layout click bindings */
parse_mouse_bindings(cfg_mouse, "layout", &awesomeconf->buttons.layout, &awesomeconf->buttons.nlayout, True); awesomeconf->buttons.layout = parse_mouse_bindings(cfg_mouse, "layout", True);
/* Mouse: title click bindings */ /* Mouse: title click bindings */
parse_mouse_bindings(cfg_mouse, "title", &awesomeconf->buttons.title, &awesomeconf->buttons.ntitle, True); awesomeconf->buttons.title = parse_mouse_bindings(cfg_mouse, "title", True);
/* Mouse: root window click bindings */ /* Mouse: root window click bindings */
parse_mouse_bindings(cfg_mouse, "root", &awesomeconf->buttons.root, &awesomeconf->buttons.nroot, True); awesomeconf->buttons.root = parse_mouse_bindings(cfg_mouse, "root", True);
/* Keys */ /* Keys */
awesomeconf->numlockmask = get_numlockmask(awesomeconf->display); awesomeconf->numlockmask = get_numlockmask(awesomeconf->display);

5
config.h
View File

@ -68,6 +68,7 @@ struct Button
unsigned int button; unsigned int button;
void (*func) (awesome_config *, char *); void (*func) (awesome_config *, char *);
char *arg; char *arg;
Button *next;
}; };
/** Status bar */ /** Status bar */
@ -174,13 +175,9 @@ struct awesome_config
struct struct
{ {
Button *tag; Button *tag;
int ntag;
Button *title; Button *title;
int ntitle;
Button *layout; Button *layout;
int nlayout;
Button *root; Button *root;
int nroot;
} buttons; } buttons;
/** Number of keys binding in *keys */ /** Number of keys binding in *keys */
int nkeys; int nkeys;

26
event.c
View File

@ -141,19 +141,17 @@ resizemouse(Client * c, awesome_config *awesomeconf)
static void static void
handle_mouse_button_press(awesome_config *awesomeconf, handle_mouse_button_press(awesome_config *awesomeconf,
unsigned int button, unsigned int state, unsigned int numlockmask, unsigned int button, unsigned int state, unsigned int numlockmask,
Button *buttons, int nbuttons, char *arg) Button *buttons, char *arg)
{ {
int i; Button *b;
for(i = 0; i < nbuttons; i++) for(b = buttons; b; b = b->next)
if(button == buttons[i].button if(button == b->button && (state == b->mod || state == (b->mod | numlockmask)) && b->func)
&& (state == buttons[i].mod || state == (buttons[i].mod | numlockmask))
&& buttons[i].func)
{ {
if(arg) if(arg)
buttons[i].func(awesomeconf, arg); b->func(awesomeconf, arg);
else else
buttons[i].func(awesomeconf, buttons[i].arg); b->func(awesomeconf, b->arg);
return; return;
} }
} }
@ -182,7 +180,7 @@ handle_event_buttonpress(XEvent * e, awesome_config *awesomeconf)
snprintf(arg, sizeof(arg), "%d", i + 1); snprintf(arg, sizeof(arg), "%d", i + 1);
handle_mouse_button_press(&awesomeconf[screen], handle_mouse_button_press(&awesomeconf[screen],
ev->button, ev->state, awesomeconf->numlockmask, ev->button, ev->state, awesomeconf->numlockmask,
awesomeconf->buttons.tag, awesomeconf->buttons.ntag, arg); awesomeconf[screen].buttons.tag, arg);
return; return;
} }
} }
@ -194,11 +192,11 @@ handle_event_buttonpress(XEvent * e, awesome_config *awesomeconf)
|| (awesomeconf[screen].statusbar.position == BarLeft && ev->y > awesomeconf[screen].statusbar.width - x)) || (awesomeconf[screen].statusbar.position == BarLeft && ev->y > awesomeconf[screen].statusbar.width - x))
handle_mouse_button_press(&awesomeconf[screen], handle_mouse_button_press(&awesomeconf[screen],
ev->button, ev->state, awesomeconf->numlockmask, ev->button, ev->state, awesomeconf->numlockmask,
awesomeconf->buttons.layout, awesomeconf->buttons.nlayout, NULL); awesomeconf[screen].buttons.layout, NULL);
else else
handle_mouse_button_press(&awesomeconf[screen], handle_mouse_button_press(&awesomeconf[screen],
ev->button, ev->state, awesomeconf->numlockmask, ev->button, ev->state, awesomeconf->numlockmask,
awesomeconf->buttons.title, awesomeconf->buttons.ntitle, NULL); awesomeconf[screen].buttons.title, NULL);
return; return;
} }
@ -212,7 +210,7 @@ handle_event_buttonpress(XEvent * e, awesome_config *awesomeconf)
{ {
restack(&awesomeconf[c->screen]); restack(&awesomeconf[c->screen]);
window_grabbuttons(c->display, c->phys_screen, c->win, window_grabbuttons(c->display, c->phys_screen, c->win,
True, True, awesomeconf->buttons.root, awesomeconf->buttons.nroot, True, True, awesomeconf->buttons.root,
awesomeconf->modkey, awesomeconf->numlockmask); awesomeconf->modkey, awesomeconf->numlockmask);
} }
} }
@ -258,7 +256,7 @@ handle_event_buttonpress(XEvent * e, awesome_config *awesomeconf)
screen = get_screen_bycoord(e->xany.display, x, y); screen = get_screen_bycoord(e->xany.display, x, y);
handle_mouse_button_press(&awesomeconf[screen], handle_mouse_button_press(&awesomeconf[screen],
ev->button, ev->state, awesomeconf->numlockmask, ev->button, ev->state, awesomeconf->numlockmask,
awesomeconf->buttons.root, awesomeconf->buttons.nroot, NULL); awesomeconf[screen].buttons.root, NULL);
return; return;
} }
} }
@ -369,7 +367,7 @@ handle_event_enternotify(XEvent * e, awesome_config *awesomeconf)
|| get_current_layout(awesomeconf[c->screen].tags, || get_current_layout(awesomeconf[c->screen].tags,
awesomeconf[c->screen].ntags)->arrange == layout_floating) awesomeconf[c->screen].ntags)->arrange == layout_floating)
window_grabbuttons(c->display, c->phys_screen, c->win, window_grabbuttons(c->display, c->phys_screen, c->win,
True, False, awesomeconf->buttons.root, awesomeconf->buttons.nroot, True, False, awesomeconf->buttons.root,
awesomeconf->modkey, awesomeconf->numlockmask); awesomeconf->modkey, awesomeconf->numlockmask);
} }
else else

15
window.c
View File

@ -93,10 +93,9 @@ window_configure(Display *disp, Window win, int x, int y, int w, int h, int bord
*/ */
void void
window_grabbuttons(Display *disp, int screen, Window win, Bool focused, Bool raised, window_grabbuttons(Display *disp, int screen, Window win, Bool focused, Bool raised,
Button *buttons_root, int nbuttons_root, Button *buttons_root, KeySym modkey, unsigned int numlockmask)
KeySym modkey, unsigned int numlockmask)
{ {
int i; Button *b;
XUngrabButton(disp, AnyButton, AnyModifier, win); XUngrabButton(disp, AnyButton, AnyModifier, win);
@ -158,18 +157,18 @@ window_grabbuttons(Display *disp, int screen, Window win, Bool focused, Bool rai
XGrabButton(disp, AnyButton, AnyModifier, win, False, BUTTONMASK, XGrabButton(disp, AnyButton, AnyModifier, win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None); GrabModeAsync, GrabModeSync, None, None);
for(i = 0; i < nbuttons_root; i++) for(b = buttons_root; b; b = b->next)
{ {
XGrabButton(disp, buttons_root[i].button, buttons_root[i].mod, XGrabButton(disp, b->button, b->mod,
RootWindow(disp, screen), False, BUTTONMASK, RootWindow(disp, screen), False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None); GrabModeAsync, GrabModeSync, None, None);
XGrabButton(disp, buttons_root[i].button, buttons_root[i].mod | LockMask, XGrabButton(disp, b->button, b->mod | LockMask,
RootWindow(disp, screen), False, BUTTONMASK, RootWindow(disp, screen), False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None); GrabModeAsync, GrabModeSync, None, None);
XGrabButton(disp, buttons_root[i].button, buttons_root[i].mod | numlockmask, XGrabButton(disp, b->button, b->mod | numlockmask,
RootWindow(disp, screen), False, BUTTONMASK, RootWindow(disp, screen), False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None); GrabModeAsync, GrabModeSync, None, None);
XGrabButton(disp, buttons_root[i].button, buttons_root[i].mod | numlockmask | LockMask, XGrabButton(disp, b->button, b->mod | numlockmask | LockMask,
RootWindow(disp, screen), False, BUTTONMASK, RootWindow(disp, screen), False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None); GrabModeAsync, GrabModeSync, None, None);
} }

2
window.h
View File

@ -31,7 +31,7 @@
int window_setstate(Display *, Window, long); int window_setstate(Display *, Window, long);
long window_getstate(Display *, Window); long window_getstate(Display *, Window);
Status window_configure(Display *, Window, int, int, int, int, int); Status window_configure(Display *, Window, int, int, int, int, int);
void window_grabbuttons(Display *, int, Window, Bool, Bool, Button *, int, KeySym, unsigned int); void window_grabbuttons(Display *, int, Window, Bool, Bool, Button *, KeySym, unsigned int);
void window_setshape(Display *, int, Window); void window_setshape(Display *, int, Window);
void window_settrans(Display *, Window, double); void window_settrans(Display *, Window, double);