diff options
| -rw-r--r-- | calmwm.h | 6 | ||||
| -rw-r--r-- | conf.c | 2 | ||||
| -rw-r--r-- | cwmrc.5 | 5 | ||||
| -rw-r--r-- | parse.y | 7 | ||||
| -rw-r--r-- | xutil.c | 10 |
5 files changed, 26 insertions, 4 deletions
diff --git a/calmwm.h b/calmwm.h index c524fcf..fdf33fe 100644 --- a/calmwm.h +++ b/calmwm.h @@ -97,6 +97,7 @@ enum cursor_font { enum color { CWM_COLOR_BORDER_ACTIVE, CWM_COLOR_BORDER_INACTIVE, + CWM_COLOR_BORDER_URGENCY, CWM_COLOR_BORDER_GROUP, CWM_COLOR_BORDER_UNGROUP, CWM_COLOR_MENU_FG, @@ -162,6 +163,7 @@ struct client_ctx { #define CLIENT_INPUT 0x0080 #define CLIENT_WM_DELETE_WINDOW 0x0100 #define CLIENT_WM_TAKE_FOCUS 0x0200 +#define CLIENT_URGENCY 0x0400 #define CLIENT_HIGHLIGHT (CLIENT_GROUP | CLIENT_UNGROUP) #define CLIENT_MAXFLAGS (CLIENT_VMAXIMIZED | CLIENT_HMAXIMIZED) @@ -350,9 +352,10 @@ enum { _NET_WM_DESKTOP, _NET_CLOSE_WINDOW, _NET_WM_STATE, -#define _NET_WM_STATES_NITEMS 2 +#define _NET_WM_STATES_NITEMS 3 _NET_WM_STATE_MAXIMIZED_VERT, _NET_WM_STATE_MAXIMIZED_HORZ, + _NET_WM_STATE_DEMANDS_ATTENTION, EWMH_NITEMS }; enum { @@ -396,6 +399,7 @@ void client_setname(struct client_ctx *); int client_snapcalc(int, int, int, int, int); void client_transient(struct client_ctx *); void client_unhide(struct client_ctx *); +void client_urgency(struct client_ctx *); void client_vmaximize(struct client_ctx *); void client_vtile(struct client_ctx *); void client_warp(struct client_ctx *); diff --git a/conf.c b/conf.c index 970b0ce..445571b 100644 --- a/conf.c +++ b/conf.c @@ -88,6 +88,7 @@ conf_ignore(struct conf *c, char *val) static char *color_binds[] = { "#CCCCCC", /* CWM_COLOR_BORDER_ACTIVE */ "#666666", /* CWM_COLOR_BORDER_INACTIVE */ + "#FC8814", /* CWM_COLOR_BORDER_URGENCY */ "blue", /* CWM_COLOR_BORDER_GROUP */ "red", /* CWM_COLOR_BORDER_UNGROUP */ "black", /* CWM_COLOR_MENU_FG */ @@ -687,6 +688,7 @@ static char *ewmhints[] = { "_NET_WM_STATE", "_NET_WM_STATE_MAXIMIZED_VERT", "_NET_WM_STATE_MAXIMIZED_HORZ", + "_NET_WM_STATE_DEMANDS_ATTENTION", }; void diff --git a/cwmrc.5 b/cwmrc.5 index 2d00e73..3c3fc25 100644 --- a/cwmrc.5 +++ b/cwmrc.5 @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: July 8 2013 $ +.Dd $Mdocdate: November 27 2013 $ .Dt CWMRC 5 .Os .Sh NAME @@ -125,6 +125,9 @@ Set menu background color. .It Ic color menufg Ar color Set menu foreground color. .Pp +.It Ic color urgencyborder Ar color +Set the color of the border of a window indicating urgency. +.Pp .It Ic color ungroupborder Ar color Set the color of the border while ungrouping a window. .Pp diff --git a/parse.y b/parse.y index ef46887..f347f85 100644 --- a/parse.y +++ b/parse.y @@ -70,7 +70,7 @@ typedef struct { %token AUTOGROUP BIND COMMAND IGNORE %token YES NO BORDERWIDTH MOVEAMOUNT %token COLOR SNAPDIST -%token ACTIVEBORDER INACTIVEBORDER +%token ACTIVEBORDER INACTIVEBORDER URGENCYBORDER %token GROUPBORDER UNGROUPBORDER %token MENUBG MENUFG %token FONTCOLOR FONTSELCOLOR @@ -193,6 +193,10 @@ colors : ACTIVEBORDER STRING { free(conf->color[CWM_COLOR_BORDER_INACTIVE]); conf->color[CWM_COLOR_BORDER_INACTIVE] = $2; } + | URGENCYBORDER STRING { + free(conf->color[CWM_COLOR_BORDER_URGENCY]); + conf->color[CWM_COLOR_BORDER_URGENCY] = $2; + } | GROUPBORDER STRING { free(conf->color[CWM_COLOR_BORDER_GROUP]); conf->color[CWM_COLOR_BORDER_GROUP] = $2; @@ -271,6 +275,7 @@ lookup(char *s) { "snapdist", SNAPDIST}, { "sticky", STICKY}, { "ungroupborder", UNGROUPBORDER}, + { "urgencyborder", URGENCYBORDER}, { "yes", YES} }; const struct keywords *p; diff --git a/xutil.c b/xutil.c index 3435274..3a25304 100644 --- a/xutil.c +++ b/xutil.c @@ -333,6 +333,9 @@ xu_ewmh_handle_net_wm_state_msg(struct client_ctx *cc, int action, { _NET_WM_STATE_MAXIMIZED_HORZ, CLIENT_HMAXIMIZED, client_hmaximize }, + { _NET_WM_STATE_DEMANDS_ATTENTION, + CLIENT_URGENCY, + client_urgency }, }; for (i = 0; i < nitems(handlers); i++) { @@ -366,6 +369,8 @@ xu_ewmh_restore_net_wm_state(struct client_ctx *cc) client_hmaximize(cc); if (atoms[i] == ewmh[_NET_WM_STATE_MAXIMIZED_VERT]) client_vmaximize(cc); + if (atoms[i] == ewmh[_NET_WM_STATE_DEMANDS_ATTENTION]) + client_urgency(cc); } free(atoms); } @@ -380,7 +385,8 @@ xu_ewmh_set_net_wm_state(struct client_ctx *cc) atoms = xcalloc((n + _NET_WM_STATES_NITEMS), sizeof(Atom)); for (i = j = 0; i < n; i++) { if (oatoms[i] != ewmh[_NET_WM_STATE_MAXIMIZED_HORZ] && - oatoms[i] != ewmh[_NET_WM_STATE_MAXIMIZED_VERT]) + oatoms[i] != ewmh[_NET_WM_STATE_MAXIMIZED_VERT] && + oatoms[i] != ewmh[_NET_WM_STATE_DEMANDS_ATTENTION]) atoms[j++] = oatoms[i]; } free(oatoms); @@ -388,6 +394,8 @@ xu_ewmh_set_net_wm_state(struct client_ctx *cc) atoms[j++] = ewmh[_NET_WM_STATE_MAXIMIZED_HORZ]; if (cc->flags & CLIENT_VMAXIMIZED) atoms[j++] = ewmh[_NET_WM_STATE_MAXIMIZED_VERT]; + if (cc->flags & CLIENT_URGENCY) + atoms[j++] = ewmh[_NET_WM_STATE_DEMANDS_ATTENTION]; if (j > 0) XChangeProperty(X_Dpy, cc->win, ewmh[_NET_WM_STATE], XA_ATOM, 32, PropModeReplace, (unsigned char *)atoms, j); |