summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/trailfocus2.c
diff options
context:
space:
mode:
authorkristian <kristian@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-17 00:25:43 +0000
committerkristian <kristian@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-17 00:25:43 +0000
commita11345d93587cdbf18aa9830f78cd59b832e703b (patch)
tree30551d85e32eac9d6fc4d1cc152791a19cba7e37 /beryl-plugins/src/trailfocus2.c
parentabb8c6737bed7348cb3df0293442c71115870a5e (diff)
downloadmarex-dev-a11345d93587cdbf18aa9830f78cd59b832e703b.tar.gz
marex-dev-a11345d93587cdbf18aa9830f78cd59b832e703b.tar.bz2
trunk: plugins:
- state: Use the new locking-mechanism, add option to lock both default values and temporary. - trailfocus2: Remove exclude list, no longer necesarry. Todo: Split default and temporary values up in state somehow. git-svn-id: file:///beryl/trunk@2746 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/trailfocus2.c')
-rw-r--r--beryl-plugins/src/trailfocus2.c34
1 files changed, 2 insertions, 32 deletions
diff --git a/beryl-plugins/src/trailfocus2.c b/beryl-plugins/src/trailfocus2.c
index 14ec593..a2037dc 100644
--- a/beryl-plugins/src/trailfocus2.c
+++ b/beryl-plugins/src/trailfocus2.c
@@ -70,7 +70,6 @@ typedef enum _TfOpt
SOPT_MIN_SATURATION,
SOPT_WINDOWS,
SOPT_WINDOW_TYPE,
- SOPT_EXCLUDE_LIST,
SOPT_IGNORE_SKIPTASKBAR,
SOPT_IGNORE_SKIPPAGER,
SOPT_NUM
@@ -103,18 +102,10 @@ typedef struct _TrailfocusScreen
/* Checks if a window is a window trailfocus is supposed to touch or not. */
static Bool is_trailfocus_window(TrailfocusScreen * ts, CompWindow * w)
{
- int i;
- CompOption *o;
-
if (!(w->type & ts->wMask))
return False;
- o = &ts->opt[SOPT_EXCLUDE_LIST];
- for (i = 0; i < o->value.list.nValue; i++)
- {
- if (w->resClass
- && (strcmp(o->value.list.value[i].s, w->resClass) == 0))
- return False;
- }
+ if (w->defaultPaintLock || w->paint.lock)
+ return False;
if (ts->opt[SOPT_IGNORE_SKIPTASKBAR].value.b
&& w->state & CompWindowStateSkipTaskbarMask)
@@ -403,10 +394,6 @@ static Bool trailfocusSetScreenOptions(CompScreen * screen, char *name,
return FALSE;
ts->wMask = compWindowTypeMaskFromStringList(&o->value);
break;
- case SOPT_EXCLUDE_LIST:
- if (!compSetOptionList(o, value))
- return FALSE;
- break;
case SOPT_IGNORE_SKIPPAGER:
case SOPT_IGNORE_SKIPTASKBAR:
if (!compSetBoolOption(o, value))
@@ -567,23 +554,6 @@ static void trailfocusScreenInitOptions(TrailfocusScreen * ts)
o->rest.s.nString = nWindowTypeString;
o->advanced = True;
- o = &ts->opt[SOPT_EXCLUDE_LIST];
- o->advanced = False;
- o->name = "exclude_list";
- o->group = N_("Behaviour");
- o->subGroup = N_("");
- o->displayHints = "";
- o->shortDesc = N_("WM_CLASS to exclude");
- o->longDesc =
- N_
- ("Windows classes to exclude from trailfocusing. Use xprop to find window class.");
- o->type = CompOptionTypeList;
- o->value.list.type = CompOptionTypeString;
- o->value.list.nValue = 0;
- o->value.list.value = 0;
- o->rest.s.string = 0;
- o->rest.s.nString = 0;
-
o = &ts->opt[SOPT_IGNORE_SKIPTASKBAR];
o->advanced = True;
o->name = "ignore_skiptaskbar";