fold in 'active' into 'flags'
This commit is contained in:
parent
5b08aa926e
commit
3d7b8e2b10
@ -15,7 +15,7 @@
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*
|
||||
* $OpenBSD: calmwm.h,v 1.274 2014/09/08 21:15:14 okan Exp $
|
||||
* $OpenBSD: calmwm.h,v 1.275 2014/09/10 20:30:38 okan Exp $
|
||||
*/
|
||||
|
||||
#ifndef _CALMWM_H_
|
||||
@ -180,12 +180,12 @@ struct client_ctx {
|
||||
#define CLIENT_URGENCY 0x0400
|
||||
#define CLIENT_FULLSCREEN 0x0800
|
||||
#define CLIENT_STICKY 0x1000
|
||||
#define CLIENT_ACTIVE 0x2000
|
||||
|
||||
#define CLIENT_HIGHLIGHT (CLIENT_GROUP | CLIENT_UNGROUP)
|
||||
#define CLIENT_MAXFLAGS (CLIENT_VMAXIMIZED | CLIENT_HMAXIMIZED)
|
||||
#define CLIENT_MAXIMIZED (CLIENT_VMAXIMIZED | CLIENT_HMAXIMIZED)
|
||||
int flags;
|
||||
int active;
|
||||
int stackingorder;
|
||||
struct winname_q nameq;
|
||||
#define CLIENT_MAXNAMEQLEN 5
|
||||
|
@ -15,7 +15,7 @@
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*
|
||||
* $OpenBSD: client.c,v 1.181 2014/09/08 21:24:27 okan Exp $
|
||||
* $OpenBSD: client.c,v 1.182 2014/09/10 20:30:38 okan Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -195,7 +195,7 @@ client_setactive(struct client_ctx *cc)
|
||||
client_msg(cc, cwmh[WM_TAKE_FOCUS], Last_Event_Time);
|
||||
|
||||
if ((oldcc = client_current())) {
|
||||
oldcc->active = 0;
|
||||
oldcc->flags &= ~CLIENT_ACTIVE;
|
||||
client_draw_border(oldcc);
|
||||
}
|
||||
|
||||
@ -204,7 +204,7 @@ client_setactive(struct client_ctx *cc)
|
||||
client_mtf(cc);
|
||||
|
||||
curcc = cc;
|
||||
cc->active = 1;
|
||||
cc->flags |= CLIENT_ACTIVE;
|
||||
cc->flags &= ~CLIENT_URGENCY;
|
||||
client_draw_border(cc);
|
||||
conf_grab_mouse(cc->win);
|
||||
@ -485,7 +485,7 @@ client_hide(struct client_ctx *cc)
|
||||
|
||||
XUnmapWindow(X_Dpy, cc->win);
|
||||
|
||||
cc->active = 0;
|
||||
cc->flags &= ~CLIENT_ACTIVE;
|
||||
cc->flags |= CLIENT_HIDDEN;
|
||||
client_set_wm_state(cc, IconicState);
|
||||
|
||||
@ -509,7 +509,7 @@ client_unhide(struct client_ctx *cc)
|
||||
void
|
||||
client_urgency(struct client_ctx *cc)
|
||||
{
|
||||
if (!cc->active)
|
||||
if (!(cc->flags & CLIENT_ACTIVE))
|
||||
cc->flags |= CLIENT_URGENCY;
|
||||
}
|
||||
|
||||
@ -519,7 +519,7 @@ client_draw_border(struct client_ctx *cc)
|
||||
struct screen_ctx *sc = cc->sc;
|
||||
unsigned long pixel;
|
||||
|
||||
if (cc->active)
|
||||
if (cc->flags & CLIENT_ACTIVE)
|
||||
switch (cc->flags & CLIENT_HIGHLIGHT) {
|
||||
case CLIENT_GROUP:
|
||||
pixel = sc->xftcolor[CWM_COLOR_BORDER_GROUP].pixel;
|
||||
|
Loading…
Reference in New Issue
Block a user