summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/move.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/move.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/move.c')
-rw-r--r--beryl-plugins/src/move.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/beryl-plugins/src/move.c b/beryl-plugins/src/move.c
index 878b6a6..a01a381 100644
--- a/beryl-plugins/src/move.c
+++ b/beryl-plugins/src/move.c
@@ -558,7 +558,7 @@ movePaintWindow (CompWindow * w,
}
static void
-moveDisplayInitOptions (MoveDisplay * md, Display * display)
+moveDisplayInitOptions (MoveDisplay * md)
{
CompOption *o;
@@ -578,9 +578,8 @@ moveDisplayInitOptions (MoveDisplay * md, Display * display)
o->value.action.type |= CompBindingTypeKey;
o->value.action.state |= CompActionStateInitKey;
o->value.action.key.modifiers = MOVE_INITIATE_KEY_MODIFIERS_DEFAULT;
- o->value.action.key.keycode =
- XKeysymToKeycode (display,
- XStringToKeysym (MOVE_INITIATE_KEY_DEFAULT));
+ o->value.action.key.keysym =
+ XStringToKeysym (MOVE_INITIATE_KEY_DEFAULT);
o = &md->opt[MOVE_DISPLAY_OPTION_OPACIFY_MIN_OPACITY];
o->name = "opacify_min_opacity";
@@ -638,9 +637,7 @@ moveGetDisplayOptions (CompDisplay * display, int *count)
else
{
MoveDisplay * md = malloc(sizeof(MoveDisplay));
- Display * d = XOpenDisplay(getenv("DISPLAY"));
- if(!d)exit(1);
- moveDisplayInitOptions(md,d);
+ moveDisplayInitOptions(md);
*count=NUM_OPTIONS(md);
return md->opt;
}
@@ -718,7 +715,7 @@ moveInitDisplay (CompPlugin * p, CompDisplay * d)
md->opacifyMinOpacity = (MOVE_OPACIFY_MIN_OPACITY_DEFAULT * OPAQUE) / 100;
- moveDisplayInitOptions (md, d->display);
+ moveDisplayInitOptions (md);
md->w = 0;