Remove some (duplicated?) configuration identifiers that are not in definitions
This commit is contained in:
parent
ee0910ad38
commit
9d235a1ecd
|
|
@ -321,7 +321,6 @@ AclassConfigLoad(FILE * fs)
|
|||
goto done;
|
||||
|
||||
case CONFIG_CLASSNAME:
|
||||
case ACLASS_NAME:
|
||||
ac = ActionclassFindAny(s2);
|
||||
if (ac)
|
||||
{
|
||||
|
|
@ -335,7 +334,6 @@ AclassConfigLoad(FILE * fs)
|
|||
}
|
||||
break;
|
||||
case CONFIG_TYPE:
|
||||
case ACLASS_TYPE:
|
||||
if (!ac || i2 == ACLASS_TYPE_ACLASS)
|
||||
break;
|
||||
LIST_REMOVE(ActionClass, &aclass_list, ActionclassFind(ac->name));
|
||||
|
|
@ -344,7 +342,6 @@ AclassConfigLoad(FILE * fs)
|
|||
|
||||
break;
|
||||
case CONFIG_MODIFIER:
|
||||
case ACLASS_MODIFIER:
|
||||
/* These are the defines that I have listed...
|
||||
* These, therefore, are the ones that I am
|
||||
* going to accept by default.
|
||||
|
|
@ -431,19 +428,15 @@ AclassConfigLoad(FILE * fs)
|
|||
}
|
||||
break;
|
||||
case CONFIG_ANYMOD:
|
||||
case ACLASS_ANYMOD:
|
||||
anymod = i2;
|
||||
break;
|
||||
case CONFIG_ANYBUT:
|
||||
case ACLASS_ANYBUT:
|
||||
anybut = i2;
|
||||
break;
|
||||
case CONFIG_BUTTON:
|
||||
case ACLASS_BUT:
|
||||
but = i2;
|
||||
break;
|
||||
case CONFIG_ANYKEY:
|
||||
case ACLASS_ANYKEY:
|
||||
anykey = i2;
|
||||
break;
|
||||
case ACLASS_KEY:
|
||||
|
|
|
|||
|
|
@ -1095,7 +1095,6 @@ BackgroundsConfigLoad(FILE * fs)
|
|||
break;
|
||||
|
||||
case CONFIG_CLASSNAME:
|
||||
case BG_NAME:
|
||||
bg = BackgroundFind(s2);
|
||||
if (!bg)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1226,17 +1226,14 @@ _BorderPartLoad(FILE * fs, char type __UNUSED__, Border * b)
|
|||
borigin, bxp, bxa, byp, bya, keepshade);
|
||||
goto done;
|
||||
case CONFIG_IMAGECLASS:
|
||||
case BORDERPART_ICLASS:
|
||||
STRCPY(iclass, s2);
|
||||
piclass = iclass;
|
||||
break;
|
||||
case CONFIG_ACTIONCLASS:
|
||||
case BORDERPART_ACLASS:
|
||||
STRCPY(aclass, s2);
|
||||
paclass = aclass;
|
||||
break;
|
||||
case CONFIG_TEXT:
|
||||
case BORDERPART_TEXTCLASS:
|
||||
STRCPY(tclass, s2);
|
||||
ptclass = tclass;
|
||||
break;
|
||||
|
|
@ -1331,7 +1328,6 @@ BorderConfigLoad(FILE * fs)
|
|||
_BorderCheck(b);
|
||||
goto done;
|
||||
case CONFIG_CLASSNAME:
|
||||
case BORDER_NAME:
|
||||
if (BorderFind(s2))
|
||||
{
|
||||
SkipTillEnd(fs);
|
||||
|
|
|
|||
15
src/conf.h
15
src/conf.h
|
|
@ -52,7 +52,6 @@
|
|||
#define TEXT_FG_COL 205
|
||||
#define TEXT_BG_COL 206
|
||||
|
||||
#define ICLASS_NAME 350
|
||||
#define ICLASS_NORMAL 351
|
||||
#define ICLASS_CLICKED 352
|
||||
#define ICLASS_HILITED 353
|
||||
|
|
@ -77,22 +76,11 @@
|
|||
#define ICLASS_ROTATE 373
|
||||
#define ICLASS_BEVEL 374
|
||||
|
||||
#define ACLASS_NAME 420
|
||||
#define ACLASS_TYPE 421
|
||||
#define ACLASS_MODIFIER 422
|
||||
#define ACLASS_ANYMOD 423
|
||||
#define ACLASS_ANYBUT 424
|
||||
#define ACLASS_BUT 425
|
||||
#define ACLASS_ANYKEY 426
|
||||
#define ACLASS_KEY 427
|
||||
#define ACLASS_EVENT_TRIGGER 428
|
||||
#define ACLASS_ACTION 429
|
||||
|
||||
#define ACLASS_TYPE_ACLASS 5
|
||||
|
||||
#define BORDERPART_ICLASS 450
|
||||
#define BORDERPART_ACLASS 451
|
||||
#define BORDERPART_TEXTCLASS 452
|
||||
#define BORDERPART_ONTOP 453
|
||||
#define BORDERPART_FLAGS 454
|
||||
#define BORDERPART_ISREGION 455
|
||||
|
|
@ -126,7 +114,6 @@
|
|||
#define WINDOWMATCH_DESKTOP 491
|
||||
#define WINDOWMATCH_MAKESTICKY 492
|
||||
|
||||
#define BORDER_NAME 500
|
||||
#define BORDER_LEFT 501
|
||||
#define BORDER_RIGHT 502
|
||||
#define BORDER_TOP 503
|
||||
|
|
@ -156,7 +143,6 @@
|
|||
#define BG_RGB 560
|
||||
#define BG_BG1 561
|
||||
#define BG_BG2 562
|
||||
#define BG_NAME 563
|
||||
#define BG_DESKNUM 564
|
||||
#define BG_BG_FILE 565
|
||||
#define BG_BG_PARAM 566
|
||||
|
|
@ -169,7 +155,6 @@
|
|||
|
||||
#define SLIDEOUT_DIRECTION 620
|
||||
|
||||
#define TOOLTIP_DRAWICLASS 640
|
||||
#define TOOLTIP_BUBBLE1 641
|
||||
#define TOOLTIP_BUBBLE2 642
|
||||
#define TOOLTIP_BUBBLE3 643
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
|
||||
* Copyright (C) 2004-2018 Kim Woelders
|
||||
* Copyright (C) 2004-2020 Kim Woelders
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to
|
||||
|
|
@ -405,7 +405,6 @@ ImageclassConfigLoad(FILE * fs)
|
|||
case ICLASS_COLORMOD:
|
||||
continue;
|
||||
case CONFIG_CLASSNAME:
|
||||
case ICLASS_NAME:
|
||||
if (ImageclassFind(s2, 0))
|
||||
{
|
||||
SkipTillEnd(fs);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
|
||||
* Copyright (C) 2004-2018 Kim Woelders
|
||||
* Copyright (C) 2004-2020 Kim Woelders
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to
|
||||
|
|
@ -176,7 +176,6 @@ TooltipConfigLoad(FILE * fs)
|
|||
}
|
||||
STRCPY(name, s2);
|
||||
break;
|
||||
case TOOLTIP_DRAWICLASS:
|
||||
case CONFIG_IMAGECLASS:
|
||||
STRCPY(iclass, s2);
|
||||
break;
|
||||
|
|
|
|||
Loading…
Reference in New Issue