summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/splash.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/splash.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/splash.c')
-rw-r--r--beryl-plugins/src/splash.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/beryl-plugins/src/splash.c b/beryl-plugins/src/splash.c
index f6403e8..3884955 100644
--- a/beryl-plugins/src/splash.c
+++ b/beryl-plugins/src/splash.c
@@ -611,7 +611,7 @@ splashInitiate (CompDisplay * d, CompAction * ac, CompActionState state,
}
static void
-splashDisplayInitOptions (SplashDisplay * sd, Display * display)
+splashDisplayInitOptions (SplashDisplay * sd)
{
CompOption *o;
@@ -627,10 +627,9 @@ splashDisplayInitOptions (SplashDisplay * sd, Display * display)
o->value.action.type = CompBindingTypeKey;
o->value.action.state = CompActionStateInitKey;
o->value.action.key.modifiers = SPLASH_DISPLAY_OPTION_INITIATE_MOD;
- o->value.action.key.keycode =
- XKeysymToKeycode (display,
+ o->value.action.key.keysym =
XStringToKeysym
- (SPLASH_DISPLAY_OPTION_INITIATE_KEY));
+ (SPLASH_DISPLAY_OPTION_INITIATE_KEY);
o = &sd->opt[SPLASH_DISPLAY_OPTION_BACKGROUND];
o->name = "background_file";
@@ -714,7 +713,7 @@ splashGetDisplayOptions (CompDisplay * display, int *count)
Display *d = XOpenDisplay (getenv ("DISPLAY"));
if (!d)
exit (1);
- splashDisplayInitOptions (sd, d);
+ splashDisplayInitOptions (sd);
*count = NUM_OPTIONS (sd);
return sd->opt;
}
@@ -736,7 +735,7 @@ splashInitDisplay (CompPlugin * p, CompDisplay * d)
free (sd);
return FALSE;
}
- splashDisplayInitOptions (sd, d->display);
+ splashDisplayInitOptions (sd);
d->privates[displayPrivateIndex].ptr = sd;
return TRUE;
}