diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-11-12 15:01:36 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-11-12 15:01:36 -0600 |
| commit | d74fed9b65e4c5e742a3fe81a05b83201ccf591a (patch) | |
| tree | 679088bca9ef010b9785605cdda841b64929e69b /twin/compton-tde/c2.c | |
| parent | b0c4ab328e98e611c61ce2b34b4535e0120781bd (diff) | |
| parent | 325fb4c2983cb3211138078bff9cbec749be21c8 (diff) | |
| download | tdebase-d74fed9b65e4c5e742a3fe81a05b83201ccf591a.tar.gz tdebase-d74fed9b65e4c5e742a3fe81a05b83201ccf591a.zip | |
Merge remote-tracking branch 'compton-update/master'
Conflicts:
twin/compton-tde/common.h
twin/compton-tde/compton.c
twin/compton-tde/opengl.c
Diffstat (limited to 'twin/compton-tde/c2.c')
| -rw-r--r-- | twin/compton-tde/c2.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/twin/compton-tde/c2.c b/twin/compton-tde/c2.c index de221c01d..6baf1337e 100644 --- a/twin/compton-tde/c2.c +++ b/twin/compton-tde/c2.c @@ -764,6 +764,7 @@ c2_l_postprocess(session_t *ps, c2_l_t *pleaf) { if (pleaf->predef) { switch (pleaf->predef) { case C2_L_PFOCUSED: ps->o.track_focus = true; break; + // case C2_L_PROUNDED: ps->o.detect_rounded_corners = true; break; case C2_L_PNAME: case C2_L_PCLASSG: case C2_L_PCLASSI: @@ -1057,6 +1058,8 @@ c2_match_once_leaf(session_t *ps, win *w, const c2_l_t *pleaf, case C2_L_PARGB: tgt = (WMODE_ARGB == w->mode); break; case C2_L_PFOCUSED: tgt = win_is_focused_real(ps, w); break; case C2_L_PWMWIN: tgt = w->wmwin; break; + case C2_L_PBSHAPED: tgt = w->bounding_shaped; break; + case C2_L_PROUNDED: tgt = w->rounded_corners; break; case C2_L_PCLIENT: tgt = w->client_win; break; case C2_L_PLEADER: tgt = w->leader; break; default: *perr = true; assert(0); break; @@ -1292,6 +1295,8 @@ c2_match_once(session_t *ps, win *w, const c2_ptr_t cond) { bool c2_matchd(session_t *ps, win *w, const c2_lptr_t *condlst, const c2_lptr_t **cache, void **pdata) { + assert(IsViewable == w->a.map_state); + // Check if the cached entry matches firstly if (cache && *cache && c2_match_once(ps, w, (*cache)->ptr)) { if (pdata) |