PolytreeDE/picom
1
0
Fork 0
mirror of https://github.com/yshui/picom.git synced 2024-11-11 13:51:02 -05:00
Code Releases Activity

c2: make sure properties are used consistently

Browse source 
Make sure a property is not used both as a number and as a string. This
only apply to actual strings, atoms can be used as either a number or a
string.

Offending conditions will be annulled and always return false.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2024-02-16 09:54:39 +00:00
parent 74b5fd193a
commit c475b95036
No known key found for this signature in database
GPG key ID: D3A4405BE6CC17F4
1 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/c2.c
View file

@ -59,6 +59,7 @@ typedef struct {
struct c2_tracked_property { struct c2_tracked_property {
UT_hash_handle hh; UT_hash_handle hh;
xcb_atom_t property; xcb_atom_t property;
bool is_string;
}; };
struct c2_state { struct c2_state {
@ -96,12 +97,13 @@ struct _c2_b {
struct _c2_l { struct _c2_l {
bool neg : 1; bool neg : 1;
enum { enum {
C2_L_OEXISTS, C2_L_OEXISTS = 0,
C2_L_OEQ, C2_L_OEQ,
C2_L_OGT, C2_L_OGT,
C2_L_OGTEQ, C2_L_OGTEQ,
C2_L_OLT, C2_L_OLT,
C2_L_OLTEQ, C2_L_OLTEQ,
C2_L_OFALSE, // Always false, for annulled conditions
} op : 3; } op : 3;
enum { enum {
C2_L_MEXACT, C2_L_MEXACT,
@ -1151,6 +1153,23 @@ static bool c2_l_postprocess(struct c2_state *state, xcb_connection_t *c, c2_l_t
property = cmalloc(struct c2_tracked_property); property = cmalloc(struct c2_tracked_property);
property->property = pleaf->tgtatom; property->property = pleaf->tgtatom;
HASH_ADD_INT(state->tracked_properties, property, property); HASH_ADD_INT(state->tracked_properties, property, property);
property->is_string = pleaf->type == C2_L_TSTRING;
} else {
if (property->is_string != (pleaf->type == C2_L_TSTRING)) {
char buf[256];
size_t len = c2_condition_to_str(
(c2_ptr_t){.isbranch = false, .l = pleaf}, buf,
sizeof(buf));
len = min2(sizeof(buf), len);
log_error("Type mismatch for property \"%s\", %s a "
"string, now %s. Offending rule is: %.*s, it "
"will be disabled.",
pleaf->tgt, property->is_string ? "was" : "wasn't",
pleaf->type == C2_L_TSTRING ? "is" : "isn't",
(int)len, buf);
pleaf->op = C2_L_OFALSE;
return false;
}
} }
} }
@ -1193,10 +1212,6 @@ static bool c2_l_postprocess(struct c2_state *state, xcb_connection_t *c, c2_l_t
} }
pleaf->regex_pcre_match = pleaf->regex_pcre_match =
pcre2_match_data_create_from_pattern(pleaf->regex_pcre, NULL); pcre2_match_data_create_from_pattern(pleaf->regex_pcre, NULL);
// Free the target string
// free(pleaf->tgt);
// pleaf->tgt = NULL;
#else #else
log_error("PCRE regular expression support not compiled in."); log_error("PCRE regular expression support not compiled in.");
return false; return false;
@ -1373,6 +1388,11 @@ static size_t c2_condition_to_str(c2_ptr_t p, char *output, size_t len) {
push_char('!'); push_char('!');
} }
if (pleaf->op == C2_L_OFALSE) {
push_str("(annulled)");
return offset;
}
// Print target name, type, and format // Print target name, type, and format
const char *target_str = c2h_dump_str_tgt(pleaf); const char *target_str = c2h_dump_str_tgt(pleaf);
push_str(target_str); push_str(target_str);
@ -1418,6 +1438,7 @@ static size_t c2_condition_to_str(c2_ptr_t p, char *output, size_t len) {
} }
switch (pleaf->op) { switch (pleaf->op) {
case C2_L_OFALSE: unreachable();
case C2_L_OEXISTS: break; case C2_L_OEXISTS: break;
case C2_L_OEQ: push_str("="); break; case C2_L_OEQ: push_str("="); break;
case C2_L_OGT: push_str(">"); break; case C2_L_OGT: push_str(">"); break;
@ -1721,6 +1742,10 @@ c2_match_once_leaf(session_t *ps, const struct managed_win *w, const c2_l_t *lea
return false; return false;
} }
if (leaf->op == C2_L_OFALSE) {
return leaf->neg;
}
switch (leaf->ptntype) { switch (leaf->ptntype) {
// Deal with integer patterns // Deal with integer patterns
case C2_L_PTINT: return c2_match_once_leaf_int(ps, w, leaf); case C2_L_PTINT: return c2_match_once_leaf_int(ps, w, leaf);