Rename node_{manage,unmanage} to node_{add,remove}

To be consistent with the other *_{add,remove} events.

The insertion point is also now given in third position, because it is
part of the coordinates.

diff --git a/doc/bspwm.1 b/doc/bspwm.1
index b2e468074d321d0020d6794bf253c5bc72b321c9..b1a69a5a8809c0513b0ccc7961538e5e77c33398 100644 (file)
--- a/doc/bspwm.1
+++ b/doc/bspwm.1
@@ -4,10 +4,10 @@
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
 .\"      Date: 07/24/2017
 .\"    Manual: Bspwm Manual
-.\"    Source: Bspwm 0.9.3-9-g9ce48c4
+.\"    Source: Bspwm 0.9.3-10-g9ea4b01
 .\"  Language: English
 .\"
-.TH "BSPWM" "1" "07/24/2017" "Bspwm 0\&.9\&.3\-9\-g9ce48c4" "Bspwm Manual"
+.TH "BSPWM" "1" "07/24/2017" "Bspwm 0\&.9\&.3\-10\-g9ea4b01" "Bspwm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1326,14 +1326,14 @@ A desktop is activated\&.
 The layout of a desktop changed\&.
 .RE
 .PP
-\fInode_manage <monitor_id> <desktop_id> <node_id> <ip_id>\fR
+\fInode_add <monitor_id> <desktop_id> <ip_id> <node_id>\fR
 .RS 4
-A window is managed\&.
+A node is added\&.
 .RE
 .PP
-\fInode_unmanage <monitor_id> <desktop_id> <node_id>\fR
+\fInode_remove <monitor_id> <desktop_id> <node_id>\fR
 .RS 4
-A window is unmanaged\&.
+A node is removed\&.
 .RE
 .PP
 \fInode_swap <src_monitor_id> <src_desktop_id> <src_node_id> <dst_monitor_id> <dst_desktop_id> <dst_node_id>\fR

diff --git a/doc/bspwm.1.asciidoc b/doc/bspwm.1.asciidoc
index 420208bc00df255fac41be200946fca55a0f0195..5286b10d6990d93563075c7c4ed4ba313b2bcd52 100644 (file)
--- a/doc/bspwm.1.asciidoc
+++ b/doc/bspwm.1.asciidoc
@@ -778,11 +778,11 @@ Events
 'desktop_layout <monitor_id> <desktop_id> tiled|monocle'::
        The layout of a desktop changed.
 
-'node_manage <monitor_id> <desktop_id> <node_id> <ip_id>'::
-       A window is managed.
+'node_add <monitor_id> <desktop_id> <ip_id> <node_id>'::
+       A node is added.
 
-'node_unmanage <monitor_id> <desktop_id> <node_id>'::
-       A window is unmanaged.
+'node_remove <monitor_id> <desktop_id> <node_id>'::
+       A node is removed.
 
 'node_swap <src_monitor_id> <src_desktop_id> <src_node_id> <dst_monitor_id> <dst_desktop_id> <dst_node_id>'::
        A node is swapped.

diff --git a/src/parse.c b/src/parse.c
index 225f0cf74df4a266d7321cb5bb27ed187653ab6d..3a72f0d0205766bb88e12b76020ca3d407078e06 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -363,10 +363,10 @@ bool parse_subscriber_mask(char *s, subscriber_mask_t *mask)
                *mask = SBSC_MASK_MONITOR;
        } else if (streq("pointer_action", s)) {
                *mask = SBSC_MASK_POINTER_ACTION;
-       } else if (streq("node_manage", s)) {
-               *mask = SBSC_MASK_NODE_MANAGE;
-       } else if (streq("node_unmanage", s)) {
-               *mask = SBSC_MASK_NODE_UNMANAGE;
+       } else if (streq("node_add", s)) {
+               *mask = SBSC_MASK_NODE_ADD;
+       } else if (streq("node_remove", s)) {
+               *mask = SBSC_MASK_NODE_REMOVE;
        } else if (streq("node_swap", s)) {
                *mask = SBSC_MASK_NODE_SWAP;
        } else if (streq("node_transfer", s)) {

diff --git a/src/subscribe.h b/src/subscribe.h
index 167e9d3537860db4b84d6c9a334c7638317a022b..eb78fd690c85a9ea1ce67732f62194b6a6c24847 100644 (file)
--- a/src/subscribe.h
+++ b/src/subscribe.h
@@ -43,8 +43,8 @@ typedef enum {
        SBSC_MASK_DESKTOP_FOCUS = 1 << 12,
        SBSC_MASK_DESKTOP_ACTIVATE = 1 << 13,
        SBSC_MASK_DESKTOP_LAYOUT = 1 << 14,
-       SBSC_MASK_NODE_MANAGE = 1 << 15,
-       SBSC_MASK_NODE_UNMANAGE = 1 << 16,
+       SBSC_MASK_NODE_ADD = 1 << 15,
+       SBSC_MASK_NODE_REMOVE = 1 << 16,
        SBSC_MASK_NODE_SWAP = 1 << 17,
        SBSC_MASK_NODE_TRANSFER = 1 << 18,
        SBSC_MASK_NODE_FOCUS = 1 << 19,

diff --git a/src/window.c b/src/window.c
index 599bac7a6456b2105e0635614cd55d28b2c008b2..57776ffe9c71d916d3711c74395c2e323fcf99d2 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -161,7 +161,7 @@ void manage_window(xcb_window_t win, rule_consequence_t *csq, int fd)
        f = insert_node(m, d, n, f);
        clients_count++;
 
-       put_status(SBSC_MASK_NODE_MANAGE, "node_manage 0x%08X 0x%08X 0x%08X 0x%08X\n", m->id, d->id, win, f!=NULL?f->id:0);
+       put_status(SBSC_MASK_NODE_ADD, "node_add 0x%08X 0x%08X 0x%08X 0x%08X\n", m->id, d->id, f!=NULL?f->id:0, win);
 
        if (f != NULL && f->client != NULL && csq->state != NULL && *(csq->state) == STATE_FLOATING) {
                c->layer = f->client->layer;
@@ -220,7 +220,7 @@ void unmanage_window(xcb_window_t win)
 {
        coordinates_t loc;
        if (locate_window(win, &loc)) {
-               put_status(SBSC_MASK_NODE_UNMANAGE, "node_unmanage 0x%08X 0x%08X 0x%08X\n", loc.monitor->id, loc.desktop->id, win);
+               put_status(SBSC_MASK_NODE_REMOVE, "node_remove 0x%08X 0x%08X 0x%08X\n", loc.monitor->id, loc.desktop->id, win);
                remove_node(loc.monitor, loc.desktop, loc.node);
                set_window_state(win, XCB_ICCCM_WM_STATE_WITHDRAWN);
                arrange(loc.monitor, loc.desktop);