qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

all mapped clients now should have a group, so simplify some cases

Browse Source
This commit is contained in:
okan 2014-02-07 21:59:56 +00:00
parent e39098c28b
commit 92bf6935f5
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/cwm/mousefunc.c
View File

@ -16,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $OpenBSD: mousefunc.c,v 1.70 2014/01/30 14:40:21 okan Exp $
* $OpenBSD: mousefunc.c,v 1.71 2014/02/07 21:59:56 okan Exp $
*/
#include <sys/param.h>
@ -203,7 +203,7 @@ mousefunc_menu_unhide(struct client_ctx *cc, union arg *arg)
continue;
menuq_add(&menuq, cc, "(%d) %s",
cc->group ? cc->group->shortcut : 0, wname);
cc->group->shortcut, wname);
}
if (TAILQ_EMPTY(&menuq))

4
app/cwm/search.c
View File

@ -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: search.c,v 1.36 2014/01/20 18:58:03 okan Exp $
* $OpenBSD: search.c,v 1.37 2014/02/07 21:59:56 okan Exp $
*/
#include <sys/param.h>
@ -143,7 +143,7 @@ search_print_client(struct menu *mi, int list)
cc->matchname = cc->name;
(void)snprintf(mi->print, sizeof(mi->print), "(%d) %c%s",
cc->group ? cc->group->shortcut : 0, flag, cc->matchname);
cc->group->shortcut, flag, cc->matchname);
if (!list && cc->matchname != cc->name &&
strlen(mi->print) < sizeof(mi->print) - 1) {

8
app/cwm/xutil.c
View File

@ -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: xutil.c,v 1.83 2014/01/03 15:29:06 okan Exp $
* $OpenBSD: xutil.c,v 1.84 2014/02/07 21:59:56 okan Exp $
*/
#include <sys/param.h>
@ -291,11 +291,7 @@ xu_ewmh_net_desktop_names(struct screen_ctx *sc, char *data, int n)
void
xu_ewmh_net_wm_desktop(struct client_ctx *cc)
{
struct group_ctx *gc = cc->group;
long no = 0xffffffff;
if (gc)
no = gc->shortcut;
int no = cc->group->shortcut;
XChangeProperty(X_Dpy, cc->win, ewmh[_NET_WM_DESKTOP],
XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&no, 1);