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

Rename internal functions to delinate between client remove, delete and xproto

Browse Source 
delete; 'window-close' is now the proper action, but 'window-delete' as an
alias will remain until more interesting changes require breaking configs.
This commit is contained in:
okan 2019-02-22 19:40:32 +00:00
parent aadf21edf2
commit 90189b3ce0
7 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/cwm/calmwm.h
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: calmwm.h,v 1.362 2018/11/08 15:49:42 okan Exp $
* $OpenBSD: calmwm.h,v 1.363 2019/02/22 19:40:32 okan Exp $
*/
#ifndef _CALMWM_H_
@ -401,7 +401,7 @@ void client_applysizehints(struct client_ctx *);
void client_config(struct client_ctx *);
struct client_ctx *client_current(void);
void client_cycle(struct screen_ctx *, int);
void client_delete(struct client_ctx *);
void client_remove(struct client_ctx *);
void client_draw_border(struct client_ctx *);
struct client_ctx *client_find(Window);
long client_get_wm_state(struct client_ctx *);
@ -419,7 +419,7 @@ void client_ptrsave(struct client_ctx *);
void client_ptrwarp(struct client_ctx *);
void client_raise(struct client_ctx *);
void client_resize(struct client_ctx *, int);
void client_send_delete(struct client_ctx *);
void client_close(struct client_ctx *);
void client_set_wm_state(struct client_ctx *, long);
void client_setactive(struct client_ctx *);
void client_setname(struct client_ctx *);
@ -490,7 +490,7 @@ void kbfunc_ptrmove(void *, struct cargs *);
void kbfunc_client_snap(void *, struct cargs *);
void kbfunc_client_move(void *, struct cargs *);
void kbfunc_client_resize(void *, struct cargs *);
void kbfunc_client_delete(void *, struct cargs *);
void kbfunc_client_close(void *, struct cargs *);
void kbfunc_client_lower(void *, struct cargs *);
void kbfunc_client_raise(void *, struct cargs *);
void kbfunc_client_hide(void *, struct cargs *);

6
app/cwm/client.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: client.c,v 1.248 2019/02/22 14:39:18 okan Exp $
* $OpenBSD: client.c,v 1.249 2019/02/22 19:40:32 okan Exp $
*/
#include <sys/types.h>
@ -170,7 +170,7 @@ client_find(Window win)
}
void
client_delete(struct client_ctx *cc)
client_remove(struct client_ctx *cc)
{
struct screen_ctx *sc = cc->sc;
struct winname *wn;
@ -636,7 +636,7 @@ client_msg(struct client_ctx *cc, Atom proto, Time ts)
}
void
client_send_delete(struct client_ctx *cc)
client_close(struct client_ctx *cc)
{
if (cc->flags & CLIENT_WM_DELETE_WINDOW)
client_msg(cc, cwmh[WM_DELETE_WINDOW], CurrentTime);

7
app/cwm/conf.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: conf.c,v 1.243 2019/02/13 15:43:24 okan Exp $
* $OpenBSD: conf.c,v 1.244 2019/02/22 19:40:33 okan Exp $
*/
#include <sys/types.h>
@ -67,7 +67,8 @@ static const struct {
{ FUNC_CC(window-lower, client_lower, 0) },
{ FUNC_CC(window-raise, client_raise, 0) },
{ FUNC_CC(window-hide, client_hide, 0) },
{ FUNC_CC(window-delete, client_delete, 0) },
{ FUNC_CC(window-close, client_close, 0) },
{ FUNC_CC(window-delete, client_close, 0) },
{ FUNC_CC(window-htile, client_htile, 0) },
{ FUNC_CC(window-vtile, client_vtile, 0) },
{ FUNC_CC(window-stick, client_toggle_sticky, 0) },
@ -194,7 +195,7 @@ static const struct {
{ "M-Tab", "window-cycle" },
{ "MS-Tab", "window-rcycle" },
{ "CM-n", "window-menu-label" },
{ "CM-x", "window-delete" },
{ "CM-x", "window-close" },
{ "CM-a", "group-toggle-all" },
{ "CM-0", "group-toggle-all" },
{ "CM-1", "group-toggle-1" },

6
app/cwm/cwm.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: cwm.1,v 1.62 2018/02/04 22:56:26 okan Exp $
.\" $OpenBSD: cwm.1,v 1.63 2019/02/22 19:40:33 okan Exp $
.\"
.\" Copyright (c) 2004,2005 Marius Aamodt Eriksen <marius@monkey.org>
.\"
@ -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: February 4 2018 $
.Dd $Mdocdate: February 22 2019 $
.Dt CWM 1
.Os
.Sh NAME
@ -100,7 +100,7 @@ Cycle through currently visible windows.
.It Ic MS-Tab
Reverse cycle through currently visible windows.
.It Ic CM-x
Delete current window.
Close current window.
.It Ic CM-[n]
Toggle visibility of group n, where n is 1-9.
.It Ic CM-a

8
app/cwm/cwmrc.5
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: cwmrc.5,v 1.70 2017/12/29 20:03:46 okan Exp $
.\" $OpenBSD: cwmrc.5,v 1.71 2019/02/22 19:40:33 okan Exp $
.\"
.\" Copyright (c) 2004,2005 Marius Aamodt Eriksen <marius@monkey.org>
.\"
@ -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: December 29 2017 $
.Dd $Mdocdate: February 22 2019 $
.Dt CWMRC 5
.Os
.Sh NAME
@ -306,8 +306,8 @@ Reverse cycle through windows.
Forward cycle through windows in current group.
.It window-rcycle-ingroup
Reverse cycle through windows in current group.
.It window-delete
Delete current window.
.It window-close
Close current window.
.It window-hide
Hide current window.
.It window-lower

6
app/cwm/kbfunc.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: kbfunc.c,v 1.160 2019/02/13 15:43:24 okan Exp $
* $OpenBSD: kbfunc.c,v 1.161 2019/02/22 19:40:33 okan Exp $
*/
#include <sys/types.h>
@ -324,9 +324,9 @@ kbfunc_client_snap(void *ctx, struct cargs *cargs)
}
void
kbfunc_client_delete(void *ctx, struct cargs *cargs)
kbfunc_client_close(void *ctx, struct cargs *cargs)
{
client_send_delete(ctx);
client_close(ctx);
}
void

8
app/cwm/xevents.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: xevents.c,v 1.135 2018/11/13 17:37:13 okan Exp $
* $OpenBSD: xevents.c,v 1.136 2019/02/22 19:40:33 okan Exp $
*/
/*
@ -102,7 +102,7 @@ xev_handle_unmapnotify(XEvent *ee)
client_set_wm_state(cc, WithdrawnState);
} else {
if (!(cc->flags & CLIENT_HIDDEN))
client_delete(cc);
client_remove(cc);
}
}
}
@ -116,7 +116,7 @@ xev_handle_destroynotify(XEvent *ee)
LOG_DEBUG3("window: 0x%lx", e->window);
if ((cc = client_find(e->window)) != NULL)
client_delete(cc);
client_remove(cc);
}
static void
@ -389,7 +389,7 @@ xev_handle_clientmessage(XEvent *ee)
}
} else if (e->message_type == ewmh[_NET_CLOSE_WINDOW]) {
if ((cc = client_find(e->window)) != NULL) {
client_send_delete(cc);
client_close(cc);
}
} else if (e->message_type == ewmh[_NET_ACTIVE_WINDOW]) {
if ((cc = client_find(e->window)) != NULL) {