summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/bench.c
diff options
context:
space:
mode:
authorquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-09-30 11:58:49 +0000
committerquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-09-30 11:58:49 +0000
commit4de155464d8101b4dab13b659ae9054649fd015c (patch)
tree055f3de0d7e36ebff1477e5925d19a21b1188697 /beryl-plugins/src/bench.c
parentdfdec57999b80a630e7cbc1a4aba4eeed091b8b7 (diff)
downloadmarex-dev-4de155464d8101b4dab13b659ae9054649fd015c.tar.gz
marex-dev-4de155464d8101b4dab13b659ae9054649fd015c.tar.bz2
major overhaul of keybindings system
bump VERSION to 0.1.1 bump ABI VERSION to 4 git-svn-id: file:///beryl/trunk@406 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/bench.c')
-rw-r--r--beryl-plugins/src/bench.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/beryl-plugins/src/bench.c b/beryl-plugins/src/bench.c
index 07cffd7..80ad425 100644
--- a/beryl-plugins/src/bench.c
+++ b/beryl-plugins/src/bench.c
@@ -549,7 +549,7 @@ benchInitiate (CompDisplay * d, CompAction * ac, CompActionState state,
}
static void
-benchDisplayInitOptions (BenchDisplay * bd, Display * display)
+benchDisplayInitOptions (BenchDisplay * bd)
{
CompOption *o;
@@ -565,10 +565,9 @@ benchDisplayInitOptions (BenchDisplay * bd, Display * display)
o->value.action.type = CompBindingTypeKey;
o->value.action.state = CompActionStateInitKey;
o->value.action.key.modifiers = BENCH_DISPLAY_OPTION_INITIATE_MOD;
- o->value.action.key.keycode =
- XKeysymToKeycode (display,
+ o->value.action.key.keysym =
XStringToKeysym
- (BENCH_DISPLAY_OPTION_INITIATE_KEY));
+ (BENCH_DISPLAY_OPTION_INITIATE_KEY);
o = &bd->opt[BENCH_DISPLAY_OPTION_OUTPUT_SCREEN];
o->name = "output_screen";
@@ -632,9 +631,7 @@ benchGetDisplayOptions (CompDisplay * display, int *count)
else
{
BenchDisplay * bd = malloc(sizeof(BenchDisplay));
- Display * d = XOpenDisplay(getenv("DISPLAY"));
- if(!d)exit(1);
- benchDisplayInitOptions(bd,d);
+ benchDisplayInitOptions(bd);
*count=NUM_OPTIONS(bd);
return bd->opt;
}
@@ -656,7 +653,7 @@ benchInitDisplay (CompPlugin * p, CompDisplay * d)
free (bd);
return FALSE;
}
- benchDisplayInitOptions (bd, d->display);
+ benchDisplayInitOptions (bd);
bd->active = FALSE;
//Record the display
d->privates[displayPrivateIndex].ptr = bd;