Xid and Class WindowsPredicates respect g

These predicates returned all windows that matched before regardless if they
were on the active workspace or not. This fixes that.