summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/group
diff options
context:
space:
mode:
authoronestone <onestone@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-22 22:31:32 +0000
committeronestone <onestone@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-22 22:31:32 +0000
commitaea6ff110c237bee6259aca6325734974f385455 (patch)
tree768305522fed6dedaf5a3414cb8a2d2ce8176528 /beryl-plugins/src/group
parentc90de5c51fe6212e654b51101a7596d564d88813 (diff)
downloadmarex-dev-aea6ff110c237bee6259aca6325734974f385455.tar.gz
marex-dev-aea6ff110c237bee6259aca6325734974f385455.tar.bz2
beryl-plugins: group: empty bindings should be disabled
git-svn-id: file:///beryl/trunk@3019 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/group')
-rw-r--r--beryl-plugins/src/group/option.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/beryl-plugins/src/group/option.c b/beryl-plugins/src/group/option.c
index 0c00909..92a5d3d 100644
--- a/beryl-plugins/src/group/option.c
+++ b/beryl-plugins/src/group/option.c
@@ -560,11 +560,11 @@ void groupScreenInitOptions(GroupScreen * gs)
o->type = CompOptionTypeString;
o->value.s = strdup(glowTextureName[GROUP_GLOW_TYPE_DEFAULT]);
o->rest.s.string = (char **) glowTextureName;
- o->rest.s.nString = nGlowTextureNames;
+ o->rest.s.nString = nGlowTextureNames;
/* initialize glowType here to prevent code duplication in init.c */
gs->glowType = GROUP_GLOW_TYPE_DEFAULT;
-
+
o = &gs->opt[GROUP_SCREEN_OPTION_FADE_TIME];
o->name = "fade_time";
o->group = N_("Tabbing");
@@ -606,7 +606,7 @@ void groupScreenInitOptions(GroupScreen * gs)
o->rest.f.min = GROUP_VISIBILITY_TIME_MIN;
o->rest.f.max = GROUP_VISIBILITY_TIME_MAX;
o->rest.f.precision = GROUP_VISIBILITY_TIME_PRECISION;
-
+
o = &gs->opt[GROUP_SCREEN_OPTION_UNTAB_ON_CLOSE];
o->name = "untab_on_close";
o->group = N_("Tabbing");
@@ -618,7 +618,7 @@ void groupScreenInitOptions(GroupScreen * gs)
"instead of changing tab.");
o->type = CompOptionTypeBool;
o->value.b = GROUP_UNTAB_ON_CLOSE_DEFAULT;
-
+
o = &gs->opt[GROUP_SCREEN_OPTION_CHANGE_ANIMATION_TIME];
o->name = "change_animation_time";
o->group = N_("Tabbing");
@@ -641,7 +641,7 @@ void groupScreenInitOptions(GroupScreen * gs)
o->displayHints = "";
o->advanced = False;
o->shortDesc = N_("Hover time for slot dragging");
- o->longDesc = N_("Timespan (in s) after which a grouped window is activated if "
+ o->longDesc = N_("Timespan (in s) after which a grouped window is activated if "
"a window of another group is dragged over it.");
o->type = CompOptionTypeFloat;
o->value.f = GROUP_TAB_DRAG_HOVER_TIME_DEFAULT;
@@ -716,7 +716,7 @@ void groupScreenInitOptions(GroupScreen * gs)
o->longDesc = N_("Use spring model for the tab-bar when moving the window.");
o->type = CompOptionTypeBool;
o->value.b = GROUP_SPRING_MODEL_ON_MOVE_DEFAULT;
-
+
o=&gs->opt[GROUP_SCREEN_OPTION_AUTOTAB];
o->name="autotab_create";
o->group = N_("Tabbing");
@@ -806,7 +806,7 @@ groupSetScreenOption(CompScreen * s, char *name, CompOptionValue * value)
finiTexture (s, &gs->glowTexture);
initTexture (s, &gs->glowTexture);
- imageToTexture (s, &gs->glowTexture,
+ imageToTexture (s, &gs->glowTexture,
glowTextureProperties[gs->glowType].textureData,
glowTextureProperties[gs->glowType].textureSize,
glowTextureProperties[gs->glowType].textureSize);
@@ -1116,7 +1116,8 @@ void groupDisplayInitOptions(GroupDisplay * gd)
o->value.action.bell = FALSE;
o->value.action.edgeMask = 0;
o->value.action.state = CompActionStateInitKey;
- o->value.action.type = CompBindingTypeKey;
+ o->value.action.type = 0
+ //o->value.action.type |= CompBindingTypeKey;
o->value.action.key.modifiers =
GROUP_MINIMIZING_MODIFIERS_DEFAULT;
o->value.action.key.keysym =
@@ -1138,7 +1139,8 @@ void groupDisplayInitOptions(GroupDisplay * gd)
o->value.action.bell = FALSE;
o->value.action.edgeMask = 0;
o->value.action.state = CompActionStateInitKey;
- o->value.action.type = CompBindingTypeKey;
+ o->value.action.type = 0
+ //o->value.action.type |= CompBindingTypeKey;
o->value.action.key.modifiers = GROUP_IGNORE_MODIFIERS_DEFAULT;
o->value.action.key.keysym =
XStringToKeysym(GROUP_IGNORE_KEY_DEFAULT);
@@ -1158,7 +1160,8 @@ void groupDisplayInitOptions(GroupDisplay * gd)
o->value.action.bell = FALSE;
o->value.action.edgeMask = 0;
o->value.action.state = CompActionStateInitKey;
- o->value.action.type = CompBindingTypeKey;
+ o->value.action.type = 0
+ //o->value.action.type |= CompBindingTypeKey;
o->value.action.key.modifiers =
GROUP_CHANGE_COLOR_MODIFIERS_DEFAULT;
o->value.action.key.keysym =